From 2683f94c44fa299fb6c67c8ac8e15f0f98c7f1b0 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@baicgroup.com.cn>
Date: Wed, 19 Jul 2023 09:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=93=E6=8D=B7=E4=BA=91=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=9D=E5=A7=8B=E5=8C=96230719?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/META-INF/context.xml               |  2 +-
 .../LBIdentityCheck/LBCarIdentityCheck.jsp    |  2 +-
 config/quartz.properties                      |  2 +-
 .../sadre/app/action/BasicWebAction.java      |  6 ++---
 .../app/action/UndefinedPolicyAction.java     |  2 +-
 .../amarsoft/sadre/app/action/WebAction.java  | 10 ++++----
 .../identity/IdentityAlphaVerification.java   | 24 ++++++++++++-------
 .../alpha/identity/ejy/config/Config.java     | 16 ++++++-------
 .../ejy/config/VerificationConfig.java        | 12 +++++-----
 .../identity/ejy/utils/AESCryptService.java   |  6 ++---
 .../alpha/identity/ejy/utils/EncodesUtil.java |  4 ++--
 .../alpha/identity/ejy/utils/HttpUtil.java    |  2 +-
 .../alpha/identity/ejy/utils/JSONUtil.java    | 12 +++++-----
 .../alpha/identity/ejy/utils/SignService.java | 12 +++++-----
 14 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index eae318bb1..a7463d7d1 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -5,7 +5,7 @@
 		type="javax.sql.DataSource" maxActive="30" maxIdle="2" maxWait="10000"
 		username="apzl" password="apzl@2018"
 		driverClassName="com.mysql.jdbc.Driver"
