Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java

@@ -5,6 +5,7 @@ import com.czg.account.service.ShopCouponService;
 import com.czg.account.vo.UserCouponVo;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
+import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
@@ -44,6 +45,7 @@ public class UserShopCouponController {
      */
     @GetMapping("/findCoupon")
     public CzgResult<List<UserCouponVo>> findCoupon(@RequestHeader String shopId, @RequestParam Long shopUserId, @RequestParam(required = false) Integer type) {
+        AssertUtil.isBlank(shopId, "店铺Id不能为空");
         return CzgResult.success(couponService.findCoupon(Long.parseLong(shopId), shopUserId, type));
     }
 }

cash-api/account-server/src/main/resources/application-dev.yml

@@ -32,11 +32,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-dev
-#    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9101
     threads: 20
-#    threadpool: fixed
+    name: dubbo
+    serialization: fastjson2
+    port: -1
 
 
 seata:

cash-api/account-server/src/main/resources/application-test.yml

@@ -33,11 +33,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-test
-    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9101
     threads: 20
-    threadpool: fixed
+    port: -1
+    name: dubbo
+    serialization: fastjson2
 
 
 

cash-api/order-server/src/main/resources/application-dev.yml

@@ -34,11 +34,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-dev
-    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9201
+    port: -1
     threads: 20
-    threadpool: fixed
+    name: dubbo
+    serialization: fastjson2
 
 seata:
   application-id: order-server

cash-api/order-server/src/main/resources/application-test.yml

@@ -35,11 +35,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-test
-    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9201
+    port: -1
     threads: 20
-    threadpool: fixed
+    name: dubbo
+    serialization: hessian2
 
 
 seata:

cash-api/product-server/src/main/resources/application-dev.yml

@@ -39,11 +39,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-dev
-    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9301
+    port: -1
     threads: 20
-    threadpool: fixed
+    name: dubbo
+    serialization: fastjson2
 
 seata:
   application-id: product-server

cash-api/product-server/src/main/resources/application-test.yml

@@ -28,12 +28,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-test
-    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9301
+    port: -1
     threads: 20
-    threadpool: fixed
+    name: dubbo
-
+    serialization: fastjson2
 
 seata:
   application-id: product-server

cash-api/system-server/src/main/resources/application-dev.yml

@@ -34,11 +34,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-dev
-#    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9401
+    port: -1
     threads: 20
-#    threadpool: fixed
+    name: dubbo
+    serialization: fastjson2
 
 seata:
   application-id: system-server

cash-api/system-server/src/main/resources/application-test.yml

@@ -34,11 +34,11 @@ dubbo:
   registry:
     address: nacos://121.40.109.122:8848 # Nacos 服务地址
     group: server-test
-    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
   protocol:
-    port: 9401
+    port: -1
     threads: 20
-    threadpool: fixed
+    name: dubbo
+    serialization: fastjson2
 
 
 seata:

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CommonServiceImpl.java

@@ -32,8 +32,13 @@ public class CommonServiceImpl implements CommonService {
         if (StrUtil.isBlank(sysUser.getPhone())) {
             throw new ApiNotPrintException("账号未绑定手机号");
         }
+        String key = RedisCst.SMS_CODE + sysUser.getPhone() + ":" + type;
+        Object val = redisService.get(key);
+        if (val != null) {
+            throw new ApiNotPrintException("请勿频繁获取");
+        }
         int code = RandomUtil.randomInt(100000, 1000000);
-        redisService.set(RedisCst.SMS_CODE + sysUser.getPhone() + ":" + type, code, 300);
+        redisService.set(key, code, 300);
         smsService.sendCode(sysUser.getPhone(), String.valueOf(code));
         return true;
     }

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java

@@ -159,6 +159,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
             }
 
             shopInfo.setOperationPwd(SecureUtil.md5(shopInfoEditDTO.getOperationPwd()));
+            redisService.del(key);
         }
         return updateById(shopInfo);
     }