From c4d88d651a1786a90ae7b1250b1993d5edfbdf66 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 十一月 2024 15:09:18 +0800
Subject: [PATCH] 修改bug

---
 UserZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java                       |    6 
 DriverZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java                     |    6 
 DriverZYTravel/guns-core/src/main/resources/default-config.properties                                                     |    2 
 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |   10 
 UserZYTravel/guns-admin/src/main/resources/application.yml                                                                |   38 --
 UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java                                         |   21 -
 DriverZYTravel/guns-admin/src/main/resources/application.yml                                                              |   40 --
 DriverZYTravel/guns-admin/src/main/resources/logback-spring.xml                                                           |  319 ++++++++++++++++------
 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/PaymentRecordMapper.xml                 |   14 
 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java   |    2 
 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java      |    4 
 UserZYTravel/guns-admin/src/main/resources/logback-spring.xml                                                             |  319 ++++++++++++++++------
 12 files changed, 482 insertions(+), 299 deletions(-)

diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index c51ae9c..4baa3cb 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -778,7 +778,7 @@
                 //写入相应的文件
                 PrintWriter out = new PrintWriter(new FileWriter(file));
                 orderPositions.add(orderPosition);
-                System.err.println("存储新数据:" + JSON.toJSONString(orderPositions));
+//                System.err.println("存储新数据:" + JSON.toJSONString(orderPositions));
                 out.write(JSON.toJSONString(orderPositions));
                 out.flush();
                 out.close();
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java
index 5a6223c..2e223a4 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -65,7 +65,7 @@
             //写入相应的文件
             PrintWriter out = new PrintWriter(new FileWriter(file));
             orderPositions.add(orderPosition);
-            System.err.println("存储新数据:" + JSON.toJSONString(orderPositions));
+//            System.err.println("存储新数据:" + JSON.toJSONString(orderPositions));
             out.write(JSON.toJSONString(orderPositions));
             out.flush();
             out.close();
@@ -124,7 +124,7 @@
         if(ToolUtil.isNotEmpty(sb.toString())){
             list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
         }
-        System.err.println("坐标:" + sb);
+//        System.err.println("坐标:" + sb);
         return list;
     }
 }
diff --git a/DriverZYTravel/guns-admin/src/main/resources/application.yml b/DriverZYTravel/guns-admin/src/main/resources/application.yml
index 2d34417..8db4c0a 100644
--- a/DriverZYTravel/guns-admin/src/main/resources/application.yml
+++ b/DriverZYTravel/guns-admin/src/main/resources/application.yml
@@ -2,7 +2,7 @@
   port: 8007
 
 guns:
-  swagger-open: true              #是否开启swagger (true/false)
+  swagger-open: false              #是否开启swagger (true/false)
   kaptcha-open: false             #是否开启登录时验证码 (true/false)
 #  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
   spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
@@ -13,7 +13,7 @@
   application:
     name: driver-server
   profiles:
