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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/config/MulitpartConfig.java

@@ -1,5 +1,6 @@
 package com.gree.mall.miniapp.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -9,13 +10,19 @@ import javax.servlet.MultipartConfigElement;
 @Configuration
 public class MulitpartConfig {
 
+    @Value("${spring.profiles.active}")
+    private String env;
     /**
      * 文件上传临时路径
      */
     @Bean
     MultipartConfigElement multipartConfigElement() {
         MultipartConfigFactory factory = new MultipartConfigFactory();
-        factory.setLocation("/app");
+        if (env.equals("prd")) {
+            factory.setLocation("/home/jsmapp");
+        } else {
+            factory.setLocation("/app");
+        }
         return factory.createMultipartConfig();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/config/MulitpartConfig.java

@@ -1,5 +1,6 @@
 package com.gree.mall.manager.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -9,13 +10,21 @@ import javax.servlet.MultipartConfigElement;
 @Configuration
 public class MulitpartConfig {
 
+
+    @Value("${spring.profiles.active}")
+    private String env;
     /**
      * 文件上传临时路径
      */
     @Bean
     MultipartConfigElement multipartConfigElement() {
         MultipartConfigFactory factory = new MultipartConfigFactory();
-        factory.setLocation("/app");
+        if (env.equals("prd")) {
+            factory.setLocation("/home/jsmapp");
+        } else {
+            factory.setLocation("/app");
+        }
+
         return factory.createMultipartConfig();
     }
 

mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -19,10 +19,10 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://rm-bp1gsex17k87vu0np.mysql.rds.aliyuncs.com:3306/sxb-mall?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
 
 #����
-spring.datasource.url=jdbc:mysql://121.43.111.127:3306/zfire-dept-mall?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://rm-wz9yahzr80gze34ab35930.mysql.rds.aliyuncs.com:3306/gf2024?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
 
-spring.datasource.username=root
-spring.datasource.password=xch!eCdvc124@
+spring.datasource.username=gFgreeJsm_gd2024_system
+spring.datasource.password=Jsm_Gf_2024@)@$_)(*&
 spring.datasource.druid.connection-init-sqls=set names utf8mb4
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.minIdle=5