优化

src/main/java/com/sooka/module/web/cms/LoginController.java

@@ -1,7 +1,7 @@
 package com.sooka.module.web.cms;
 
+import com.google.common.collect.Maps;
 import com.sooka.common.utils.ControllerUtil;
-import com.sooka.common.utils.JsonUtil;
 import com.sooka.common.utils.StrUtil;
 import com.sooka.module.web.system.service.CmsUserService;
 import com.sooka.mybatis.model.TCmsUser;
@@ -30,18 +30,21 @@ public class LoginController {
 
     @PostMapping("/login")
     @ResponseBody
-    public Map login(HttpServletRequest request) {
+    public Map<String, Object> login(HttpServletRequest request) {
         String verifyCode = request.getParameter("verifyCode");
         /* 临时验证码验证 */
         if (StrUtil.isBlank(verifyCode) || !ControllerUtil.validate(verifyCode, request)) {
-            return JsonUtil.toMAP(false, "验证码输入错误");
+            Map<String, Object> result = Maps.newHashMap();
+            result.put("code", 300);
+            result.put("msg", "验证码输入错误");
+            return result;
         }
         return userService.login(request);
     }
 
     @PostMapping("/register")
     @ResponseBody
-    public String register(@Validated TCmsUser user) {
+    public Map<String, Object> register(@Validated TCmsUser user) {
         return userService.insert(user);
     }
 

src/main/java/com/sooka/module/web/system/service/CmsUserService.java

@@ -14,5 +14,5 @@ public interface CmsUserService {
 
     TCmsUser selectByUsername(String username);
 
-    String insert(TCmsUser user);
+    Map<String, Object> insert(TCmsUser user);
 }

src/main/java/com/sooka/module/web/system/service/impl/CmsUserServiceImpl.java

@@ -2,7 +2,6 @@ package com.sooka.module.web.system.service.impl;
 
 import com.google.common.collect.Maps;
 import com.sooka.common.utils.ControllerUtil;
-import com.sooka.common.utils.JsonUtil;
 import com.sooka.common.utils.StrUtil;
 import com.sooka.module.web.system.service.CmsUserService;
 import com.sooka.mybatis.mapper.TCmsUserMapper;
@@ -59,32 +58,34 @@ public class CmsUserServiceImpl implements CmsUserService {
 
     @Override
     public Map<String, Object> login(HttpServletRequest request) {
-        String username = request.getParameter("username"), password = request.getParameter("password"),
-                remberMe = request.getParameter("remberMe");
+        String username = request.getParameter("username"), password = request.getParameter("password");
         Map<String, Object> result = Maps.newHashMap();
-        result.put("success", false);
+        result.put("code", 300);
         Cache cache = springEhCacheManager.getCache("cms-login-cache");
         Integer tryCount = getTryCount(cache, username);
         if (tryCount >= 5) {
-            result.put("message", "密码输入错误次数超限，请5分钟后再试");
+            result.put("msg", "密码输入错误次数超限，请5分钟后再试");
             return result;
         }
         HttpSession session = request.getSession();
         try {
             TCmsUser user = selectByUsername(username);
-            user.setLoginTime(new Date());
-            user.setLastIp(ControllerUtil.getRemoteAddress(request));
-            /*更新用户的登陆信息*/
-            userMapper.updateByPrimaryKey(user);
-            /*设置session*/
-            session.setAttribute(LOGIN_USER, user);
-            session.setMaxInactiveInterval(30 * 60);
-            result.put("success", true);
-            result.put("message", "登录成功！");
+            if (matches(user, password)) {
+                user.setLoginTime(new Date());
+                user.setLastIp(ControllerUtil.getRemoteAddress(request));
+                /*更新用户的登陆信息*/
+                userMapper.updateByPrimaryKey(user);
+                /*设置session*/
+                session.setAttribute(LOGIN_USER, user);
+                session.setMaxInactiveInterval(30 * 60);
+                result.put("code", 200);
+                result.put("msg", "登录成功！");
+                return result;
+            }
         } catch (Exception e) {
-            result.put("message", "账号或者密码输入错误！");
             putInCache(cache, username);
         }
+        result.put("msg", "账号或者密码输入错误！");
         return result;
     }
 
@@ -104,9 +105,12 @@ public class CmsUserServiceImpl implements CmsUserService {
     }
 
     @Override
-    public String insert(TCmsUser user) {
+    public Map<String, Object> insert(TCmsUser user) {
+        Map<String, Object> result = Maps.newHashMap();
+        result.put("code", 300);
         if (null != selectByUsername(user.getUsername())) {
-            return JsonUtil.toERROR("该账号已被注册！");
+            result.put("msg", "该账号已被注册！");
+            return result;
         }
         /* 加工password */
         if (!StrUtil.isBlank(user.getPassword().trim())) {
@@ -118,8 +122,11 @@ public class CmsUserServiceImpl implements CmsUserService {
         }
         user.setCreateTime(new Date());
         if (userMapper.insert(user) > 0) {
-            return JsonUtil.toSUCCESS("注册成功");
+            result.put("code", 200);
+            result.put("msg", "注册成功！");
+            return result;
         }
-        return JsonUtil.toERROR("注册失败！");
+        result.put("msg", "注册失败！");
+        return result;
     }
 }

src/main/resources/static/js/register/login.js

@@ -10,10 +10,10 @@ $(function () {
             "verifyCode": $("#j_captcha").val()
         }, function (data) {
             var obj = eval(data);
-            if (obj.success) {
-                show_msg(obj.message, "/tuiyijunren/4");
+            if (obj.code == 200) {
+                show_msg(obj.msg, "/tuiyijunren/4");
             } else {
-                show_err_msg(obj.message);
+                show_err_msg(obj.msg);
                 setTimeout(function () {
                     location.reload();
                 }, 3000);
@@ -23,5 +23,5 @@ $(function () {
 });
 
 function changeCode() {
-    $("#captcha_img").attr("src", "${ctxPath}/verify?t=" + (new Date().getTime()));
+    $("#captcha_img").attr("src", "/verify?t=" + (new Date().getTime()));
 }

src/main/resources/static/js/register/register.js

@@ -8,22 +8,6 @@ $(function () {
             show_err_msg("请检查必填项！");
             return;
         }
-        console.log({
-            "username": username,
-            "password": password,
-            "nickname": nickname,
-            "sex": $("input[name='sex']").filter(":checked").val(),
-            "idcard": $("input[name='idcard']").val(),
-            "age": $("input[name='age']").val(),
-            "height": $("input[name='height']").val(),
-            "weight": $("input[name='weight']").val(),
-            "eduBg": $("select[name='eduBg']").val(),
-            "auth": $("input[name='auth']").val(),
-            "plan": $("select[name='plan']").val(),
-            "post": $("input[name='post']").val(),
-            "isPost": $("input[name='isPost']").filter(":checked").val(),
-            "city": $("select[name='city']").val()
-        });
         show_loading();
         // ajax提交表单，#login_form为表单的ID。如：$('#login_form').ajaxSubmit(function(data)
         $.post("/register", {
@@ -43,10 +27,10 @@ $(function () {
             "city": $("select[name='city']").val()
         }, function (data) {
             var obj = eval(data);
-            if (obj.statusCode == 200) {
-                show_msg(obj.message, "/login");
+            if (obj.code == 200) {
+                show_msg(obj.msg, "/login");
             } else {
-                show_err_msg(obj.message);
+                show_err_msg(obj.msg);
                 setTimeout(function () {
                     location.reload();
                 }, 3000);