Merge branch 'develop' of github.com:sharefly-iuav/oms

kustomization/base/deployment.yaml

@@ -53,6 +53,31 @@ spec:
                 configMapKeyRef:
                   name: oms-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/oms
-  newTag: 846e733aab54989498d6373d75b8fd729867284d
+  newTag: 0581d55682e2439e20095968c719becc92e69cea

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

@@ -44,10 +44,7 @@ public class TenantContext {
     }
 
     public static Tenant buildTenant( String accountNo ) {
-
-
         if (StringUtils.isBlank(accountNo)) {
-            log.error("登录信息[accountNo]获取异常");
             return null;
         }
         return new Tenant(accountNo);

src/main/java/com/mmc/oms/model/dto/mall/OGSkuSpecDTO.java

@@ -8,20 +8,16 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
-/**
- * author:zhenjie
- * Date:2022/11/28
- * time:14:54
- */
+/** author:zhenjie Date:2022/11/28 time:14:54 */
 @Builder
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.OGSkuSpecDTO", description = "下单时所选规格")
+@ApiModel(description = "下单时所选规格")
 public class OGSkuSpecDTO implements Serializable {
-    private static final long serialVersionUID = -6135270464499137225L;
-    private Integer id;
-    private Integer directoryId;
-    private Integer shopCarId;
-    private String skuSpecName;
+  private static final long serialVersionUID = -6135270464499137225L;
+  private Integer id;
+  private Integer directoryId;
+  private Integer shopCarId;
+  private String skuSpecName;
 }

src/main/java/com/mmc/oms/model/dto/user/UserAccountSimpleDTO.java

@@ -23,8 +23,6 @@ public class UserAccountSimpleDTO implements Serializable {
     private static final long serialVersionUID = 3451336520607073343L;
     @ApiModelProperty(value = "用户id")
     private Integer id;
-    @ApiModelProperty(value = "用户类型")
-    private Integer accountType;
     @ApiModelProperty(value = "用户uid")
     private String uid;
     @ApiModelProperty(value = "手机号")
@@ -35,6 +33,8 @@ public class UserAccountSimpleDTO implements Serializable {
     private String nickName;
     @ApiModelProperty(value = "用户头像")
     private String userImg;
+    @ApiModelProperty(value = "openid")
+    private String openid;
     @ApiModelProperty(value = "用户性别：0未知、1男、2女")
     private Integer userSex;
     @ApiModelProperty(value = "用户邮箱")

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_oms_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
@@ -27,7 +27,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:
@@ -40,10 +40,10 @@ mount:
 wechat:
   sub:
     appid: wx5c6a105a0ddca4c5
-    secret: 96c75255dd26f82f8d55e15b59e101c7
+    secret: ${WECHAT_SUB_SECRET}
   applet:
-    appid: wx3121a147f65f1900
-    secret: 94296481fdad89c251892b9b722f3c73
+    appid: wx18b7883acd204278
+    secret: ${WECHAT_APPLET_SECRET}
     miniprogram-state: trial
 
 rabbitmq:

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_oms_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
@@ -40,8 +40,8 @@ wechat:
     appid: wx5c6a105a0ddca4c5
     secret: 96c75255dd26f82f8d55e15b59e101c7
   applet:
-    appid: wx3121a147f65f1900
-    secret: 94296481fdad89c251892b9b722f3c73
+    appid: wx18b7883acd204278
+    secret: 28afe74ba373830237a8133a7431ee82
     miniprogram-state: trial
 
 rabbitmq:

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_oms?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
@@ -26,7 +26,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:
@@ -39,10 +39,10 @@ mount:
 wechat:
   sub:
     appid: wx5c6a105a0ddca4c5
-    secret: 96c75255dd26f82f8d55e15b59e101c7
+    secret: ${WECHAT_SUB_SECRET}
   applet:
-    appid: wx3121a147f65f1900
-    secret: 94296481fdad89c251892b9b722f3c73
+    appid: wx18b7883acd204278
+    secret: ${WECHAT_APPLET_SECRET}
     miniprogram-state: trial
 
 rabbitmq: