更新VFJ相关功能

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/SystemFinals.java

@@ -0,0 +1,13 @@
+package cn.com.taiji.core.manager.tools;
+
+public class SystemFinals {
+
+    public final static String appId = "52030131";// 系统APPID
+    public final static String commonServiceHallId = "5201010600400000000";// 普通用户的专属网点编号
+    public final static String commonStaffId = "003d875dabaa4390b22739f6897cf570";// 普通用户的专属业务人员编号
+    public final static String appBaseRoleId = "d1eb3eebfac846d39aea7d39aea7s365";// APP专用的RoleId
+    public final static String miniProgramBaseRoleId = "d1eb3eebfac846d39aea7d39aea7s124";// 微信小程序专用的RoleId
+    public final static String zfbMiniProgramBaseRoleId = "7acb029592c84738a8f509af6e179ffc";// 支付宝小程序专用的RoleId
+
+
+}

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/config/VfjConfigProperties.java

@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @Data
-@ConfigurationProperties("vfj")
+@ConfigurationProperties(prefix = "vfj")
 @Component
 public class VfjConfigProperties {
 

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/vfj/AbstractHandleManager.java

@@ -15,7 +15,6 @@ import cn.com.taiji.inss.config.VfjConfigProperties;
 import cn.com.taiji.inss.manager.cache.RedisWrapManager;
 import cn.com.taiji.inss.manager.model.VfjCommonRequest;
 import cn.com.taiji.inss.manager.model.VfjCommonResponse;
-
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.SM2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,14 +49,19 @@ public abstract class AbstractHandleManager extends AbstractManager {
             sessionId = new String(sessionIdBytes);
             redisWrapManager.set(VFJ_SESSION_ID_KEY, sessionId, 86400, TimeUnit.SECONDS);
         }
+        logger.info("VFJ sessionId :{}", sessionId);
         return sessionId;
     }
 
+
     protected final String excute(InssServiceCmd cmd, BaseModel req) throws ServiceHandleException {
         try {
             VfjCommonRequest vfjRequest = new VfjCommonRequest(vfjConfig, cmd, this.getSessionId(cmd), req.toJson(), this.getTermTrace());
+            logger.info("vfj request:{}", vfjRequest.toJson());
             VfjCommonResponse vfjResponse = HttpClientHelper.jsonPost(VfjCommonResponse.class, vfjConfig.getUrl(), vfjRequest.toJson());
+            logger.info("vfj response:{}", vfjResponse.toJson());
             if (vfjResponse.getCode().equals("E9997")) {
+                redisWrapManager.delete(VFJ_SESSION_ID_KEY);
                 return this.excute(cmd, req);
             } else if (vfjResponse.getCode().equals("0000")) {
                 if (!hasText(vfjResponse.getBuzzData()))
@@ -85,6 +89,7 @@ public abstract class AbstractHandleManager extends AbstractManager {
     private String getTermTrace() {
         long termTrace = redisWrapManager.increment(VFJ_TERM_TRACE, 1);
         if (termTrace > 99999999) redisWrapManager.set(VFJ_TERM_TRACE, "1", 1, TimeUnit.DAYS);
-        return ("00000000" + termTrace).substring(0, 8);
+        String termTraceStr = "00000000" + termTrace;
+        return termTraceStr.substring(termTraceStr.length() - 8);
     }
 }