修改application无用的分支

site/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-     active: dev-online
+     active: dev
   cache:
     guava:
       spec: expireAfterWrite=30s
@@ -42,15 +42,16 @@ green:
     id: 99231
 
 ---
+# 开发版本
 spring:
-  profiles: private-cloud
+  profiles: dev
   datasource:
-    url: jdbc:mysql://mysql:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: Customs2019
+    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service-online?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: mooctest
+    password: secr3t!
   redis:
-    host: redis
-    port: 6379
+    host: 121.40.93.243
+    port: 16379
     password:
     jedis:
       pool:
@@ -58,123 +59,32 @@ spring:
         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/
-
+    database: 6
 user:
   service:
-    baseUrl: http://crowd_user:8081
-#    baseUrl: http://59.42.10.53:8081
-
-website:
-  domain: 127.0.0.1
-
----
-spring:
-  profiles: private-cloud-localhost
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: Customs2019
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    password:
-    jedis:
-      pool:
-        max-active: 8
-        max-idle: 8
-        max-wait: -1
-        min-idle: 0
-    database: 0
-
-#  redis:
-#    host: 127.0.0.1
-#    password:
-#    pool:
-#      max-active: 8
-#      max-idle: 8
-#      max-wait: -1
-#      min-idle: 0
-#    port: 6379
-
-feature:
-  client:
-    oss: false
+    baseUrl: http://121.40.93.243:8082
 
 file:
   save:
-    path: /Users/guochao/Desktop/project/data/cofortest/
-
-user:
-  service:
-    baseUrl: http://127.0.0.1:8081
-#    baseUrl: http://59.42.10.53:8081
-
-website:
-  domain: 127.0.0.1
-
----
-spring:
-  profiles: dev-localhost
-  datasource:
-    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-    username: mooctest
-    password: secr3t!
-  redis:
-    host: 59.42.10.53
-    port: 6379
-    password: '#2019@callforttest@!'
-    jedis:
-      pool:
-        max-active: 8
-        max-idle: 8
-        max-wait: -1
-        min-idle: 0
-    database: 6
+    path: /var/www/
 
 feature:
   client:
     oss: true
 
-file:
-  save:
-    path: http://mooctest-crowd-service.oss-cn-hangzhou.aliyuncs.com/
-
-user:
-  service:
-    #    baseUrl: http://127.0.0.1:8081
-    baseUrl: http://59.42.10.53:8081
-
 website:
   domain: mooctest.net
 
 ---
+# 线上版本
 spring:
-  profiles: pre
+  profiles: online
   datasource:
-    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service-pre?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-    username: mooctest
-    password: secr3t!
+    url: jdbc:mysql://8.134.32.27:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: callfortest_crowd
   redis:
-    host: 10.18.18.50
+    host: 8.134.32.27
     port: 6379
     password: '#2019@callforttest@!'
     jedis:
@@ -183,62 +93,35 @@ spring:
         max-idle: 8
         max-wait: -1
         min-idle: 0
-    database: 6
-user:
-  service:
-    baseUrl: http://10.18.18.50:8081
+    database: 0
 
 feature:
   client:
     oss: true
 
-website:
-  domain: mooctest.net
-
----
-spring:
-  profiles: dev-online
-  datasource:
-    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service-online?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-    username: mooctest
-    password: secr3t!
-  redis:
-    host: 121.40.93.243
-    port: 16379
-    password:
-    jedis:
-      pool:
-        max-active: 8
-        max-idle: 8
-        max-wait: -1
-        min-idle: 0
-    database: 6
-user:
-  service:
-    baseUrl: http://121.40.93.243:8082
-
 file:
   save:
     path: /var/www/
-
-feature:
-  client:
-    oss: true
-
+user:
+  service:
+#    baseUrl: http://59.42.10.53
+    baseUrl: http://user.cofortest.com:8081
 website:
-  domain: mooctest.net
+  domain: cofortest.com
+
 
 ---
+# 私有云版本
 spring:
-  profiles: pre-online
+  profiles: private-cloud
   datasource:
-    url: jdbc:mysql://10.18.18.50:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://mysql:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     username: root
-    password: callfortest_crowd
+    password: Customs2019
   redis:
-    host: 10.18.18.50
+    host: redis
     port: 6379
-    password: '#2019@callforttest@!'
+    password:
     jedis:
       pool:
         max-active: 8
@@ -247,9 +130,19 @@ spring:
         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: true
+    oss: false
 
 file:
   save:
@@ -257,21 +150,24 @@ file:
 
 user:
   service:
-    baseUrl: http://user.cofortest.com:8081
+    baseUrl: http://crowd_user:8081
+#    baseUrl: http://59.42.10.53:8081
+
 website:
-  domain: cofortest.com
+  domain: 127.0.0.1
 
 ---
+# 私有云版本-本地测试
 spring:
-  profiles: online
+  profiles: private-cloud-localhost
   datasource:
-    url: jdbc:mysql://8.134.32.27:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     username: root
-    password: callfortest_crowd
+    password: Customs2019
   redis:
-    host: 8.134.32.27
+    host: 127.0.0.1
     port: 6379
-    password: '#2019@callforttest@!'
+    password:
     jedis:
       pool:
         max-active: 8
@@ -280,16 +176,28 @@ spring:
         min-idle: 0
     database: 0
 
+#  redis:
+#    host: 127.0.0.1
+#    password:
+#    pool:
+#      max-active: 8
+#      max-idle: 8
+#      max-wait: -1
+#      min-idle: 0
+#    port: 6379
+
 feature:
   client:
-    oss: true
+    oss: false
 
 file:
   save:
-    path: /var/www/
+    path: /Users/guochao/Desktop/project/data/cofortest/
+
 user:
   service:
-#    baseUrl: http://59.42.10.53
-    baseUrl: http://user.cofortest.com:8081
+    baseUrl: http://127.0.0.1:8081
+#    baseUrl: http://59.42.10.53:8081
+
 website:
-  domain: cofortest.com
+  domain: 127.0.0.1