diff --git a/cash-api/account-server/src/main/resources/application-dev.yml b/cash-api/account-server/src/main/resources/application-dev.yml index cadafbe7b..39f41a464 100644 --- a/cash-api/account-server/src/main/resources/application-dev.yml +++ b/cash-api/account-server/src/main/resources/application-dev.yml @@ -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 diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopCouponController.java index 96a49dcda..6c48f3f7f 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopCouponController.java @@ -24,7 +24,6 @@ public class UShopCouponController { private ShopCouponService couponService; - /** * 获取当前店铺会员信息 * 请求头必须携带shopId, 不携带则会失败 @@ -33,7 +32,8 @@ public class UShopCouponController { */ @GetMapping("/shops") public CzgResult> 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)); } /** diff --git a/cash-api/market-server/src/main/resources/application-dev.yml b/cash-api/market-server/src/main/resources/application-dev.yml index 43516bab6..86bfdc5e8 100644 --- a/cash-api/market-server/src/main/resources/application-dev.yml +++ b/cash-api/market-server/src/main/resources/application-dev.yml @@ -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 diff --git a/cash-api/order-server/src/main/resources/application-dev.yml b/cash-api/order-server/src/main/resources/application-dev.yml index dd12c08ce..a2d9fc027 100644 --- a/cash-api/order-server/src/main/resources/application-dev.yml +++ b/cash-api/order-server/src/main/resources/application-dev.yml @@ -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 diff --git a/cash-api/product-server/src/main/resources/application-dev.yml b/cash-api/product-server/src/main/resources/application-dev.yml index 7ebd118d3..60eb1a833 100644 --- a/cash-api/product-server/src/main/resources/application-dev.yml +++ b/cash-api/product-server/src/main/resources/application-dev.yml @@ -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 diff --git a/cash-api/system-server/src/main/resources/application-dev.yml b/cash-api/system-server/src/main/resources/application-dev.yml index 1153e34a4..d8063b188 100644 --- a/cash-api/system-server/src/main/resources/application-dev.yml +++ b/cash-api/system-server/src/main/resources/application-dev.yml @@ -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