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

# Conflicts:
#	src/main/resources/application-dev.yml

src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ spring:
       maximum-pool-size: 60
       minimum-idle: 10
   redis:
-    database: 10
+    database: 8
     host: 127.0.0.1
     port: 6379
     #    password: 123456
@@ -37,23 +37,19 @@ ok:
     write-timeout: 3000
     max-idle-connections: 200
     keep-alive-duration: 300
-minio:
-  endpoint: http://139.9.219.60:9000
-  access-key: minioadmin
-  secret-key: minioadmin
 
 
 logging:
   level:
     com.glxp.api.dao: debug
 
+back_file_path: d:/share/udisps/back/
 file_path: D:/udi/udiwms/udiwmsfile/
 file_lpath: /udiwms/image/register/file/getImage
 file_url: http://127.0.0.1:9993
 minio_path: /udi
 minio_url: http://139.9.219.60:9000
 err_path: d:/udi/udiwms/err/
-back_file_path: d:/share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: test
   jmx:
     enabled: false
   servlet: