Merge branch 'develop'

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

+server:
+  port: 35150
+  servlet:
+    context-path: /userapp
+#spring
+spring:
+  application:
+    name: userapp
+  #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
+    username: tmj
+    password: MMC@2022&MYSQL
+    #   Druid数据源配置
+    type: com.alibaba.druid.pool.DruidDataSource
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+
+#mybatis
+mybatis:
+  executor-type: simple
+  mapper-locations: classpath:mapper/**/*.xml
+  type-aliases-package: com.mmc.iuav.user
+  configuration:
+    map-underscore-to-camel-case: true
+
+wx:
+  sub:
+    appid: wx5c6a105a0ddca4c5
+    secret: 96c75255dd26f82f8d55e15b59e101c7
+  app:
+    id: wx18b7883acd204278
+    secret: 28afe74ba373830237a8133a7431ee82
+    miniprogram-state: trial
+    env-version: trial
+    token-path: /userservlet/wechat/getAppletUserAccessToken
+    port: user
+
+third-party:
+  ali:
+    app-code: 524b1864a88f47458c1061bae3811570
+  qcc:
+    app-key: 5015e664848d406ab1ca4b505c3da803
+    secret-key: 7C4DB8CCECC148175E46392CC0A1B410
\ 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: 2528536a2a0840adb161c2278d26ab9559f60e86
+  newTag: 50300cdb6c80c5b241b0f67920ff8aad112f2ec3

kustomization/overlays/prod/increase_replicas.yaml

@@ -6,8 +6,9 @@ spec:
   replicas: 1
   template:
     spec:
-      nodeSelector:
-        on-master: "true"
+      nodeName: master
+#      nodeSelector:
+#        on-master: "true"
 #      affinity:
 #        podAntiAffinity:
 #          requiredDuringSchedulingIgnoredDuringExecution: