Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/resources/application-prod.yml

@@ -119,58 +119,58 @@ flowable:
   async-executor-activate: false
 # sop接口调用地址
 sop:
-  url: http://222.90.211.174:18868
-  findCorporateGoodwillUrl: http://222.90.211.174:18868/api/trade/corporateGoodwill
-  getScopeUrl: http://222.90.211.174:18868/api/trade/getScope
-  getChangesUrl: http://222.90.211.174:18868/api/trade/getChanges
-  dongjiangaoRisksUrl: http://222.90.211.174:18868/api/trade/dongjiangaoRiskById
-  getBusinesssScoreUrl: http://222.90.211.174:18868/api/trade/getBusinesssScore
-  pubStockUrl: http://222.90.211.174:18868/api/trade/pubStock
-  getIndustryUrl: http://222.90.211.174:18868/api/trade/getIndustry
-  getProjectReviewInfoUrl: http://222.90.211.174:18868/api/trade/getProjectReviewInfo
-  getProjectCoreEnterpriseScoreUrl: http://222.90.211.174:18868/api/trade/getProjectCoreEnterpriseScore
-  reviewResolutionReportUrl: http://222.90.211.174:18868/api/trade/reviewResolution/report
-  getEnterpriseAreaUrl: http://222.90.211.174:18868/api/trade/getEnterpriseArea
-  getBusinessByKeyWordUrl: http://222.90.211.174:18868/api/trade/findBusinessName
-  getFlushUrl: http://222.90.211.174:18868/sys/customer/flushByTrade/url
-  getEnterpriseInfoUrl: http://222.90.211.174:18868/sys/customer/getEnterpriseInfoByTrade
-  synchronizeDownloadFile: http://222.90.211.174:8868/synchronize/factoringContractTemplate/fileStorage/downloadFile
-  synchronizeInformation: http://222.90.211.174:18868/sys/customer/synchronize/information
-  getPaymentCollBasicStatus: http://222.90.211.174:18868/api/trade/findStatusListByContractNoAndBatch
-  getBusinessNoByTrade: http://222.90.211.174:18868/api/trade/quotaDisburseReport/getBusinessNoByTrade
-  judgeOverdueBySocialCreditCode: http://222.90.211.174:18868/api/trade/judgeOverdueBySocialCreditCode
-  getPaymentCollBasicOneStatus: http://222.90.211.174:18868/api/trade/findStatusByContractNoAndBatch
-  underlyingAssetsBasicId: http://222.90.211.174:18868/api/underlyingAssetsBasic/findBySocialCreditCode
-  underlyingAssetsDomesticAdd: http://222.90.211.174:18868/api/underlyingAssetsDomestic/add
-  domesticAccountsReceivableAdd: http://222.90.211.174:18868/api/domesticAccountsReceivable/add
-  quotaDisburseReportUrl: http://222.90.211.174:18868/api/quotaDisburse/report
-  addBusinessUrl: http://222.90.211.174:18868/api/trade/addBusiness
-  getAllOACompanyEntityUrl: http://222.90.211.174:18868/api/trade/getAllOACompanyEntity
-  applyOtherOAUrl: http://222.90.211.174:18868/api/trade/applyOtherOA
+  url: http://222.90.211.174:10526
+  findCorporateGoodwillUrl: http://222.90.211.174:10526/api/trade/corporateGoodwill
+  getScopeUrl: http://222.90.211.174:10526/api/trade/getScope
+  getChangesUrl: http://222.90.211.174:10526/api/trade/getChanges
+  dongjiangaoRisksUrl: http://222.90.211.174:10526/api/trade/dongjiangaoRiskById
+  getBusinesssScoreUrl: http://222.90.211.174:10526/api/trade/getBusinesssScore
+  pubStockUrl: http://222.90.211.174:10526/api/trade/pubStock
+  getIndustryUrl: http://222.90.211.174:10526/api/trade/getIndustry
+  getProjectReviewInfoUrl: http://222.90.211.174:10526/api/trade/getProjectReviewInfo
+  getProjectCoreEnterpriseScoreUrl: http://222.90.211.174:10526/api/trade/getProjectCoreEnterpriseScore
+  reviewResolutionReportUrl: http://222.90.211.174:10526/api/trade/reviewResolution/report
+  getEnterpriseAreaUrl: http://222.90.211.174:10526/api/trade/getEnterpriseArea
+  getBusinessByKeyWordUrl: http://222.90.211.174:10526/api/trade/findBusinessName
+  getFlushUrl: http://222.90.211.174:10526/sys/customer/flushByTrade/url
+  getEnterpriseInfoUrl: http://222.90.211.174:10526/sys/customer/getEnterpriseInfoByTrade
+  synchronizeDownloadFile: http://222.90.211.174:10526/synchronize/factoringContractTemplate/fileStorage/downloadFile
+  synchronizeInformation: http://222.90.211.174:10526/sys/customer/synchronize/information
+  getPaymentCollBasicStatus: http://222.90.211.174:10526/api/trade/findStatusListByContractNoAndBatch
+  getBusinessNoByTrade: http://222.90.211.174:10526/api/trade/quotaDisburseReport/getBusinessNoByTrade
+  judgeOverdueBySocialCreditCode: http://222.90.211.174:10526/api/trade/judgeOverdueBySocialCreditCode
+  getPaymentCollBasicOneStatus: http://222.90.211.174:10526/api/trade/findStatusByContractNoAndBatch
+  underlyingAssetsBasicId: http://222.90.211.174:10526/api/underlyingAssetsBasic/findBySocialCreditCode
+  underlyingAssetsDomesticAdd: http://222.90.211.174:10526/api/underlyingAssetsDomestic/add
+  domesticAccountsReceivableAdd: http://222.90.211.174:10526/api/domesticAccountsReceivable/add
+  quotaDisburseReportUrl: http://222.90.211.174:10526/api/quotaDisburse/report
+  addBusinessUrl: http://222.90.211.174:10526/api/trade/addBusiness
+  getAllOACompanyEntityUrl: http://222.90.211.174:10526/api/trade/getAllOACompanyEntity
+  applyOtherOAUrl: http://222.90.211.174:10526/api/trade/applyOtherOA
 fdd:
