提交保存

pom.xml

@@ -109,6 +109,10 @@
             <artifactId>iov-sjjh-servicenode-channel-interface</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
@@ -192,7 +196,7 @@
                                    </configuration>
                                </execution>
                            </executions>
-                       </plugin> 
+                       </plugin>
 
 
             <plugin>
@@ -226,7 +230,7 @@
                     </execution>
                 </executions>
             </plugin>
-          
+
 
         </plugins>
     </build>

src/main/java/info/aspirecn/iov/sjjh/supplier10000043/constant/SjjhConstant.java

@@ -142,5 +142,12 @@ public class SjjhConstant {
             "j?x-kUh[;`8Hd?xbj={b/M6MGK>VJXC?.?s4d?d?/?v?jI;EfXkAn5s?vO[DnUmYaWzb=RzZp?xLc=d?g-i?g3c?v?jX.H/JtOiGjP[LpIf?x?" +
             "vc9Pz?j?x?v?j^sPvIdA;Xkb-\\ya`)e+eKr@nZ.I[XkUwa3[lJbLa_j4a8bBbEl`8Qq?x&l?.*o?.?v$sKfQmPt@b/k?v9wMpUj\\gJi@" +
             "/Sj_yKcb-d1Yw?x?va{a=GgRkKga QcYi?x";
-
+    public static String TWO_ELEMENTS_XML_TEMPLATE_V2 = "<ROWS><INFO><SBM>北轻科技</SBM></INFO>" +
+            "<ROW><GMSFHM>公民身份号码</GMSFHM><XM>姓名</XM></ROW>" +
+            "<ROW FSD=\"{fsd}\" YWLX=\"{ywlx}\"><GMSFHM>{idCode}</GMSFHM><XM>{name}</XM></ROW></ROWS>";
+    public static final String TWO_ELEMENTS_SECRET_KEY_V2 = "?v?zV`)Q>_$bFZ=%W4V4?&A`bd5.?o9.?k?h?o?[ab(E;%D0anTJB-^??" +
+            "c?oc3][c7?o?z?x_*>cNcPtJ/@nYeQcSw?x:mJ[Iy`4`CBsRi@mCd?x7s@sa8Edb5)e`+1x-u?m?.0c?v?jZk`7Ui^y?x?v\\nKv`8M/?" +
+            "x9.;s?/*;7z?d?v?jKlKvXk\\r?x?v\\mQtYjAn?x\\HOHH2F-PC+#]MM6%l?a?ma*)i?v`}LwW[Yj]t?x?vMo[y_d`VSb^kXaUk:bAh(" +
+            "t2v?g?g/p?v-c]fVecZCjGjXeYsZp?x?vMbMo?j+q?v%aCw\\hOa_f[lHmCnUy?x?vbX\\t`CRbQrZtTk`8WtKfVt?x$rIh@eLnZp?x*u7" +
+            "m5b?f?v*nSqUcKcTj%u?v?jUmV;A;DlQrP;SwXkRiHgKb?x?v$sLzEdYyHf[qYa]r?x";
 }

src/main/java/info/aspirecn/iov/sjjh/supplier10000043/constant/SupplierProperties.java

@@ -24,4 +24,5 @@ public class SupplierProperties {
     private long url4PhotoUp;
     private long url5PhotoUp;
     private long url6PhotoUp;
+    private long identityInfoV2Up;
 }

src/main/java/info/aspirecn/iov/sjjh/supplier10000043/service/ChannelService.java

@@ -116,4 +116,14 @@ public interface ChannelService {
      * @return
      */
     public ChannelTypeHandleResponseObject photoIdentityCheckV6New(HttpServletRequest request, String customBody, int outTime, String decodeType);
+
+    /**
+     * 二要素cxf调用方式-北轻
+     *
+     * @param request
+     * @param customBody
+     * @param outTime
+     * @return
+     */
+    ChannelTypeHandleResponseObject twoElementsCheckV2(HttpServletRequest request, String customBody, int outTime, String decodeType);
 }

src/main/java/info/aspirecn/iov/sjjh/supplier10000043/service/ChannelServiceImpl.java

