diff --git a/.idea/libraries/Maven__com_aliyun_alibabacloud_dysmsapi20170525_3_0_0.xml b/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
similarity index 50%
rename from .idea/libraries/Maven__com_aliyun_alibabacloud_dysmsapi20170525_3_0_0.xml
rename to .idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
index 3594cb899..a0ba707d8 100644
--- a/.idea/libraries/Maven__com_aliyun_alibabacloud_dysmsapi20170525_3_0_0.xml
+++ b/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_gateway_pop_0_2_10_beta.xml b/.idea/libraries/Maven__com_aliyun_aliyun_gateway_pop_0_2_10_beta.xml
deleted file mode 100644
index 2dec95d45..000000000
--- a/.idea/libraries/Maven__com_aliyun_aliyun_gateway_pop_0_2_10_beta.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_http_apache_0_2_10_beta.xml b/.idea/libraries/Maven__com_aliyun_aliyun_http_apache_0_2_10_beta.xml
deleted file mode 100644
index de5668502..000000000
--- a/.idea/libraries/Maven__com_aliyun_aliyun_http_apache_0_2_10_beta.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_auth_0_2_10_beta.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_auth_0_2_10_beta.xml
deleted file mode 100644
index 60f4ee92b..000000000
--- a/.idea/libraries/Maven__com_aliyun_aliyun_java_auth_0_2_10_beta.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_core_0_2_10_beta.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_core_0_2_10_beta.xml
deleted file mode 100644
index adc025ddb..000000000
--- a/.idea/libraries/Maven__com_aliyun_aliyun_java_core_0_2_10_beta.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml b/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
new file mode 100644
index 000000000..6ff722e4c
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_darabonba_java_core_0_2_10_beta.xml b/.idea/libraries/Maven__com_aliyun_darabonba_java_core_0_2_10_beta.xml
deleted file mode 100644
index 5bd00c25e..000000000
--- a/.idea/libraries/Maven__com_aliyun_darabonba_java_core_0_2_10_beta.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml b/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml
new file mode 100644
index 000000000..b0b7ec33b
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml b/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml
new file mode 100644
index 000000000..66d2291a6
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml b/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
new file mode 100644
index 000000000..ecff150cf
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml b/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml
new file mode 100644
index 000000000..f0f19244d
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml b/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml
new file mode 100644
index 000000000..69ab5e796
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml b/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml
new file mode 100644
index 000000000..f8cb4eb06
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml b/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml
new file mode 100644
index 000000000..cdcc418a8
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml b/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml
new file mode 100644
index 000000000..51215c03d
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
new file mode 100644
index 000000000..7e58f9645
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
new file mode 100644
index 000000000..70b2b05c0
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml
new file mode 100644
index 000000000..cd5071415
--- /dev/null
+++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml
new file mode 100644
index 000000000..015b98b4c
--- /dev/null
+++ b/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml
deleted file mode 100644
index 10fb46ae0..000000000
--- a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
new file mode 100644
index 000000000..b7f6c9ae6
--- /dev/null
+++ b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_annotations_24_1_0.xml b/.idea/libraries/Maven__org_jetbrains_annotations_24_1_0.xml
deleted file mode 100644
index ab69107b9..000000000
--- a/.idea/libraries/Maven__org_jetbrains_annotations_24_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index 784f94564..8dd286f20 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -168,7 +168,6 @@
-
@@ -218,15 +217,23 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index 899cc05f3..80cdb34e8 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -122,7 +122,6 @@
-
@@ -176,15 +175,23 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index 31eac3211..b65f58c64 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -79,16 +79,16 @@
-
-
-
-
-
com.aliyun
- alibabacloud-dysmsapi20170525
- 3.0.0
+ dysmsapi20170525
+ 2.0.22
+
+
+
+
+
@@ -103,26 +103,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ com.aliyun
+ tea-openapi
+ 0.2.6
+
+
+ com.aliyun
+ tea-console
+ 0.0.1
+
+
+ com.aliyun
+ tea-util
+ 0.2.14
+
+
+ com.aliyun
+ tea
+ 1.1.14
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java
index c17780253..8cb51df97 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java
@@ -2,21 +2,15 @@ package com.xdadan.erp.emis.service.sms;
import com.alibaba.fastjson.JSONObject;
-import com.aliyun.auth.credentials.Credential;
-import com.aliyun.auth.credentials.provider.StaticCredentialProvider;
-import com.aliyun.sdk.service.dysmsapi20170525.AsyncClient;
-import com.aliyun.sdk.service.dysmsapi20170525.models.SendSmsRequest;
-import com.aliyun.sdk.service.dysmsapi20170525.models.SendSmsResponse;
-import com.google.gson.Gson;
+import com.aliyun.dysmsapi20170525.Client;
+import com.aliyun.tea.TeaModel;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.system.service.ISysConfigService;
-import darabonba.core.client.ClientOverrideConfiguration;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.concurrent.CompletableFuture;
@Slf4j
@Service("AliyunSMSService")
@@ -50,95 +44,95 @@ public class AliyunSMSService {
* @return Client
* @throws Exception
*/
-// public static Client createClient(String accessKeyId, String accessKeySecret) throws Exception {
-// com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
-// .setAccessKeyId(accessKeyId)
-// .setAccessKeySecret(accessKeySecret);
-// // 访问的域名
-// config.endpoint = "dysmsapi.aliyuncs.com";
-// return new Client(config);
-// }
-
-// public static int innerSendMessage(String accessKeyId,String accessKeySecret,String signName,String templateCode, String phone, String tplParam) throws EmisBizError {
-// try {
-// Client client = createClient(accessKeyId, accessKeySecret);
-// com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest();
-// sendSmsRequest.setPhoneNumbers(phone);
-// sendSmsRequest.setSignName(signName);
-// sendSmsRequest.setTemplateCode(templateCode);
-//// sendSmsRequest.setTemplateParam("{\"code\":\""+param+"\"}");
-// sendSmsRequest.setTemplateParam(tplParam);
-// com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions();
-// com.aliyun.dysmsapi20170525.models.SendSmsResponse response = client.sendSmsWithOptions(sendSmsRequest, runtime);
-// String jsonStr=com.aliyun.teautil.Common.toJSONString(TeaModel.buildMap(response));
-//
-// if(response.getStatusCode()==200) {
-// if ("OK".equals(response.getBody().getCode())) {
-// return 1;
-// } else {
-// throw new EmisBizError(EmisBizErrorType.FAIL,response.getBody().getMessage());
-// }
-// }else{
-// throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道发送错误");
-// }
-// }catch (Exception e) {
-// e.printStackTrace();
-// throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道异常");
-// }
-// }
-
- public static AsyncClient createClient(String accessKeyId, String accessKeySecret) throws Exception {
- StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
- .accessKeyId(accessKeyId)
- .accessKeySecret(accessKeySecret)
- .build());
-
- return AsyncClient.builder()
- .credentialsProvider(provider)
- .overrideConfiguration(
- ClientOverrideConfiguration.create().setEndpointOverride("dysmsapi.aliyuncs.com")
- )
- .build();
-
+ public static Client createClient(String accessKeyId, String accessKeySecret) throws Exception {
+ com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
+ .setAccessKeyId(accessKeyId)
+ .setAccessKeySecret(accessKeySecret);
+ // 访问的域名
+ config.endpoint = "dysmsapi.aliyuncs.com";
+ return new Client(config);
}
-
public static int innerSendMessage(String accessKeyId,String accessKeySecret,String signName,String templateCode, String phone, String tplParam) throws EmisBizError {
try {
- AsyncClient client = createClient(accessKeyId, accessKeySecret);
+ Client client = createClient(accessKeyId, accessKeySecret);
+ com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest();
+ sendSmsRequest.setPhoneNumbers(phone);
+ sendSmsRequest.setSignName(signName);
+ sendSmsRequest.setTemplateCode(templateCode);
+// sendSmsRequest.setTemplateParam("{\"code\":\""+param+"\"}");
+ sendSmsRequest.setTemplateParam(tplParam);
+ com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions();
+ com.aliyun.dysmsapi20170525.models.SendSmsResponse response = client.sendSmsWithOptions(sendSmsRequest, runtime);
+ String jsonStr=com.aliyun.teautil.Common.toJSONString(TeaModel.buildMap(response));
-
- SendSmsRequest sendSmsRequest = SendSmsRequest.builder()
- .phoneNumbers(phone)
- .signName(signName)
- .templateCode(templateCode)
- .templateParam(tplParam)
- .build();
-
- CompletableFuture response = client.sendSms(sendSmsRequest);
- SendSmsResponse resp = response.get();
-// String jsonStr=resp.getBody();
-
-
- if(resp.getStatusCode()==200) {
- if ("OK".equals(resp.getBody().getCode())) {
- client.close();
+ if(response.getStatusCode()==200) {
+ if ("OK".equals(response.getBody().getCode())) {
return 1;
} else {
- client.close();
- throw new EmisBizError(EmisBizErrorType.FAIL,resp.getBody().getMessage());
+ throw new EmisBizError(EmisBizErrorType.FAIL,response.getBody().getMessage());
}
}else{
- client.close();
throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道发送错误");
}
-
}catch (Exception e) {
e.printStackTrace();
throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道异常");
}
}
+// public static AsyncClient createClient(String accessKeyId, String accessKeySecret) throws Exception {
+// StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
+// .accessKeyId(accessKeyId)
+// .accessKeySecret(accessKeySecret)
+// .build());
+//
+// return AsyncClient.builder()
+// .credentialsProvider(provider)
+// .overrideConfiguration(
+// ClientOverrideConfiguration.create().setEndpointOverride("dysmsapi.aliyuncs.com")
+// )
+// .build();
+//
+// }
+//
+//
+// public static int innerSendMessage(String accessKeyId,String accessKeySecret,String signName,String templateCode, String phone, String tplParam) throws EmisBizError {
+// try {
+// AsyncClient client = createClient(accessKeyId, accessKeySecret);
+//
+//
+// SendSmsRequest sendSmsRequest = SendSmsRequest.builder()
+// .phoneNumbers(phone)
+// .signName(signName)
+// .templateCode(templateCode)
+// .templateParam(tplParam)
+// .build();
+//
+// CompletableFuture response = client.sendSms(sendSmsRequest);
+// SendSmsResponse resp = response.get();
+//// String jsonStr=resp.getBody();
+//
+//
+// if(resp.getStatusCode()==200) {
+// if ("OK".equals(resp.getBody().getCode())) {
+// client.close();
+// return 1;
+// } else {
+// client.close();
+// throw new EmisBizError(EmisBizErrorType.FAIL,resp.getBody().getMessage());
+// }
+// }else{
+// client.close();
+// throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道发送错误");
+// }
+//
+// }catch (Exception e) {
+// e.printStackTrace();
+// throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道异常");
+// }
+// }
+
public static void main(String[] args) {
String accessKeyId="LTAI5tA1yz1QK6BVhzg3ne5D";