Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 194916f4e3221cae1ca3a244509e5a2311dca5db
+  newTag: 5e8c835f7da9e8cc8ffc705237b88730b8620a4e

pom.xml

@@ -235,13 +235,6 @@
                 <version>3.13.1</version>
             </dependency>
 
-            <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>31.1-jre</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi</artifactId>

src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     username: tmj
     password: MMC@2022&MYSQL
   redis:
-    database: 1
+    database: 5
     host: redis.default
     port: 6379
     password: MMC@2022&REDIS