From 3ab6d4dc613d90c17ebf68771e9dbfc02c33c929 Mon Sep 17 00:00:00 2001 From: "sin-ning@aliyun.com" Date: Mon, 27 May 2019 22:37:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-=20=E7=9F=AD=E4=BF=A1=20key=20=E5=80=BC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20default=5Fvalue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/iocoder/mall/admin/client/SmsAliYunClient.java | 4 ++-- .../java/cn/iocoder/mall/admin/client/SmsYunPianClient.java | 2 +- .../src/main/resources/config/application.yaml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java index 54e879c6b..745e4ce6a 100644 --- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java +++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java @@ -25,9 +25,9 @@ import java.util.Map; @Component public class SmsAliYunClient implements SmsClient { - @Value("${sms.aliYun.accessKeyId}") + @Value("${sms.aliYun.accessKeyId?:'default_value'}") private String accessKeyId; - @Value("${sms.aliYun.accessSecret}") + @Value("${sms.aliYun.accessSecret?:'default_value'}") private String accessSecret; private static final String DOMAIN = "dysmsapi.aliyuncs.com"; diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java index 98f857c90..38c87d60f 100644 --- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java +++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java @@ -91,7 +91,7 @@ public class SmsYunPianClient implements SmsClient { //编码格式。发送编码格式统一用UTF-8 private static String ENCODING = "UTF-8"; - @Value("${sms.yunPian.apiKey}") + @Value("${sms.yunPian.apiKey?:'default_value'}") private String apiKey; @Override diff --git a/system/system-service-impl/src/main/resources/config/application.yaml b/system/system-service-impl/src/main/resources/config/application.yaml index 2d0313463..6236180c3 100644 --- a/system/system-service-impl/src/main/resources/config/application.yaml +++ b/system/system-service-impl/src/main/resources/config/application.yaml @@ -27,10 +27,10 @@ mybatis-plus: # sms sms: yunPian: - apiKey: ${YUN_PIAN} + apiKey: aliYun: - accessKeyId: ${ALI_YUN_KEY_ID} - accessSecret: ${ALI_YUN_SECRET} + accessKeyId: + accessSecret: # dubbo dubbo: From 780ed5b209dfaa2d8c108e81afcc5f878cdd391b Mon Sep 17 00:00:00 2001 From: "sin-ning@aliyun.com" Date: Tue, 28 May 2019 17:11:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?-=20=E6=A8=A1=E5=9D=97=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=BF=98=E6=94=B9=E4=BA=86=EF=BC=8Cadmin-application?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0f9f5940..02308be7e 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ TODO 此处应有一个架构图的装逼 JPG 图。 | --- | --- | --- | --- | | `admin-web` | 【前端】管理后台 | HTTP 8080 | | | `mobile-web` | 【前端】商城 H5 | HTTP 8000 | | -| `admin-application` | 管理员 HTTP 服务 | HTTP 18083 | [接口文档](http://api.shop.iocoder.cn:18099/admin-api/doc.html) | +| `system-application` | 管理员 HTTP 服务 | HTTP 18083 | [接口文档](http://api.shop.iocoder.cn:18099/admin-api/doc.html) | | `user-application` | 用户 HTTP 服务 | HTTP 18082 | [接口文档](http://api.shop.iocoder.cn:18099/user-api/doc.html) | | `product-application` | 商品 HTTP 服务 | HTTP 18081 | [接口文档](http://api.shop.iocoder.cn:18099/product-api/doc.html) | | `pay-application` | 支付 HTTP 服务 | HTTP 18084 | [接口文档](http://api.shop.iocoder.cn:18099/pay-api/doc.html) |