Merge remote-tracking branch 'origin/store-plantform' into store-plantform

alien-gateway/src/main/java/shop/alien/gateway/config/JwtTokenFilter.java

@@ -114,7 +114,7 @@ public class JwtTokenFilter implements GlobalFilter, Ordered {
                 }
                 String redisVal = baseRedisService.getString(redisKey);
                 if (StringUtils.isEmpty(redisVal) || !token.equals(redisVal)) {
-                    if ("store".equals(deviceType)) {
+                    if ("store".equals(deviceType) || "storePlatform".equals(deviceType)) {
                         //判断程序是否为用户禁用
                         StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getPhone, phone));
                         if (storeUser.getStatus() == 1) {

alien-store/src/main/java/shop/alien/store/controller/AliController.java

@@ -139,7 +139,7 @@ public class AliController {
     @ApiOperationSupport(order = 4)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "appType", value = "端区分(0:用户, 1:商家)", dataType = "Integer", paramType = "query", required = true, defaultValue = "0"),
+            @ApiImplicitParam(name = "appType", value = "端区分(0:用户, 1:商家, 2:商家web端)", dataType = "Integer", paramType = "query", required = true, defaultValue = "0"),
             @ApiImplicitParam(name = "businessType", value = "业务类型 (0:登录, 1:修改密码, 2:注册, 3:修改手机号, 4:注销店铺, 5:注销账号, 6:忘记密码)", dataType = "Integer", paramType = "query", required = true, defaultValue = "0")
     })
     @GetMapping("/sendSms")

alien-store/src/main/java/shop/alien/store/controller/WebSocketController.java

@@ -52,7 +52,7 @@ public class WebSocketController {
     @GetMapping(value = "/getTokenStatus")
     public R<Boolean> getTokenStatus() {
         String phoneId = Objects.requireNonNull(JwtUtil.getCurrentUserInfo()).getString("userType") + "_" + JwtUtil.getCurrentUserInfo().getString("phone");
-        log.info("WebSocketController.getTokenStatus()----------phoneId={}", phoneId);
+//        log.info("WebSocketController.getTokenStatus()----------phoneId={}", phoneId);
         return R.data(true);
     }
 

alien-store/src/main/java/shop/alien/store/util/ali/AliSms.java

@@ -60,7 +60,7 @@ public class AliSms {
     public Integer sendSms(String phone, Integer appType, Integer businessType) {
         log.info("AliSmsConfig.sendSms?phone={}&appType={}&businessType={}", phone, appType, businessType);
         try {
-            String appTypeStr = appType == 0 ? "user" : "store";
+            String appTypeStr = appType == 0 ? "user" : (appType == 1 ? "store" : "store_platform");
             String businessTypeStr;
             switch (businessType) {
                 case 0:
@@ -91,18 +91,6 @@ public class AliSms {
                     //忘记密码
                     businessTypeStr = "forget_password";
                     break;
-                case 7:
-                    //商家平台-注册
-                    businessTypeStr = "platform_register";
-                    break;
-                case 8:
-                    //商家平台-登录
-                    businessTypeStr = "platform_login";
-                    break;
-                case 9:
-                    //商家平台-忘记密码
-                    businessTypeStr = "platform_forget_password";
-                    break;
                 default:
                     businessTypeStr = "login";
             }