-		url="jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
+		url="jdbc:mysql://47.93.34.101:10323/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
 	<!-- 18娴嬭瘯鐜 -->
 	<!-- <Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource" 
 		maxActive="30" maxIdle="2" maxWait="10000" username="apzl" password="apzl@2018" 
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp
index 27f1d4383..2c3afdb14 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp
@@ -56,7 +56,7 @@
 			 reloadSelf();	
 		 }else{
 			 alert(result);
-			 reloadSelf();	
+			 reloadSelf();
 		 }
 	}
 	function viewAndEdit(){
diff --git a/config/quartz.properties b/config/quartz.properties
index b275217d0..9734a6360 100644
--- a/config/quartz.properties
+++ b/config/quartz.properties
@@ -1,4 +1,4 @@
-org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false
+org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://47.93.34.101:10323/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false
 org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7
 org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3
 org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver
diff --git a/src/com/amarsoft/sadre/app/action/BasicWebAction.java b/src/com/amarsoft/sadre/app/action/BasicWebAction.java
index ff53c071a..94c771840 100644
--- a/src/com/amarsoft/sadre/app/action/BasicWebAction.java
+++ b/src/com/amarsoft/sadre/app/action/BasicWebAction.java
@@ -40,10 +40,10 @@ public abstract class BasicWebAction implements WebAction {
 	
 	public static String describe(int flag){
 		switch(flag){
-			case WEB_ACTION_成功:
-				return ACTION_DESC_成功;
+			case WEB_ACTION_suc:
+				return ACTION_DESC_suc;
 			default:
-				return ACTION_DESC_失败;
+				return ACTION_DESC_fail;
 		}
 	}
 	
diff --git a/src/com/amarsoft/sadre/app/action/UndefinedPolicyAction.java b/src/com/amarsoft/sadre/app/action/UndefinedPolicyAction.java
index 97f6036fa..580d4e948 100644
--- a/src/com/amarsoft/sadre/app/action/UndefinedPolicyAction.java
+++ b/src/com/amarsoft/sadre/app/action/UndefinedPolicyAction.java
@@ -33,7 +33,7 @@ public class UndefinedPolicyAction implements WebAction {
 	 */
 	public int execute(JBOTransaction tx) throws SADREException {
 //		throw new UnsupportedOperationException(this.getClass().getName()+"未定义授权方案不支持执行execute(Transaction)");
-		return WEB_ACTION_失败;
+		return WEB_ACTION_fail;
 	}
 
 }
diff --git a/src/com/amarsoft/sadre/app/action/WebAction.java b/src/com/amarsoft/sadre/app/action/WebAction.java
index 4415c0464..f6b53d473 100644
--- a/src/com/amarsoft/sadre/app/action/WebAction.java
+++ b/src/com/amarsoft/sadre/app/action/WebAction.java
@@ -26,12 +26,12 @@ import com.amarsoft.are.jbo.JBOTransaction;
  * logs: 1. 
  */
 public interface WebAction {
-	public static final int WEB_ACTION_成功 = 1;
-	public static final int WEB_ACTION_失败 = 0;
-	public static final int WEB_ACTION_未知 = -1;
+	public static final int WEB_ACTION_suc = 1;
+	public static final int WEB_ACTION_fail = 0;
+	public static final int WEB_ACTION_un = -1;
 	
-	public static final String ACTION_DESC_成功 = "SUCCESSFUL";
-	public static final String ACTION_DESC_失败 = "FAILED";
+	public static final String ACTION_DESC_suc = "SUCCESSFUL";
+	public static final String ACTION_DESC_fail = "FAILED";
 	
 	
 	/**
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/IdentityAlphaVerification.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/IdentityAlphaVerification.java
index 309728fed..e8c01b3dc 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/IdentityAlphaVerification.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/IdentityAlphaVerification.java
@@ -140,7 +140,7 @@ public class IdentityAlphaVerification {
 	 * @return
 	 */
 	public String doIdentityVerification(JBOTransaction tx){
-		String res = null;
+		String res = "";
 		logger.info("IdentityAlphaVerificationDoIdentityVerification --begin--" + UserName+"@"+OrgName+"@"+FlowUnid);
 		try {
 			// TODO: 2023-7-4 整理参数
@@ -153,15 +153,15 @@ public class IdentityAlphaVerification {
 			// TODO: 2023-7-4 循环参数
 			for(int i=0; i < fullNamesArr.length; i++){
 				logger.info("IdentityAlphaVerificationDoIdentityVerification --【info】--begin-foreach："+fullNamesArr[i]);
-				// TODO: 2023-7-5 判断是否已实名校验过
+				// TODO: 2023-7-5 判断是否已身份校验过
 				BizObjectManager bom4 = JBOFactory.getBizObjectManager(LC_IDENTITY_CHECK_RESULT_TEMP.CLASS_NAME,tx);
 				BizObject queryResult = bom4.createQuery("select result from O where flowunid=:FLOWUNID and name = '"+fullNamesArr[i]+"'").setParameter("FLOWUNID",FlowUnid).getSingleResult(false);
 				if(null != queryResult){
-					logger.info("IdentityAlphaVerificationDoIdentityVerification --【info】--已实名校验过："+fullNamesArr[i]);
+					logger.info("IdentityAlphaVerificationDoIdentityVerification --【info】--已身份校验过："+fullNamesArr[i]);
 					if(i == fullNamesArr.length-1){
-						res += fullNamesArr[i]+ "实名校验成功";
+						res += fullNamesArr[i]+ "：身份校验成功";
 					}else {
-						res += fullNamesArr[i]+ "实名校验成功@";
+						res += fullNamesArr[i]+ "：身份校验成功\n";
 					}
 					continue;
 				}
@@ -171,12 +171,18 @@ public class IdentityAlphaVerification {
 				// TODO: 2023-7-4 保存结果
 				if(null == httpRes){
 					if(i == fullNamesArr.length-1){
-						res += fullNamesArr[i]+ "易捷云实名校验接口异常，请稍后再试！";
+						res += fullNamesArr[i]+ "：易捷云身份校验接口异常，请稍后再试！";
 					}else {
-						res += fullNamesArr[i]+ "易捷云实名校验接口异常，请稍后再试！@";
+						res += fullNamesArr[i]+ "：易捷云身份校验接口异常，请稍后再试！\n";
 					}
-					logger.info("IdentityAlphaVerificationDoIdentityVerificationError --【info】--易捷云实名校验接口异常，请稍后再试！："+fullNamesArr[i]);
+					logger.info("IdentityAlphaVerificationDoIdentityVerificationError --【info】--易捷云身份校验接口异常，请稍后再试！："+fullNamesArr[i]);
 					continue;
+				}else {
+					if(i == fullNamesArr.length-1){
+						res += fullNamesArr[i]+ "：身份校验成功";
+					}else {
+						res += fullNamesArr[i]+ "：身份校验成功\n";
+					}
 				}
 				saveIdentityRes(tx, fullNamesArr[i], certIdsArr[i], httpRes);
 				logger.info("IdentityAlphaVerificationDoIdentityVerification --【info】--end-foreach："+fullNamesArr[i]);
@@ -185,7 +191,7 @@ public class IdentityAlphaVerification {
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("IdentityAlphaVerificationDoIdentityVerificationError 报错：", e);
-			res = "ERROR";
+			res += "ERROR";
 		}
 		logger.info("IdentityAlphaVerificationDoIdentityVerification --end--" + UserName+"@"+OrgName+"@"+FlowUnid);
 		return res;
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/Config.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/Config.java
index 886bebf5b..d02ed9269 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/Config.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/Config.java
@@ -11,19 +11,19 @@ public class Config {
     public static Map<Integer, String> bizTypeMode = new HashMap<>();
 
     static {
-        bizTypeMode.put(BizType.X6000, "6000-韬唤鏍搁獙");
+        bizTypeMode.put(BizType.X6000, "6000-身份核验");
     }
 
     public static class BizType {
-        //璋冪敤鐢宠鎺ュ彛
+        //调用申请接口
         public static final Integer X1000 = 1000;
-        //韬唤鏍搁獙
+        //身份核验
         public static final Integer X6000 = 6000;
     }
 
 
     /**
-     * 绛惧悕宸ュ叿
+     * 签名工具
      */
     public static SignService signService = new SignService();
 
@@ -34,7 +34,7 @@ public class Config {
 
 
     /**
-     * 浠ヤ笅涓変釜涓鸿祴鐮侀獙鐮佽繃绋嬩腑鐨勪笂涓嬫枃鍙橀噺
+     * 以下三个为赋码验码过程中的上下文变量
      */
     public static String bsn;
     public static String randomNumber;
@@ -46,12 +46,12 @@ public class Config {
     public static String idExpireDate = "";
     public static String idIssueDate = "";
 
-    //鐢ㄦ埛绛惧悕绉侀挜
+    //用户签名私钥
     public static String PRIVATE_KEY = "";
 
-    //骞冲彴楠岀鍏挜
+    //平台验签公钥
     public static String PUBLIC_SIGN_KEY = "";
-    //骞冲彴鍔犲瘑鍏挜
+    //平台加密公钥
     public static String PUBLIC_ENCRYPT_KEY = "";
 
     //
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/VerificationConfig.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/VerificationConfig.java
index 572febdd7..624fb7a01 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/VerificationConfig.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/config/VerificationConfig.java
@@ -22,21 +22,21 @@ public class VerificationConfig {
     public static class VerificationMode {
         public static final String X70 = "0x70";
         public static final String X69 = "0x69";
-        //2椤逛俊鎭�(杩擯ID)
+        //2项信息(返PID)
         public static final String X68 = "0x68";
         //
         public static final String X65 = "0x65";
         //
         public static final String X66 = "0x66";
-        //4椤逛俊鎭�
+        //4项信息
         public static final String X10 = "0x10";
-        //浜哄儚+ 4椤逛俊鎭�
+        //人像+ 4项信息
         public static final String X12 = "0x12";
-        //2椤逛俊鎭�
+        //2项信息
         public static final String X40 = "0x40";
-        //浜哄儚+2椤逛俊鎭�
+        //人像+2项信息
         public static final String X42 = "0x42";
-        //4椤逛俊鎭繑璇佷欢鐘舵��
+        //4项信息返证件状态
         public static final String X18 = "0x18";
     }
 }
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/AESCryptService.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/AESCryptService.java
index d08016abf..91af3bce9 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/AESCryptService.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/AESCryptService.java
@@ -24,7 +24,7 @@ public class AESCryptService {
         try {
             keyGenerator = KeyGenerator.getInstance(ALGORITHM_KEY);
         } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException("娌℃湁" + ALGORITHM_KEY + "鐩稿叧鐨勫疄鐜�");
+            throw new RuntimeException("没有" + ALGORITHM_KEY + "相关的实现");
         }
         keyGenerator.init(AES_KEY_LENGTH, new SecureRandom());
     }
@@ -72,7 +72,7 @@ public class AESCryptService {
         try {
             cipher.init(mode, key, iv);
         } catch (InvalidAlgorithmParameterException e) {
-            //姝ｅ父鎯呭喌涓嶄細鍑虹幇璇ュ紓甯�
+            //正常情况不会出现该异常
             throw new RuntimeException("un expect algorithm-parameter", e);
         }
         return cipher.doFinal(content, start, length);
@@ -84,7 +84,7 @@ public class AESCryptService {
             try {
                 cipher = Cipher.getInstance(ALGORITHM_CIPHER);
             } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
-                throw new RuntimeException("娌℃湁鎵惧埌'" + ALGORITHM_CIPHER + "'鐨勫疄鐜�", e);
+                throw new RuntimeException("没有找到'" + ALGORITHM_CIPHER + "'的实现", e);
             }
             localCipher.set(cipher);
         }
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/EncodesUtil.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/EncodesUtil.java
index bf932cd18..2d68ab8b2 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/EncodesUtil.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/EncodesUtil.java
@@ -5,14 +5,14 @@ import org.apache.commons.codec.binary.Base64;
 public class EncodesUtil {
 
     /**
-     * Base64缂栫爜.
+     * Base64编码.
      */
     public static String encodeBase64(byte[] input) {
         return Base64.encodeBase64String(input);
     }
 
     /**
-     * Base64瑙ｇ爜.
+     * Base64解码.
      */
     public static byte[] decodeBase64(String input) {
         return Base64.decodeBase64(input);
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/HttpUtil.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/HttpUtil.java
index 3e65674ba..7f503a595 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/HttpUtil.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/HttpUtil.java
@@ -26,7 +26,7 @@ public class HttpUtil {
 
 //        int statusCode = response.getStatusLine().getStatusCode();
 //        if (statusCode != 200) {
-//            throw new RuntimeException("http璇锋眰寮傚父" + statusCode);
+//            throw new RuntimeException("http请求异常" + statusCode);
 //        }
 
         return EntityUtils.toString(response.getEntity(), "UTF-8");
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/JSONUtil.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/JSONUtil.java
index 8cf6520a7..f2f2bcc97 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/JSONUtil.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/JSONUtil.java
@@ -9,11 +9,11 @@ import java.util.Map;
 public class JSONUtil {
 
     /**
-     * 灏咼SON瀛楃涓茶浆鎹负Java瀵硅薄.
+     * 将JSON字符串转换为Java对象.
      *
      * @param jsonStr
-     * @param clazz   鐩爣瀵硅薄鐨凜lass绫�.
-     * @return Java瀵硅薄
+     * @param clazz   目标对象的Class类.
+     * @return Java对象
      */
     @SuppressWarnings("unchecked")
     public static <T> T json2Object(String jsonStr, Class<?> clazz) {
@@ -25,11 +25,11 @@ public class JSONUtil {
     }
 
     /**
-     * 灏咼ava瀵硅薄杞崲涓簀son瀛楃涓�.
-     * 绂佺敤寰幆寮曠敤妫�娴�.
+     * 将Java对象转换为json字符串.
+     * 禁用循环引用检测.
      *
      * @param obj
-     * @return json瀛楃涓�.
+     * @return json字符串.
      */
     public static String toJson(Object obj) {
         try {
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/SignService.java b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/SignService.java
index 8b0e20970..30705d19c 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/SignService.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/alpha/identity/ejy/utils/SignService.java
@@ -44,9 +44,9 @@ public class SignService {
         try {
             enContent = aesService.encrypt(aesKey, iv, plaintext);
         } catch (IllegalBlockSizeException | BadPaddingException e) {
-            System.out.println("AES鍔犲瘑澶辫触");
+            System.out.println("AES加密失败");
         } catch (InvalidKeyException e) {
-            System.out.println("AES绉橀挜涓嶅彲鐢�");
+            System.out.println("AES秘钥不可用");
         }
 
         try {
@@ -54,7 +54,7 @@ public class SignService {
             ByteArrayOutputStream bout = new ByteArrayOutputStream();
             bout.write(aesKey.getEncoded());
             bout.write(iv.getIV());
-            bout.write(VER); //鐗堟湰淇℃伅锛屽鍔犺В瀵嗘棤浠讳綍褰卞搷
+            bout.write(VER); //版本信息，对加解密无任何影响
             byte[] enDes = encryptKey(pubKey, bout.toByteArray());
 
             //parse
@@ -63,7 +63,7 @@ public class SignService {
             bout.write(enContent);
             return bout.toByteArray();
         } catch (Exception e) {
-            throw new RuntimeException("鍔犲瘑鍙戠敓閿欒", e);
+            throw new RuntimeException("加密发生错误", e);
         }
     }
 
@@ -92,7 +92,7 @@ public class SignService {
             cipher.init(store.getMode(), store.getKey());
             return cipher;
         } catch (Exception e) {
-            throw new RuntimeException("娌℃湁鎵惧埌" + SYSTEM_CIPHER_ALGORITHM + "鐨勫姞瀵嗙畻娉�", e);
+            throw new RuntimeException("没有找到" + SYSTEM_CIPHER_ALGORITHM + "的加密算法", e);
         }
     }
 
@@ -147,7 +147,7 @@ public class SignService {
             }
             return signature;
         } catch (Exception e) {
-            throw new RuntimeException("娌℃湁鎵惧埌" + SYSTEM_SIGNATURE_ALGORITHM + "鐨勭鍚嶇畻娉�", e);
+            throw new RuntimeException("没有找到" + SYSTEM_SIGNATURE_ALGORITHM + "的签名算法", e);
         }
     }