czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	cash-common/cash-common-tools/pom.xml
#	pom.xml
This commit is contained in:
Tankaikai 2025-02-08 09:56:18 +08:00
parent 4bc0c260d2 9341c9469a
commit 0981e67c85
8 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/resources/logback.xml
View File

@ -17,7 +17,7 @@
<file>logs/account/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/account/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<fileNamePattern>logs/account/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<maxFileSize>20MB</maxFileSize>

2
cash-api/order-server/src/main/resources/logback.xml
View File

@ -17,7 +17,7 @@
<file>logs/order/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/order/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<fileNamePattern>logs/order/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<maxFileSize>20MB</maxFileSize>

2
cash-api/product-server/src/main/resources/logback.xml
View File

@ -17,7 +17,7 @@
<file>logs/product/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/product/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<fileNamePattern>logs/product/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<maxFileSize>20MB</maxFileSize>

2
cash-api/system-server/src/main/resources/logback.xml
View File

@ -17,7 +17,7 @@
<file>logs/system/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/system/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<fileNamePattern>logs/system/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<maxFileSize>20MB</maxFileSize>

4
cash-common/cash-common-tools/pom.xml
View File

@ -17,6 +17,10 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>

5
cash-service/account-service/pom.xml
View File

@ -23,11 +23,6 @@
<artifactId>cash-common-sa-token</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.czg</groupId>
<artifactId>cash-common-tools</artifactId>
</dependency>
</dependencies>
</project>

5
cash-service/pom.xml
View File

@ -33,11 +33,6 @@
<artifactId>cash-common-tools</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.czg</groupId>
<artifactId>cash-sdk</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.mybatis-flex</groupId>

30
pom.xml
View File

@ -44,11 +44,41 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
<!-- spring-boot-starter-test 的漏洞的依赖处理 -->
<!-- start -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<!-- 排除有漏洞的依赖 -->
<exclusions>
<exclusion>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
</exclusion>
<exclusion>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.10.0</version>
<scope>test</scope>
</dependency>
<!-- end -->
<!--
<dependency>
<groupId>org.springframework.cloud</groupId>