张延森 3 years ago
parent
commit
9b601b318b

+ 1
- 1
pom.xml View File

@@ -10,7 +10,7 @@
10 10
 	</parent>
11 11
 	<groupId>com.huiju</groupId>
12 12
 	<artifactId>xiangsong</artifactId>
13
-	<version>1.2.1</version>
13
+	<version>1.3.1</version>
14 14
 	<name>xiangsong</name>
15 15
 	<description>香颂</description>
16 16
 

+ 2
- 3
src/main/java/com/huiju/estateagents/common/smsService/Captcha.java View File

@@ -23,8 +23,8 @@ public class Captcha {
23 23
     @Value("${sms-service.captcha.code}")
24 24
     String code;
25 25
 
26
-    @Value("${sms-service.captcha.product}")
27
-    String product;
26
+//    @Value("${sms-service.captcha.product}")
27
+//    String product;
28 28
 
29 29
     @Value("${sms-service.captcha.sign}")
30 30
     String sign;
@@ -51,7 +51,6 @@ public class Captcha {
51 51
 
52 52
         Map<String, String> content = new HashMap<>();
53 53
         content.put("code", captcha);
54
-        content.put("product", product);
55 54
 
56 55
         Phone phone = new Phone()
57 56
                 .setNumber(tel)

+ 2
- 1
src/main/java/com/huiju/estateagents/common/smsService/Service.java View File

@@ -37,7 +37,8 @@ public class Service implements InitializingBean {
37 37
     IAcsClient acsClient;
38 38
 
39 39
     public void sendMessage(Message message) throws Exception {
40
-        request(message);
40
+        CommonResponse request = request(message);
41
+        log.info("发送结果: [{}] {}", request.getHttpStatus(), request.getData());
41 42
     }
42 43
 
43 44
     private CommonResponse request(Message message) throws Exception {

+ 8
- 8
src/main/resources/application-prod.yml View File

@@ -5,8 +5,8 @@ spring:
5 5
     name: zhiyun
6 6
   datasource:
7 7
     username: xiangsong
8
-    password: xiangsong@123
9
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/xiangsong?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
8
+    password: fg+(!rci(_VFu3GATVP
9
+    url: jdbc:mysql://rm-7xv0r7259e2x7g2zdoo.mysql.rds.aliyuncs.com:3306/xiangsong?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
10 10
     driver-class-name: com.mysql.cj.jdbc.Driver
11 11
     initial-size: 10 # 初始化连接数
12 12
     max-active: 20 # 最大连接数
@@ -40,12 +40,12 @@ wx:
40 40
       id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
41 41
       keywords: 6
42 42
 ali:
43
-  accessKeyId: LTAIGQtIi28MfXms
44
-  accessKeySecret: b6maakcdzEywmkhcK15rStx54hOiIA
43
+  accessKeyId: LTAI5tCLQSf3yqoXfSuyjpvy
44
+  accessKeySecret: A5WfR03R7f3cmgs0OVxlahDAx13yB2
45 45
   oss:
46
-    endpoint: oss-cn-shanghai.aliyuncs.com
47
-    bucketName: zhiyun-image
48
-    bucketURL: https://zhiyun-image.oss-accelerate.aliyuncs.com
46
+    endpoint: oss-cn-guangzhou.aliyuncs.com
47
+    bucketName: yuandao-image
48
+    bucketURL: https://yuandao-image.oss-cn-guangzhou.aliyuncs.com
49 49
 
50 50
 # 手机短信服务
51 51
 sms:
@@ -86,7 +86,7 @@ pay-refund: https://wx.fangdeal.cn/api/refund/
86 86
 
87 87
 # 支付回调
88 88
 pay-new-notify:
89
-  wx-bill-notify: https://xs.njyunzhi.com/api/wxBillNotify
89
+  wx-bill-notify: https://api.gxyd.com/api/wxBillNotify
90 90
   ali-bill-notify:
91 91
   wx-car-notify:
92 92
   ali-car-notify:

+ 7
- 7
src/main/resources/application.yml View File

@@ -4,12 +4,12 @@ spring:
4 4
     active: @profiles.active@
5 5
 
6 6
 sms-service:
7
-  accessKeyId: LTAIGQtIi28MfXms
8
-  accessKeySecret: b6maakcdzEywmkhcK15rStx54hOiIA
7
+  accessKeyId: LTAI5tCLQSf3yqoXfSuyjpvy
8
+  accessKeySecret: A5WfR03R7f3cmgs0OVxlahDAx13yB2
9 9
   captcha:
10
-    code: SMS_27440200
11
-    product: 【远道荟】
12
-    sign: 身份验证
10
+    code: SMS_226835231
11
+#    product: 【远道荟】
12
+    sign: 远道荟
13 13
 
14 14
 wx:
15 15
   miniapp:
@@ -17,8 +17,8 @@ wx:
17 17
     ticket: pages/WoDe/YeZhuBaoXiu/index?id=
18 18
     propertyPay: pages/WuYe/index?type=4
19 19
   mp:
20
-    festivalH5: https://xs.njyunzhi.com/jierih5.html
21
-    birthdayH5: https://xs.njyunzhi.com/shengrih5.html
20
+    festivalH5: https://api.gxyd.com/jierih5.html
21
+    birthdayH5: https://api.gxyd.com/shengrih5.html
22 22
 
23 23
 biz:
24 24
   room: