Merge branch 'develop'

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/pms
-  newTag: 170aeaf79c1b18e3b5a445e9aafc83b1417b8e9f
+  newTag: 60ddd93968ca23baa3307d900e38035f04984f4d

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,9 +3,4 @@ kind: Deployment
 metadata:
   name: pms-deployment
 spec:
-  replicas: 1
-  template:
-    spec:
-      nodeName: master
-#      nodeSelector:
-#        on-master: "true"
\ No newline at end of file
+  replicas: 2
\ No newline at end of file

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://mysql.default:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: tmj
     password: MMC@2022&MYSQL
   redis:

src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://mysql.default:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: tmj
     password: MMC@2022&MYSQL
   redis:

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
     context-path: /pms
 spring:
   profiles:
-    active: dev
+    active: local
   application:
     name: pms
   mvc: