From ebf0f007c68e4cac247f73cafc15e9b54cb8de07 Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Tue, 15 Mar 2022 14:12:08 +0800
Subject: [PATCH] =?UTF-8?q?feat=200=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springcloud/client/PaymentClient.java     | 12 -------
 .../service/imp/MerchantServiceImp.java       |  2 +-
 .../base/springcloud/util/OssBootUtil.java    |  1 +
 .../base/springcloud/util/StringHelper.java   | 34 +++++++++++++++++++
 4 files changed, 36 insertions(+), 13 deletions(-)
 delete mode 100644 payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java

diff --git a/payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java b/payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java
deleted file mode 100644
index 42e8a4e..0000000
--- a/payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.base.springcloud.client;
-
-import com.base.springcloud.base.CommonResult;
-import com.base.springcloud.dto.MerchantConfigReqDTO;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-public interface PaymentClient {
-
-	/*@PostMapping(value = "/merchant/merchantConfig")
-	CommonResult paymentConfigure(@RequestBody MerchantConfigReqDTO merchantConfigDTO);*/
-}
\ No newline at end of file
diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java
index 636814c..92080e9 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java
@@ -129,7 +129,7 @@ public class MerchantServiceImp implements MerchantService {
 	private void removeCertificate(String certPath) {
 		if(StringUtils.isBlank(certPath))
 			return;
-		OssBootUtil.deleteUrl(certPath);
+		OssBootUtil.delete(certPath);
 	}
 
 	/**
diff --git a/payment-base-app/src/main/java/com/base/springcloud/util/OssBootUtil.java b/payment-base-app/src/main/java/com/base/springcloud/util/OssBootUtil.java
index b4e3c30..ce43d8c 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/util/OssBootUtil.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/util/OssBootUtil.java
@@ -184,6 +184,7 @@ public class OssBootUtil {
     }
 
     public static void delete(String fileName) {
+        initOSS(endPoint, accessKeyId, accessKeySecret);
         ossClient.deleteObject(bucketName, fileName);
     }
 
diff --git a/payment-base-app/src/main/java/com/base/springcloud/util/StringHelper.java b/payment-base-app/src/main/java/com/base/springcloud/util/StringHelper.java
index 89e5d40..f291124 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/util/StringHelper.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/util/StringHelper.java
@@ -4,10 +4,20 @@ import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.Map;
 
 public class StringHelper {
 
+	/**
+	 * json转Map
+	 * @param str_json
+	 * @return
+	 */
 	public static Map<String, String> json2map(String str_json) {
 		Map<String, String> res = null;
 		try {
@@ -18,4 +28,28 @@ public class StringHelper {
 		}
 		return res;
 	}
+
+	/**
+	 * 对象转Map
+	 * @param obj
+	 * @return
+	 * @throws Exception
+	 */
+	public static Map<String, Object> objectToMap(Object obj) throws Exception {
+		if(obj == null)
+			return null;
+		Map<String, Object> map = new HashMap<String, Object>();
+		BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
+		PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+		for (PropertyDescriptor property : propertyDescriptors) {
+			String key = property.getName();
+			if (key.compareToIgnoreCase("class") == 0) {
+				continue;
+			}
+			Method getter = property.getReadMethod();
+			Object value = getter!=null ? getter.invoke(obj) : null;
+			map.put(key, value);
+		}
+		return map;
+	}
 }