ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "用户注册" 

This reverts commit 304f94a340.
This commit is contained in:
zhujunjieit 2019-01-28 03:07:44 +08:00
parent c34d44dfdb
commit f278d03caa
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.cms.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.base.AjaxResult;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.exam.domain.*; import com.ruoyi.exam.domain.*;
import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.extra.servlet.ServletUtil;
import com.ruoyi.exam.domain.ExamPractice; import com.ruoyi.exam.domain.ExamPractice;
@ -9,6 +10,7 @@ import com.ruoyi.exam.domain.ExamUserErrorQuestion;
import com.ruoyi.exam.domain.ExamUserErrorQuestionVO; import com.ruoyi.exam.domain.ExamUserErrorQuestionVO;
import com.ruoyi.exam.service.*; import com.ruoyi.exam.service.*;
import com.ruoyi.framework.jwt.JwtUtil; import com.ruoyi.framework.jwt.JwtUtil;
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.framework.web.util.ServletUtils; import com.ruoyi.framework.web.util.ServletUtils;
import com.ruoyi.framework.web.util.ShiroUtils; import com.ruoyi.framework.web.util.ShiroUtils;
import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.SysUser;
@ -35,6 +37,7 @@ import org.springframework.web.servlet.ModelAndView;
import sun.awt.image.IntegerComponentRaster; import sun.awt.image.IntegerComponentRaster;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -49,8 +52,6 @@ public class CmsUserController {
private String prefix = "web"; private String prefix = "web";
@Autowired
private ISysUserService sysUserService;
@Autowired @Autowired
private IExamUserErrorQuestionService examUserErrorQuestionService; private IExamUserErrorQuestionService examUserErrorQuestionService;
@ -64,6 +65,11 @@ public class CmsUserController {
@Autowired @Autowired
private IVipUserOrdersService vipUserOrdersService; private IVipUserOrdersService vipUserOrdersService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private SysPasswordService passwordService;
@RequestMapping("/user/login.html") @RequestMapping("/user/login.html")
@ -78,6 +84,25 @@ public class CmsUserController {
return prefix + "/user/reg"; return prefix + "/user/reg";
} }
@RequestMapping("/user/regaccount")
@ResponseBody
public AjaxResult reg(SysUser user) {
List<SysUser> sysUsers = sysUserService.selectUserList(user);
AjaxResult success = AjaxResult.success("注册成功");
if(sysUsers.size()>0){
success = AjaxResult.error("账户名已存在");
return success;
}
user.setStatus("0");
user.setDelFlag("0");
user.setCreateTime(new Date());
user.setSalt( ShiroUtils.randomSalt() );
user.setUserType( UserConstants.USER_VIP );
user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) );
sysUserService.insertUser(user);
return success;
}
@RequestMapping("/user/index.html") @RequestMapping("/user/index.html")