新需求

src/main/java/com/huiju/estateagents/config/FadadaProperties.java

@@ -14,4 +14,5 @@ public class FadadaProperties {
     private String version;
     private String serveHost;
     private String companyNotify;
+    private String signNotify;
 }

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -406,12 +406,13 @@ public class TaCompanyController extends BaseController {
      *
      */
     @RequestMapping(value = "/fadd/company", method = RequestMethod.POST)
-    public void faddCompanyNitify(@RequestParam String companyName,
-                                  @RequestParam String transactionNo,
-                                  @RequestParam String authenticationType,
-                                  @RequestParam String status,
+    public void faddCompanyNotify(@RequestParam(value = "companyName",required = false) String companyName,
+                                  @RequestParam(value = "transactionNo",required = false) String transactionNo,
+                                  @RequestParam(value = "authenticationType",required = false) String authenticationType,
+                                  @RequestParam(value = "status",required = false) String status,
+                                  @RequestParam(value = "personName",required = false) String personName,
                                   HttpServletRequest request) {
-        logger.info("企业认证回调函数参数:公司名称{},交易号{}，认证类型{}，状态，{}",companyName,transactionNo,authenticationType,status);
+        logger.info("企业认证回调函数参数:公司名称{},交易号{}，认证类型{}，状态，{}, 人员名称{}",companyName,transactionNo,authenticationType,status,personName);
         QueryWrapper<TaCompany> taCompanyQueryWrapper = new QueryWrapper<>();
         taCompanyQueryWrapper.eq("certified_serial_number",transactionNo);
         TaCompany taCompany = iTaCompanyService.getOne(taCompanyQueryWrapper);
@@ -425,4 +426,22 @@ public class TaCompanyController extends BaseController {
     public ResponseBean autoAuthCompanySeal(Integer companyId, HttpServletRequest request){
         return null;
     }
+
+
+    /**
+     * 手动签署回调函数
+     *
+     */
+    @RequestMapping(value = "/fadd/sign", method = RequestMethod.POST)
+    public void faddSignNotify(@RequestParam(value = "transaction_id ",required = false) String transaction_id,
+                                  @RequestParam(value = "contract_id ",required = false) String contract_id,
+                                  @RequestParam(value = "result_code",required = false) String result_code,
+                                  @RequestParam(value = "result_desc",required = false) String result_desc,
+                                  @RequestParam(value = "download_url",required = false) String download_url,
+                                  @RequestParam(value = "viewpdf_url",required = false) String viewpdf_url,
+                                  @RequestParam(value = "timestamp",required = false) String timestamp,
+                                  @RequestParam(value = "msg_digest",required = false) String msg_digest,
+                                  HttpServletRequest request) {
+        logger.info("企业认证回调函数参数:交易号 {},合同编号 {}，签章结果代码 {}，签章结果描述 ，{}, 下载地址{}, 查看地址 {},请求时间 {}, 摘要 {} ",transaction_id,contract_id,result_code,result_desc,download_url,viewpdf_url,timestamp,msg_digest);
+    }
 }

src/main/java/com/huiju/estateagents/eContract/controller/TaContractController.java

@@ -274,7 +274,7 @@ public class TaContractController extends BaseController {
 
 
     /**
-     * 自动签署合同
+     * 手动签署合同
      */
     @RequestMapping(value = "/wx/contract/manual", method = RequestMethod.POST)
     public ResponseBean manualContract(@RequestBody TaContract taContract, HttpServletRequest request) {
@@ -295,4 +295,6 @@ public class TaContractController extends BaseController {
         }
         return responseBean;
     }
+
+
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java

@@ -173,8 +173,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-        req.setReturn_url("www.baidu.com");
-        req.setNotify_url("www.baidu.com");
+        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
+        req.setNotify_url(fadadaProperties.getSignNotify());
         String signUrl = base.invokeExtSign(req);
         return signUrl;
     }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java

@@ -85,8 +85,8 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         String customer_id = jsonObject.getString("data");
         String verifyed_way = "0";
         String page_modify = "1";
-        String notify_url = "https://www.baidu.com";
-        String return_url= "https://www.baidu.com"+"?raiseRecordId=" + taRaiseRecord.getRaiseRecordId();
+        String notify_url = fadadaProperties.getCompanyNotify();
+        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
                 page_modify,notify_url,return_url,null,customer_ident_type,

src/main/resources/application-blue.yml

@@ -84,4 +84,5 @@ fadada:
   appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-dev.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8080
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"

src/main/resources/application-green.yml

@@ -84,4 +84,5 @@ fadada:
   appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-gzysd.yml

@@ -1,129 +0,0 @@
-<<<<<<< HEAD
-server:
-  port: 8009
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_17?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxe3b1e683853800b5
-    secret: 207dd6d0f807b2dd0d41b57a8184365f
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
-      keywords: 6
-ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"
-=======
-server:
-  port: 8009
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_gzysd?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wxe3b1e683853800b5
-    secret: 207dd6d0f807b2dd0d41b57a8184365f
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: IVWM-wpzSNV6CyXeSBGBgRku2lRrZ-3x4vXRILQpHM0
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-
->>>>>>> ac499f2ddc4d4469098e59fff8bbe310779f7be3

src/main/resources/application-hj.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8011
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_hj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wx03aca9d7d9b0b7f1
-    secret: f85aa21010204969b0f9a16f81de8a4b
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: Dflyeuyy76tCpam6OfVMblBaiog9fBt4NGAxbLPQ6AI
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: BDrgtJK9zul0gtHhHwY31x7kDH8BWGJxKvkj1wPzB4E
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-

src/main/resources/application-jj.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8013
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_jj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wx7183d7d918a426d3
-    secret: d06320d36d0b706f981da20b796c5875
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 80jdxzuPITEffVNC1KD1IGvbOxGkipTJlrxPosQrz0s
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: UbuzqEqULHf_NAZHay_3RJPGHm1g11YYU2R66ASq5Uw
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-

src/main/resources/application-nj.yml

@@ -1,75 +0,0 @@
-server:
-  port: 8007
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_nj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wx1a3e5f7d0139285e
-    secret: 06d3db7f27ea08481effd509aa4dcb57
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: wO59V2ARIEXsoYaX1AlB9HK_SqUlnJzZq_X-xeYS1rU
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: wO59V2ARIEXsoYaX1AlB9HK_SqUlnJzZq_X-xeYS1rU
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/application-prod-blue.yml

@@ -89,4 +89,5 @@ fadada:
   appSecret: ""
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-prod-green.yml

@@ -89,4 +89,5 @@ fadada:
   appSecret: ""
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-rc.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8005
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_test?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxe9e01aa4a3568f52
-    secret: f1d70000e55f221976b95a43084042b0
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: FikibBOSwA_v0Ud80o9t_06kAUjn5TRd60
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: 8b0kuLCKzPeu1MUBfpLT9DhysqMl2LSWNYqluycvGm8
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/application-v3.yml

@@ -1,58 +0,0 @@
-server:
-  port: 8080
-spring:
-  application:
-    name: estateagents
-  datasource:
-   username: estateagents
-   password: DQ@0lW##kBb2+-jPZ
-   url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-   driver-class-name: com.mysql.cj.jdbc.Driver
-   initial-size: 10 # 初始化连接数
-   max-active: 20 # 最大连接数
-   min-idle: 8 # 最小空闲数
-   max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"

src/main/resources/application-xs.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8003
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents2?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wx09cd665abf378db7
-    secret: a6cbd778272c87426952b5a1f8449698
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: thSzcSAhIHiZZuCdydBsoB-dSa_g72vHgqo9e_CltNM
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: iJLceA_zp1fq9xnL4yV8IOwWGeFHebCO-HxNtcPYLoA
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"