@@ -100,6 +100,8 @@ public class ChannelServiceImpl implements ChannelService {
     private String urlV6;
     @Value("${supplier.sensitive}")
     private String[] sensitive;
+    @Value("${supplier.identityInfoV2Url}")
+    private String identityInfoV2Url;
     @Autowired
     SupplierProperties supplierProperties;
     @Autowired
@@ -1782,4 +1784,88 @@ public class ChannelServiceImpl implements ChannelService {
 
         proxy.getRequestContext().put(Message.PROTOCOL_HEADERS, headers);
     }
+
+    @Override
+    public ChannelTypeHandleResponseObject twoElementsCheckV2(HttpServletRequest request, String customBody, int outTime, String decodeType) {
+        ChannelTypeHandleResponseObject ret = new ChannelTypeHandleResponseObject();
+        ret.setIsCharge(Constant.INTERFACE_QUERY_NO_FEE);
+        ret.setCode(Constant.SUCCESS);
+        String upstreamCode = "" + Constant.LOG_UPSTREAM_DEFAULT_RESPONSE_CODE;
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        String returnType = request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA);
+        String channelId = request.getHeader("channelId");
+        if (StringUtils.isBlank(returnType)) {
+            returnType = Constant.CUSTOMER_RETURN_ZW;
+        }
+        if (outTime <= SjjhConstant.PARA_ZERO) {
+            outTime = Constant.HTTPCLIENT_CONNECTTIMEOUT;
+        }
+        log.info("supplier10000043.twoElementsCheckV2---customBody={},outTime={}", customBody, outTime);
+        String key="identityInfoBQ"+twoElementsMethod;
+        LocalDateTime now = LocalDateTime.now();
+        String ymd = dateTimeFormatter.format(now);
+        String hashKey = "043-"+ymd;
+        boolean flag = checkVisitCount(hashKey,key,supplierProperties.getIdentityInfoV2Up(),channelId);
+        if(!flag){
+            countOver(ret,Constant.CUSTOMER_RETURN_JK);
+            return ret;
+        }
+        if (!decodeType.equals(SjjhConstant.DECODE_TYPE_COMMON)) {
+            customBody = decodeParams(ret, returnType, customBody, decodeType);
+            if (StringUtils.isBlank(customBody)) {
+                ret.setCode(Constant.SUCCESS);
+                reduceVisitCount(hashKey,key);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+                return ret;
+            }
+        }
+        try {
+            TwoElementsRequestObject requestObject = objectMapper.readValue(customBody,
+                    TwoElementsRequestObject.class);
+            log.info("supplier10000043.twoElementsCheckV2---requestObject={}", requestObject);
+            // 参数校验
+            if (!validateRequestParams(ret, returnType, requestObject)) {
+                ret.setCode(Constant.SUCCESS);
+                reduceVisitCount(hashKey,key);
+                request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+                return ret;
+            }
+
+            JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
+            factory.setServiceClass(NciicServicesPortType.class);// 设置请求接口
+            factory.setAddress(identityInfoV2Url);
+
+            NciicServicesPortType nciicServices = (NciicServicesPortType) factory.create(); // 创建客户端对象
+            // 设置客户端的配置信息，超时等.
+            Client proxy = ClientProxy.getClient(nciicServices);
+            common(request,proxy);
+            HTTPConduit conduit = (HTTPConduit) proxy.getConduit();
+
+            HTTPClientPolicy policy = new HTTPClientPolicy();
+            policy.setConnectionTimeout(outTime); // 连接超时时间
+            policy.setReceiveTimeout(outTime);// 请求超时时间.
+            policy.setConnection(ConnectionType.CLOSE);
+            conduit.setClient(policy);
+            String paramXml = SjjhConstant.TWO_ELEMENTS_XML_TEMPLATE_V2
+                    .replace("{fsd}", requestObject.getIdCode().substring(0, 6))
+                    .replace("{ywlx}", SjjhConstant.PARAMETER_YWLX_BQ)
+                    .replace("{idCode}", requestObject.getIdCode())
+                    .replace("{name}", requestObject.getName());
+
+            String result = nciicServices.nciicCheck(SjjhConstant.TWO_ELEMENTS_SECRET_KEY_V2,paramXml);
+//            String result = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><RESPONSE errorcode=\"-20\" code=\"0\" countrows=\"1\"><ROWS><ROW><ErrorCode>-20</ErrorCode><ErrorMsg>计费失败，请与管理员联系(errorcode=-20)！</ErrorMsg></ROW></ROWS></RESPONSE>";
+            log.info("twoElementsCheck上游返回xml:{}", result);
+            upstreamCode = setTwoElementsCheckResponse(ret, returnType, result);
+        } catch (WebServiceException ste) {
+            log.info("supplier10000043.twoElementsCheckV2接口-SocketTimeoutException：", ste);
+            ErrorUtils.captureException(ste);
+            ret.setCode(Constant.REQUEST_TIMEOUT);
+        } catch (Exception ioe) {
+            log.info("supplier10000043.twoElementsCheckV2接口-Exception：", ioe);
+            ErrorUtils.captureException(ioe);
+            ret.setCode(Constant.FAIL);
+        }
+        request.setAttribute(Constant.LOG_UPSTREAM_RESPONSE_CODE, upstreamCode);
+        return ret;
+    }
 }

