Merge remote-tracking branch 'origin/master'

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) |

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";

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

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}
+    accessKeyId:
-    accessSecret: ${ALI_YUN_SECRET}
+    accessSecret:
 
 # dubbo
 dubbo: