From 52d2aa793fb9fbff6b33acd1904c38bf9ae75ebb Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 24 Jun 2022 10:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=82=A8=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E7=BC=96=E8=BE=91=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/impl/SettingStorageServiceImpl.java | 10 ++++++---- .../common/plugin/storage/engine/AliyunStorage.java | 4 ++-- .../common/plugin/storage/engine/QcloudStorage.java | 4 ++-- .../common/plugin/storage/engine/QiniuStorage.java | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java index 4c5ee856..3e32dac4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java @@ -70,8 +70,8 @@ public class SettingStorageServiceImpl implements ISettingStorageService { map.put("status", engine.equals(alias) ? 1 : 0); if (!alias.equals("local")) { map.put("bucket", config.getOrDefault("bucket", "")); - map.put("secretKey", config.getOrDefault("secret_key", "")); - map.put("accessKey", config.getOrDefault("access_key", "")); + map.put("secretKey", config.getOrDefault("secretKey", "")); + map.put("accessKey", config.getOrDefault("accessKey", "")); map.put("domain", config.getOrDefault("domain", "")); if (alias.equals("qcloud")) { map.put("region", config.getOrDefault("region", "")); @@ -92,7 +92,8 @@ public class SettingStorageServiceImpl implements ISettingStorageService { Assert.notNull(params.get("alias"), "alias参数缺失"); Assert.notNull(params.get("status"), "status参数缺失"); Map map = new LinkedHashMap<>(); - + System.out.println("斤斤计较"); + System.out.println(params); map.put("name", "本地存储"); if (!params.get("alias").equals("local")) { map.put("bucket", params.getOrDefault("bucket", "")); @@ -113,8 +114,9 @@ public class SettingStorageServiceImpl implements ISettingStorageService { } } - String engine = ConfigUtil.get("storage", "default", "local"); ConfigUtil.set("storage", params.get("alias"), JSON.toJSONString(map)); + + String engine = ConfigUtil.get("storage", "default", "local"); if (Integer.parseInt(params.get("status")) == 1) { ConfigUtil.set("storage", "default", params.get("alias")); } else if (engine.equals(params.get("alias")) && Integer.parseInt(params.get("status")) == 0) { diff --git a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java index 7073d58b..4b63cb12 100644 --- a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java +++ b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java @@ -35,8 +35,8 @@ public class AliyunStorage { */ public OSS ossClient() { String endpoint = "https://oss-cn-shenzhen.aliyuncs.com"; - String accessKeyId = this.config.get("access_key"); - String accessKeySecret = this.config.get("secret_key"); + String accessKeyId = this.config.get("accessKey"); + String accessKeySecret = this.config.get("secretKey"); return new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); } diff --git a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java index 869b989f..e00bdf2a 100644 --- a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java +++ b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java @@ -39,8 +39,8 @@ public class QcloudStorage { * @return String */ public COSClient cosClient() { - String secretId = this.config.get("access_key"); - String secretKey = this.config.get("secret_key"); + String secretId = this.config.get("accessKey"); + String secretKey = this.config.get("secretKey"); COSCredentials cred = new BasicCOSCredentials(secretId, secretKey); Region region = new Region(this.config.get("region")); ClientConfig clientConfig = new ClientConfig(region); diff --git a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java index cbb81dc9..00a8d242 100644 --- a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java +++ b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java @@ -37,8 +37,8 @@ public class QiniuStorage { * @return String */ public String upToken() { - String accessKey = this.config.get("access_key"); - String secretKey = this.config.get("secret_key"); + String accessKey = this.config.get("accessKey"); + String secretKey = this.config.get("secretKey"); String bucket = this.config.get("bucket"); Auth auth = Auth.create(accessKey, secretKey); return auth.uploadToken(bucket);