src/main/resources/config/application.yml

@@ -68,31 +68,36 @@ eureka:
     health-check-url-path: /actuator/health
   client:
     serviceUrl:
-      defaultZone: http://localhost:8888/eureka
+      defaultZone: http://101.42.99.184:39001/eureka
 
 #custom
 supplier:
-  url: http://47.94.238.107:8085/nciic/nciic_ws/services/NciicServices
+  urlV2: http://kong-svc.iov-sjjh:8000/20000172/nciic/nciic_ws/services/NciicServices
+  url: http://kong-svc.iov-sjjh:8000/20000171/nciic/nciic_ws/services/NciicServices
+  urlV3: http://kong-svc.iov-sjjh:8000/20000175/nciic/nciic_ws/services/NciicServices
+  urlV4: http://kong-svc.iov-sjjh:8000/20000180/nciic/nciic_ws/services/NciicServices
+  urlV5: http://kong-svc.iov-sjjh:8000/20000183/nciic/nciic_ws/services/NciicServices
+  urlV6: http://kong-svc.iov-sjjh:8000/20000184/nciic/nciic_ws/services/NciicServices
   twoElementsMethod: nciicCheck
   photoIdentityMethod: nciicCompare
   decryptKey: JK568FG2823
-  urlV2: http://47.95.12.213/nciic/nciic_ws/services/NciicServices
+  urlPhotoUp: 138500
+  url3PhotoUp: 49500
+  url2PhotoUp: 149000
+  urlSecondUp: 4800
+  url4PhotoUp: 150000
+  url5PhotoUp: 75000
+  url6PhotoUp: 40000
   decodeApi: CMCC_3RD_DECRYPT
-  decodeUrl: http://jkxy.h11.site/gateway?api=credit.sec.data
   decodeAppKey: JIAO_KE
   decodeAppSecret: D78C393359BF128715C65D91C67051478A4DFC13
-  flag: 1
-  urlPhotoUp: 1000
-  url2PhotoUp: 1000
-  urlSecondUp: 1000
-  secondFlag: 1
-  urlPhotoFlag: 1000
-  url2PhotoFlag: 1000
+  decodeUrl: http://jkxy.h11.site/gateway?api=credit.sec.data
+  targetSms: 13911939833,18611184241,13811548824,17338112749,15139705191
+  notityLimit: 10000
+  hour: 3
   aesDecryptKey: C1AA8eh0116128nn
-  urlV3: http://8.140.178.39:8888/nciic/nciic_ws/services/NciicServices
-  url3PhotoUp: 100000
-  urlV4: http://47.93.191.209:8888/nciic/nciic_ws/services/NciicServices
-  url4PhotoUp: 100000
-  urlV5: http://alb-b2yjoz2cs7z7yc3dzl.cn-beijing.alb.aliyuncs.com/nciic/nciic_ws/services/NciicServices
+  sensitive:
+  identityInfoV2Url: http://8.140.178.39:8888/nciic/nciic_ws/services/NciicServices
+  identityInfoV2Up: 49000
 swagger:
   show: true

