Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: a7b1837ada52647282e0ce5e1e4c4d2dec8eaf0b
+  newTag: b0986b7ec6df8855f2bdc57012e02abc5defa94d

src/main/java/com/mmc/pms/controller/UploadController.java

@@ -88,7 +88,7 @@ public class UploadController {
           @RequestParam("uploadFile") MultipartFile uploadFile, HttpServletRequest request) throws IOException {
     OSS ossClient =
             new OSSClientBuilder()
-                    .build(OssConstant.ENDPOINT, OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
+                    .build("oss-cn-hangzhou-internal.aliyuncs.com", OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
     File file = XmlUtil.ossUpload(uploadFile);
     String location =null;
     try {

src/main/resources/application-dev.yml

@@ -26,7 +26,7 @@ springfox:
 
 aliyun:
   oss:
-    endpoint: oss-cn-hangzhou-internal.aliyuncs.com
+    endpoint: oss-cn-hangzhou.aliyuncs.com
     access-key-id: LTAI5tK6UG2LzMkf1FKZBkBU
     access-key-secret: ${OSS_ACCESS_KEY_SECRET}
     bucket: share-fly

src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ springfox:
 
 aliyun:
   oss:
-    endpoint: oss-cn-hangzhou-internal.aliyuncs.com
+    endpoint: oss-cn-hangzhou.aliyuncs.com
     access-key-id: LTAI5tK6UG2LzMkf1FKZBkBU
     access-key-secret: ${OSS_ACCESS_KEY_SECRET}
     bucket: share-fly