用户注册

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")

ruoyi-cms/src/main/resources/templates/web/user/login.html

@@ -47,6 +47,14 @@
 <div class="fly-footer" th:replace="web/index::cmsBottom">
 </div>
 <script>
+    var layer;
+    $(function () {
+        layui.use('layer', function () {
+            layer = layui.layer;
+        });
+
+    })
+
     function login() {
         var loginName = $.common.trim($("input[name='loginName']").val());
         var password = $.common.trim($("input[name='password']").val());
@@ -63,7 +71,7 @@
                 if (r.code == 200) {
                     location.href = ctx + 'web/user/index.html';
                 } else {
-                    $.modal.msg(r.msg);
+                    layer.msg(r.msg, {icon: 2});
                 }
             }
         });

ruoyi-cms/src/main/resources/templates/web/user/reg.html

@@ -19,37 +19,34 @@
       <div class="layui-form layui-tab-content" id="LAY_ucm" style="padding: 20px 0;">
         <div class="layui-tab-item layui-show">
           <div class="layui-form layui-form-pane">
-            <form method="post">
+
               <div class="layui-form-item">
-                <label for="L_email" class="layui-form-label">邮箱</label>
+                <label for="L_email" class="layui-form-label">登录名</label>
                 <div class="layui-input-inline">
-                  <input type="text" id="L_email" name="email" required lay-verify="email" autocomplete="off" class="layui-input">
+                  <input type="text" id="L_email" name="logiName" required lay-verify="email" autocomplete="on" class="layui-input">
                 </div>
-                <div class="layui-form-mid layui-word-aux">将会成为您唯一的登入名</div>
               </div>
               <div class="layui-form-item">
                 <label for="L_username" class="layui-form-label">昵称</label>
                 <div class="layui-input-inline">
-                  <input type="text" id="L_username" name="username" required lay-verify="required" autocomplete="off" class="layui-input">
+                  <input type="text" id="L_username" name="userName" required lay-verify="required" autocomplete="off" class="layui-input">
                 </div>
               </div>
               <div class="layui-form-item">
                 <label for="L_pass" class="layui-form-label">密码</label>
                 <div class="layui-input-inline">
-                  <input type="password" id="L_pass" name="pass" required lay-verify="required" autocomplete="off" class="layui-input">
+                  <input type="password" id="L_pass" name="password" required lay-verify="required" autocomplete="off" class="layui-input">
                 </div>
-                <div class="layui-form-mid layui-word-aux">6到16个字符</div>
               </div>
               <div class="layui-form-item">
                 <label for="L_repass" class="layui-form-label">确认密码</label>
                 <div class="layui-input-inline">
-                  <input type="password" id="L_repass" name="repass" required lay-verify="required" autocomplete="off" class="layui-input">
+                  <input type="password" id="L_repass" name="repassword" required lay-verify="required" autocomplete="off" class="layui-input">
                 </div>
               </div>
               <div class="layui-form-item">
-                <button class="layui-btn" lay-filter="*" lay-submit>立即注册</button>
+                <button id="btnSubmit" class="layui-btn" lay-filter="*" onclick="regAccount()"> 立即注册</button>
               </div>
-            </form>
           </div>
         </div>
       </div>
@@ -62,22 +59,42 @@
 <div class="fly-footer" th:replace="web/index::cmsBottom">
 </div>
 
-<script src="../../res/layui/layui.js"></script>
 <script>
-layui.cache.page = 'user';
+    var layer;
-layui.cache.user = {
+    $(function () {
-  username: '游客'
+        layui.use('layer', function () {
-  ,uid: -1
+            layer = layui.layer;
-  ,avatar: '../../res/images/avatar/00.jpg'
+        });
-  ,experience: 83
+
-  ,sex: '男'
+    })
-};
+
-layui.config({
+    function regAccount() {
-  version: "3.0.0"
+        var loginName = $.common.trim($("input[name='logiName']").val());
-  ,base: '../../res/mods/'
+        var userName = $.common.trim($("input[name='userName']").val());
-}).extend({
+        var password = $.common.trim($("input[name='password']").val());
-  fly: 'index'
+        var repassword = $.common.trim($("input[name='repassword']").val());
-}).use('fly');
+        if(password != repassword){
+            layer.msg("密码不一致", {icon: 2});
+            return;
+        }
+        $.ajax({
+            type: "post",
+            url: "/web/user/regaccount",
+            data: {
+                "loginName": loginName,
+                "userName": userName,
+                "password":password
+            },
+            success: function(r) {
+                debugger
+                if (r.code == 200) {
+                    location.href = ctx + 'web/user/login.html';
+                } else {
+                    layer.msg(r.msg, {icon: 2});
+                }
+            }
+        });
+    }
 </script>
 
 </body>

ruoyi-cms/src/main/resources/templates/web/user/set.html

@@ -87,7 +87,6 @@
               <div class="layui-input-inline">
                 <input type="text" id="L_email" name="email" required lay-verify="email" autocomplete="off" value="" class="layui-input">
               </div>
-              <div class="layui-form-mid layui-word-aux">如果您在邮箱已激活的情况下，变更了邮箱，需<a href="activate.html" style="font-size: 12px; color: #4f99cf;">重新验证邮箱</a>。</div>
             </div>
             <div class="layui-form-item">
               <label for="L_username" class="layui-form-label">昵称</label>