Ver código fonte

增加私有云已有mysql和redis容器的配置,修改两容器的端口为13306和16397

郭超 4 anos atrás
pai
commit
669659cb5d

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
site/src/main/java/com/mooctest/crowd/site/controller/CommonController.java


+ 1 - 1
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

@@ -329,7 +329,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
             // 将File类型转成MultipartFile类型
             FileInputStream inputStream = new FileInputStream(downloadFile);
             MultipartFile multipartFile = new MockMultipartFile(downloadFile.getName(), downloadFile.getName(), "", inputStream);
-            // 文件上传oss
+            // 文件上传oss
             if(usingOss){
                 downloadUrl = uploadService.uploadTask(multipartFile, userId);
             }

+ 42 - 0
site/src/main/resources/application.yml

@@ -93,6 +93,48 @@ user:
     baseUrl: http://crowd_user:8081
 #    baseUrl: http://59.42.10.53:8081
 
+---
+spring:
+  profiles: private-cloud-mutil-mysql-redis
+  datasource:
+    url: jdbc:mysql://mysql:13306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: Customs2019
+  redis:
+    host: redis
+    port: 16379
+    password:
+    jedis:
+      pool:
+        max-active: 8
+        max-idle: 8
+        max-wait: -1
+        min-idle: 0
+    database: 0
+
+#  redis:
+#    host: redis
+#    password:
+#    pool:
+#      max-active: 8
+#      max-idle: 8
+#      max-wait: -1
+#      min-idle: 0
+#    port: 6379
+
+feature:
+  client:
+    oss: false
+
+file:
+  save:
+    path: /var/www/
+
+user:
+  service:
+    baseUrl: http://crowd_user:8081
+#    baseUrl: http://59.42.10.53:8081
+
 website:
   domain: 127.0.0.1
 

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff