Merge remote-tracking branch 'origin/master'

src/main/resources/application-pertest.yml

+# 测试环境
+service:
+  wxloginUrl: http://sso.ops.com/wxlogin?t=%s%%26env=pertest
+  apiUrl: http://sso.pertest.ops.com
+  sysUrl: http://sys.pertest.ops.com
+swagger:
+  enable: true
+spring:
+  datasource:
+    url: jdbc:postgresql://139.9.144.39:5432/test_lims_tobacco
+    username: dbtobacco
+    password: sfdWrE39&d!Pt
+  redis:
+    host: 124.70.150.247
+  mail:
+    host: smtp.163.com
+    username: ptlims_test@163.com
+    password: meng12315
+    port: 25
+
+# 单点登录
+#kisso:
+#  config:
+#    cookieDomain: test.iosrs.org.cn
+
+# Mongodb GridFS 存储
+oss:
+  grid-fs: true
+  bucket-name: ptlims
+

src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
   # Redis 数据库索引（默认为0）,如果设置为1，那么存入的key-value都存放在select 1中
   redis:
     database: 0
-    host: 119.3.226.204
+    host: 124.70.150.247
     port: 6379
     password: patzn123TQa