-    active: "@spring.active@"
+    active: produce
   mvc:
     static-path-pattern: /static/**
     view:
@@ -30,9 +30,9 @@
 
 mybatis-plus:
   typeAliasesPackage: com.stylefeng.guns.modular
+  configuration:
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
 
-log:
-  path: guns-logs
 
 eureka:
   client:
@@ -46,7 +46,6 @@
 
 ################# 测试环境 ###################
 spring:
-  profiles: local
   datasource:
     url: jdbc:mysql://localhost:3306/zytravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
@@ -66,37 +65,6 @@
     dataSourceNames:
       - dataSourceGuns
       - dataSourceBiz
-
----
-
-spring:
-  profiles: dev
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
-    db-name: guns #用来搜集数据库的所有表
-    filters: wall,mergeStat
-
----
-
-spring:
-  profiles: test
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
-    filters: wall,mergeStat
-
----
-
-spring:
-  profiles: produce
-  datasource:
-      url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-      username: root
-      password: root
-      filters: wall,mergeStat
 
 ---
 
diff --git a/DriverZYTravel/guns-admin/src/main/resources/logback-spring.xml b/DriverZYTravel/guns-admin/src/main/resources/logback-spring.xml
index e8f66d9..e6ce5b4 100644
--- a/DriverZYTravel/guns-admin/src/main/resources/logback-spring.xml
+++ b/DriverZYTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -1,99 +1,230 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <!--定义日志存放的位置-->
-    <springProperty scope="context" name="gunsLogPath" source="log.path"
-                    defaultValue="guns-logs"/>
-
-    <!-- ****************************************************************************************** -->
-    <!-- ****************************** 本地开发只在控制台打印日志 ************************************ -->
-    <!-- ****************************************************************************************** -->
-    <springProfile name="local">
-
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <!--encoder 默认配置为PatternLayoutEncoder-->
-            <encoder>
-                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
-                <charset>utf-8</charset>
-            </encoder>
-        </appender>
-
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL,比如: 如果设置为WARN,则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时,配置文档如果发生改变,将会被重新加载,默认值为true -->
+<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
+<configuration  scan="true" scanPeriod="10 seconds">
+    <contextName>logback</contextName>
+    
+    <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后,可以使“${}”来使用变量。 -->
+    <property name="log.path" value="D:/web/log/driver"/>
+    
+    <!--0. 日志格式和颜色渲染 -->
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志,时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.2 level为 INFO 日志,时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.3 level为 WARN 日志,时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.4 level为 ERROR 日志,时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.5 所有 除了DEBUG级别的其它高于DEBUG的 日志,记录到一个文件  -->
+    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/all.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/all-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+    </appender>
+    
+    <!--
+		<logger>用来设置某一个包或者具体的某一个类的日志打印级别、
+		以及指定<appender>。<logger>仅有一个name属性,
+		一个可选的level和一个可选的addtivity属性。
+		name:用来指定受此logger约束的某一个包或者具体的某一个类。
+		level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
+			  还有一个特殊值INHERITED或者同义词NULL,代表强制执行上级的级别。
+			  如果未设置此属性,那么当前logger将会继承上级的级别。
+		addtivity:是否向上级logger传递打印信息。默认是true。
+		<logger name="org.springframework.web" level="info"/>
+		<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
+	-->
+    
+    <!--
+		root节点是必选节点,用来指定最基础的日志输出级别,只有一个level属性
+		level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
+		不能设置为INHERITED或者同义词NULL。默认是DEBUG
+		可以包含零个或多个元素,标识这个appender将会添加到这个logger。
+	-->
+    
+    <!-- 4  最终的策略:
+				 基本策略(root级) + 根据profile在启动时, logger标签中定制化package日志级别(优先级高于上面的root级)-->
+    <springProfile name="dev">
         <root level="info">
-            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="CONSOLE" />
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="WARN_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="ALL_FILE" />
         </root>
-
-        <logger name="com.stylefeng.guns" level="debug" additivity="false">
-            <appender-ref ref="STDOUT"/>
-        </logger>
-
+        <logger name="com.baomidou.mybatisplus" level="info"/>
+        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
+        <logger name="business-log" level="warn"/>
+    </springProfile>
+    
+    <springProfile name="fat">
+        <root level="info">
+            <appender-ref ref="CONSOLE" />
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="WARN_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="ALL_FILE" />
+        </root>
+        <logger name="com.baomidou.mybatisplus" level="info"/>
+        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
+        <logger name="business-log" level="warn"/>
+    </springProfile>
+    
+    <springProfile name="produce">
+        <root level="info">
+            <!-- 生产环境最好不配置console写文件 -->
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="WARN_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="ALL_FILE" />
+        </root>
+        <logger name="com.baomidou.mybatisplus" level="info"/>
+        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
+        <logger name="business-log" level="warn"/>
     </springProfile>
 
-    <!-- ****************************************************************************************** -->
-    <!-- ********************** 放到服务器上不管在什么环境都只在文件记录日志 **************************** -->
-    <!-- ****************************************************************************************** -->
-    <springProfile name="!local">
-
-        <!-- 日志记录器,日期滚动记录 -->
-        <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <!-- 正在记录的日志文件的路径及文件名 -->
-            <file>${gunsLogPath}/log_error.log</file>
-            <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!-- 归档的日志文件的路径,例如今天是2013-12-21日志,当前写的日志文件路径为file节点指定,可以将此文件与file指定文件路径设置为不同路径,从而将当前日志文件或归档日志文件置不同的目录。
-                而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式,%i指定索引 -->
-                <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
-                命名日志文件,例如log-error-2013-12-21.0.log -->
-                <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                    <maxFileSize>2MB</maxFileSize>
-                </timeBasedFileNamingAndTriggeringPolicy>
-            </rollingPolicy>
-            <!-- 追加方式记录日志 -->
-            <append>true</append>
-            <!-- 日志文件的格式 -->
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
-                <charset>utf-8</charset>
-            </encoder>
-            <!-- 此日志文件只记录error级别的 -->
-            <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                <level>error</level>
-                <onMatch>ACCEPT</onMatch>
-                <onMismatch>DENY</onMismatch>
-            </filter>
-        </appender>
-
-        <!-- 日志记录器,日期滚动记录 -->
-        <appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <!-- 正在记录的日志文件的路径及文件名 -->
-            <file>${gunsLogPath}/log_total.log</file>
-            <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!-- 归档的日志文件的路径,例如今天是2013-12-21日志,当前写的日志文件路径为file节点指定,可以将此文件与file指定文件路径设置为不同路径,从而将当前日志文件或归档日志文件置不同的目录。
-                而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式,%i指定索引 -->
-                <fileNamePattern>${gunsLogPath}/total/log-total-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
-                命名日志文件,例如log-error-2013-12-21.0.log -->
-                <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                    <maxFileSize>2MB</maxFileSize>
-                </timeBasedFileNamingAndTriggeringPolicy>
-            </rollingPolicy>
-            <!-- 追加方式记录日志 -->
-            <append>true</append>
-            <!-- 日志文件的格式 -->
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
-                <charset>utf-8</charset>
-            </encoder>
-        </appender>
-
-        <root level="info">
-            <appender-ref ref="FILE_ERROR"/>
-            <appender-ref ref="FILE_ALL"/>
-        </root>
-
-    </springProfile>
-
-</configuration>
-
-
+</configuration>
\ No newline at end of file
diff --git a/DriverZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java b/DriverZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
index 17ffd3a..8c81e34 100644
--- a/DriverZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
+++ b/DriverZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
@@ -20,11 +20,11 @@
 
     private String driverClassName = "com.mysql.cj.jdbc.Driver";
 
-    private Integer initialSize = 2;
+    private Integer initialSize = 100;
 
-    private Integer minIdle = 1;
+    private Integer minIdle = 100;
 
-    private Integer maxActive = 20;
+    private Integer maxActive = 1000;
 
     private Integer maxWait = 60000;
 
diff --git a/DriverZYTravel/guns-core/src/main/resources/default-config.properties b/DriverZYTravel/guns-core/src/main/resources/default-config.properties
index 8d458f7..3166d4a 100644
--- a/DriverZYTravel/guns-core/src/main/resources/default-config.properties
+++ b/DriverZYTravel/guns-core/src/main/resources/default-config.properties
@@ -22,7 +22,7 @@
 # \u5F00\u542F\u7684\u8BDD\uFF0C\u5EF6\u65F6\u52A0\u8F7D\u4E00\u4E2A\u5C5E\u6027\u65F6\u4F1A\u52A0\u8F7D\u8BE5\u5BF9\u8C61\u5168\u90E8\u5C5E\u6027\uFF0C\u5426\u5219\u6309\u9700\u52A0\u8F7D\u5C5E\u6027
 mybatis-plus.configuration.multipleResultSetsEnabled=true
 # \u6253\u5370sql\u8BED\u53E5,\u8C03\u8BD5\u7528
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 
 ########################## beetl\u9ED8\u8BA4\u914D\u7F6E ###########################
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 0142c10..5349323 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1038,10 +1038,16 @@
             resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"", code,orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
             if(resultUtil.getCode()==200){
                 paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 1, orderMoney, null, 1, code);//添加预支付数据
+                long millis = System.currentTimeMillis();
                 new Thread(()->{
-                    long time = orderPrivateCar.getInsertTime().getTime();
+                    long time = millis;
+                    try {
+                        Thread.sleep(5000);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
                     //订单创建后15分钟
-                    while (System.currentTimeMillis() - time <= 900000) {
+                    while ((System.currentTimeMillis() - time) <= 900000) {
                         try {
                             String value1 = redisUtil.getValue(orderId + "_status_1");
                             if(ToolUtil.isNotEmpty(value1) && "8".equals(value1)){
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/PaymentRecordMapper.xml b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/PaymentRecordMapper.xml
index d65166f..ead31b6 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/PaymentRecordMapper.xml
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/PaymentRecordMapper.xml
@@ -19,19 +19,7 @@
 
 
     <select id="query" resultType="PaymentRecord">
-        select
-        id as id,
-        category as category,
-        userId as userId,
-        `type` as `type`,
-        orderId as orderId,
-        orderType as orderType,
-        payType as payType,
-        amount as amount,
-        code as code,
-        state as state,
-        insertTime as insertTime
-        from t_payment_record where category = #{category}
+        select * from t_payment_record where category = #{category}
         <if test="null != userId">
             and userId = #{userId}
         </if>
diff --git a/UserZYTravel/guns-admin/src/main/resources/application.yml b/UserZYTravel/guns-admin/src/main/resources/application.yml
index 8ebc582..a6d8277 100644
--- a/UserZYTravel/guns-admin/src/main/resources/application.yml
+++ b/UserZYTravel/guns-admin/src/main/resources/application.yml
@@ -2,7 +2,7 @@
   port: 8006
 
 guns:
-  swagger-open: true              #是否开启swagger (true/false)
+  swagger-open: false              #是否开启swagger (true/false)
   kaptcha-open: false             #是否开启登录时验证码 (true/false)
 #  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
   spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
@@ -13,7 +13,7 @@
   application:
     name: user-server
   profiles:
-    active: "@spring.active@"
+    active: produce
   mvc:
     static-path-pattern: /static/**
     view:
@@ -30,6 +30,8 @@
 
 mybatis-plus:
   typeAliasesPackage: com.stylefeng.guns.modular
+  configuration:
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
 
 eureka:
   client:
@@ -49,7 +51,6 @@
 
 ################# 测试环境 ###################
 spring:
-  profiles: local
   datasource:
     url: jdbc:mysql://localhost:3306/zytravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
@@ -68,37 +69,6 @@
     dataSourceNames:
       - dataSourceGuns
       - dataSourceBiz
-
----
-
-spring:
-  profiles: dev
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
-    db-name: guns #用来搜集数据库的所有表
-    filters: wall,mergeStat
-
----
-
-spring:
-  profiles: test
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
-    filters: wall,mergeStat
-
----
-
-spring:
-  profiles: produce
-  datasource:
-      url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-      username: root
-      password: root
-      filters: wall,mergeStat
 
 
 ---
diff --git a/UserZYTravel/guns-admin/src/main/resources/logback-spring.xml b/UserZYTravel/guns-admin/src/main/resources/logback-spring.xml
index e8f66d9..4ed01f8 100644
--- a/UserZYTravel/guns-admin/src/main/resources/logback-spring.xml
+++ b/UserZYTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -1,99 +1,230 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <!--定义日志存放的位置-->
-    <springProperty scope="context" name="gunsLogPath" source="log.path"
-                    defaultValue="guns-logs"/>
-
-    <!-- ****************************************************************************************** -->
-    <!-- ****************************** 本地开发只在控制台打印日志 ************************************ -->
-    <!-- ****************************************************************************************** -->
-    <springProfile name="local">
-
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <!--encoder 默认配置为PatternLayoutEncoder-->
-            <encoder>
-                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
-                <charset>utf-8</charset>
-            </encoder>
-        </appender>
-
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL,比如: 如果设置为WARN,则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时,配置文档如果发生改变,将会被重新加载,默认值为true -->
+<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
+<configuration  scan="true" scanPeriod="10 seconds">
+    <contextName>logback</contextName>
+    
+    <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后,可以使“${}”来使用变量。 -->
+    <property name="log.path" value="D:/web/log/user"/>
+    
+    <!--0. 日志格式和颜色渲染 -->
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志,时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.2 level为 INFO 日志,时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.3 level为 WARN 日志,时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.4 level为 ERROR 日志,时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    
+    <!-- 2.5 所有 除了DEBUG级别的其它高于DEBUG的 日志,记录到一个文件  -->
+    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/all.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/all-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+    </appender>
+    
+    <!--
+		<logger>用来设置某一个包或者具体的某一个类的日志打印级别、
+		以及指定<appender>。<logger>仅有一个name属性,
+		一个可选的level和一个可选的addtivity属性。
+		name:用来指定受此logger约束的某一个包或者具体的某一个类。
+		level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
+			  还有一个特殊值INHERITED或者同义词NULL,代表强制执行上级的级别。
+			  如果未设置此属性,那么当前logger将会继承上级的级别。
+		addtivity:是否向上级logger传递打印信息。默认是true。
+		<logger name="org.springframework.web" level="info"/>
+		<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
+	-->
+    
+    <!--
+		root节点是必选节点,用来指定最基础的日志输出级别,只有一个level属性
+		level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
+		不能设置为INHERITED或者同义词NULL。默认是DEBUG
+		可以包含零个或多个元素,标识这个appender将会添加到这个logger。
+	-->
+    
+    <!-- 4  最终的策略:
+				 基本策略(root级) + 根据profile在启动时, logger标签中定制化package日志级别(优先级高于上面的root级)-->
+    <springProfile name="dev">
         <root level="info">
-            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="CONSOLE" />
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="WARN_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="ALL_FILE" />
         </root>
-
-        <logger name="com.stylefeng.guns" level="debug" additivity="false">
-            <appender-ref ref="STDOUT"/>
-        </logger>
-
+        <logger name="com.baomidou.mybatisplus" level="info"/>
+        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
+        <logger name="business-log" level="warn"/>
+    </springProfile>
+    
+    <springProfile name="fat">
+        <root level="info">
+            <appender-ref ref="CONSOLE" />
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="WARN_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="ALL_FILE" />
+        </root>
+        <logger name="com.baomidou.mybatisplus" level="info"/>
+        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
+        <logger name="business-log" level="warn"/>
+    </springProfile>
+    
+    <springProfile name="produce">
+        <root level="info">
+            <!-- 生产环境最好不配置console写文件 -->
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="WARN_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="ALL_FILE" />
+        </root>
+        <logger name="com.baomidou.mybatisplus" level="info"/>
+        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
+        <logger name="business-log" level="warn"/>
     </springProfile>
 
-    <!-- ****************************************************************************************** -->
-    <!-- ********************** 放到服务器上不管在什么环境都只在文件记录日志 **************************** -->
-    <!-- ****************************************************************************************** -->
-    <springProfile name="!local">
-
-        <!-- 日志记录器,日期滚动记录 -->
-        <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <!-- 正在记录的日志文件的路径及文件名 -->
-            <file>${gunsLogPath}/log_error.log</file>
-            <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!-- 归档的日志文件的路径,例如今天是2013-12-21日志,当前写的日志文件路径为file节点指定,可以将此文件与file指定文件路径设置为不同路径,从而将当前日志文件或归档日志文件置不同的目录。
-                而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式,%i指定索引 -->
-                <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
-                命名日志文件,例如log-error-2013-12-21.0.log -->
-                <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                    <maxFileSize>2MB</maxFileSize>
-                </timeBasedFileNamingAndTriggeringPolicy>
-            </rollingPolicy>
-            <!-- 追加方式记录日志 -->
-            <append>true</append>
-            <!-- 日志文件的格式 -->
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
-                <charset>utf-8</charset>
-            </encoder>
-            <!-- 此日志文件只记录error级别的 -->
-            <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                <level>error</level>
-                <onMatch>ACCEPT</onMatch>
-                <onMismatch>DENY</onMismatch>
-            </filter>
-        </appender>
-
-        <!-- 日志记录器,日期滚动记录 -->
-        <appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <!-- 正在记录的日志文件的路径及文件名 -->
-            <file>${gunsLogPath}/log_total.log</file>
-            <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!-- 归档的日志文件的路径,例如今天是2013-12-21日志,当前写的日志文件路径为file节点指定,可以将此文件与file指定文件路径设置为不同路径,从而将当前日志文件或归档日志文件置不同的目录。
-                而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式,%i指定索引 -->
-                <fileNamePattern>${gunsLogPath}/total/log-total-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
-                命名日志文件,例如log-error-2013-12-21.0.log -->
-                <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                    <maxFileSize>2MB</maxFileSize>
-                </timeBasedFileNamingAndTriggeringPolicy>
-            </rollingPolicy>
-            <!-- 追加方式记录日志 -->
-            <append>true</append>
-            <!-- 日志文件的格式 -->
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
-                <charset>utf-8</charset>
-            </encoder>
-        </appender>
-
-        <root level="info">
-            <appender-ref ref="FILE_ERROR"/>
-            <appender-ref ref="FILE_ALL"/>
-        </root>
-
-    </springProfile>
-
-</configuration>
-
-
+</configuration>
\ No newline at end of file
diff --git a/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index 684fb1d..2bf3187 100644
--- a/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,5 +1,6 @@
 //package com.stylefeng.guns;
 //
+//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
 //import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
 //import com.stylefeng.guns.modular.system.util.ResultUtil;
 //import org.junit.Test;
@@ -21,26 +22,14 @@
 //	@Autowired
 //	private PayMoneyUtil payMoneyUtil;
 //
+//	@Autowired
+//	private IOrderPrivateCarService orderPrivateCarService;
+//
 //
 //	@Test
 //	public void test(){
 //		try {
-//			ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", "37551_1_74ed0", "JSAPI");
-//			if (resultUtil1.getCode() == 200) {
-//				/**
-//				 * SUCCESS--支付成功
-//				 * REFUND--转入退款
-//				 * NOTPAY--未支付
-//				 * CLOSED--已关闭
-//				 * REVOKED--已撤销(刷卡支付)
-//				 * USERPAYING--用户支付中
-//				 * PAYERROR--支付失败(其他原因,如银行返回失败)
-//				 * ACCEPT--已接收,等待扣款
-//				 */
-//				System.err.println(resultUtil1.getData());
-//			}
-//
-////			payMoneyUtil.closeWXOrder("37551_1_74ed0");
+//			orderPrivateCarService.payPrivateCarOrder(1, 37630, null, 1);
 //		} catch (Exception e) {
 //			throw new RuntimeException(e);
 //		}
diff --git a/UserZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java b/UserZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
index 17ffd3a..8c81e34 100644
--- a/UserZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
+++ b/UserZYTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
@@ -20,11 +20,11 @@
 
     private String driverClassName = "com.mysql.cj.jdbc.Driver";
 
-    private Integer initialSize = 2;
+    private Integer initialSize = 100;
 
-    private Integer minIdle = 1;
+    private Integer minIdle = 100;
 
-    private Integer maxActive = 20;
+    private Integer maxActive = 1000;
 
     private Integer maxWait = 60000;
 

--
Gitblit v1.7.1