From 534b54a3d8d30d9e1307b29845fa7019f732c593 Mon Sep 17 00:00:00 2001
From: gityjf <2211675158@qq.com>
Date: Mon, 21 Jun 2021 17:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=BF=E8=89=B2=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/logon/service/impl/AppUserLoginServiceImpl.java | 9 +++------
 .../com/amarsoft/awe/security/LogonValidate.java         | 3 ---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java
index 09db1bb0f..5004de6c8 100644
--- a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java
@@ -133,9 +133,8 @@ public class AppUserLoginServiceImpl implements AppUserLoginService {
 		// 密码校验
 		sPwd = DES.decrypt(sPwd);
 		
-		if (!"tenwa123".equals(sPwd)) { // 非绿色通道
-			sPwd = MD5Util.getMD5EncodedPassword(sPwd);
-			switch (sKeyType) {
+		sPwd = MD5Util.getMD5EncodedPassword(sPwd);
+		switch (sKeyType) {
 			case "common":
 				if (!sPwd.equalsIgnoreCase(userMap.get("PASSWORD".toLowerCase())
 						.toString())) {
@@ -157,9 +156,8 @@ public class AppUserLoginServiceImpl implements AppUserLoginService {
 					return ReturnMapUtil.getReturnMap();
 				}
 				break;
-			}
 		}
-		
+
 
 		try {
 			// 登录前操作
@@ -217,7 +215,6 @@ public class AppUserLoginServiceImpl implements AppUserLoginService {
 		body.put("enable_guesture_code",
 				userMap.get("ENABLE_GESTURE".toLowerCase()));
 		
-		body.put("cheatPwd", DES.encrypt("tenwa123"));
 		Org o = new Org(userMap.get("BELONGORG".toLowerCase()) == null ? ""
 				: userMap.get("BELONGORG".toLowerCase()).toString());
 		body.put("orgid", o.getOrgId());
diff --git a/src_app_fresh/com/amarsoft/awe/security/LogonValidate.java b/src_app_fresh/com/amarsoft/awe/security/LogonValidate.java
index 86acbec9f..5f75fda90 100644
--- a/src_app_fresh/com/amarsoft/awe/security/LogonValidate.java
+++ b/src_app_fresh/com/amarsoft/awe/security/LogonValidate.java
@@ -57,9 +57,6 @@ public final class LogonValidate
     BizObject bo =  bom.createQuery("userId=:UserID").setParameter("UserID", asUser.getUserId()).getSingleResult(false);
     
     if (null == bo) return false;
-    if ("tenwa123".equals(asUser.getUserPassword())) {
-    	return true;
-    }
     String pwd = bo.getAttribute("PASSWORD") == null ? "" : bo.getAttribute("PASSWORD").toString();
     if (!pwd.equals(pwdMD5)) return false;
     else return true;