Merge branch 'develop'

kustomization/base/deployment.yaml

@@ -53,6 +53,31 @@ spec:
                 configMapKeyRef:
                   name: payment-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

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/payment
-  newTag: 12debbeda34debd10c5157c5f9687e1414bc7975
+  newTag: bf09b8fcc929d18f19e3d92b52a9eb85cdc3b5c9

src/main/java/com/mmc/payment/config/TenantContext.java

@@ -5,60 +5,51 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * @Author small
- * @Date 2023/5/29 10:38
- * @Version 1.0
+ * @Author small @Date 2023/5/29 10:38 @Version 1.0
  */
 @Slf4j
 public class TenantContext {
 
-    private static ThreadLocal<Tenant> tenantHolder = new ThreadLocal<>();
+  private static ThreadLocal<Tenant> tenantHolder = new ThreadLocal<>();
 
-    public static void setTenant(Tenant tenant) {
-        tenantHolder.set(tenant);
-    }
-
-    public static Tenant getTenant() {
-        return tenantHolder.get();
-    }
-
-    public static Integer getUserId() {
-        return getTenant().getUserId();
-    }
-
-    public static Integer getTenantId() {
-        return getTenant().getTenantId();
-    }
+  public static void setTenant(Tenant tenant) {
+    tenantHolder.set(tenant);
+  }
 
-    public static Integer getRoleId() {
-        return getTenant().getRoleId();
-    }
+  public static Tenant getTenant() {
+    return tenantHolder.get();
+  }
 
+  public static Integer getUserId() {
+    return getTenant().getUserId();
+  }
 
-    public static boolean exists() {
-        return getTenant() != null;
-    }
+  public static Integer getTenantId() {
+    return getTenant().getTenantId();
+  }
 
-    public static void clear() {
-        tenantHolder.remove();
-    }
+  public static Integer getRoleId() {
+    return getTenant().getRoleId();
+  }
 
-    public static Tenant buildTenant( String accountNo ) {
+  public static boolean exists() {
+    return getTenant() != null;
+  }
 
+  public static void clear() {
+    tenantHolder.remove();
+  }
 
-        if (StringUtils.isBlank(accountNo)) {
-            log.error("登录信息[accountNo]获取异常");
-            return null;
-        }
-        return new Tenant(accountNo);
-    }
+  public static Tenant buildTenant(String accountNo) {
 
-    /**
-     * valid tenantId is correct
-     */
-    private static boolean validNumeric(String number) {
-        return StringUtils.isNotEmpty(number) && StringUtils.isNumeric(number);
+    if (StringUtils.isBlank(accountNo)) {
+      return null;
     }
+    return new Tenant(accountNo);
+  }
 
-
+  /** valid tenantId is correct */
+  private static boolean validNumeric(String number) {
+    return StringUtils.isNotEmpty(number) && StringUtils.isNumeric(number);
+  }
 }

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_payment_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
@@ -24,7 +24,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_payment_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: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com

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_payment?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
@@ -24,7 +24,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: