Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev

mall-server-admin/src/main/java/com/fzm/mall/server/admin/config/InitConfig.java

@@ -23,10 +23,7 @@ import com.fzm.mall.server.admin.home_page.service.IAdminService;
 import com.fzm.mall.server.admin.home_page.service.IMerchantService;
 import com.fzm.mall.server.admin.system.model.SysConfig;
 import com.fzm.mall.server.admin.system.service.ISysConfigService;
-import com.fzm.mall.server.admin.util.OSSUtil;
-import com.fzm.mall.server.admin.util.SerialIdsUtil;
-import com.fzm.mall.server.admin.util.Sha256Util;
-import com.fzm.mall.server.admin.util.UUIDUtil;
+import com.fzm.mall.server.admin.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +70,7 @@ public class InitConfig {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            String logoPath = OSSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
+            String logoPath = OBSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
             SysConfig sysConfig = new SysConfig();
             sysConfig.setConfigId(UUIDUtil.getUUID());
             sysConfig.setDictKey("admin_head_img");

mall-server-admin/src/main/java/com/fzm/mall/server/admin/finance_center/service/impl/PlatformIntegralServiceImpl.java

@@ -25,10 +25,7 @@ import com.fzm.mall.server.admin.system.model.SysConfig;
 import com.fzm.mall.server.admin.system.service.ISysConfigService;
 import com.fzm.mall.server.admin.user_center.model.User;
 import com.fzm.mall.server.admin.user_center.service.IUserService;
-import com.fzm.mall.server.admin.util.ExcelUtil;
-import com.fzm.mall.server.admin.util.OSSUtil;
-import com.fzm.mall.server.admin.util.SerialIdsUtil;
-import com.fzm.mall.server.admin.util.UUIDUtil;
+import com.fzm.mall.server.admin.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dozer.DozerBeanMapper;
@@ -109,7 +106,7 @@ public class PlatformIntegralServiceImpl extends ServiceImpl<PlatformIntegralMap
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            String logoPath = OSSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".jpg"));
+            String logoPath = OBSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".jpg"));
 
             SysConfig sysConfig = new SysConfig();
             sysConfig.setConfigId(UUIDUtil.getUUID());

mall-server-admin/src/main/java/com/fzm/mall/server/admin/home_page/service/impl/MerchantServiceImpl.java

@@ -263,7 +263,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         } catch (IOException e) {
             e.printStackTrace();
         }
-        String logoPath = OSSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
+        String logoPath = OBSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
 
         UpdateWrapper<Merchant> uw = new UpdateWrapper<>();
         uw.lambda()
@@ -359,7 +359,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         } catch (IOException e) {
             e.printStackTrace();
         }
-        String logoPath = OSSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
+        String logoPath = OBSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
 
         merchant.setTokenIssueAddr(issueAddr);
         merchant.setTokenRecoverAddr(recoverAddr);

mall-server-admin/src/main/java/com/fzm/mall/server/admin/system/controller/UploadController.java

@@ -3,6 +3,7 @@ package com.fzm.mall.server.admin.system.controller;
 import com.fzm.mall.server.admin.constant.MallResponseError;
 import com.fzm.mall.server.admin.repo.ResponseFactory;
 import com.fzm.mall.server.admin.repo.ResponseVO;
+import com.fzm.mall.server.admin.util.OBSUtil;
 import com.fzm.mall.server.admin.util.OSSUtil;
 import com.fzm.mall.server.admin.util.SerialIdsUtil;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -85,7 +86,7 @@ public class UploadController {
             log.error("upload error:", e);
             e.printStackTrace();
         }
-        return OSSUtil.uploadByte(bytes, "manage/" + type + "/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(fileType));
+        return OBSUtil.uploadByte(bytes, "manage/" + type + "/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(fileType));
     }
 
     private String getFileType(String fileName) {

mall-server-admin/src/main/java/com/fzm/mall/server/admin/util/OBSUtil.java

@@ -14,16 +14,16 @@ import java.net.URL;
  */
 public class OBSUtil {
 
-    private static String accessKey = "LTAI4GCoj6DGZx5JgUYVLs3P"; //取值为获取的AK
-    private static String securityKey = "7TEBqdFmFtKT7AFDhh1DNgdoUSosYJ";  //取值为获取的SK
+    private static String accessKey = "HIULSHJZJOTWB72Z38ZB"; //取值为获取的AK LTAI4GCoj6DGZx5JgUYVLs3P
+    private static String securityKey = "GI0oWEGRJuMKmPXJq2fCmuMpFPIITLmjeCQxo2tA";  //取值为获取的SK 7TEBqdFmFtKT7AFDhh1DNgdoUSosYJ
     private static String endpoint = "https://obs.cn-east-3.myhuaweicloud.com"; //终端节点（Endpoint）
     private static String region = "cn-east-3"; // 取值为规划桶所在的区域
-    private static String bucket = "lele-test"; //存储桶
-    private static String baseUrl = "https://lele-test.obs.cn-east-3.myhuaweicloud.com/";
+    private static String bucket = "yimu-file"; //存储桶
+    private static String baseUrl = "https://yimu-file.obs.cn-east-3.myhuaweicloud.com/";
 
     public static void main(String[] str) {
-        uploadNet("https://xls-data-test.oss-cn-shanghai.aliyuncs.com/manage/img/20210521/20210521112801772_571732.xlsx", "", "tes.xlsx");
-    }
+        String S = uploadFile("C:\\Users\\bl\\Desktop\\链命令.txt", "manage/img/ttt", "a.txt");
+        System.err.println(S);    }
 
     // 创建ObsClient实例
     public static ObsClient getObsClient() {

mall-server-admin/src/main/java/com/fzm/mall/server/admin/util/QRCodeUtil.java

@@ -262,7 +262,7 @@ public class QRCodeUtil {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        String logoPath = OSSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
+        String logoPath = OBSUtil.uploadStream(inputStream, "manage/img/" + SerialIdsUtil.createDateStr() + "/", SerialIdsUtil.createFileName(".png"));
         System.err.println(logoPath);
     }