CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整oam配置;调整日志打印

Browse Source
This commit is contained in:
DB 2024-04-18 11:13:12 +08:00
parent 5bbca4104c
commit 7b38a28e0c
3 changed files with 141 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Cpop-Core/src/main/java/com/cpop/core/config/FilterConfig.java
View File

@ -34,11 +34,10 @@ public class FilterConfig {
private String urlPatterns; private String urlPatterns;
/** /**
* @Description: xss过滤器 * xss过滤器
* @param * @return FilterRegistrationBean
* @return: FilterRegistrationBean * @author DB
* @Author: DB * @since 2023/4/17 9:17
* @Date: 2023/4/17 9:17
**/ **/
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@Bean @Bean

85
Cpop-Oam/Cpop-Oam-Web/src/main/resources/application.yml
View File

@ -4,14 +4,6 @@ cpop:
name: Cpop-Oam name: Cpop-Oam
# 版本 # 版本
version: 1.0.0 version: 1.0.0
#JWT
jwt:
#密钥
secret: abcdefghijklmnopqrstuvwxyz
#过期时间
expire: 604800
#token头
header: Authorization
#拦截 #拦截
gateway: gateway:
rsa-keypair: rsa-keypair:
@ -31,7 +23,7 @@ spring:
max-file-size: 1024MB max-file-size: 1024MB
max-request-size: 300MB max-request-size: 300MB
profiles: profiles:
active: dev,core,jambox,pay active: dev,pay
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
@ -83,18 +75,6 @@ spring:
threadPriority: 5 threadPriority: 5
threadsInheritContextClassLoaderOfInitializingThread: true threadsInheritContextClassLoaderOfInitializingThread: true
#Mybatis-Flex
mybatis-flex:
global-config:
key-config:
key-type: generator
value: snowFlakeId
# 逻辑删除数据存在标记值 默认值:0
normal-value-of-logic-delete: 0
# 逻辑删除数据删除标记值 默认值:0
deleted-value-of-logic-delete: 1
# 全局逻辑删除默认字段
logic-delete-column: is_delete
# 线程池配置参数 # 线程池配置参数
task: task:
@ -112,6 +92,19 @@ task:
# 设置线程池等待终止时间(秒) # 设置线程池等待终止时间(秒)
awaitTerminationSeconds: 60 awaitTerminationSeconds: 60
#Mybatis-Flex
mybatis-flex:
global-config:
key-config:
key-type: generator
value: snowFlakeId
# 逻辑删除数据存在标记值 默认值:0
normal-value-of-logic-delete: false
# 逻辑删除数据删除标记值 默认值:0
deleted-value-of-logic-delete: true
# 全局逻辑删除默认字段
logic-delete-column: is_delete
# 防止XSS攻击 # 防止XSS攻击
xss: xss:
# 过滤开关 # 过滤开关
@ -122,9 +115,25 @@ xss:
urlPatterns: /* urlPatterns: /*
logging: logging:
config: classpath:logback.xml
level: level:
#swagger日志 org.springframework.web: INFO
springfox: error me.chanjar.weixin: DEBUG
com.github.binarywang.wxpay: debug
# 腾讯云
tencent:
cos:
#id
secretId: AKIDFK8hz0kDRP6XjdGciX5LK3VfYBWaMs7V
#密钥
secretKey: 92g38wUlkSt50e17wUllUw71pMcaIjtl
#
bucketName: dataresource-1302318474
#cdn地址
cdnUrl: .cos.accelerate.myqcloud.com/
#地区
region: ap-guangzhou
#微信 #微信
wx: wx:
@ -150,22 +159,14 @@ wx:
aesKey: DLSzfHVUZN3O9WhtL07RBXUoooqC2bjEJYwep8k8ojt aesKey: DLSzfHVUZN3O9WhtL07RBXUoooqC2bjEJYwep8k8ojt
#开放平台 #开放平台
open: open:
openAppid: wx6e07ba6606e912a5 component-app-id: wx1efbf67f8637d7d1
componentAppId: wx1efbf67f8637d7d1 component-secret: fc2e9457aaa32342751cc655b5a1d273
componentSecret: fc2e9457aaa32342751cc655b5a1d273 component-token: jambox
componentToken: jambox component-aes-key: 1a3NBxmCFwkCJvfoQ7WhJHB6iX3qHPsc9JbaDznE1i0
componentAesKey: 1a3NBxmCFwkCJvfoQ7WhJHB6iX3qHPsc9JbaDznE1i0 #授权链接
redirectUri: https://empower.oamapi.cpopsz.com/test/openPlatform/thirdPartyPlatform/redirectUrl authorized-link: https://jamboxtest.cpopsz.com/Jambox-System/callback/wxOpen/authorization
#小程序 redis:
miniapp: host: gz-crs-lv77ii2t.sql.tencentcdb.com
configs: port: 27714
#微信小程序的appid password: Cpop2022@
- appid: wx20853d18c455e874 database: 20
#微信小程序的Secret
secret: 217caf62439579195c8da19774de40d1
#微信小程序消息服务器配置的token
token:
#微信小程序消息服务器配置的EncodingAESKey
aesKey:
#数据格式
msgDataFormat: JSON

154
Cpop-Oam/Cpop-Oam-Web/src/main/resources/logback.xml
View File

@ -1,68 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?> <configuration>
<!--本文主要输出日志为控制台日志，系统日志，sql日志，异常日志-->
<!-- Logback configuration. See http://logback.qos.ch/manual/index.html --> <!-- %m输出的信息,%p日志级别,%t线程名,%d日期,%c类的全名 -->
<configuration scan="true" scanPeriod="10 seconds"> <!--控制台-->
<!--<include resource="org/springframework/boot/logging/logback/base.xml" />--> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<!--定义日志文件的存储地址和前缀名--> <encoder>
<property name="LOG_HOME" value="./logs"/> <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n</pattern>
<property name="LOG_PREFIX" value="Cpop-Oam"/>
<!--控制台输出 -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="UTF-8">
<!--格式化输出：%d表示日期，%-5level：级别，%thread表示线程名，%file输出文件名，%line文件行数，%msg：日志消息，%n是换行符-->
<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %level [%thread] %file:%line - %msg%n</pattern>
<charset>UTF-8</charset> <charset>UTF-8</charset>
</encoder> </encoder>
</appender> </appender>
<springProfile name="test,prod"> <!--定义日志文件的存储地址和前缀名-->
<appender name="SYS_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender"> <property name="LOG_HOME" value="./logs"/>
<File>${LOG_HOME}/${LOG_PREFIX}-info.log</File> <property name="LOG_PREFIX" value="Cpop-Oam-System"/>
<append>true</append>
<!--过滤器,只打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.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/${LOG_PREFIX}-info-%d{yyyyMMdd}.log.%d</fileNamePattern>
<maxHistory>7</maxHistory>
</rollingPolicy>
<encoder charset="UTF-8">
<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %level [%thread] %file:%line - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="SYS_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender"> <!--系统info级别日志-->
<File>${LOG_HOME}/${LOG_PREFIX}-error.log</File> <!--<File> 日志目录，没有会自动创建-->
<append>true</append> <!--<rollingPolicy>日志策略，每天简历一个日志文件，或者当天日志文件超过64MB时-->
<!--过滤器,只打ERROR级别的日志--> <!--encoder 日志编码及输出格式-->
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <appender name="fileLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<level>ERROR</level> <File>${LOG_HOME}/${LOG_PREFIX}/info.log</File>
<onMatch>ACCEPT</onMatch> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<onMismatch>DENY</onMismatch> <fileNamePattern>${LOG_HOME}/${LOG_PREFIX}/info.log.%d.%i</fileNamePattern>
</filter> <!-- 保留的历史日志文件数 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <maxHistory>15</maxHistory>
<fileNamePattern>${LOG_HOME}/${LOG_PREFIX}-error-%d{yyyyMMdd}.log.%d</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxHistory>7</maxHistory> <!-- or whenever the file size reaches 64 MB -->
</rollingPolicy> <maxFileSize>64 MB</maxFileSize>
<encoder charset="UTF-8"> </timeBasedFileNamingAndTriggeringPolicy>
<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %level [%thread] %file:%line - %msg%n</pattern> </rollingPolicy>
<charset>UTF-8</charset> <!--对记录事件进行格式化。负责两件事，一是把日志信息转换成字节数组，二是把字节数组写入到输出流。-->
</encoder> <encoder>
</appender> <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n</pattern>
</springProfile> <charset>UTF-8</charset>
</encoder>
</appender>
<!--info和error分开打印--> <!--sql日志-->
<appender name="sqlFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>${LOG_HOME}/${LOG_PREFIX}/sql.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/${LOG_PREFIX}/sql.log.%d.%i</fileNamePattern>
<!-- 保留的历史日志文件数 -->
<maxHistory>15</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<!--对记录事件进行格式化。负责两件事，一是把日志信息转换成字节数组，二是把字节数组写入到输出流。-->
<encoder>
<pattern>%date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<!--异常日志-->
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>${LOG_HOME}/${LOG_PREFIX}/error.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/${LOG_PREFIX}/error.log.%d.%i</fileNamePattern>
<!-- 保留的历史日志文件数 -->
<maxHistory>15</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<!--对记录事件进行格式化。负责两件事，一是把日志信息转换成字节数组，二是把字节数组写入到输出流。-->
<encoder>
<pattern>%date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
<!--
日志都在这里 过滤出 error
使用 try {}catch (Exception e){} 的话异常无法写入日志，可以在catch里用logger.error()方法手动写入日志
-->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 日志输出级别 -->
<!--All\DEBUG\INFO\WARN\ERROR\FATAL\OFF-->
<!--打印info级别日志，分别在控制台，fileLog，errorFile输出
异常日志在上面由过滤器过滤出ERROR日志打印
-->
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE"/> <appender-ref ref="fileLog" />
<springProfile name="test,prod"> <appender-ref ref="console" />
<appender-ref ref="SYS_INFO"/> <appender-ref ref="errorFile" />
<appender-ref ref="SYS_ERROR"/>
</springProfile>
</root> </root>
<logger name="com.cpop.oam" level="DEBUG"/>
</configuration> <!--打印sql至sqlFile文件日志-->
<logger name="com.cpop.core.mapper" level="DEBUG">
<appender-ref ref="sqlFile" />
</logger>
<logger name="com.cpop.system.business.mapper" level="DEBUG">
<appender-ref ref="sqlFile" />
</logger>
</configuration>