udpate

src/main/resources/application-dev.yml

@@ -58,31 +58,31 @@ spring:
         # 登录密码
         login-password: yj18710905369\
       # 使用阿里的Druid连接池
-      driver-class-name: com.mysql.cj.jdbc.Driver
+      driver-class-name: org.mariadb.jdbc.Driver
       type: com.alibaba.druid.pool.DruidDataSource
       enableDrds: true
       dialect: org.hibernate.dialect.MySQL5InnoDBDialect
       # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
-      jdbc-url: jdbc:mysql://159.75.82.245:3306/afl_fss?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=UTC
-      username: ${MYSQL_SERVER_USER:root}
-      password: ${MYSQL_SERVER_PASSWORD:houyi..}
+      jdbc-url: jdbc:mariadb://192.168.101.154:3307/afl_fss?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=UTC
+      username: root
+      password: etc2021
       second:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        type: com.alibaba.druid.pool.DruidDataSource
-        enableDrds: true
-        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-        # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
-        jdbc-url: jdbc:mysql://159.75.82.245:3306/afl_fss_second?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
-        username: ${MYSQL_SERVER_USER:root}
-        password: ${MYSQL_SERVER_PASSWORD:houyi..}
-#        driver-class-name: oracle.jdbc.driver.OracleDriver
+#        driver-class-name: com.mysql.cj.jdbc.Driver
+#        type: com.alibaba.druid.pool.DruidDataSource
 #        enableDrds: true
-#        dialect: org.hibernate.dialect.Oracle10gDialect
+#        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
 #        # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
-#        #    url: jdbc:oracle:thin:@192.168.101.21:5016:ORCL
-#        jdbc-url: jdbc:oracle:thin:@10.52.0.159:1521:QTKDB1
-#        username: qtk
-#        password: QWERTasdfg12345ZXCVB
+#        jdbc-url: jdbc:mysql://159.75.82.245:3306/afl_fss_second?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
+#        username: ${MYSQL_SERVER_USER:root}
+#        password: ${MYSQL_SERVER_PASSWORD:houyi..}
+        driver-class-name: oracle.jdbc.driver.OracleDriver
+        enableDrds: true
+        dialect: org.hibernate.dialect.Oracle10gDialect
+        # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
+        #    url: jdbc:oracle:thin:@192.168.101.21:5016:ORCL
+        jdbc-url: jdbc:oracle:thin:@10.52.0.159:1521:QTKDB1
+        username: qtk
+        password: QWERTasdfg12345ZXCVB
         initial-size: 5
         max-active: 100
         # 配置一个连接在池中最小生存的时间，单位是毫秒

src/main/resources/application-prod.yml

@@ -226,4 +226,9 @@ wechat:
     # 黔通获取公众号accessToken地址
     qt-token-url: http://192.168.100.184/common/getToken.php
     # 微信公众号发送模板消息地址
-    wechat-url: https://api.weixin.qq.com/cgi-bin/message/template/send
+    wechat-url: https://api.weixin.qq.com/cgi-bin/message/template/send
+  channel:
+    # 微信API主机地址
+    weChatHost: https://api.weixin.qq.com
+    # 微信商户API主机地址
+    weChatMchHost: https://api.mch.weixin.qq.com

src/test/java/SaleTest.java

@@ -1,22 +1,22 @@
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.qtzl.alterSales.UserApplication;
 import com.qtzl.alterSales.dao.entity.second.AflBydDashboard;
 import com.qtzl.alterSales.dao.repo.jpa.second.AflBydDashboardRepo;
 import com.qtzl.alterSales.dao.repo.jpa.third.EtcOrderVehicleInfoRepo;
 import com.qtzl.alterSales.manager.enums.AflBydDashboardPushStateEnum;
+import com.qtzl.alterSales.manager.model.protocol.sales.ChoiceBillsPayRequest;
 import com.qtzl.alterSales.manager.quartz.*;
-import com.qtzl.alterSales.manager.service.AflBydDashboardService;
-import com.qtzl.alterSales.manager.service.AflBydExceptionManager;
-import com.qtzl.alterSales.manager.service.AflMchConfigManager;
-import com.qtzl.alterSales.manager.service.AflMchStatisticsLogService;
+import com.qtzl.alterSales.manager.service.*;
 import com.qtzl.alterSales.manager.service.byd.BydService;
 import com.qtzl.alterSales.manager.service.byd.vo.BydDashBoardResponse;
 import com.qtzl.alterSales.manager.service.byd.vo.BydPushDataResultRequest;
 import com.qtzl.alterSales.manager.service.wechat.WechatMchService;
 import com.qtzl.alterSales.manager.tools.RedisUtils;
 import com.qtzl.alterSales.manager.vo.BydOrderVehicleInfoVo;
+import com.qtzl.alterSales.manager.vo.ChoiceBillsPayVo;
 import com.qtzl.alterSales.manager.vo.WechatStatisticsVo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,6 +27,7 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 
 /***
@@ -68,6 +69,19 @@ public class SaleTest {
     private AflMchStatisticsLogService aflMchStatisticsLogService;
     @Resource
     private AflMchStatisticsTask aflMchStatisticsTask;
+    @Resource
+    private ChoiceBillsOperationService choiceBillsOperationService;
+
+    @Test
+    public void djjjj() throws ServiceHandleException {
+        final ChoiceBillsPayRequest request = new ChoiceBillsPayRequest();
+        request.setOpenId("oHQtp5Pi2691elk_8DfaXYnkoIOo");
+        request.setIdNum("522125199512293714");
+        request.setIdType(101);
+        request.setPayIds(Arrays.asList("118486658403087208101"));
+        final ChoiceBillsPayVo billsPayVo = choiceBillsOperationService.choiceBillsPay(request);
+        System.out.println("---" + JSON.toJSONString(billsPayVo));
+    }
 
     @Test
     public void ttsss() {