Merge remote-tracking branch 'origin/master'

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/EncryptDecrypt.java

@@ -18,7 +18,7 @@ public class EncryptDecrypt {
    }
 
     public static void main(String[] args) {
-        System.out.println(getEncrypt("JK20220120%JIK"));
+        System.out.println(getEncrypt("DOB87VaBCXmk3L3OWiO++iWoevuek7QkC9NrbDvs"));
 //        System.out.println(getEncrypt("LTAI5tJZBJwP5qazE6b3b4Gr"));
 //        System.out.println(getEncrypt("zSQCG0yyvRJISPokNZGhbhaAfh4hGX"));
 //        System.out.println(getEncrypt("4dkankan524%40123*"));

4dkankan-common-web/src/main/java/com/fdkankan/web/util/WebUtil.java

@@ -7,9 +7,12 @@ import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.alibaba.fastjson.JSON;
 
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import org.aspectj.lang.JoinPoint;
 import org.springframework.http.HttpHeaders;
@@ -63,6 +66,35 @@ public class WebUtil {
         }
     }
 
+    public static Map<String, Object> getParameter(HttpServletRequest request) throws IOException {
+        String contentType = request.getContentType();
+        if (StrUtil.isNotEmpty(contentType) && contentType.contains(ContentType.JSON.getValue())) {
+            BufferedReader reader = request.getReader(); // 对于文本数据，如JSON或XML
+            String json = "";
+            if (reader != null) {
+                json = reader.lines().collect(Collectors.joining()); // 收集所有行到一个字符串中
+            }
+            return JSON.parseObject(json, HashMap.class);
+        } else {
+            Enumeration<String> parameterNames = request.getParameterNames();
+            if(CollUtil.isEmpty(parameterNames)){
+                return null;
+            }
+            Map<String, Object> params = new HashMap<>();
+            String name = null;
+            do {
+                name = parameterNames.nextElement();
+                params.put(name, request.getParameter(name));
+            }while (parameterNames.hasMoreElements());
+            return params;
+        }
+    }
+
+    public static <T> T getParameter(String name, HttpServletRequest request) throws IOException {
+        Map<String, Object> parameters = getParameter(request);
+        return (T) parameters.get(name);
+    }
+
     /**
      * 获取客户端请求终端地址
      * @param request  客户端请求request

4dkankan-utils-fyun-parent/src/main/java/com/fdkankan/fyun/config/FYunFileConfig.java

@@ -29,7 +29,7 @@ public class FYunFileConfig {
     @Value("${fyun.host}")
     private String host;
 
-    @Value("${fyun.region:#{null}}")
+    @Value("${fyun.region:eu-west-2}")
     private String region;
 
 }

4dkankan-utils-fyun-s3/src/main/java/com/fdkankan/fyun/s3/config/S3Config.java

@@ -8,6 +8,7 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
@@ -32,6 +33,6 @@ public class S3Config {
         return AmazonS3ClientBuilder.standard()
                 .withCredentials(new AWSStaticCredentialsProvider(awsCreds))
                 .withClientConfiguration(clientConfiguration)
-                .withRegion(Regions.EU_WEST_2).build();
+                .withRegion(fYunFileConfig.getRegion()).build();
     }
 }

4dkankan-utils-sign/src/main/java/com/fdkankan/sign/RsaUtils.java

@@ -2,6 +2,9 @@ package com.fdkankan.sign;
 
 
 import cn.hutool.crypto.digest.MD5;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -15,6 +18,7 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
+import java.util.Calendar;
 
 public class RsaUtils {
 
@@ -28,20 +32,23 @@ public class RsaUtils {
 	public static final int KEY_SIZE = 1024;
 
 	public static void main(String[] args) {
-		KeyPairInfo keyPair = getKeyPair();
-		String publicKey = keyPair.getPublicKey();
-		String privateKey = keyPair.getPrivateKey();
-		String appId = "tsxh";
+//		KeyPairInfo keyPair = getKeyPair();
+		String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCaKAIIFQjNK1mziSQkXh1WEg/keWjWlYEOn+LDwjzvpN1wEm+UFGNrv5orccS5iingtIMJxPPFlKBEMPk11TxQKHwFMJqwWDcXCIdarInjdxZXy3cbUOuE6OFgSGh9tBUANcHAiIIOKplIQLdvVc5DpVi5MGmpQVcCNOSQ4KsaDwIDAQAB";
+//		String privateKey = keyPair.getPrivateKey();
+		String appId = "bf6acc5386b1106428fb1096b506661c";
 		System.out.println(appId+":");
-		System.out.println("appId:"+ MD5.create().digestHex(appId));
+//		System.out.println("appId:"+ MD5.create().digestHex(appId));
 		System.out.println("公钥："+publicKey);
-		System.out.println("私钥："+privateKey);
+//		System.out.println("私钥："+privateKey);
+		JSONObject params = new JSONObject();
+		params.set("appId", appId);
+		params.set("timestamp", Calendar.getInstance().getTimeInMillis());
 
 
-		String ciphertext = RsaUtils.encipher("123", publicKey);
+		String ciphertext = RsaUtils.encipher(JSONUtil.toJsonStr(params), publicKey);
 		System.out.println(String.format("密文："+ciphertext));
-		String deTxt = RsaUtils.decipher(ciphertext, privateKey);
-		System.out.println(deTxt);
+//		String deTxt = RsaUtils.decipher(ciphertext, privateKey);
+//		System.out.println(deTxt);
 	}
 
 	/**