Merge remote-tracking branch 'origin/master'

src/main/resources/application-231-zhai.yml

@@ -137,7 +137,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass-tos
+      virtual-host: /agmp-saas-tos
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -147,7 +147,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass
+      virtual-host: /agmp-saas
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -281,4 +281,4 @@ weather:
 map:
   gaode:
     api: http://restapi.amap.com
-    key: 78ce288400f4fc6d9458989875c833c2
+    key: 78ce288400f4fc6d9458989875c833c2

src/main/resources/application-demo.yml

@@ -137,7 +137,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass-tos
+      virtual-host: /agmp-saas-tos
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -147,7 +147,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass
+      virtual-host: /agmp-saas
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -281,4 +281,4 @@ weather:
 map:
   gaode:
     api: http://restapi.amap.com
-    key: 78ce288400f4fc6d9458989875c833c2
+    key: 78ce288400f4fc6d9458989875c833c2

src/main/resources/application-dev.yml

@@ -137,7 +137,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass-tos
+      virtual-host: /agmp-saas-tos
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -147,7 +147,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass
+      virtual-host: /agmp-saas
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -182,7 +182,7 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
     expireTime: 30
-  
+
 # MyBatis配置
 mybatis:
     # 搜索指定包别名
@@ -193,10 +193,10 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Swagger配置
 swagger:
@@ -206,7 +206,7 @@ swagger:
   pathMapping: /dev-api
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
@@ -281,4 +281,4 @@ weather:
 map:
   gaode:
     api: http://restapi.amap.com
-    key: 78ce288400f4fc6d9458989875c833c2
+    key: 78ce288400f4fc6d9458989875c833c2

src/main/resources/application-prod-demo.yml

@@ -137,7 +137,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass-tos
+      virtual-host: /agmp-saas-tos
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -147,7 +147,7 @@ spring:
       port: 5672
       username: admin
       password: admin
-      virtual-host: /agmp-sass
+      virtual-host: /agmp-saas
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -276,4 +276,4 @@ weather:
 map:
   gaode:
     api: http://restapi.amap.com
-    key: 78ce288400f4fc6d9458989875c833c2
+    key: 78ce288400f4fc6d9458989875c833c2

src/main/resources/application-test.yml

@@ -123,31 +123,21 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size:  10MB
+      max-file-size: 10MB
       # 设置总上传的文件大小
-      max-request-size:  20MB
+      max-request-size: 20MB
   # 服务模块
   devtools:
     restart:
       # 热部署开关
       enabled: true
   rabbitmq:
-    tos:
-      host: 192.168.1.231
-      port: 5672
-      username: user
-      password: 123456
-      virtual-host: /agmp-sass-tos
-      connection-timeout: 15000
-      publisher-returns: true
-      enabled: true
-      code: saas1
     agmp:
       host: 192.168.1.231
       port: 5672
       username: user
       password: 123456
-      virtual-host: /agmp-sass
+      virtual-host: /agmp-saas
       connection-timeout: 15000
       publisher-returns: true
       enabled: true
@@ -277,4 +267,4 @@ weather:
 map:
   gaode:
     api: http://restapi.amap.com
-    key: 78ce288400f4fc6d9458989875c833c2
+    key: 78ce288400f4fc6d9458989875c833c2

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: 231-zhai
+    active: test