合并代码预备

src/main/java/cn/quantgroup/report/config/datasource/baihang/BaiHangDataSourceConfig.java

@@ -43,10 +43,10 @@ public class BaiHangDataSourceConfig {
     @Primary
     public DataSource baihangDataSource() {
         HikariConfig config = new HikariConfig();
-        config.setJdbcUrl("jdbc:mysql://172.30.5.27:7434?useUnicode=true&characterEncoding=UTF8&useSSL=false");
-        config.setPassword("AHvVRT3eOGsm3tHS");
-        config.setUsername("jian.zheng");
-        log.info("百行征信数据库地址:{}", "jdbc:mysql://172.30.5.27:7434?useUnicode=true&characterEncoding=UTF8&useSSL=false");
+        config.setJdbcUrl(baiHangDataSourcePreperties.getJdbcUrl());
+        log.info("百行征信数据库地址:{}", baiHangDataSourcePreperties.getJdbcUrl());
+        config.setPassword(baiHangDataSourcePreperties.getPassword());
+        config.setUsername(baiHangDataSourcePreperties.getUsername());
         config.setMaximumPoolSize(baiHangDataSourcePreperties.getMaxPoolSize());
         config.setMinimumIdle(baiHangDataSourcePreperties.getMinPoolSize());
         config.addDataSourceProperty("cachePrepStmts", "true");

src/main/java/cn/quantgroup/report/config/datasource/xyqbuser/XyqbUserDataSourceConfig.java

@@ -42,10 +42,10 @@ public class XyqbUserDataSourceConfig {
   @Bean(name = "xyqbUserDataSource")
   public DataSource xyqbUserDataSource() {
     HikariConfig config = new HikariConfig();
-    config.setJdbcUrl("jdbc:mysql://172.30.5.27:7434/xyqb_user?useUnicode=true&characterEncoding=UTF8&useSSL=false");
-    config.setPassword("AHvVRT3eOGsm3tHS");
-    config.setUsername("jian.zheng");
+    config.setJdbcUrl(xyqbUserDatasourceProperties.getJdbcUrl());
     log.info("数据库地址:{}", xyqbUserDatasourceProperties.getJdbcUrl());
+    config.setPassword(xyqbUserDatasourceProperties.getPassword());
+    config.setUsername(xyqbUserDatasourceProperties.getUsername());
     config.setMaximumPoolSize(xyqbUserDatasourceProperties.getMaxPoolSize());
     config.setMinimumIdle(xyqbUserDatasourceProperties.getMinPoolSize());
     config.addDataSourceProperty("cachePrepStmts", "true");

src/main/java/cn/quantgroup/report/controller/external/RepairController.java

@@ -25,7 +25,7 @@ public class RepairController {
      * pageNo 从0开始
      */
     @RequestMapping("/repair")
-    public String mainLoanInfoSend(int pageNo,String type){
+    public String mainLoanInfoSend(){
         try{
             Stopwatch stopwatch = Stopwatch.createStarted();
             repairService.doRepair("normal_lh");

src/main/resources/logback-qa.xml

@@ -5,19 +5,18 @@
               value="%5p [${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]"/>
     <property name="FILE_LOG_PATTERN"
               value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} --- [%thread] [%file:%line] %logger - %msg%n}"/>
-
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>E:\baihang-report.log</file>
+        <file>/home/quant_group/logs/baihang-report.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>
+                /home/quant_group/logs/baihang-report.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+            <maxHistory>7</maxHistory>
+        </rollingPolicy>
         <encoder>
             <pattern>${FILE_LOG_PATTERN}</pattern>
         </encoder>
     </appender>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-        </layout>
-    </appender>
     <logger name="com.atomikos" level="warn"/>
     <logger name="org.springframework" level="warn"/>
     <logger name="org.mybatis" level="warn"/>