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

kustomization/base/deployment.yaml

@@ -53,6 +53,31 @@ spec:
                 configMapKeyRef:
                   name: pms-map
                   key: SW_AGENT_NAME
+            - name: MYSQL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: MYSQL_PASSWORD
+            - name: REDIS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: REDIS_PASSWORD
+            - name: OSS_ACCESS_KEY_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: OSS_ACCESS_KEY_SECRET
+            - name: WECHAT_SUB_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: WECHAT_SUB_SECRET
+            - name: WECHAT_APPLET_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: WECHAT_APPLET_SECRET
       volumes:
         - name: log-of-app
           hostPath:

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: 8a65ef2b514a59c4b34a0d96fa8053feb691351d
+  newTag: 07020d6b39db13f3c4432870fd633fc3e6b84850

src/main/resources/application-dev.yml

@@ -3,13 +3,13 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://mysql.default:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: tmj
-    password: MMC@2022&MYSQL
+    username: iuav_dev
+    password: ${MYSQL_PASSWORD}
   redis:
     database: 1
     host: redis.default
     port: 6379
-    password: MMC@2022&REDIS
+    password: ${REDIS_PASSWORD}
     jedis:
       pool:
         max-active: 2
@@ -28,7 +28,7 @@ aliyun:
   oss:
     endpoint: oss-cn-shenzhen.aliyuncs.com
     access-key-id: LTAI4FzCpyrA33PegnxWS6XV
-    access-key-secret: ILuNh3zJfRjg3iARSipMWBKCjglz3u
+    access-key-secret: ${OSS_ACCESS_KEY_SECRET}
     bucket: pad-video-x
 
 mmcflying:

src/main/resources/application-local.yml

@@ -3,8 +3,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://rm-wz9dd796t4j1giz6t2o.mysql.rds.aliyuncs.com:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: tmj
-    password: MMC@2022&MYSQL
+    username: iuav_dev
+    password: IUAV_DEV@2023&MYSQL
   redis:
     database: 1
     host: 127.0.0.1

src/main/resources/application-prod.yml

@@ -3,13 +3,13 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://mysql.default:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: tmj
-    password: MMC@2022&MYSQL
+    username: iuav
+    password: ${MYSQL_PASSWORD}
   redis:
     database: 5
     host: redis.default
     port: 6379
-    password: MMC@2022&REDIS
+    password: ${REDIS_PASSWORD}
     jedis:
       pool:
         max-active: 2
@@ -28,7 +28,7 @@ aliyun:
   oss:
     endpoint: oss-cn-shenzhen.aliyuncs.com
     access-key-id: LTAI4FzCpyrA33PegnxWS6XV
-    access-key-secret: ILuNh3zJfRjg3iARSipMWBKCjglz3u
+    access-key-secret: ${OSS_ACCESS_KEY_SECRET}
     bucket: pad-video-x
 
 mmcflying: