Merge branch 'master' into wx

# Conflicts:
#	pigx-common/pigx-common-bom/pom.xml

pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml

@@ -23,11 +23,11 @@ spring:
     password: root
     url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
 
-# 文件系统
+# 文件系统 (提供测试环境，不要乱传)
 minio:
-  url: http://139.224.200.249:9090
-  access-key: lengleng
-  secret-key: lengleng
+  url: https://minio.pig4cloud.com
+  access-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)
+  secret-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)
 
 # Logger Config
 logging: