Merge branch 'develop'

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -9,7 +9,7 @@ spring:
   #Database
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql:3306/iuav_cms?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://mysql.default:3306/iuav_cms?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
     username: tmj
     password: MMC@2022&MYSQL
     #   Druid数据源配置

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
   #Database
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql:3306/iuav_cms?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://mysql.default:3306/iuav_cms?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
     username: tmj
     password: MMC@2022&MYSQL
     #   Druid数据源配置

csm-service/cms-service-user/src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
+    active: local
 
 ---
 
@@ -10,7 +10,7 @@ spring:
 ---
 
 spring:
-  profiles: beta
+  profiles: local
 
 ---
 

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: 50300cdb6c80c5b241b0f67920ff8aad112f2ec3
+  newTag: 0daa0f1dd1a4ce72ec4a757747b15cd94782f44e

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,10 +3,10 @@ kind: Deployment
 metadata:
   name: cms-deployment
 spec:
-  replicas: 1
-  template:
-    spec:
-      nodeName: master
+  replicas: 2
+#  template:
+#    spec:
+#      nodeName: master
 #      nodeSelector:
 #        on-master: "true"
 #      affinity: