胡轶钦 5 년 전
부모
커밋
91d56c6823

+ 2
- 2
pom.xml 파일 보기

178
 			</properties>
178
 			</properties>
179
 		</profile>
179
 		</profile>
180
 		<profile>
180
 		<profile>
181
-			<id>3.0</id>
181
+			<id>v3</id>
182
 			<properties>
182
 			<properties>
183
-				<profiles.active>3.0</profiles.active>
183
+				<profiles.active>v3</profiles.active>
184
 			</properties>
184
 			</properties>
185
 		</profile>
185
 		</profile>
186
 	</profiles>
186
 	</profiles>

+ 0
- 51
src/main/java/com/huiju/estateagents/config/WxProperties.java 파일 보기

1
-package com.huiju.estateagents.config;
2
-
3
-import lombok.Data;
4
-import org.springframework.boot.context.properties.ConfigurationProperties;
5
-import org.springframework.context.annotation.Bean;
6
-
7
-import java.util.List;
8
-
9
-@Data
10
-@ConfigurationProperties(prefix = "wx")
11
-public class WxProperties {
12
-    private Miniapp  miniapp;
13
-    private List<Tpl> tpls;
14
-
15
-    @Data
16
-    public static class Miniapp {
17
-
18
-        /**
19
-         * 设置微信小程序的appid
20
-         */
21
-        private String appid;
22
-
23
-        /**
24
-         * 设置微信小程序的Secret
25
-         */
26
-        private String secret;
27
-
28
-        /**
29
-         * 设置微信小程序消息服务器配置的token
30
-         */
31
-        private String token;
32
-
33
-        /**
34
-         * 设置微信小程序消息服务器配置的EncodingAESKey
35
-         */
36
-        private String aesKey;
37
-
38
-        /**
39
-         * 消息格式,XML或者JSON
40
-         */
41
-        private String msgDataFormat;
42
-
43
-    }
44
-
45
-    @Data
46
-    public static class Tpl {
47
-        private String name;
48
-        private String id;
49
-        private Integer keywords;
50
-    }
51
-}

+ 0
- 2
src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java 파일 보기

6
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.common.*;
8
 import com.huiju.estateagents.common.*;
9
-import com.huiju.estateagents.config.WxProperties;
10
 import com.huiju.estateagents.entity.TaMiniapp;
9
 import com.huiju.estateagents.entity.TaMiniapp;
11
 import com.huiju.estateagents.entity.TaMiniappQrcode;
10
 import com.huiju.estateagents.entity.TaMiniappQrcode;
12
 import com.huiju.estateagents.entity.TaMiniappTemplate;
11
 import com.huiju.estateagents.entity.TaMiniappTemplate;
19
 import com.huiju.estateagents.service.ITaMiniFormidsService;
18
 import com.huiju.estateagents.service.ITaMiniFormidsService;
20
 import lombok.extern.slf4j.Slf4j;
19
 import lombok.extern.slf4j.Slf4j;
21
 import me.chanjar.weixin.common.error.WxErrorException;
20
 import me.chanjar.weixin.common.error.WxErrorException;
22
-import org.checkerframework.checker.units.qual.A;
23
 import org.springframework.beans.factory.annotation.Autowired;
21
 import org.springframework.beans.factory.annotation.Autowired;
24
 import org.springframework.stereotype.Service;
22
 import org.springframework.stereotype.Service;
25
 
23
 

src/main/resources/application-3.0.yml → src/main/resources/application-v3.yml 파일 보기


+ 2
- 2
src/main/resources/mapper/TaPersonMapper.xml 파일 보기

27
 
27
 
28
     <select id="selectBuildingConsultants" resultType="java.util.HashMap">
28
     <select id="selectBuildingConsultants" resultType="java.util.HashMap">
29
         SELECT
29
         SELECT
30
-            u.user_idAS id,
30
+            u.user_id AS id,
31
             u.user_name,
31
             u.user_name,
32
             u.org_name,
32
             u.org_name,
33
             u.department,
33
             u.department,
35
             u.phone,
35
             u.phone,
36
             u.avatar,
36
             u.avatar,
37
             u.photo,
37
             u.photo,
38
-            u.description,
38
+            u.description
39
 
39
 
40
         FROM
40
         FROM
41
             ta_person t
41
             ta_person t