胡轶钦 5 anos atrás
pai
commit
2e350e56bf

+ 6
- 0
pom.xml Ver arquivo

@@ -138,6 +138,12 @@
138 138
 				<profiles.active>xs</profiles.active>
139 139
 			</properties>
140 140
 		</profile>
141
+		<profile>
142
+			<id>demo</id>
143
+			<properties>
144
+				<profiles.active>demo</profiles.active>
145
+			</properties>
146
+		</profile>
141 147
 	</profiles>
142 148
 	<build>
143 149
 		<plugins>

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java Ver arquivo

@@ -109,6 +109,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
109 109
         queryWrapper.eq("qr_params", paramsStr);
110 110
         queryWrapper.ge("expire_date", LocalDateTime.now());
111 111
         queryWrapper.orderByDesc("create_date");
112
+        queryWrapper.isNotNull("qr_code");
112 113
         queryWrapper.last("limit 1");
113 114
 
114 115
         TaMiniappQrcode taMiniappQrcode = taMiniappQrcodeMapper.selectOne(queryWrapper);

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Ver arquivo

@@ -490,6 +490,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
490 490
         taPerson.setCreateDate(LocalDateTime.now());
491 491
         taPerson.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
492 492
 
493
+
493 494
         if (taPersonMapper.insert(taPerson) > 0) {
494 495
             // 授权项目
495 496
             addConsultantBuildings(taPerson.getPersonId(), paramStr);

+ 51
- 0
src/main/resources/application-demo.yml Ver arquivo

@@ -0,0 +1,51 @@
1
+server:
2
+  port: 8005
3
+spring:
4
+  application:
5
+    name: estateagents
6
+  datasource:
7
+    username: estateagents
8
+    password: DQ@0lW##kBb2+-jPZ
9
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_test?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
10
+    driver-class-name: com.mysql.cj.jdbc.Driver
11
+    initial-size: 10 # 初始化连接数
12
+    max-active: 20 # 最大连接数
13
+    min-idle: 8 # 最小空闲数
14
+    max-idle: 8 # 最大空闲数
15
+  servlet:
16
+    multipart:
17
+      max-file-size: 10MB
18
+      max-request-size: 50MB
19
+
20
+##mybatis-plus
21
+mybatis-plus:
22
+  configuration:
23
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
24
+    call-setters-on-nulls: true
25
+  mapper-locations: classpath:mapper/*.xml
26
+wx:
27
+  miniapp:
28
+    appid: wx65d61e127ed35d5e
29
+    secret: dca3f2974f59e975e3ee45c6237b0ca2
30
+    token:
31
+    aesKey:
32
+    msgDataFormat: JSON
33
+  tpls:
34
+    - name: notice
35
+      id: dRIuc5iYqjot_zuxRDeeR8Qaf0DUrwu0Da5fYUewf9k
36
+      keywords: 4
37
+    - name: newCustomer
38
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
39
+      keywords: 4
40
+    - name: mainbiz
41
+      id: wGFoATwbhXh1FS9XqRq8nag4VfBxTpc6WiKIh0uUadQ
42
+      keywords: 6
43
+ali:
44
+  accessKeyId: LTAIkc75dpkJw8Lb
45
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
46
+  oss:
47
+    endpoint: oss-cn-shanghai.aliyuncs.com
48
+    bucketName: estateagents
49
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
50
+
51
+

+ 51
- 51
src/main/resources/application-test.yml Ver arquivo

@@ -1,51 +1,51 @@
1
-server:
2
-  port: 8566
3
-spring:
4
-  application:
5
-    name: estateagents
6
-  datasource:
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
10
-    driver-class-name: com.mysql.cj.jdbc.Driver
11
-    initial-size: 10 # 初始化连接数
12
-    max-active: 20 # 最大连接数
13
-    min-idle: 8 # 最小空闲数
14
-    max-idle: 8 # 最大空闲数
15
-  servlet:
16
-    multipart:
17
-      max-file-size: 10MB
18
-      max-request-size: 50MB
19
-
20
-##mybatis-plus
21
-mybatis-plus:
22
-  configuration:
23
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
24
-    call-setters-on-nulls: true
25
-  mapper-locations: classpath:mapper/*.xml
26
-wx:
27
-  miniapp:
28
-    appid: wxc56decdcbc64d8de
29
-    secret: 80864fa371a8db79e719c07df52d59d0
30
-    token:
31
-    aesKey:
32
-    msgDataFormat: JSON
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
43
-ali:
44
-  accessKeyId: LTAIkc75dpkJw8Lb
45
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
46
-  oss:
47
-    endpoint: oss-cn-shanghai.aliyuncs.com
48
-    bucketName: estateagents
49
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
50
-
51
-
1
+server:
2
+  port: 8566
3
+spring:
4
+  application:
5
+    name: estateagents
6
+  datasource:
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
10
+    driver-class-name: com.mysql.cj.jdbc.Driver
11
+    initial-size: 10 # 初始化连接数
12
+    max-active: 20 # 最大连接数
13
+    min-idle: 8 # 最小空闲数
14
+    max-idle: 8 # 最大空闲数
15
+  servlet:
16
+    multipart:
17
+      max-file-size: 10MB
18
+      max-request-size: 50MB
19
+
20
+##mybatis-plus
21
+mybatis-plus:
22
+  configuration:
23
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
24
+    call-setters-on-nulls: true
25
+  mapper-locations: classpath:mapper/*.xml
26
+wx:
27
+  miniapp:
28
+    appid: wxc56decdcbc64d8de
29
+    secret: 80864fa371a8db79e719c07df52d59d0
30
+    token:
31
+    aesKey:
32
+    msgDataFormat: JSON
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
43
+ali:
44
+  accessKeyId: LTAIkc75dpkJw8Lb
45
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
46
+  oss:
47
+    endpoint: oss-cn-shanghai.aliyuncs.com
48
+    bucketName: estateagents
49
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
50
+
51
+