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://rm-wz9dd796t4j1giz6t2o.mysql.rds.aliyuncs.com: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://rm-wz9dd796t4j1giz6t.mysql.rds.aliyuncs.com: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数据源配置

kustomization/base/kustomization.yaml

@@ -5,4 +5,5 @@ commonLabels:
 resources:
   - ./deployment.yaml
   - ./service.yaml
-  - ./configMap.yaml
\ No newline at end of file
+  - ./configMap.yaml
+  - ./mysql-external.yaml
\ No newline at end of file

kustomization/base/mysql-external.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: mysql
+  namespace: default
+spec:
+  type: ExternalName
+  externalName: rm-wz9dd796t4j1giz6t.mysql.rds.aliyuncs.com
+  ports:
+    - port: 3306
\ No newline at end of file

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: b935304a5de5360843b9e1eb358bab25affcb10c
+  newTag: ed8d7fbbc00dc21c06ca558d87980dec1978d8bf

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,4 +3,4 @@ kind: Deployment
 metadata:
   name: cms-deployment
 spec:
-  replicas: 1
\ No newline at end of file
+  replicas: 2
\ No newline at end of file