diff --git a/Cpop-Core/src/main/java/com/cpop/core/config/FilterConfig.java b/Cpop-Core/src/main/java/com/cpop/core/config/FilterConfig.java index 31cac31..fc57cc8 100644 --- a/Cpop-Core/src/main/java/com/cpop/core/config/FilterConfig.java +++ b/Cpop-Core/src/main/java/com/cpop/core/config/FilterConfig.java @@ -34,11 +34,10 @@ public class FilterConfig { private String urlPatterns; /** - * @Description: xss过滤器 - * @param - * @return: FilterRegistrationBean - * @Author: DB - * @Date: 2023/4/17 9:17 + * xss过滤器 + * @return FilterRegistrationBean + * @author DB + * @since 2023/4/17 9:17 **/ @SuppressWarnings({"rawtypes", "unchecked"}) @Bean diff --git a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application.yml b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application.yml index 7ec1651..0718be0 100644 --- a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application.yml +++ b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application.yml @@ -4,14 +4,6 @@ cpop: name: Cpop-Oam # 版本 version: 1.0.0 - #JWT - jwt: - #密钥 - secret: abcdefghijklmnopqrstuvwxyz - #过期时间 - expire: 604800 - #token头 - header: Authorization #拦截 gateway: rsa-keypair: @@ -31,7 +23,7 @@ spring: max-file-size: 1024MB max-request-size: 300MB profiles: - active: dev,core,jambox,pay + active: dev,pay datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver @@ -83,18 +75,6 @@ spring: threadPriority: 5 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: @@ -112,6 +92,19 @@ task: # 设置线程池等待终止时间(秒) 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: # 过滤开关 @@ -122,9 +115,25 @@ xss: urlPatterns: /* logging: + config: classpath:logback.xml level: - #swagger日志 - springfox: error + org.springframework.web: INFO + 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: @@ -150,22 +159,14 @@ wx: aesKey: DLSzfHVUZN3O9WhtL07RBXUoooqC2bjEJYwep8k8ojt #开放平台 open: - openAppid: wx6e07ba6606e912a5 - componentAppId: wx1efbf67f8637d7d1 - componentSecret: fc2e9457aaa32342751cc655b5a1d273 - componentToken: jambox - componentAesKey: 1a3NBxmCFwkCJvfoQ7WhJHB6iX3qHPsc9JbaDznE1i0 - redirectUri: https://empower.oamapi.cpopsz.com/test/openPlatform/thirdPartyPlatform/redirectUrl - #小程序 - miniapp: - configs: - #微信小程序的appid - - appid: wx20853d18c455e874 - #微信小程序的Secret - secret: 217caf62439579195c8da19774de40d1 - #微信小程序消息服务器配置的token - token: - #微信小程序消息服务器配置的EncodingAESKey - aesKey: - #数据格式 - msgDataFormat: JSON \ No newline at end of file + component-app-id: wx1efbf67f8637d7d1 + component-secret: fc2e9457aaa32342751cc655b5a1d273 + component-token: jambox + component-aes-key: 1a3NBxmCFwkCJvfoQ7WhJHB6iX3qHPsc9JbaDznE1i0 + #授权链接 + authorized-link: https://jamboxtest.cpopsz.com/Jambox-System/callback/wxOpen/authorization + redis: + host: gz-crs-lv77ii2t.sql.tencentcdb.com + port: 27714 + password: Cpop2022@ + database: 20 \ No newline at end of file diff --git a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/logback.xml b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/logback.xml index ae60909..076f3ca 100644 --- a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/logback.xml +++ b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/logback.xml @@ -1,68 +1,102 @@ - - - - - - - - - - - - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %level [%thread] %file:%line - %msg%n + + + + + + + %date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n UTF-8 - - - ${LOG_HOME}/${LOG_PREFIX}-info.log - true - - - INFO - ACCEPT - DENY - - - ${LOG_HOME}/${LOG_PREFIX}-info-%d{yyyyMMdd}.log.%d - 7 - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %level [%thread] %file:%line - %msg%n - UTF-8 - - + + + - - ${LOG_HOME}/${LOG_PREFIX}-error.log - true - - - ERROR - ACCEPT - DENY - - - ${LOG_HOME}/${LOG_PREFIX}-error-%d{yyyyMMdd}.log.%d - 7 - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %level [%thread] %file:%line - %msg%n - UTF-8 - - - + + + + + + ${LOG_HOME}/${LOG_PREFIX}/info.log + + ${LOG_HOME}/${LOG_PREFIX}/info.log.%d.%i + + 15 + + + 64 MB + + + + + %date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + - + + + ${LOG_HOME}/${LOG_PREFIX}/sql.log + + ${LOG_HOME}/${LOG_PREFIX}/sql.log.%d.%i + + 15 + + + 64 MB + + + + + %date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + + + + + ${LOG_HOME}/${LOG_PREFIX}/error.log + + ${LOG_HOME}/${LOG_PREFIX}/error.log.%d.%i + + 15 + + + 64 MB + + + + + %date{yyyy-MM-dd HH:mm:ss.SSS, GMT+8} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + + + ERROR + ACCEPT + DENY + + + + + - - - - - + + + - - + + + + + + + + + \ No newline at end of file