Ip 变动

This commit is contained in:
wangw 2025-09-25 15:20:25 +08:00
parent 35e2f9abe5
commit 31005bd6c7
6 changed files with 13 additions and 13 deletions

View File

@ -1,13 +1,13 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.71:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
username: root
password: Chaozg123.
data:
redis:
host: 192.168.0.71
host: 192.168.1.42
port: 6379
password: Chaozg123.
timeout: 1000

View File

@ -24,7 +24,6 @@ public class UShopCouponController {
private ShopCouponService couponService;
/**
* 获取当前店铺会员信息
* 请求头必须携带shopId, 不携带则会失败
@ -33,7 +32,8 @@ public class UShopCouponController {
*/
@GetMapping("/shops")
public CzgResult<List<ShopInfoCouponVO>> shops() {
return CzgResult.success(couponService.getShopByCouponRecord(StpKit.USER.getShopId(), StpKit.USER.getLoginIdAsLong()));
Long shopId = StpKit.USER.getShopId(0L);
return CzgResult.success(couponService.getShopByCouponRecord(shopId == 0L ? null : shopId, StpKit.USER.getLoginIdAsLong()));
}
/**
@ -46,7 +46,7 @@ public class UShopCouponController {
@RequestParam(required = false) Integer status,
@RequestParam(required = false) String name,
@RequestParam(required = false) Long shopId) {
return CzgResult.success(couponService.find(StpKit.USER.getLoginIdAsLong(),name, shopId, status));
return CzgResult.success(couponService.find(StpKit.USER.getLoginIdAsLong(), name, shopId, status));
}
/**

View File

@ -1,13 +1,13 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.71:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
username: root
password: Chaozg123.
data:
redis:
host: 192.168.0.71
host: 192.168.1.42
port: 6379
password: Chaozg123.
timeout: 1000

View File

@ -2,13 +2,13 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.71:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
username: root
password: Chaozg123.
data:
redis:
host: 192.168.0.71
host: 192.168.1.42
port: 6379
password: Chaozg123.
timeout: 1000

View File

@ -1,13 +1,13 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.71:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
username: root
password: Chaozg123.
data:
redis:
host: 192.168.0.71
host: 192.168.1.42
port: 6379
password: Chaozg123.
timeout: 1000

View File

@ -2,13 +2,13 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.71:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
username: root
password: Chaozg123.
data:
redis:
host: 192.168.0.71
host: 192.168.1.42
port: 6379
password: Chaozg123.
timeout: 1000