From f278d03caa49a96aa568404a8f22c3ddcffb255b Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Mon, 28 Jan 2019 03:07:44 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 304f94a340f36c16c9707d5c3a14f284a5b99cf8.
---
 .../cms/controller/CmsUserController.java     | 29 +++++++++++++++++--
 1 file changed, 27 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..abead0cae 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,6 +2,7 @@ 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;
@@ -9,6 +10,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 +37,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 +52,6 @@ public class CmsUserController {
 
     private String prefix = "web";
 
-    @Autowired
-    private ISysUserService sysUserService;
 
     @Autowired
     private IExamUserErrorQuestionService examUserErrorQuestionService;
@@ -64,6 +65,11 @@ public class CmsUserController {
     @Autowired
     private IVipUserOrdersService vipUserOrdersService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private SysPasswordService passwordService;
 
 
     @RequestMapping("/user/login.html")
@@ -78,6 +84,25 @@ 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.setUserType( UserConstants.USER_VIP );
+        user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) );
+        sysUserService.insertUser(user);
+        return success;
+    }
+
 
 
     @RequestMapping("/user/index.html")