productDev/dmvisit.git

			@@ -11,20 +11,49 @@
			<name>dmvisit</name>
			<description></description>
			<modules>
			<module>dmvisit_admin</module>
			<module>dmvisit_service</module>
			<module>dmvisit_web</module>
			<module>openapi</module>
			<module>admin_timer</module>
			<module>meeting</module>
			<module>visits</module>
			<module>system_service</module>
			<module>system_timer</module>
			<module>system_gateway</module>
			<module>emaysms</module>
			</modules>


			<parent>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-parent</artifactId>
			<version>2.2.5.RELEASE</version>
			<version>2.3.12.RELEASE</version>
			<relativePath/>
			</parent>
			<properties>
			<java.version>1.8</java.version>
			<spring-cloud.version>Hoxton.SR12</spring-cloud.version>
			<spring-cloud-alibaba.version>2.2.7.RELEASE</spring-cloud-alibaba.version>
			<maven.compiler.source>8</maven.compiler.source>
			<maven.compiler.target>8</maven.compiler.target>
			<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
			</properties>
			<dependencyManagement>
			<dependencies>
			<!-- Spring Cloud 依赖管理 -->
			<dependency>
			<groupId>org.springframework.cloud</groupId>
			<artifactId>spring-cloud-dependencies</artifactId>
			<version>${spring-cloud.version}</version>
			<type>pom</type>
			<scope>import</scope>
			</dependency>

			<!-- Alibaba Cloud 依赖管理 -->
			<dependency>
			<groupId>com.alibaba.cloud</groupId>
			<artifactId>spring-cloud-alibaba-dependencies</artifactId>
			<version>${spring-cloud-alibaba.version}</version>
			<type>pom</type>
			<scope>import</scope>
			</dependency>
			</dependencies>
			</dependencyManagement>
			<!--
			<properties>
			<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
			<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
			@@ -38,20 +67,20 @@
			<oshi.version>5.7.0</oshi.version>
			<jna.version>5.7.0</jna.version>
			<poi.version>5.0.0</poi.version>
			<!-- jwtToken -->
			<!– jwtToken –>
			<jjwt.version>0.9.1</jjwt.version>
			<!-- hutool 工具相关-->
			<!– hutool 工具相关–>
			<hutool.version>5.5.8</hutool.version>
			<!-- 微信小程序 -->
			<!– 微信小程序 –>
			<weixin-java-miniapp.version>4.1.0</weixin-java-miniapp.version>
			<!-- 微信支付 -->
			<!– 微信支付 –>
			<weixin-java-pay.version>4.1.0</weixin-java-pay.version>
			<!-- 阿里云OSS存储 -->
			<!– 阿里云OSS存储 –>
			<aliyun-oss.version>3.8.0</aliyun-oss.version>
			</properties>

			<dependencies>
			<!-- Spring Boot -->
			<!– Spring Boot –>
			<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-web</artifactId>
			@@ -60,27 +89,32 @@
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-quartz</artifactId>
			</dependency>
			<!-- Shiro -->
			<!– Shiro –>
			<dependency>
			<groupId>org.apache.shiro</groupId>
			<artifactId>shiro-spring</artifactId>
			<version>${apache.shiro.version}</version>
			</dependency>
			<!-- MyBatis plus -->
			<dependency>
			<groupId>com.github.binarywang</groupId>
			<artifactId>weixin-java-miniapp</artifactId>
			<version>${weixin-java-miniapp.version}</version>
			</dependency>
			<!– MyBatis plus –>
			<dependency>
			<groupId>com.baomidou</groupId>
			<artifactId>mybatis-plus-boot-starter</artifactId>
			<version>${mybatis.plus.version}</version>
			</dependency>
			<!-- MyBatis分页 -->
			<!– MyBatis分页 –>
			<dependency>
			<groupId>com.github.pagehelper</groupId>
			<artifactId>pagehelper-spring-boot-starter</artifactId>
			<version>1.3.0</version>
			<!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
			<!–使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
			因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
			所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突
			-->
			–>
			<exclusions>
			<exclusion>
			<groupId>org.mybatis</groupId>
			@@ -90,14 +124,14 @@
			<groupId>org.mybatis</groupId>
			<artifactId>mybatis-spring</artifactId>
			</exclusion>
			<!-- 解决jsqlparser 依赖版本冲突-->
			<!– 解决jsqlparser 依赖版本冲突–>
			<exclusion>
			<artifactId>jsqlparser</artifactId>
			<groupId>com.github.jsqlparser</groupId>
			</exclusion>
			</exclusions>
			</dependency>
			<!-- 连接池 -->
			<!– 连接池 –>
			<dependency>
			<groupId>com.alibaba</groupId>
			<artifactId>druid</artifactId>
			@@ -109,14 +143,14 @@
			<scope>runtime</scope>
			</dependency>

			<!-- swagger -->
			<!– swagger –>
			<dependency>
			<groupId>com.github.xiaoymin</groupId>
			<artifactId>knife4j-spring-boot-starter</artifactId>
			<version>3.0.3</version>
			</dependency>

			<!-- lombok -->
			<!– lombok –>
			<dependency>
			<groupId>javax.validation</groupId>
			<artifactId>validation-api</artifactId>
			@@ -141,13 +175,13 @@
			<groupId>org.projectlombok</groupId>
			<artifactId>lombok</artifactId>
			</dependency>
			<!--google kaptcha-->
			<!–google kaptcha–>
			<dependency>
			<groupId>com.github.penggle</groupId>
			<artifactId>kaptcha</artifactId>
			<version>2.3.2</version>
			</dependency>
			<!-- 工具包 -->
			<!– 工具包 –>
			<dependency>
			<groupId>org.apache.commons</groupId>
			<artifactId>commons-lang3</artifactId>
			@@ -157,7 +191,7 @@
			<artifactId>fastjson</artifactId>
			<version>${fastjson.version}</version>
			</dependency>
			<!-- Excel导入/导出依赖包 -->
			<!– Excel导入/导出依赖包 –>
			<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi</artifactId>
			@@ -168,7 +202,7 @@
			<artifactId>poi-ooxml</artifactId>
			<version>${poi.version}</version>
			</dependency>
			<!-- 获取系统信息依赖包 -->
			<!– 获取系统信息依赖包 –>
			<dependency>
			<groupId>com.github.oshi</groupId>
			<artifactId>oshi-core</artifactId>
			@@ -184,34 +218,34 @@
			<artifactId>jna-platform</artifactId>
			<version>${jna.version}</version>
			</dependency>
			<!-- https://mvnrepository.com/artifact/com.github.yulichang/mybatis-plus-join -->
			<!– https://mvnrepository.com/artifact/com.github.yulichang/mybatis-plus-join –>
			<dependency>
			<groupId>com.github.yulichang</groupId>
			<artifactId>mybatis-plus-join</artifactId>
			<version>1.4.2.2</version>
			</dependency>

			<!--添加fileupload依赖-->
			<!–添加fileupload依赖–>
			<dependency>
			<groupId>commons-fileupload</groupId>
			<artifactId>commons-fileupload</artifactId>
			<version>1.3.3</version>
			</dependency>

			<!-- FILE转换 -->
			<!– FILE转换 –>
			<dependency>
			<groupId>org.springframework</groupId>
			<artifactId>spring-test</artifactId>
			</dependency>

			<!--jwt-->
			<!–jwt–>
			<dependency>
			<groupId>io.jsonwebtoken</groupId>
			<artifactId>jjwt</artifactId>
			<version>${jjwt.version}</version>
			</dependency>

			<!--hutool工具-->
			<!–hutool工具–>
			<dependency>
			<groupId>cn.hutool</groupId>
			<artifactId>hutool-all</artifactId>
			@@ -222,27 +256,27 @@
			<artifactId>pinyin4j</artifactId>
			<version>2.5.1</version>
			</dependency>
			<!-- <!– WeChat 小程序 –>-->
			<!-- <dependency>-->
			<!-- <groupId>com.github.binarywang</groupId>-->
			<!-- <artifactId>weixin-java-miniapp</artifactId>-->
			<!-- <version>${weixin-java-miniapp.version}</version>-->
			<!-- </dependency>-->
			<!-- <!– WeChat 支付 –>-->
			<!-- <dependency>-->
			<!-- <groupId>com.github.binarywang</groupId>-->
			<!-- <artifactId>weixin-java-pay</artifactId>-->
			<!-- <version>${weixin-java-pay.version}</version>-->
			<!-- </dependency>-->
			<!– <!– WeChat 小程序 –>–>
			<!– <dependency>–>
			<!– <groupId>com.github.binarywang</groupId>–>
			<!– <artifactId>weixin-java-miniapp</artifactId>–>
			<!– <version>${weixin-java-miniapp.version}</version>–>
			<!– </dependency>–>
			<!– <!– WeChat 支付 –>–>
			<!– <dependency>–>
			<!– <groupId>com.github.binarywang</groupId>–>
			<!– <artifactId>weixin-java-pay</artifactId>–>
			<!– <version>${weixin-java-pay.version}</version>–>
			<!– </dependency>–>

			<!-- 阿里云OSS-->
			<!– 阿里云OSS–>
			<dependency>
			<groupId>com.aliyun.oss</groupId>
			<artifactId>aliyun-sdk-oss</artifactId>
			<version>${aliyun-oss.version}</version>
			</dependency>

			<!-- aliyun sms SDK -->
			<!– aliyun sms SDK –>
			<dependency>
			<groupId>com.aliyun</groupId>
			<artifactId>aliyun-java-sdk-core</artifactId>
			@@ -254,28 +288,22 @@
			<artifactId>spring-boot-configuration-processor</artifactId>
			<optional>true</optional>
			</dependency>
			<!-- mqtt -->
			<!– mqtt –>
			<dependency>
			<groupId>org.springframework.integration</groupId>
			<artifactId>spring-integration-mqtt</artifactId>
			</dependency>
			<!-- 海康系统 -->
			<!– 海康系统 –>
			<dependency>
			<groupId>com.hikvision.ga</groupId>
			<artifactId>artemis-http-client</artifactId>
			<version>1.1.3</version>
			</dependency>
			<!--生成二维码-->
			<!–生成二维码–>
			<dependency>
			<groupId>com.google.zxing</groupId>
			<artifactId>javase</artifactId>
			<version>3.3.0</version>
			</dependency>
			<!-- 海康系统 -->
			<dependency>
			<groupId>com.hikvision.ga</groupId>
			<artifactId>artemis-http-client</artifactId>
			<version>1.1.3</version>
			</dependency>
			<dependency>
			<groupId>commons-net</groupId>
			@@ -287,14 +315,36 @@
			<artifactId>spring-boot-starter-data-redis</artifactId>
			</dependency>

			<!-- WxJava公众号 -->
			<!– WxJava公众号 –>
			<dependency>
			<groupId>com.github.binarywang</groupId>
			<artifactId>weixin-java-mp</artifactId>
			<version>3.6.0</version>
			</dependency>
			<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-dependencies</artifactId>
			<version>2.3.12.RELEASE</version>
			<type>pom</type>
			<scope>import</scope>
			</dependency>

			</dependencies>
			<dependency>
			<groupId>org.springframework.cloud</groupId>
			<artifactId>spring-cloud-dependencies</artifactId>
			<version>Hoxton.SR12</version>
			<type>pom</type>
			<scope>import</scope>
			</dependency>

			<dependency>
			<groupId>com.alibaba.cloud</groupId>
			<artifactId>spring-cloud-alibaba-dependencies</artifactId>
			<version>2.2.7.RELEASE</version>
			<type>pom</type>
			<scope>import</scope>
			</dependency>
			</dependencies>-->
			<build>
			<plugins>
			<plugin>