bugfix

pom.xml

@@ -177,6 +177,12 @@
 				<profiles.active>gzysd</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>3.0</id>
+			<properties>
+				<profiles.active>3.0</profiles.active>
+			</properties>
+		</profile>
 	</profiles>
 	<build>
 		<plugins>

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -716,7 +716,14 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public String codeGenerator (){
         double r = Math.random();
         int i = (int)(r*100000);
-        return String.valueOf(i);
+        String str = String.valueOf(i);
+        if(str.length()>6){
+            int need = 6-str.length();
+            for(int j=0;j<need;j++){
+                str += "0";
+            }
+        }
+        return str;
     }
 
     @Override

src/main/resources/application-3.0.yml

@@ -0,0 +1,58 @@
+server:
+  port: 8080
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+      password: DQ@0lW##kBb2+-jPZ
+      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+      driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/*.xml
+
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: 营销云
+
+  visitor:
+    code: "0501"

src/main/resources/mapper/TaPersonMapper.xml

@@ -27,17 +27,20 @@
 
     <select id="selectBuildingConsultants" resultType="java.util.HashMap">
         SELECT
-            t.person_id AS id,
-            t.name,
-            t.company,
-            t.department,
-            t.post,
-            t.tel AS phone,
-            t.avatarurl AS avatar,
-            t.photo
+            u.user_idAS id,
+            u.user_name,
+            u.org_name,
+            u.department,
+            u.position,
+            u.phone,
+            u.avatar,
+            u.photo,
+            u.description,
+
         FROM
             ta_person t
-        JOIN ta_person_building s USING (person_id)
+        JOIN ta_person_building s USING (user_id)
+        left join ta_user u on t.user_id = u.user_id
         WHERE
             s.building_id = #{buildingId}
         AND t.person_type = #{personType}