From 489082e6779053d326f08cb3e7b609c47eb31313 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Wed, 13 Aug 2025 17:35:54 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-gmprod.yml | 46 ++++++++++
 .../src/main/resources/logback-spring.xml     | 84 ++++---------------
 2 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/base-buildpackage/src/main/resources/application-gmprod.yml b/base-buildpackage/src/main/resources/application-gmprod.yml
index e69de29b..71ea0267 100644
--- a/base-buildpackage/src/main/resources/application-gmprod.yml
+++ b/base-buildpackage/src/main/resources/application-gmprod.yml
@@ -0,0 +1,46 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: info
+  encodings: UTF-8
+  file:
+    #    日志保存路径
+    path: F:\01zjya\10Log\kangarooDataCenterV3\voucher-gm\log
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/bussinesscenter_voucher_gm?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true
+          username: root
+          password: bd993088e8a7c3dc5f44441617f9b4bf
+          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: /Users/liuyang/workspaces/hzya/kangarooDataCenterV3/file
+  pluginpath: xxx
+  tomcatpath: D:\server\apache-tomcat-9.0.91
+zt:
+  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826
+  #电子回单下载临时存放位置
+  elec_path: /Users/xiangerlin/Downloads/
+OA:
+  data_source_code: yc_oa
+
+
+
+#report
+report:
+  templatesurl: /Users/liuyang/workspaces/hzya/kangarooDataCenterV3/service/src/main/resources/template/TOCTOB正向流程导出模版.xlsx
+  tempFile: /Users/liuyang/workspaces/hzya/tempfile
diff --git a/base-buildpackage/src/main/resources/logback-spring.xml b/base-buildpackage/src/main/resources/logback-spring.xml
index fed8a49d..d6f2f6fe 100644
--- a/base-buildpackage/src/main/resources/logback-spring.xml
+++ b/base-buildpackage/src/main/resources/logback-spring.xml
@@ -1,170 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration>
     <contextName>logback</contextName>
-    <!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-    <!-- 彩色日志(IDE下载插件才可以生效) -->
+
     <!-- 彩色日志依赖的渲染类 -->
     <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:-%1p}) %clr(${PID:- }){magenta} %clr(--){faint} %clr([%1.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!-- 日志路径和编码配置 -->
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logdir"/>
     <springProperty scope="context" name="encodings" source="logging.encodings" defaultValue="UTF-8"/>
-    <!--定义日志文档的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="${logPath}"/>
     <property name="MAX_HISTORY" value="50"/>
     <property name="MAX_FILE_SIZE" value="50MB"/>
-    <!-- 控制台输出 -->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-<!--        <encoder>-->
-<!--            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>-->
-<!--            &lt;!&ndash; 设置字符集 &ndash;&gt;-->
-<!--            <charset>${encodings}</charset>-->
-<!--        </encoder>-->
 
-        <!--这里替换成AspectLogbackEncoder-->
+    <!-- 控制台输出（已正确配置编码） -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>${encodings}</charset>
+            <charset>${encodings}</charset> <!-- 控制台编码：UTF-8 -->
         </encoder>
     </appender>
-    <!-- INFO级别日志输出到文件 -->
+
+    <!-- INFO级别日志输出到文件（新增charset配置） -->
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 添加filter，只记录INFO级别以上的日志 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>INFO</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 每个日志文件最大MB -->
             <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
-            <!-- 日志文件保留天 -->
             <maxHistory>${MAX_HISTORY}</maxHistory>
-<!--            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info/info_%d{yyyyMMddHH}.%i.log</fileNamePattern>-->
             <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info/info_%d{yyyyMMdd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件超过最大大小后立即生成新文件 -->
                 <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
-
         </rollingPolicy>
-
-<!--        <encoder>-->
-<!--            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>-->
-<!--        </encoder>-->
-        <!--这里替换成AspectLogbackEncoder-->
         <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${encodings}</charset> <!-- 文件编码：UTF-8 -->
         </encoder>
     </appender>
 
-    <!-- WARN级别日志-->
+    <!-- WARN级别日志（新增charset配置） -->
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 每个日志文件最大MB -->
             <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
-            <!-- 日志文件保留天 -->
             <maxHistory>${MAX_HISTORY}</maxHistory>
             <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/warn/warn_%d{yyyyMMdd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件超过最大大小后立即生成新文件 -->
                 <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
-        <!-- 添加 WARN只记录WARN级别以上的日志 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>WARN</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
-<!--        <encoder>-->
-<!--            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>-->
-<!--        </encoder>-->
-        <!--这里替换成AspectLogbackEncoder-->
         <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${encodings}</charset> <!-- 文件编码：UTF-8 -->
         </encoder>
     </appender>
 
-    <!-- error级别日志-->
+    <!-- ERROR级别日志（新增charset配置） -->
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 每个日志文件最大MB -->
-            <!--            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>-->
             <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
-            <!-- 日志文件保留天 -->
             <maxHistory>${MAX_HISTORY}</maxHistory>
             <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/error/error_%d{yyyyMMdd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件超过最大大小后立即生成新文件 -->
                 <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
-        <!-- 添加 ERROR只记录ERROR级别以上的日志 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
-<!--        <encoder>-->
-<!--            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>-->
-<!--        </encoder>-->
-        <!--这里替换成AspectLogbackEncoder-->
         <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${encodings}</charset> <!-- 文件编码：UTF-8 -->
         </encoder>
     </appender>
 
-
-
-    <!-- ALL 任意级别日志都会记录在此级别日志-->
+    <!-- ALL级别日志（新增charset配置） -->
     <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 每个日志文件最大MB -->
-            <!--            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>-->
             <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
-            <!-- 日志文件保留天 -->
             <maxHistory>${MAX_HISTORY}</maxHistory>
             <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/all/all_%d{yyyyMMdd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件超过最大大小后立即生成新文件 -->
                 <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
-
-<!--        <encoder>-->
-<!--            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>-->
-<!--        </encoder>-->
-        <!--这里替换成AspectLogbackEncoder-->
         <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${encodings}</charset> <!-- 文件编码：UTF-8 -->
         </encoder>
     </appender>
 
-
+    <!-- 根日志配置 -->
     <root level="INFO">
-        <!-- 控制面板输出 -->
         <appender-ref ref="CONSOLE"/>
-        <!-- 按照每天生成日志文档 -->
         <appender-ref ref="INFO_FILE"/>
         <appender-ref ref="WARN_FILE"/>
         <appender-ref ref="ERROR_FILE"/>
         <appender-ref ref="ALL_FILE"/>
     </root>
-    <!-- ERROR 级别-->
     <root level="ERROR">
-        <!-- 按照每天生成日志文档 -->
         <appender-ref ref="INFO_FILE"/>
         <appender-ref ref="WARN_FILE"/>
         <appender-ref ref="ERROR_FILE"/>