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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-03-07 14:59:25 +08:00
parent dda0c1521c 32e95aa6c5
commit fda743ceee
11 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,10 +14,10 @@
</appender>
<!--按天生成日志-->
<appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/logback.log</file>
<file>logs/account/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/history/%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>

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

@@ -14,10 +14,10 @@
</appender>
<!--按天生成日志-->
<appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/logback.log</file>
<file>logs/order/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/history/%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>

6
cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java
View File

@@ -37,12 +37,12 @@ public class HomeController {
* @param lat 经度
* @param address 城市
* @param categoryId 分类 0双人餐 1饮品明细 2咖啡饮品
* @param orderType 排序规则 0离我最近 1销量优先 2价格优先
* @param orderType 排序规则 0离我最近 1销量优先 2价格优先 3上新
* @param distanceType 1000m 2000m
* @return 商品列表
*/
@GetMapping("/product")
public CzgResult<Page<RecommendProVO>> home(String lng, String lat, String address, Integer categoryId, Integer orderType, Integer distanceType) {
return CzgResult.success(homePageService.getProd(lng, lat, address, categoryId, orderType, distanceType));
public CzgResult<Page<RecommendProVO>> home(String lng, String lat, String address, Integer categoryId, Integer orderType, Integer distanceType, String name) {
return CzgResult.success(homePageService.getProd(lng, lat, address, categoryId, orderType, distanceType, name));
}
}

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

@@ -14,10 +14,10 @@
</appender>
<!--按天生成日志-->
<appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/logback.log</file>
<file>logs/product/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/history/%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>

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

@@ -14,10 +14,10 @@
</appender>
<!--按天生成日志-->
<appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/logback.log</file>
<file>logs/system/logback.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--生成日志文件名称-->
<fileNamePattern>logs/history/%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>