增加zheng-upms登录账户校验

zheng-common/src/main/java/com/zheng/common/util/MD5Util.java

@@ -45,6 +45,7 @@ public class MD5Util {
 
     public static void main(String[] args) {
         String salt = UUID.randomUUID().toString().replaceAll("-", "");
+        System.out.println(salt);
         System.out.println(MD5Util.MD5("123456" + salt));
     }
 

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/SSOController.java

@@ -1,7 +1,9 @@
 package com.zheng.upms.admin.controller;
 
 import com.zheng.common.util.CookieUtil;
+import com.zheng.common.util.MD5Util;
 import com.zheng.common.util.RedisUtil;
+import com.zheng.upms.admin.controller.util.SystemConstant;
 import com.zheng.upms.dao.model.UpmsSystemExample;
 import com.zheng.upms.dao.model.UpmsUser;
 import com.zheng.upms.dao.model.UpmsUserExample;
@@ -129,27 +131,29 @@ public class SSOController {
 		Map result = new HashMap<>();
 		String data = "";
 		if (StringUtils.isEmpty(username)) {
-			data = "帐号不能为空！";
-			_log.info("{}", data);
 			result.put("result", false);
-			result.put("data", data);
+			result.put("data", SystemConstant.NO_USERNAME);
 			return result;
 		}
 		if (StringUtils.isEmpty(password)) {
-			data = "密码不能为空！";
-			_log.info("{}", data);
 			result.put("result", false);
-			result.put("data", data);
+			result.put("data", SystemConstant.NO_PASSWORD);
 			return result;
 		}
 		// 校验帐号密码
 		UpmsUserExample upmsUserExample = new UpmsUserExample();
 		upmsUserExample.createCriteria()
-				.andUsernameEqualTo(username)
-				.andPasswordEqualTo(password);
-		int count = upmsUserService.countByExample(upmsUserExample);
-		if (count > 0) {
-
+				.andUsernameEqualTo(username);
+		UpmsUser upmsUser = upmsUserService.selectFirstByExample(upmsUserExample);
+		if (null == upmsUser) {
+			result.put("result", false);
+			result.put("data", SystemConstant.ERROR_USERNAME);
+			return result;
+		}
+		if (!upmsUser.getPassword().equals(MD5Util.MD5(password + upmsUser.getSalt()))) {
+			result.put("result", false);
+			result.put("data", SystemConstant.ERROR_PASSWORD);
+			return result;
 		}
 		// 分配单点登录sessionId，不使用session获取会话id，改为cookie，防止session丢失
 		String sessionId = CookieUtil.getCookie(request, ZHENG_UPMS_SSO_SERVER_SESSION_ID);

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/util/SystemConstant.java

@@ -0,0 +1,16 @@
+package com.zheng.upms.admin.controller.util;
+
+/**
+ * Created by shuzheng on 2017/1/19.
+ */
+public class SystemConstant {
+
+    public static final int SUCCESS = 10000;            // 成功
+
+    public static final int NO_USERNAME = 10001;        // 帐号为空
+    public static final int NO_PASSWORD = 10002;        // 密码为空
+    public static final int ERROR_ACCOUNT = 10003;      // 帐号或密码错误
+    public static final int ERROR_USERNAME = 10004;     // 帐号不存在
+    public static final int ERROR_PASSWORD = 10005;     // 密码错误
+
+}

zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/index.jsp

@@ -93,7 +93,7 @@
 							<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-settings"></i> 系统设置</a>
 						</li>
 						<li>
-							<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-run"></i> 退出登录</a>
+							<a class="waves-effect" href="${basePath}/sso/logout"><i class="zmdi zmdi-run"></i> 退出登录</a>
 						</li>
 					</ul>
 				</li>
@@ -126,7 +126,7 @@
 					<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-settings"></i> 系统设置</a>
 				</li>
 				<li>
-					<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-run"></i> 退出登录</a>
+					<a class="waves-effect" href="${basePath}/sso/logout"><i class="zmdi zmdi-run"></i> 退出登录</a>
 				</li>
 			</ul>
 		</div>

zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/sso/login.jsp

@@ -50,28 +50,52 @@
 <script src="${basePath}/resources/zheng-admin/js/login.js"></script>
 <script>
     $(function() {
+        // 点击登录按钮
         $('#login-bt').click(function() {
-            $.ajax({
-                url: '${basePath}/sso/login',
-                type: 'POST',
-                data: {
-                    username: $('#username').val(),
-                    password: $('#password').val(),
-                    backurl: '${param.backurl}'
-                },
-                success: function(json){
-                    if (json.result) {
-                        location.href = json.data;
-                    } else {
-                        alert(json.data);
+            login();
+        });
+        // 回车事件
+        $('#username, #password').keypress(function (event) {
+            if (13 == event.keyCode) {
+                login();
+            }
+        });
+    });
+    // 登录
+    function login() {
+        $.ajax({
+            url: '${basePath}/sso/login',
+            type: 'POST',
+            data: {
+                username: $('#username').val(),
+                password: $('#password').val(),
+                backurl: '${param.backurl}'
+            },
+            success: function(json){
+                if (json.result) {
+                    location.href = json.data;
+                } else {
+                    if (10001 == json.data) {
+                        alert("帐号不能为空！");
+                        $('#username').focus();
+                    }
+                    if (10002 == json.data) {
+                        alert("密码不能为空！");
+                        $('#password').focus();
+                    }
+                    if (10004 == json.data) {
+                        alert("该帐号不存在！");
+                    }
+                    if (10005 == json.data) {
+                        alert("密码错误！");
                     }
-                },
-                error: function(error){
-                    console.log(error);
                 }
-            });
+            },
+            error: function(error){
+                console.log(error);
+            }
         });
-    });
+    }
 </script>
 </body>
 </html>