增加接口:根据客户方生成签名字符串 验证通过则下发token

bootstrap/src/main/java/io/geekidea/springbootplus/config/Swagger2Config.java

@@ -155,7 +155,7 @@ public class Swagger2Config {
     @Bean
     public Docket restAppApi() {
         // 获取需要扫描的包
-        String[] basePackages = {"com.sien.common.controller"};
+        String[] basePackages = {"com.wecloud.im.controller"};
         ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .groupName("app")
@@ -174,53 +174,53 @@ public class Swagger2Config {
                 .globalOperationParameters(getParameters());
         return docket;
     }
-
-    @Bean
-    public Docket restSysApi() {
-        // 获取需要扫描的包
-        String[] basePackages = {"com.jumeirah.api.system.controlle"};
-        ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .groupName("system")
-
-                .select();
-        // 如果扫描的包为空，则默认扫描类上有@Api注解的类
-        if (ArrayUtils.isEmpty(basePackages)) {
-            apiSelectorBuilder.apis(RequestHandlerSelectors.withClassAnnotation(Api.class));
-        } else {
-            // 扫描指定的包
-            apiSelectorBuilder.apis(basePackage(basePackages));
-        }
-        Docket docket = apiSelectorBuilder.paths(PathSelectors.any())
-                .build()
-                .enable(swaggerProperties.isEnable())
-                .ignoredParameterTypes(ignoredParameterTypes)
-                .globalOperationParameters(getParameters());
-        return docket;
-    }
-
-    @Bean
-    public Docket restMerchantApi() {
-        // 获取需要扫描的包
-        String[] basePackages = {"com.jumeirah.api.merchant.controller"};
-        ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .groupName("merchant")
-                .select();
-        // 如果扫描的包为空，则默认扫描类上有@Api注解的类
-        if (ArrayUtils.isEmpty(basePackages)) {
-            apiSelectorBuilder.apis(RequestHandlerSelectors.withClassAnnotation(Api.class));
-        } else {
-            // 扫描指定的包
-            apiSelectorBuilder.apis(basePackage(basePackages));
-        }
-        Docket docket = apiSelectorBuilder.paths(PathSelectors.any())
-                .build()
-                .enable(swaggerProperties.isEnable())
-                .ignoredParameterTypes(ignoredParameterTypes)
-                .globalOperationParameters(getParameters());
-        return docket;
-    }
+//
+//    @Bean
+//    public Docket restSysApi() {
+//        // 获取需要扫描的包
+//        String[] basePackages = {"com.jumeirah.api.system.controlle"};
+//        ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2)
+//                .apiInfo(apiInfo())
+//                .groupName("system")
+//
+//                .select();
+//        // 如果扫描的包为空，则默认扫描类上有@Api注解的类
+//        if (ArrayUtils.isEmpty(basePackages)) {
+//            apiSelectorBuilder.apis(RequestHandlerSelectors.withClassAnnotation(Api.class));
+//        } else {
+//            // 扫描指定的包
+//            apiSelectorBuilder.apis(basePackage(basePackages));
+//        }
+//        Docket docket = apiSelectorBuilder.paths(PathSelectors.any())
+//                .build()
+//                .enable(swaggerProperties.isEnable())
+//                .ignoredParameterTypes(ignoredParameterTypes)
+//                .globalOperationParameters(getParameters());
+//        return docket;
+//    }
+//
+//    @Bean
+//    public Docket restMerchantApi() {
+//        // 获取需要扫描的包
+//        String[] basePackages = {"com.jumeirah.api.merchant.controller"};
+//        ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2)
+//                .apiInfo(apiInfo())
+//                .groupName("merchant")
+//                .select();
+//        // 如果扫描的包为空，则默认扫描类上有@Api注解的类
+//        if (ArrayUtils.isEmpty(basePackages)) {
+//            apiSelectorBuilder.apis(RequestHandlerSelectors.withClassAnnotation(Api.class));
+//        } else {
+//            // 扫描指定的包
+//            apiSelectorBuilder.apis(basePackage(basePackages));
+//        }
+//        Docket docket = apiSelectorBuilder.paths(PathSelectors.any())
+//                .build()
+//                .enable(swaggerProperties.isEnable())
+//                .ignoredParameterTypes(ignoredParameterTypes)
+//                .globalOperationParameters(getParameters());
+//        return docket;
+//    }
 
 
     /**

common/src/main/java/com/wecloud/im/service/impl/ImClientLoginServiceImpl.java

@@ -51,6 +51,11 @@ public class ImClientLoginServiceImpl implements ImClientLoginService {
                 new QueryWrapper<ImApplication>().lambda().eq(ImApplication::getAppKey, imTokenVerify.getAppKey())
         );
 
+        if (imApplication == null) {
+            log.debug("imApplication == null");
+            return ApiResult.result(ApiCode.FAIL, null);
+        }
+
         // 生成以数据库为准的签名
         String mySign = new MD5().digestHex(imTokenVerify.getTimestemp() + imTokenVerify.getClientId() + imApplication.getAppKey() + imApplication.getAppSecret());
 
@@ -86,6 +91,7 @@ public class ImClientLoginServiceImpl implements ImClientLoginService {
         redisTemplate.opsForValue().set("client:" + imApplication.getAppKey() + ":" + imTokenVerify.getClientId(), generateToken);
 
         TokenVo tokenVo = new TokenVo();
+        tokenVo.setToken(generateToken);
         return ApiResult.ok(tokenVo);
     }
 

config/src/main/resources/config/application-dev.yml

@@ -12,7 +12,6 @@ spring-boot-plus:
       request-log-format: false
       response-log-format: false
 
-  domain: https://767827238379.ngrok.io
 
 spring:
   datasource:

config/src/main/resources/config/application-prod.yml

@@ -13,7 +13,6 @@ spring-boot-plus:
       log-print-type: NONE
       request-log-format: false
       response-log-format: false
-  domain: https://sienapi.da300.com
 
 server:
   port: 8181

config/src/main/resources/config/application-test.yml

@@ -12,7 +12,6 @@ spring-boot-plus:
       log-print-type: LINE
       request-log-format: false
       response-log-format: false
-  domain: https://sienapi.da300.com
 
 
 spring:

config/src/main/resources/config/application.yml

@@ -184,12 +184,9 @@ spring-boot-plus:
     # 权限配置
     anon:
       # 排除登录 注册 登出
-      - /user/registerOrLogin,/user/login
-      - /sms/registerOrLoginCode
-      - /wechatUser/check
       - /app/noRole
-
-      - /wxapi/checkToken
+      # 客户端token获取
+      - /token/verify
       # 排除静态资源
       - /static/**,/templates/**
       # 排除Swagger
@@ -198,10 +195,6 @@ spring-boot-plus:
       # - /actuator/**
       - # 排除首页
       - /,/index.html
-      # 微信支付回调
-      - /pay/notify/donationOrder
-      - /pay/notify/vipOrder
-
 
     # 多行字符串权限配置
     filter-chain-definitions: |