傅行帆 5 years ago
parent
commit
827150ca5b

+ 15
- 15
src/main/resources/application-test.yml View File

@@ -1,12 +1,12 @@
1 1
 server:
2
-  port: 8566
2
+  port: 8080
3 3
 spring:
4 4
   application:
5 5
     name: estateagents
6 6
   datasource:
7 7
     username: estateagents
8
-    password: DQ@0lW##kBb2+-jPZ
9
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_t?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
8
+    password: estateagents
9
+    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&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 # 最大连接数
@@ -25,21 +25,21 @@ mybatis-plus:
25 25
   mapper-locations: classpath:mapper/**/*.xml
26 26
 wx:
27 27
   miniapp:
28
-    appid: wxc56decdcbc64d8de
29
-    secret: 80864fa371a8db79e719c07df52d59d0
28
+    appid: wxd6f47a9bb3052175
29
+    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
30 30
     token:
31 31
     aesKey:
32 32
     msgDataFormat: JSON
33 33
   tpls:
34
-    - name: notice
35
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
36
-      keywords: 4
37
-    - name: newCustomer
38
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
39
-      keywords: 4
40
-    - name: mainbiz
41
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
42
-      keywords: 6
34
+  - name: notice
35
+    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
36
+    keywords: 4
37
+  - name: newCustomer
38
+    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
39
+    keywords: 4
40
+  - name: mainbiz
41
+    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
42
+    keywords: 6
43 43
 ali:
44 44
   accessKeyId: LTAIkc75dpkJw8Lb
45 45
   accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
@@ -68,7 +68,7 @@ sms:
68 68
     # 验证码长度
69 69
     size: 4
70 70
     # 短信签名
71
-    sign: AI智慧案场
71
+    sign: 营销云
72 72
 
73 73
   visitor:
74 74
     code: "0501"

+ 1
- 1
src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml View File

@@ -13,7 +13,7 @@
13 13
             org_id,
14 14
             count( DISTINCT ( customer_id ) ) as customer_num
15 15
         FROM
16
-            ts_customer_follow_up_record
16
+            ta_customer_follow_up_record
17 17
         WHERE
18 18
             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
19 19
         GROUP BY

+ 1
- 1
src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml View File

@@ -22,7 +22,7 @@
22 22
             org_id,
23 23
             count( DISTINCT ( customer_id ) ) as customer_num
24 24
         FROM
25
-            ts_customer_follow_up_record
25
+            ta_customer_follow_up_record
26 26
         WHERE
27 27
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
28 28
         GROUP BY