diff --git a/fys-admin/src/main/resources/application-dev.yml b/fys-admin/src/main/resources/application-dev.yml index 7b25859..4e922bc 100644 --- a/fys-admin/src/main/resources/application-dev.yml +++ b/fys-admin/src/main/resources/application-dev.yml @@ -174,14 +174,14 @@ sms: # 框架定义的厂商名称标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分 supplier: alibaba # 有些称为accessKey有些称之为apiKey,也有称为sdkKey或者appId。 - access-key-id: LTAI5tJdDNpZootsPQ5hdELx + access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz # 称为accessSecret有些称之为apiSecret - access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt + access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh #模板ID 非必须配置,如果使用sendMessage的快速发送需此配置 - template-id: SMS_322180518 + template-id: SMS_324526343 #模板变量 上述模板的变量 templateName: code - signature: 湖北星汉研创科技 + signature: 深圳市富源晟科技 # sdk-app-id: 您的sdkAppId config2: # 厂商标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分 diff --git a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java index 78ab242..088bb49 100644 --- a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -24,6 +24,13 @@ public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper { private final byte[] body; + + /** + * @param request + * @param privateKey + * @param headerFlag encrypt-key + * @throws IOException + */ public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey, String headerFlag) throws IOException { super(request); // 获取 AES 密码 采用 RSA 加密 diff --git a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java index c81f353..bc737fb 100644 --- a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java @@ -19,31 +19,36 @@ public class EncryptUtilsTest { String s = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y="; + /** + * encrypt-key + */ String s1 = EncryptUtils.encryptByRsa("MTIzNDU2Nzg5MGFiY2RlZg==", g); System.out.println(s1); + System.out.println("-------------s1--------------"); + String s2 = EncryptUtils.decryptByRsa("jJPaW7hgFXD/gjdkrfBOEUdXpPZnQg/LZUASoOJAOLU/XRVXO/5666CzyALjw7neK1ujvRuys4MdKCvr9cRARw==", s); System.out.println(s2); - + System.out.println("-------------s2--------------"); String s3 = EncryptUtils.decryptByBase64(s2); System.out.println(s3); - + System.out.println("-------------s2--------------"); String s4 = EncryptUtils.encryptByAes("123456", s3); System.out.println(s4); - + System.out.println("-------------s2--------------"); String s5 = EncryptUtils.decryptByAes(s4, s3); System.out.println(s5); - + System.out.println("-------------s2--------------"); // 1. 构造 LoginBody 对象 PasswordLoginBody loginBody = new PasswordLoginBody(); loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e"); loginBody.setGrantType("password"); loginBody.setTenantId("894078"); - loginBody.setCode("0"); - loginBody.setUuid("1c285b27f516486f9535face77023aeb"); + loginBody.setCode("2"); + loginBody.setUuid("d339659cea5245aab7df92642326218e"); // loginBody.setUsername("admin"); // loginBody.setPassword("admin123"); - loginBody.setUsername("dyf"); + loginBody.setUsername("fel"); loginBody.setPassword("123456"); // 2. 使用更清晰的方式拼接 JSON 字符串 @@ -67,9 +72,12 @@ public class EncryptUtilsTest { ); + /** + * body + */ String S5 = EncryptUtils.encryptByAes(jsonLoginBody, s3); System.out.println(S5); - + System.out.println("-------------s5--------------"); String S6 = EncryptUtils.decryptByAes(S5, s3); System.out.println(S6); diff --git a/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/controller/TestSMSController.java b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/controller/TestSMSController.java index 5393a71..7b4bf24 100644 --- a/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/controller/TestSMSController.java +++ b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/controller/TestSMSController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class TestSMSController { + @GetMapping("/test") public void testSend() { // 在创建完SmsBlend实例后,再未手动调用注销的情况下框架会持有该实例,可以直接通过指定configId来获取想要的配置,如果你想使用