diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java index abead0cae..4423ca982 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java @@ -2,7 +2,6 @@ package com.ruoyi.cms.controller; import com.github.pagehelper.PageInfo; import com.ruoyi.common.base.AjaxResult; -import com.ruoyi.common.constant.UserConstants; import com.ruoyi.exam.domain.*; import cn.hutool.extra.servlet.ServletUtil; import com.ruoyi.exam.domain.ExamPractice; @@ -10,7 +9,6 @@ import com.ruoyi.exam.domain.ExamUserErrorQuestion; import com.ruoyi.exam.domain.ExamUserErrorQuestionVO; import com.ruoyi.exam.service.*; 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.ShiroUtils; import com.ruoyi.system.domain.SysUser; @@ -37,7 +35,6 @@ import org.springframework.web.servlet.ModelAndView; import sun.awt.image.IntegerComponentRaster; import javax.servlet.http.Cookie; -import java.util.Date; import java.util.List; /** @@ -52,6 +49,8 @@ public class CmsUserController { private String prefix = "web"; + @Autowired + private ISysUserService sysUserService; @Autowired private IExamUserErrorQuestionService examUserErrorQuestionService; @@ -65,11 +64,6 @@ public class CmsUserController { @Autowired private IVipUserOrdersService vipUserOrdersService; - @Autowired - private ISysUserService sysUserService; - - @Autowired - private SysPasswordService passwordService; @RequestMapping("/user/login.html") @@ -84,25 +78,6 @@ public class CmsUserController { return prefix + "/user/reg"; } - @RequestMapping("/user/regaccount") - @ResponseBody - public AjaxResult reg(SysUser user) { - List 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") diff --git a/ruoyi-cms/src/main/resources/templates/web/index.html b/ruoyi-cms/src/main/resources/templates/web/index.html index 9d1204754..b478938e1 100644 --- a/ruoyi-cms/src/main/resources/templates/web/index.html +++ b/ruoyi-cms/src/main/resources/templates/web/index.html @@ -10,6 +10,11 @@ + + + + + diff --git a/ruoyi-cms/src/main/resources/templates/web/user/set.html b/ruoyi-cms/src/main/resources/templates/web/user/set.html index c1ae43c5f..41bb56225 100644 --- a/ruoyi-cms/src/main/resources/templates/web/user/set.html +++ b/ruoyi-cms/src/main/resources/templates/web/user/set.html @@ -87,6 +87,7 @@
+
如果您在邮箱已激活的情况下,变更了邮箱,需重新验证邮箱