From d48e5a05a619a23627f2275397a0679d263cee86 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Mon, 20 Mar 2023 08:43:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8E=E4=B8=BA=E4=BA=91ob?=
 =?UTF-8?q?s=E5=BC=95=E5=85=A5=E7=89=88=E6=9C=AC=20=E5=BE=AE=E4=BF=A1jsapi?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8openID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/pom.xml                                          | 2 +-
 .../cn/lili/modules/file/plugin/impl/HuaweiFilePlugin.java | 7 +++++--
 .../modules/payment/kit/plugin/wechat/WechatPlugin.java    | 2 +-
 pom.xml                                                    | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

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 @@
         <dependency>
             <groupId>com.huaweicloud</groupId>
             <artifactId>esdk-obs-java</artifactId>
-            <version>${huaweicloud.version}</version>
+            <version>${huaweicloud-obs.version}</version>
         </dependency>
         <dependency>
             <groupId>com.qcloud</groupId>
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 @@
         <spring-boot-admin>2.3.1</spring-boot-admin>
         <owasp-java-html-sanitizer>20211018.2</owasp-java-html-sanitizer>
         <minio.version>8.0.3</minio.version>
-        <huaweicloud.version>3.21.8</huaweicloud.version>
+        <huaweicloud-obs.version>3.20.6.2</huaweicloud-obs.version>
         <cos.version>5.6.97</cos.version>
         <tencentcloud.version>3.1.693</tencentcloud.version>
         <kuaidi100-api.version>1.0.11</kuaidi100-api.version>