Merge branch 'dsc' into 'develop'

短信签名和注释中间要加个空格

See merge request 8timerv2/8timerapiv200!231

src/main/java/cn/timer/api/utils/aliyun/AliyunSMS.java

@@ -109,7 +109,6 @@ public class AliyunSMS {
 		request.putQueryParameter("RegionId", REGION_ID);
 		request.putQueryParameter("PhoneNumbers", phone);
 		request.putQueryParameter("SignName", PROJECT_NAME);
-
 		switch (templateCode) {
 		case 1:
 			request.putQueryParameter(CODE_NAME, PinType.AUTHENTICATION.getCode());
@@ -145,8 +144,8 @@ public class AliyunSMS {
 		String a = null;
 		try {
 			response = client.getCommonResponse(request);
-
 			a = response.getData();
+//			System.err.println("response:"+a); // 短信服务响应内容
 		} catch (ServerException e) {
 			e.printStackTrace();
 		} catch (ClientException e) {

src/main/resources/application-dev.yml

@@ -176,7 +176,7 @@ config-8timer:
   register-company-max-num: 100 #默认最大公司数量
   register-childAccount-max-num: 10 #默认最大子账号数量
   Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时协同办公#8小时人事管家
+    PROJECT_NAME: 8小时协同办公 #8小时人事管家
     REGION_ID: cn-shenzhen
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR

src/main/resources/application-pro.yml

@@ -151,7 +151,7 @@ config-8timer:
   register-company-max-num: 100
   register-childAccount-max-num: 10
   Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时协同办公#8小时人事管家
+    PROJECT_NAME: 8小时协同办公 #8小时人事管家
     REGION_ID: cn-shenzhen
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR

src/main/resources/application-test.yml

@@ -150,7 +150,7 @@ config-8timer:
   register-company-max-num: 100
   register-childAccount-max-num: 10
   Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时协同办公#8小时人事管家
+    PROJECT_NAME: 8小时协同办公 #8小时人事管家
     REGION_ID: cn-shenzhen
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR