From a26c2267486c8b281d67595c22d87185978cdc8b Mon Sep 17 00:00:00 2001
From: flower <zloiet@163.com>
Date: Mon, 28 Jan 2019 03:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/controller/CmsUserController.java     | 27 +++++++++++++++++--
 .../resources/templates/web/user/reg.html     |  4 +++
 2 files changed, 29 insertions(+), 2 deletions(-)

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 4423ca982..71ed30143 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
@@ -9,6 +9,7 @@ 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;
@@ -35,6 +36,7 @@ import org.springframework.web.servlet.ModelAndView;
 import sun.awt.image.IntegerComponentRaster;
 
 import javax.servlet.http.Cookie;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -49,8 +51,6 @@ public class CmsUserController {
 
     private String prefix = "web";
 
-    @Autowired
-    private ISysUserService sysUserService;
 
     @Autowired
     private IExamUserErrorQuestionService examUserErrorQuestionService;
@@ -64,6 +64,11 @@ public class CmsUserController {
     @Autowired
     private IVipUserOrdersService vipUserOrdersService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private SysPasswordService passwordService;
 
 
     @RequestMapping("/user/login.html")
@@ -78,6 +83,24 @@ public class CmsUserController {
         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.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/user/reg.html b/ruoyi-cms/src/main/resources/templates/web/user/reg.html
index e30b6a2d8..a41081fb9 100644
--- a/ruoyi-cms/src/main/resources/templates/web/user/reg.html
+++ b/ruoyi-cms/src/main/resources/templates/web/user/reg.html
@@ -73,6 +73,10 @@
         var userName = $.common.trim($("input[name='userName']").val());
         var password = $.common.trim($("input[name='password']").val());
         var repassword = $.common.trim($("input[name='repassword']").val());
+        if(password.length<5){
+            layer.msg("密码长度不正确,密码长度5-20位", {icon: 2});
+            return;
+        }
         if(password != repassword){
             layer.msg("密码不一致", {icon: 2});
             return;