diff --git a/framework/pom.xml b/framework/pom.xml
index 3003fb45..472ef724 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -440,7 +440,7 @@
com.huaweicloud
esdk-obs-java
- ${huaweicloud.version}
+ ${huaweicloud-obs.version}
com.qcloud
diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/impl/HuaweiFilePlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/impl/HuaweiFilePlugin.java
index 62e2c64d..9e1fb32b 100644
--- a/framework/src/main/java/cn/lili/modules/file/plugin/impl/HuaweiFilePlugin.java
+++ b/framework/src/main/java/cn/lili/modules/file/plugin/impl/HuaweiFilePlugin.java
@@ -44,7 +44,7 @@ public class HuaweiFilePlugin implements FilePlugin {
* @return
*/
private ObsClient getObsClient() {
- return new ObsClient(ossSetting.getHuaweicloudOBSAccessKey(), ossSetting.getHuaweicloudOBSSecretKey(), ossSetting.getAliyunOSSEndPoint());
+ return new ObsClient(ossSetting.getHuaweicloudOBSAccessKey(), ossSetting.getHuaweicloudOBSSecretKey(), ossSetting.getHuaweicloudOBSEndPoint());
}
@@ -72,14 +72,17 @@ public class HuaweiFilePlugin implements FilePlugin {
public String inputStreamUpload(InputStream inputStream, String key) {
ObsClient obsClient = getObsClient();
try {
- obsClient.putObject(new PutObjectRequest(ossSetting.getHuaweicloudOBSBucketName(), key, inputStream));
+ PutObjectRequest putObjectRequest=new PutObjectRequest(ossSetting.getHuaweicloudOBSBucketName(), key, inputStream);
+ obsClient.putObject(putObjectRequest);
} catch (ObsException obsException) {
+ obsException.printStackTrace();
throw new ServiceException(ResultCode.OSS_EXCEPTION_ERROR);
} finally {
try {
// 关闭OBS连接
obsClient.close();
} catch (IOException e) {
+ e.printStackTrace();
log.error("OBS关闭连接报错!" + e.getMessage());
throw new ServiceException(ResultCode.OSS_EXCEPTION_ERROR);
}
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
index 9601eb25..13617a89 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
@@ -179,7 +179,7 @@ public class WechatPlugin implements Payment {
try {
Connect connect = connectService.queryConnect(
- ConnectQueryDTO.builder().userId(UserContext.getCurrentUser().getId()).unionType(ConnectEnum.WECHAT.name()).build()
+ ConnectQueryDTO.builder().userId(UserContext.getCurrentUser().getId()).unionType(SourceEnum.WECHAT_OFFIACCOUNT_OPEN_ID.name()).build()
);
if (connect == null) {
return null;
diff --git a/pom.xml b/pom.xml
index 1d30464c..64f3b885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
2.3.1
20211018.2
8.0.3
- 3.21.8
+ 3.20.6.2
5.6.97
3.1.693
1.0.11