diff --git a/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml b/.idea/libraries/Maven__com_aliyun_alibabacloud_dysmsapi20170525_3_0_0.xml similarity index 50% rename from .idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml rename to .idea/libraries/Maven__com_aliyun_alibabacloud_dysmsapi20170525_3_0_0.xml index a0ba707d8..3594cb899 100644 --- a/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml +++ b/.idea/libraries/Maven__com_aliyun_alibabacloud_dysmsapi20170525_3_0_0.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 new file mode 100644 index 000000000..2dec95d45 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_gateway_pop_0_2_10_beta.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 000000000..de5668502 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_http_apache_0_2_10_beta.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 000000000..60f4ee92b --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_auth_0_2_10_beta.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 000000000..adc025ddb --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_core_0_2_10_beta.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 deleted file mode 100644 index 6ff722e4c..000000000 --- a/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 new file mode 100644 index 000000000..5bd00c25e --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_darabonba_java_core_0_2_10_beta.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 deleted file mode 100644 index b0b7ec33b..000000000 --- a/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 66d2291a6..000000000 --- a/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index ecff150cf..000000000 --- a/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml b/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml deleted file mode 100644 index 174e66d22..000000000 --- a/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index f8cb4eb06..000000000 --- a/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index cdcc418a8..000000000 --- a/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 51215c03d..000000000 --- a/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_2.xml deleted file mode 100644 index 0f3d7e94b..000000000 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_2.xml deleted file mode 100644 index 1477dab40..000000000 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_2.xml deleted file mode 100644 index c2363c40d..000000000 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_2.xml deleted file mode 100644 index 531cfee3a..000000000 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_2.xml deleted file mode 100644 index f22aa1e2d..000000000 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_2.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_2.xml deleted file mode 100644 index 2146c4bac..000000000 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 7e58f9645..000000000 --- a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 70b2b05c0..000000000 --- a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml b/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml deleted file mode 100644 index 7af89b156..000000000 --- a/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml deleted file mode 100644 index 0eb2c0a82..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml deleted file mode 100644 index 1271e960b..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml deleted file mode 100644 index f70949302..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml deleted file mode 100644 index 48549e722..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml deleted file mode 100644 index ae61434df..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml deleted file mode 100644 index 62167e6cb..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml deleted file mode 100644 index ea2a42792..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml deleted file mode 100644 index 9c61e39a3..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml deleted file mode 100644 index bace373d7..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml deleted file mode 100644 index 62f89185c..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml deleted file mode 100644 index 22a1ee590..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml deleted file mode 100644 index 906a7d8c4..000000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml b/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml deleted file mode 100644 index feefbab8e..000000000 --- a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml b/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml deleted file mode 100644 index 606a7a509..000000000 --- a/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml deleted file mode 100644 index b4e45d34a..000000000 --- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml deleted file mode 100644 index 764185cb5..000000000 --- a/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml deleted file mode 100644 index 9d254f742..000000000 --- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml deleted file mode 100644 index 6978c0b24..000000000 --- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index cd5071415..000000000 --- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 015b98b4c..000000000 --- a/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 new file mode 100644 index 000000000..10fb46ae0 --- /dev/null +++ b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 deleted file mode 100644 index b7f6c9ae6..000000000 --- a/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 new file mode 100644 index 000000000..ab69107b9 --- /dev/null +++ b/.idea/libraries/Maven__org_jetbrains_annotations_24_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml deleted file mode 100644 index 7ee5fee30..000000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml deleted file mode 100644 index 28f52d37f..000000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml deleted file mode 100644 index fa302bfc2..000000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.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 8a2e18720..b4970854e 100644 --- a/emis-biz-web/emis-biz-web.iml +++ b/emis-biz-web/emis-biz-web.iml @@ -168,6 +168,7 @@ + @@ -210,22 +211,15 @@ - - - - - - - - + + + + + + + + - - - - - - - diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml index f0c87ac08..d704e1431 100644 --- a/emis-biz/emis-biz.iml +++ b/emis-biz/emis-biz.iml @@ -121,6 +121,7 @@ + @@ -167,22 +168,15 @@ - - - - - - - - + + + + + + + + - - - - - - - diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml index 62952d8c8..8d276b534 100644 --- a/emis-biz/pom.xml +++ b/emis-biz/pom.xml @@ -100,12 +100,19 @@ + + + + + com.aliyun - dysmsapi20170525 - 2.0.22 + alibabacloud-dysmsapi20170525 + 3.0.0 - + + + 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 804d462f1..c17780253 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,16 +2,22 @@ package com.xdadan.erp.emis.service.sms; import com.alibaba.fastjson.JSONObject; -import com.aliyun.dysmsapi20170525.Client; -import com.aliyun.dysmsapi20170525.models.SendSmsResponse; -import com.aliyun.tea.TeaModel; +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.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") public class AliyunSMSService { @@ -44,37 +50,89 @@ 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 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 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)); + AsyncClient client = createClient(accessKeyId, accessKeySecret); - if(response.getStatusCode()==200) { - if ("OK".equals(response.getBody().getCode())) { + + 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 { - throw new EmisBizError(EmisBizErrorType.FAIL,response.getBody().getMessage()); + 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,"短信渠道异常"); diff --git a/emis-wms-web/emis-wms-web.iml b/emis-wms-web/emis-wms-web.iml index d343d6ba6..6dd4c7c49 100644 --- a/emis-wms-web/emis-wms-web.iml +++ b/emis-wms-web/emis-wms-web.iml @@ -188,34 +188,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/emis-wms/emis-wms.iml b/emis-wms/emis-wms.iml index 631ad14c2..8af046a7f 100644 --- a/emis-wms/emis-wms.iml +++ b/emis-wms/emis-wms.iml @@ -143,34 +143,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -