Merge remote-tracking branch 'origin/master'

4dkankan-utils-sms/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>4dkankan-utils-sms</artifactId>
-
+    <version>5.0.0-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -47,6 +47,7 @@
             <artifactId>aws-java-sdk</artifactId>
             <version>1.11.1032</version>
         </dependency>
+
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>dysmsapi20170525</artifactId>

4dkankan-utils-sms/src/main/java/com/fdkankan/sms/SmsService.java

@@ -34,14 +34,15 @@ public class SmsService {
     //初始化ascClient需要的几个参数
     private static final String product = "Dysmsapi";//短信API产品名称（短信产品名固定，无需修改）
     private static final String domain = "dysmsapi.aliyuncs.com";//短信API产品域名（接口地址固定，无需修改）
-    private static final String accessKeyId = "LTAIUrvuHqj8pvry";//你的accessKeyId,参考本文档步骤2
-    private static final String accessKeySecret = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";//你的accessKeySecret，参考本文档步骤2
-
     private static final String EN_CODE_MSG = "Your vertification code is ${code}. Thank you for using 4DKanKan, please complete your identity verification by entering this code in 5 minutes. Please ignore this message if you don't operate by yourself.";
 
 
-    @Value("${phone.sign:四维看看}")
+    @Value("${sms.ali.sign}")
     private String sign;
+    @Value("${sms.ali.accessKey}")
+    private String accessKeyId;
+    @Value("${sms.ali.accessKeySecret}")
+    private String accessKeySecret;
 
     public String sendSms(String phoneNum, String templateParam, String templateCode) throws Exception {
         log.info("cnCode:" + templateCode);

4dkankan-utils-sms/src/main/java/com/fdkankan/sms/SmsServiceV2.java

@@ -23,10 +23,12 @@ import org.springframework.util.StringUtils;
 public class SmsServiceV2 {
     private static Logger log = LoggerFactory.getLogger("programLog");
 
-    private static final String accessKeyId = "LTAIUrvuHqj8pvry";//你的accessKeyId,参考本文档步骤2
-    private static final String accessKeySecret = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";//你的accessKeySecret，参考本文档步骤2
-    @Value("${phone.sign:四维看看}")
+    @Value("${sms.ali.sign}")
     private String sign;
+    @Value("${sms.ali.accessKey}")
+    private String accessKeyId;
+    @Value("${sms.ali.accessKeySecret}")
+    private String accessKeySecret;
 
     public String sendSms(String phoneNum, String templateParam, String templateCode) throws Exception {
         log.info("cnCode:" + templateCode);
@@ -79,7 +81,7 @@ public class SmsServiceV2 {
      * @return Client
      * @throws Exception
      */
-    public static com.aliyun.dysmsapi20170525.Client createClient() throws Exception {
+    public  com.aliyun.dysmsapi20170525.Client createClient() throws Exception {
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
                 // 必填，您的 AccessKey ID
                 .setAccessKeyId(accessKeyId)