src/main/resources/config/bootstrap.yml

@@ -3,16 +3,16 @@ spring:
     name: '@project.artifactId@'
   banner:
     location: classpath:config/banner.txt
-  profiles:
-    active: hwtest
-  cloud:
-    config:
-      discovery:
-        enabled: false
-      uri: http://10.8.18.157:32533
-      label: trunk
-      name: ${spring.application.name}
-      profile: ${spring.profiles.active}
+#  profiles:
+#    active: hwtest
+#  cloud:
+#    config:
+#      discovery:
+#        enabled: false
+#      uri: http://10.8.18.157:32533
+#      label: trunk
+#      name: ${spring.application.name}
+#      profile: ${spring.profiles.active}
 
 
 server:

src/main/resources/config/iov-sjjh-servicenode-supplier-10000034-hwtest.yml

@@ -1,89 +0,0 @@
-spring:
-  sleuth:
-    sampler:
-      probability: 1
-    web:
-      additional-skip-pattern: /api/v2/spans
-  zipkin:
-    base-url: http://127.0.0.1:${server.port}
-
-  mvc:
-    favicon:
-      enabled: false
-server:
-  tomcat:
-    accesslog:
-      buffered: false
-      enabled: true
-      pattern: '{"DateTime":"%{yyyy-MM-dd''T''HH:mm:ss.SSSZZ}t","ClientIP":"%a","Method":"%m","URI":"%U","RequestProtocol":"%H","ResponseCode":%s,
-                "ResponseTime":%D,"UserAgent":"%{user-agent}i","X-Forwarded-For":"%{x-forwarded-for}r","X-User-IP":"%{X-User-IP}i","traceId":"%{x-b3-traceid}i","id":"%{x-b3-spanid}r",
-                "parentId":"%{x-b3-parentspanid}i","ApplicationName":"${spring.application.name}","MG-IsCharge":%{isCharge}r,
-                "MG-ChannelId":%{channelId}i,"MG-CustomBody":"%{x-requestQuery}r","MG-ResultBody":"%{resultBody}o",
-                "MG-ResponseCode":%{respnoseCode}r,"MG-Upstream-ResponseCode":"%{upResponseCode}r","MG-SellingPrice":%{price}i,"req_type":"%{req_type}r","MG-ProductId":%{productId}i,"MG-UserId":%{userid}i}'
-      prefix: access_${HOSTNAME}_${spring.application.name}_${server.port}
-      directory: ${logging.path}
-  servlet:
-    context-path: /
-
-#management
-management:
-  endpoints:
-    enabled-by-default: true
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-    shutdown:
-      enabled: true
-
-#logging
-logging:
-  path: /apps/var/jakarta/logs
-  level:
-    root: INFO
-    red:
-      microcloud: DEBUG
-  config: classpath:config/logback-spring.xml
-  file: ${logging.path}/catalina_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.out
-
-#error logging
-#sleuth logging
-rdc:
-  logging:
-    error-file: ${logging.path}/error_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
-    sleuth-file: ${logging.path}/sleuth_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
-
-#eureka
-eureka:
-  instance:
-    prefer-ip-address: true
-    instance-id: ${spring.cloud.client.ipaddress}:${server.port}
-    metadata-map:
-      management:
-        port: ${management.server.port}
-    health-check-url: http://${spring.cloud.client.ipaddress}:${management.server.port}${eureka.instance.health-check-url-path}
-    health-check-url-path: /actuator/health
-  client:
-    serviceUrl:
-      defaultZone: http://10.8.18.156:31102/eureka,http://10.8.18.172:31102/eureka
-
-
-custom:
-  appKey: 3AA555152F3299F6A37C66C074DEF14D
-  appSecret: A84A975F4C324E20659CB340735DA894
-  #enterpriseUrl: https://gateway.logink.cn/credit/enterpriseQuery/logink
-  enterpriseUrl: https://gateway.logink.cn/credit/enterpriseQuery/noLimit
-  #personUrl: https://gateway.logink.cn/credit/personQuery/logink
-  personUrl: https://gateway.logink.cn/credit/personQuery/noLimit
-  #urlVehiclePermit: https://gateway.logink.cn/credit/vehicleQuery/logink
-  urlVehiclePermit: https://gateway.logink.cn/credit/vehicleQuery/noLimit
-  urlCheckVehicleExist: https://gateway.logink.cn/credit/vehicleQuery/checkVehicleExist
-  enterpriseV2Url: https://gateway.logink.cn/credit/enterpriseQuery/V2/logink
-  personV2Url: https://gateway.logink.cn/credit/personQuery/V2/logink
-  checkVehicleRoadTransportUrl: https://gateway.logink.cn/credit/vehicleQuery/V2/logink
-  sleepTime: 5000
-  code: {1: 1000,2: 1001,3: 9901,4: 1099,8: 9909}
-swagger:
-  show: true

