5 rokov pred · e86c2f0125
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -11,7 +11,7 @@
 
				     <artifactId>common</artifactId>
			
 
				     <name>common</name>
			
 
				     <description>智慧小区公共库</description>
			
 
				-    <packaging>pom</packaging>
			
 
				+    <packaging>jar</packaging>
			
 
				     <properties>
			
 
				         <swagger2.version>2.7.0</swagger2.version>
			
 
				         <jwts.version>0.10.5</jwts.version>
			
--- a/common/src/main/resources/mapper/base/AlarmInfo.xml
+++ b/common/src/main/resources/mapper/base/AlarmInfo.xml
--- a/common/src/main/resources/mapper/base/CompanyInfo.xml
+++ b/common/src/main/resources/mapper/base/CompanyInfo.xml
--- a/common/src/main/resources/mapper/base/CompanyPosition.xml
+++ b/common/src/main/resources/mapper/base/CompanyPosition.xml
--- a/common/src/main/resources/mapper/base/DeviceInfo.xml
+++ b/common/src/main/resources/mapper/base/DeviceInfo.xml
--- a/common/src/main/resources/mapper/base/ElectricClientInfo.xml
+++ b/common/src/main/resources/mapper/base/ElectricClientInfo.xml
--- a/common/src/main/resources/mapper/base/ElectricMeterInfo.xml
+++ b/common/src/main/resources/mapper/base/ElectricMeterInfo.xml
--- a/common/src/main/resources/mapper/base/EmployeeInfo.xml
+++ b/common/src/main/resources/mapper/base/EmployeeInfo.xml
--- a/common/src/main/resources/mapper/base/InformationInfo.xml
+++ b/common/src/main/resources/mapper/base/InformationInfo.xml
--- a/common/src/main/resources/mapper/base/OwnerInfo.xml
+++ b/common/src/main/resources/mapper/base/OwnerInfo.xml
--- a/common/src/main/resources/mapper/base/ParkingApply.xml
+++ b/common/src/main/resources/mapper/base/ParkingApply.xml
--- a/common/src/main/resources/mapper/base/ParkingInfo.xml
+++ b/common/src/main/resources/mapper/base/ParkingInfo.xml
--- a/common/src/main/resources/mapper/base/PersonDeviceRelation.xml
+++ b/common/src/main/resources/mapper/base/PersonDeviceRelation.xml
--- a/common/src/main/resources/mapper/base/PersonInfo.xml
+++ b/common/src/main/resources/mapper/base/PersonInfo.xml
--- a/common/src/main/resources/mapper/base/RechargeRecord.xml
+++ b/common/src/main/resources/mapper/base/RechargeRecord.xml
--- a/common/src/main/resources/mapper/base/RechargeRecordWater.xml
+++ b/common/src/main/resources/mapper/base/RechargeRecordWater.xml
--- a/common/src/main/resources/mapper/base/RoomInfo.xml
+++ b/common/src/main/resources/mapper/base/RoomInfo.xml
--- a/common/src/main/resources/mapper/base/TerminalInfo.xml
+++ b/common/src/main/resources/mapper/base/TerminalInfo.xml
--- a/common/src/main/resources/mapper/sys/DataDictionary.xml
+++ b/common/src/main/resources/mapper/sys/DataDictionary.xml
--- a/common/src/main/resources/mapper/sys/Menu.xml
+++ b/common/src/main/resources/mapper/sys/Menu.xml
--- a/common/src/main/resources/mapper/sys/Permission.xml
+++ b/common/src/main/resources/mapper/sys/Permission.xml
--- a/common/src/main/resources/mapper/sys/Role.xml
+++ b/common/src/main/resources/mapper/sys/Role.xml
--- a/common/src/main/resources/mapper/sys/RoleMenu.xml
+++ b/common/src/main/resources/mapper/sys/RoleMenu.xml
--- a/common/src/main/resources/mapper/sys/RolePermission.xml
+++ b/common/src/main/resources/mapper/sys/RolePermission.xml
--- a/common/src/main/resources/mapper/sys/User.xml
+++ b/common/src/main/resources/mapper/sys/User.xml
--- a/common/src/main/resources/mapper/sys/UserRole.xml
+++ b/common/src/main/resources/mapper/sys/UserRole.xml
--- a/common/src/main/resources/mapper/wechat/ReplyMessage.xml
+++ b/common/src/main/resources/mapper/wechat/ReplyMessage.xml
--- a/common/src/main/resources/mapper/wechat/accessControl.xml
+++ b/common/src/main/resources/mapper/wechat/accessControl.xml
--- a/web/src/main/resources/application-dev.yml
+++ b/web/src/main/resources/application-dev.yml
@@ -5,9 +5,9 @@ server:
 
				 
			
 
				 spring:
			
 
				   datasource:
			
 
				-    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
			
 
				+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
			
 
				     username: root
			
 
				-    password: root
			
 
				+    password: jpsoft2016
			
 
				   devtools:
			
 
				     add-properties: false
			
 
				     restart:
			
--- a/web/src/main/resources/application.yml
+++ b/web/src/main/resources/application.yml
@@ -86,7 +86,7 @@ jwt:
 
				 
			
 
				 mybatis:
			
 
				   typeAliasesPackage: com.jpsoft.smart.**.entity
			
 
				-  mapperLocations: classpath:mapper/**/*.xml
			
 
				+  mapperLocations: classpath*:mapper/**/*.xml
			
 
				   configuration:
			
 
				     default-statement-timeout: 60