Merge branch 'develop'

cms-common/cms-common-util/pom.xml

@@ -38,6 +38,11 @@
             <artifactId>jjwt</artifactId>
             <version>0.9.1</version>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+        </dependency>
 
     </dependencies>
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java

@@ -157,12 +157,12 @@ public class AuthServiceImpl implements AuthService {
         map.put(JwtConstant.TOKEN_TYPE, JwtConstant.M_TOKEN);
         String token = JwtUtil.createJwt(map);
         LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).uid(user.getUid())
-                .userName(user.getUserName()).nickName(user.getNickName()).phoneNum(user.getPhoneNum()).portType(100).build();
+                .userName(user.getUserName()).nickName(user.getNickName()).phoneNum(user.getPhoneNum()).portType(0).build();
         stringRedisTemplate.opsForValue().set(
                 token, JSONObject.toJSONString(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
 
-        return ResultBody.success(LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).portType(100).build());
+        return ResultBody.success(LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).portType(0).build());
     }
 
     @Override

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: d73505c2f61e2e9dd9339199b38e311f62757717
+  newTag: 5411acd1277940438d815b52edb47865fb8e516c

pom.xml

@@ -88,6 +88,12 @@
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>3.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
@@ -141,11 +147,11 @@
                 <version>2.1.2</version>
             </dependency>
 
+            <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>8.0.16</version>
-                <scope>provided</scope>
+                <version>8.0.28</version>
             </dependency>
 
             <dependency>