-  contractUrl: "http://192.168.125.194:8888/#/register"
-  caykCustomId: "8210513B14FE854DF1061E2D54665AF9"
-  yhrzzpCustomId: "2291B7F84D6340530A5469FB6FC15BF3"
-  registerUrl: "http://222.90.211.174:18870/fdd/accountRegister"
-  authUrl: "http://222.90.211.174:18870/fdd/getAuthAddress/sop"
-  removeAuthInfoUrl: "http://222.90.211.174:18870/fdd/removeAuthInfoUrl"
-  authUrlV3: "http://222.90.211.174:18870/fdd/v3/getAuthAddress"
-  authUrlV3PersonalFaceRecognition: "http://222.90.211.174:18870/fdd/v3/getAuthAddress/face/recognition"
-  uploadContractUrl: "http://222.90.211.174:18870/fdd/uploadContract"
-  batchSignUrl: "http://222.90.211.174:18870/fdd/manualBatchSign"
-  batchSignUrlSearchLocation: "http://222.90.211.174:18870/fdd/manualBatchSign/searchLocation"
-  authSignUrl: "http://222.90.211.174:18870/fdd/autoSign"
-  downloadContractUrl: "http://222.90.211.174:18870/fdd/downloadContract"
-  filedContractUrl: "http://222.90.211.174:18870/fdd/contractFiled"
-  beforeAutoSignUrl: "http://222.90.211.174:18870/fdd/before_autoSign"
-  shortUrl: "http://222.90.211.174:18870/fdd/short_url"
-  reportUrl: "http://222.90.211.174:18870/fdd/compliance_contract_report"
-  authInfoUrl: "http://222.90.211.174:18870/fdd/getAuthInfo"
-  getAuthInfoDetail: "http://222.90.211.174:18870/fdd/getAuthInfoDetail"
-  signInfoUrl: "http://222.90.211.174:18870/fdd/getSignInfo"
-  viewContractUrl: "http://222.90.211.174:18870/fdd/getViewContractUrl"
+  contractUrl: "https://hdts.changan-inkasso.com/#/register"
+  caykCustomId: "49AE3DAA91DA87A92C9371CE41D2A642"
+  yhrzzpCustomId: "E5E5D7FD1424DE57C4672B566BF517E2"
+  registerUrl: "http://47.114.148.98:8868/fdd/accountRegister"
+  authUrl: "http://47.114.148.98:8868/fdd/getAuthAddress/sop"
+  removeAuthInfoUrl: "http://47.114.148.98:8868/fdd/removeAuthInfoUrl"
+  authUrlV3: "http://47.114.148.98:8868/fdd/v3/getAuthAddress"
+  authUrlV3PersonalFaceRecognition: "http://47.114.148.98:8868/fdd/v3/getAuthAddress/face/recognition"
+  uploadContractUrl: "http://47.114.148.98:8868/fdd/uploadContract"
+  batchSignUrl: "http://47.114.148.98:8868/fdd/manualBatchSign"
+  batchSignUrlSearchLocation: "http://47.114.148.98:8868/fdd/manualBatchSign/searchLocation"
+  authSignUrl: "http://47.114.148.98:8868/fdd/autoSign"
+  downloadContractUrl: "http://47.114.148.98:8868/fdd/downloadContract"
+  filedContractUrl: "http://47.114.148.98:8868/fdd/contractFiled"
+  beforeAutoSignUrl: "http://47.114.148.98:8868/fdd/before_autoSign"
+  shortUrl: "http://47.114.148.98:8868/fdd/short_url"
+  reportUrl: "http://47.114.148.98:8868/fdd/compliance_contract_report"
+  authInfoUrl: "http://47.114.148.98:8868/fdd/getAuthInfo"
+  getAuthInfoDetail: "http://47.114.148.98:8868/fdd/getAuthInfoDetail"
+  signInfoUrl: "http://47.114.148.98:8868/fdd/getSignInfo"
+  viewContractUrl: "http://47.114.148.98:8868/fdd/getViewContractUrl"
 
-  localhost: http://localhost:8888
+  localhost: http://localhost:8868
 
 auth:
   not-login:

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 #环境配置
 spring:
   profiles:
-    active: dev
+    active: prod