src/main/resources/config/iov-sjjh-servicenode-supplier-10000043-hwtest.yml

@@ -1,97 +0,0 @@
-
-server:
-  tomcat:
-    accesslog:
-      buffered: false
-      enabled: true
-      pattern: '{"DateTime":"%{yyyy-MM-dd''T''HH:mm:ss.SSSZZ}t","ClientIP":"%a","Method":"%m","URI":"%U","RequestProtocol":"%H","ResponseCode":%s,"ResponseTime":%D,"UserAgent":"%{user-agent}i","X-Forwarded-For":"%{x-forwarded-for}r","X-User-IP":"%{X-User-IP}i","traceId":"%{x-b3-traceid}i","id":"%{x-b3-spanid}r",
-                "parentId":"%{x-b3-parentspanid}i","ApplicationName":"${spring.application.name}","MG-IsCharge":%{isCharge}r,"MG-ChannelId":%{channelId}i,"MG-CustomBody":"%{x-requestQuery}r","MG-ResponseCode":%{respnoseCode}r,"MG-Upstream-ResponseCode":"%{upResponseCode}r","MG-SellingPrice":%{price}i,"req_type":"%{req_type}r","MG-ResultBody":"%{resultBody}r","MG-ProductId":%{productId}i,"MG-UserId":%{userid}i}'
-      prefix: access_${HOSTNAME}_${spring.application.name}_${server.port}
-      directory: ${logging.path}
-  servlet:
-    context-path: /
-
-spring:
-  sleuth:
-    sampler:
-      probability: 1
-    web:
-      additional-skip-pattern: /api/v2/spans
-  zipkin:
-    base-url: http://127.0.0.1:${server.port}
-  redis:
-    host: 10.8.18.171
-    port: 6380
-    password: Sjjh@2019
-    jedis:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  mvc:
-    favicon:
-      enabled: false
-
-#management
-management:
-  endpoints:
-    enabled-by-default: true
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-    shutdown:
-      enabled: true
-
-#logging
-logging:
-  path: /apps/var/jakarta/logs
-  level:
-    root: INFO
-    red:
-      microcloud: DEBUG
-  config: classpath:config/logback-spring.xml
-  file: ${logging.path}/catalina_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.out
-
-#error logging
-#sleuth logging
-rdc:
-  logging:
-    error-file: ${logging.path}/error_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
-    sleuth-file: ${logging.path}/sleuth_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
-
-#eureka
-eureka:
-  instance:
-    prefer-ip-address: true
-    instance-id: ${spring.cloud.client.ipaddress}:${server.port}
-    metadata-map:
-      management:
-        port: ${management.server.port}
-    health-check-url: http://${spring.cloud.client.ipaddress}:${management.server.port}${eureka.instance.health-check-url-path}
-    health-check-url-path: /actuator/health
-  client:
-    serviceUrl:
-      defaultZone: http://10.8.18.156:31102/eureka,http://10.8.18.172:31102/eureka
-
-#custom
-supplier:
-  url: http://10.8.18.171:34591/ws/weather
-  urlV2: http://10.8.18.171:34591/ws/weather 
-  twoElementsMethod: nciicCheck
-  photoIdentityMethod: nciicCompare
-  decryptKey: JK568FG2823
-  urlPhotoUp: 5
-  url2PhotoUp: 5
-  urlSecondUp: 3
-  decodeApi: CMCC_3RD_DECRYPT
-  decodeUrl: http://jkxy.h11.site/gateway?api=credit.sec.data
-  decodeAppKey: JIAO_KE
-  decodeAppSecret: D78C393359BF128715C65D91C67051478A4DFC13
-  targetSms: 18210953442
-  notityLimit: 10
-swagger:
-  show: true

