Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.1-2019-11-21</version>
+	<version>v2.5.1</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -108,27 +108,6 @@
 			<artifactId>guava</artifactId>
 			<version>26.0-jre</version>
 		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>easyexcel</artifactId>
-			<version>2.0.4</version>
-		</dependency>
-
-		<!-- swagger2 -->
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>2.7.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.7.0</version>
-		</dependency>
-
 	</dependencies>
 
 	<profiles>
@@ -160,9 +139,9 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>demo</id>
+			<id>rc</id>
 			<properties>
-				<profiles.active>demo</profiles.active>
+				<profiles.active>rc</profiles.active>
 			</properties>
 		</profile>
 		<profile>
@@ -171,6 +150,12 @@
 				<profiles.active>nj</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>hj</id>
+			<properties>
+				<profiles.active>hj</profiles.active>
+			</properties>
+		</profile>
 		<profile>
 			<id>gzysd</id>
 			<properties>
@@ -178,9 +163,9 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>v3</id>
+			<id>jj</id>
 			<properties>
-				<profiles.active>v3</profiles.active>
+				<profiles.active>jj</profiles.active>
 			</properties>
 		</profile>
 	</profiles>
@@ -198,7 +183,7 @@
 				<includes>
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
-					<include>mapper/**/*.xml</include>
+					<include>mapper/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

src/main/resources/application-gzysd.yml

@@ -1,74 +1,52 @@
-server:
-  port: 8009
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_17?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
-wx:
-  miniapp:
-    appid: wxe3b1e683853800b5
-    secret: 207dd6d0f807b2dd0d41b57a8184365f
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
-      keywords: 6
-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: AI智慧案场
-
-  visitor:
-    code: "0501"
+server:
+  port: 8009
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_gzysd?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
+wx:
+  miniapp:
+    appid: wxe3b1e683853800b5
+    secret: 207dd6d0f807b2dd0d41b57a8184365f
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: IVWM-wpzSNV6CyXeSBGBgRku2lRrZ-3x4vXRILQpHM0
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
+
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+

src/main/resources/application-hj.yml

@@ -0,0 +1,52 @@
+server:
+  port: 8011
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_hj?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
+wx:
+  miniapp:
+    appid: wx03aca9d7d9b0b7f1
+    secret: f85aa21010204969b0f9a16f81de8a4b
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: Dflyeuyy76tCpam6OfVMblBaiog9fBt4NGAxbLPQ6AI
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: BDrgtJK9zul0gtHhHwY31x7kDH8BWGJxKvkj1wPzB4E
+
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+

src/main/resources/application-jj.yml

@@ -0,0 +1,52 @@
+server:
+  port: 8013
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_jj?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
+wx:
+  miniapp:
+    appid: wx7183d7d918a426d3
+    secret: d06320d36d0b706f981da20b796c5875
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: 80jdxzuPITEffVNC1KD1IGvbOxGkipTJlrxPosQrz0s
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: UbuzqEqULHf_NAZHay_3RJPGHm1g11YYU2R66ASq5Uw
+
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+

src/main/resources/application-demo.yml → src/main/resources/application-rc.yml

@@ -25,20 +25,20 @@ mybatis-plus:
   mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
-    appid: wx65d61e127ed35d5e
-    secret: dca3f2974f59e975e3ee45c6237b0ca2
+    appid: wxe9e01aa4a3568f52
+    secret: f1d70000e55f221976b95a43084042b0
     token:
     aesKey:
     msgDataFormat: JSON
   tpls:
     - name: notice
-      id: dRIuc5iYqjot_zuxRDeeR8Qaf0DUrwu0Da5fYUewf9k
+      id: FikibBOSwA_v0Ud80o9t_06kAUjn5TRd60
       keywords: 4
     - name: newCustomer
       id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
       keywords: 4
     - name: mainbiz
-      id: wGFoATwbhXh1FS9XqRq8nag4VfBxTpc6WiKIh0uUadQ
+      id: 8b0kuLCKzPeu1MUBfpLT9DhysqMl2LSWNYqluycvGm8
       keywords: 6
 ali:
   accessKeyId: LTAIkc75dpkJw8Lb