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

src/main/resources/application-dev.yml

@@ -61,9 +61,9 @@ xjrsoft:
   oss:
     #enabled: true
     cloud-type: minio
-    access-key: ycbx
+    access-key: root
     secret-key: qwe123QWE
-    endpoint: https://test.minio.yingcaibx.com
+    endpoint: http://10.150.10.140:9000
     endpoint-preview: https://test.minio.yingcaibx.com
     bucket-name: learun
     prefix: xjr

src/main/resources/application-pre.yml

@@ -46,9 +46,9 @@ xjrsoft:
   oss:
     #enabled: true
     cloud-type: minio
-    access-key: ycbx
+    access-key: root
     secret-key: qwe123QWE
-    endpoint: https://test.minio.yingcaibx.com
+    endpoint: http://10.150.10.140:9000
     endpoint-preview: https://test.minio.yingcaibx.com
     bucket-name: learun
     prefix: xjr