src/main/resources/config/iov-sjjh-servicenode-supplier-10000043-new.yaml

@@ -1,54 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: iov-sjjh-servicenode-supplier-10000043-new
-  namespace: iov-sjjh
-spec:
-  replicas: 1
-  revisionHistoryLimit: 2
-  progressDeadlineSeconds: 600
-  strategy:  
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 25%  
-      maxUnavailable: 25%
-  template:
-    metadata:
-      labels:
-        name: iov-sjjh-servicenode-supplier-10000043-new
-    spec:
-      containers:    
-      - name: iov-sjjh-servicenode-supplier-10000043-new
-        image: hub.i139.cn/iov-sjjh/iov-sjjh-servicenode-supplier-10000043:1.0.2
-        imagePullPolicy: IfNotPresent
-        ports:
-        - containerPort: 8080
-        - containerPort: 8081        
-        resources:
-          limits:
-            memory: 1Gi
-            cpu: 2
-          requests:
-            memory: 256Mi
-            cpu: 200m
-        env:
-        - name: JAVA_OPTS
-          value: "-Xmx1G -Xms256M -Xss1024k -Duser.timezone=Asia/Shanghai"
-        - name: APP_OPTS
-          value: "--server.port=8080 --management.server.port=8081 
-                  --spring.profiles.active=jkonline
-                  --spring.cloud.config.uri=http://iov-sjjh-config-node.iov-sjjh:8080"
-        volumeMounts:
-        - mountPath: /data/var/jakarta/logs
-          name: logs-dir
-        - name: timezone
-          mountPath: /etc/localtime
-          readOnly: true
-
-      volumes:
-      - name: logs-dir
-        hostPath:
-          path: /var/jakarta/logs
-      - name: timezone
-        hostPath:
-          path: /etc/localtime

src/main/resources/config/logback-spring.xml

@@ -5,13 +5,13 @@
 		resource="org/springframework/boot/logging/logback/console-appender.xml" />
 
 	<property name="LOG_FILE"
-		value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}" />		
+		value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}" />
 	<springProperty scope="context" name="LOG_PATH" source="logging.path" defaultValue="/apps/var/jakarta/logs" />
 	<springProperty scope="context" name="application_name" source="spring.application.name" defaultValue="test-servicenode-supplier-2" />
 	<springProperty scope="context" name="sleuth_file" source="rdc.logging.sleuth-file" defaultValue="${LOG_PATH}/sleuth/sleuth.log" />
 	<springProperty scope="context" name="error_file" source="rdc.logging.error-file" defaultValue="${LOG_PATH}/error/error.log" />
 
-	<include resource="info/aspirecn/rdc/aspirecloud/node/except/xml/defaults.xml" />
+<!--	<include resource="info/aspirecn/rdc/aspirecloud/node/except/xml/defaults.xml" />-->
 	<include resource="info/aspirecn/rdc/aspirecloud/node/brave/xml/defaults.xml" />
 
 	<appender name="TIME_FILE"
@@ -29,9 +29,9 @@
 			</timeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
 	</appender>
-	
+
 	<root level="INFO">
 		<appender-ref ref="CONSOLE" />
 		<appender-ref ref="TIME_FILE" />
 	</root>
-</configuration>
+</configuration>

src/main/resources/config/supplier-test.yaml

