解决冲突

pluss-common-bundle/src/main/resources/config/application-common.yml

@@ -20,8 +20,10 @@ aliyun:
     bucketname: czg-oss
     callback: ${parameter.domain}/manage/upload/ossCallback
   bankcard:
+    #旧地址  https://aliyun-bankcard4-verify.apistore.cn/bank4
     bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4
-    app-code: 11cb746de2704f5482a40fd36ed8a1f1
+    app-code: 11cb746de2704f5482a40fd36ed2sg6u
+    SceneId: 3931001
 
 #阿里MQTT参数配置
 mqtt:
@@ -88,6 +90,7 @@ spring:
     port: 5672
 
 parameter:
+  # 124.114.74.203本机ip
   domain: http://60.205.224.68
   ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
   ALI_APP_ID: 支付宝原生接入的APPID
@@ -118,9 +121,9 @@ parameter:
   bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
   blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
   # 百度人脸识别应用的AK
-  baiduAK2:
+  baiduAK2: ASgPr1OxpI32E3G96rxWObuZ
   # 百度人脸识别应用的SK
-  baiduSK2:
+  baiduSK2: 80aOspiFxTgGmcWZoTinwlOOjRT6IRPE
   fans_profit: 4.0E-4
   idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
   leshuaCallBackKey:
@@ -138,8 +141,8 @@ parameter:
 ## 默认为正式环境
 sxf:
   domain: https://openapi.tianquetech.com
-  orgId:
-  publicKey:
+  orgId: "02668880"
+  publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjo1+KBcvwDSIo+nMYLeOJ19Ju4ii0xH66ZxFd869EWFWk/EJa3xIA2+4qGf/Ic7m7zi/NHuCnfUtUDmUdP0JfaZiYwn+1Ek7tYAOc1+1GxhzcexSJLyJlR2JLMfEM+rZooW4Ei7q3a8jdTWUNoak/bVPXnLEVLrbIguXABERQ0Ze0X9Fs0y/zkQFg8UjxUN88g2CRfMC6LldHm7UBo+d+WlpOYH7u0OTzoLLiP/04N1cfTgjjtqTBI7qkOGxYs6aBZHG1DJ6WdP+5w+ho91sBTVajsCxAaMoExWQM2ipf/1qGdsWmkZScPflBqg7m0olOD87ymAVP/3Tcbvi34bDfwIDAQAB
 
 getui:
   domain: https://restapi.getui.com/v2/${getui.appId}