diff --git a/admin/src/views/setting/storage/edit.vue b/admin/src/views/setting/storage/edit.vue
index 64e72856..38f0b56b 100644
--- a/admin/src/views/setting/storage/edit.vue
+++ b/admin/src/views/setting/storage/edit.vue
@@ -60,6 +60,14 @@
>
+
+
+
+
@@ -95,6 +103,7 @@ const formData = reactive({
secret_key: '',
domain: '',
region: '', // 腾讯云需要
+ endpoint: '',
status: 0
})
@@ -156,6 +165,13 @@ const formRules = {
message: '请输入REGION',
trigger: 'blur'
}
+ ],
+ endpoint: [
+ {
+ required: true,
+ message: '请输入endpoint',
+ trigger: 'blur'
+ }
]
}
diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java
index 025e7154..633b70de 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java
@@ -86,6 +86,9 @@ public class SettingStorageServiceImpl implements ISettingStorageService {
if (engine.equals("qcloud")) {
map.put("region", config.getOrDefault("region", ""));
}
+ if (engine.equals("aliyun")) {
+ map.put("endpoint", config.getOrDefault("endpoint", ""));
+ }
}
return map;
@@ -119,6 +122,7 @@ public class SettingStorageServiceImpl implements ISettingStorageService {
break;
case "aliyun":
map.put("name", "阿里云存储");
+ map.put("endpoint", params.getOrDefault("endpoint", ""));
break;
}
}
diff --git a/server/like-admin/src/main/resources/application-dev-example.yml b/server/like-admin/src/main/resources/application-dev-example.yml
deleted file mode 100644
index dc0c9208..00000000
--- a/server/like-admin/src/main/resources/application-dev-example.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# 项目配置
-like:
- upload-directory: /www/uploads/likeadmin-java/ # 上传目录
- unique-identification: WHsAs2rtaav7hor8LdGy #密码盐
-
-# 框架配置
-spring:
- jackson:
- property-naming-strategy: SNAKE_CASE #下划线返回值和获取值
- # 数据源配置
- datasource:
- url: jdbc:mysql://localhost:3306/【库名称】?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
- type: com.zaxxer.hikari.HikariDataSource # 数据源类型
- driver-class-name: com.mysql.jdbc.Driver # MySql的驱动
- username: root # 数据库账号
- password: root # 数据库密码
- # Redis配置
- redis:
- host: localhost # Redis服务地址
- port: 6379 # Redis端口
- password: # Redis密码
- database: 0 # 数据库索引
-
-# Mybatis-plus配置 【是否开启SQL日志输出】
-#mybatis-plus:
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/server/like-common/pom.xml b/server/like-common/pom.xml
index a17e3467..befdb7dd 100644
--- a/server/like-common/pom.xml
+++ b/server/like-common/pom.xml
@@ -119,10 +119,21 @@
com.alibaba.fastjson2
fastjson2
+
+ com.squareup.okhttp3
+ okhttp
+ 4.9.3
+
com.alipay.sdk
alipay-sdk-java
- 4.38.72.ALL
+ 4.39.246.ALL
+
+
+ com.squareup.okhttp3
+ okhttp
+
+
@@ -213,6 +224,7 @@
com.github.binarywang
weixin-java-pay
+
\ No newline at end of file
diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/AliyunStorage.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/AliyunStorage.java
index 050cded1..93e6ae30 100644
--- a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/AliyunStorage.java
+++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/AliyunStorage.java
@@ -34,9 +34,9 @@ public class AliyunStorage {
* @return String
*/
public OSS ossClient() {
- String endpoint = "https://oss-cn-shenzhen.aliyuncs.com";
- String accessKeyId = this.config.get("accessKey");
- String accessKeySecret = this.config.get("secretKey");
+ String endpoint = this.config.get("endpoint");
+ String accessKeyId = this.config.get("access_key");
+ String accessKeySecret = this.config.get("secret_key");
return new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
}
diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/QcloudStorage.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/QcloudStorage.java
index 908b01d2..f6027ae5 100644
--- a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/QcloudStorage.java
+++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/QcloudStorage.java
@@ -39,8 +39,8 @@ public class QcloudStorage {
* @return String
*/
public COSClient cosClient() {
- String secretId = this.config.get("accessKey");
- String secretKey = this.config.get("secretKey");
+ String secretId = this.config.get("access_key");
+ String secretKey = this.config.get("secret_key");
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/mdd/common/plugin/storage/engine/QiniuStorage.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/QiniuStorage.java
index f5582a8b..b813e008 100644
--- a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/QiniuStorage.java
+++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/QiniuStorage.java
@@ -37,8 +37,8 @@ public class QiniuStorage {
* @return String
*/
public String upToken() {
- String accessKey = this.config.getOrDefault("accessKey", "");
- String secretKey = this.config.getOrDefault("secretKey", "");
+ String accessKey = this.config.getOrDefault("access_key", "");
+ String secretKey = this.config.getOrDefault("secret_key", "");
String bucket = this.config.getOrDefault("bucket", "");
Auth auth = Auth.create(accessKey, secretKey);
return auth.uploadToken(bucket);
diff --git a/server/pom.xml b/server/pom.xml
index 7a5505f1..df52945f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -47,7 +47,7 @@
3.1.3
2.3.2
- 7.9.5
+ 7.17.0
5.6.54
3.1.411
3.10.2