@@ -1,109 +0,0 @@
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: iov-sjjh-servicenode-supplier-10000043
-  namespace: iov-sjjh
-data:
-
-  iov-sjjh-servicenode-supplier-10000043.yml: |-
-    server:
-      tomcat:
-        accesslog:
-          buffered: false
-          enabled: true
-          pattern: '{"DateTime":"%{yyyy-MM-dd''T''HH:mm:ss.SSSZZ}t","ClientIP":"%a","Method":"%m","URI":"%U","RequestProtocol":"%H","ResponseCode":%s,"ResponseTime":%D,"UserAgent":"%{user-agent}i","X-Forwarded-For":"%{x-forwarded-for}r","X-User-IP":"%{X-User-IP}i","traceId":"%{x-b3-traceid}i","id":"%{x-b3-spanid}r",
-            "parentId":"%{x-b3-parentspanid}i","ApplicationName":"${spring.application.name}","MG-IsCharge":%{isCharge}r,"MG-ChannelId":%{channelId}i,"MG-CustomBody":"%{x-requestQuery}r","MG-ResponseCode":%{respnoseCode}r,"MG-Upstream-ResponseCode":"%{upResponseCode}r","MG-SellingPrice":%{price}i,"req_type":"%{req_type}r","MG-ResultBody":"%{resultBody}r","MG-ProductId":%{productId}i,"MG-UserId":%{userid}i}'
-          prefix: access_${HOSTNAME}_${spring.application.name}_${server.port}
-          directory: ${logging.path}
-      servlet:
-        context-path: /
-
-    spring:
-      redis:
-         host: iov-sjjh-redis.iov-sjjh
-         port: 6379
-         jedis:
-           pool:
-             max-active: 8
-             max-wait: -1
-             max-idle: 8
-             min-idle: 0
-      sleuth:
-        sampler:
-          probability: 1
-        web:
-          additional-skip-pattern: /api/v2/spans
-      zipkin:
-        base-url: http://127.0.0.1:${server.port}
-
-      mvc:
-        favicon:
-          enabled: false
-
-    #management
-    management:
-      endpoints:
-        enabled-by-default: true
-        web:
-          exposure:
-            include: '*'
-      endpoint:
-        health:
-          show-details: always
-        shutdown:
-          enabled: true
-
-    #logging
-    logging:
-      path: /data/var/jakarta/logs
-      level:
-        root: INFO
-        red:
-          microcloud: DEBUG
-      config: classpath:config/logback-spring.xml
-      file: ${logging.path}/catalina_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.out
-
-    #error logging
-    #sleuth logging
-    rdc:
-      logging:
-        error-file: ${logging.path}/error_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
-        sleuth-file: ${logging.path}/sleuth_${spring.cloud.client.hostname}_${spring.application.name}_${server.port}.log
-
-    #eureka
-    eureka:
-      instance:
-        metadata-map:
-          management:
-            port: ${management.server.port}
-        health-check-url: http://${spring.cloud.client.ipaddress}:${management.server.port}${eureka.instance.health-check-url-path}
-        health-check-url-path: /actuator/health
-      client:
-        serviceUrl:
-          defaultZone: http://iov-sjjh-registcenter.iov-sjjh:8080/eureka
-
-    supplier:
-      urlV2: http://47.95.12.213/nciic/nciic_ws/services/NciicServices
-      url: http://47.94.238.107:8085/nciic/nciic_ws/services/NciicServices
-      urlV3: http://39.100.68.41:8888/nciic/nciic_ws/services/NciicServices
-      twoElementsMethod: nciicCheck
-      photoIdentityMethod: nciicCompare
-      decryptKey: JK568FG2823
-      urlPhotoUp: 135000
-      url3PhotoUp: 48000
-      url2PhotoUp: 145000
-      urlSecondUp: 140000
-      decodeApi: CMCC_3RD_DECRYPT
-      decodeAppKey: JIAO_KE
-      decodeAppSecret: D78C393359BF128715C65D91C67051478A4DFC13
-      decodeUrl: http://jkxy.h11.site/gateway?api=credit.sec.data
-      targetSms: 13911939833,18611184241,18210953442
-      notityLimit: 10000
-      hour: 3
-      aesDecryptKey: C1AA8eh0116128nn
-
-    swagger:
-      show: true
-    iov-sjjh-servicenode-sms:
-      ribbon:
-        ReadTimeout: 4000