underway-spring.git

			@@ -9,15 +9,16 @@
			<relativePath/> <!-- lookup parent from repository -->
			</parent>
			<groupId>com.flightfeather</groupId>
			<artifactId>obd</artifactId>
			<artifactId>uav</artifactId>
			<version>1.0.0</version>
			<packaging>war</packaging>
			<name>obd</name>
			<description>Obd data server</description>
			<name>uav</name>
			<description>Uav data server</description>

			<properties>
			<java.version>1.8</java.version>
			<kotlin.version>1.2.71</kotlin.version>
			<kotlin.version>2.1.0</kotlin.version>
			<itext.version>7.2.2</itext.version>
			<!-- tk.mybatis -->
			<mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin>
			<mapper.Mapper>tk.mybatis.mapper.common.Mapper</mapper.Mapper>
			@@ -36,16 +37,16 @@
			</exclusions>
			</dependency>
			<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-thymeleaf</artifactId>
			</dependency>
			<dependency>
			<groupId>com.fasterxml.jackson.module</groupId>
			<artifactId>jackson-module-kotlin</artifactId>
			</dependency>
			<dependency>
			<groupId>org.jetbrains.kotlin</groupId>
			<artifactId>kotlin-reflect</artifactId>
			</dependency>
			<dependency>
			<groupId>org.jetbrains.kotlin</groupId>
			<artifactId>kotlin-stdlib-jdk8</artifactId>
			</dependency>

			<dependency>
			@@ -100,7 +101,7 @@
			<dependency>
			<groupId>com.google.code.gson</groupId>
			<artifactId>gson</artifactId>
			<version>2.8.5</version>
			<version>2.8.6</version>
			</dependency>

			<!--分页-->
			@@ -116,16 +117,193 @@
			<artifactId>spring-boot-starter-log4j2</artifactId>
			</dependency>

			<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
			<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi</artifactId>
			<version>4.1.2</version>
			</dependency>

			<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
			<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-ooxml</artifactId>
			<version>4.1.2</version>
			</dependency>


			<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
			<dependency>
			<groupId>com.alibaba</groupId>
			<artifactId>fastjson</artifactId>
			<version>1.2.75</version>
			</dependency>
			<dependency>
			<groupId>org.jetbrains.kotlin</groupId>
			<artifactId>kotlin-stdlib-jdk8</artifactId>
			<version>${kotlin.version}</version>
			</dependency>
			<dependency>
			<groupId>org.jetbrains.kotlin</groupId>
			<artifactId>kotlin-test-junit</artifactId>
			<version>${kotlin.version}</version>
			<scope>test</scope>
			</dependency>
			<!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-maven-plugin -->
			<dependency>
			<groupId>org.jetbrains.kotlin</groupId>
			<artifactId>kotlin-maven-plugin</artifactId>
			<version>${kotlin.version}</version>
			<scope>provided</scope>
			</dependency>

			<!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-maven-allopen -->
			<dependency>
			<groupId>org.jetbrains.kotlin</groupId>
			<artifactId>kotlin-maven-allopen</artifactId>
			<version>${kotlin.version}</version>
			</dependency>

			<dependency>
			<groupId>io.springfox</groupId>
			<artifactId>springfox-boot-starter</artifactId>
			<version>3.0.0</version>
			</dependency>
			<dependency>
			<groupId>org.springframework.plugin</groupId>
			<artifactId>spring-plugin-core</artifactId>
			<version>2.0.0.RELEASE</version>
			</dependency>
			<!-- <dependency>-->
			<!-- <groupId>org.springframework.plugin</groupId>-->
			<!-- <artifactId>spring-plugin-metadata</artifactId>-->
			<!-- <version>2.0.0.RELEASE</version>-->
			<!-- </dependency>-->


			<!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
			<dependency>
			<groupId>org.freemarker</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.31</version>
			</dependency>

			<!-- https://mvnrepository.com/artifact/com.itextpdf/html2pdf -->
			<dependency>
			<groupId>com.itextpdf</groupId>
			<artifactId>html2pdf</artifactId>
			<version>4.0.2</version>
			</dependency>
			<dependency>
			<groupId>com.itextpdf</groupId>
			<artifactId>font-asian</artifactId>
			<version>${itext.version}</version>
			<scope>test</scope>
			</dependency>
			<!-- 支持css样式渲染 -->
			<dependency>
			<groupId>org.xhtmlrenderer</groupId>
			<artifactId>flying-saucer-pdf-itext5</artifactId>
			<version>9.1.16</version>
			</dependency>
			<!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
			<dependency>
			<groupId>org.apache.pdfbox</groupId>
			<artifactId>pdfbox</artifactId>
			<version>2.0.26</version>
			</dependency>

			<!-- echarts-->
			<dependency>
			<groupId>org.icepear.echarts</groupId>
			<artifactId>echarts-java</artifactId>
			<version>1.0.7</version>
			</dependency>

			<!-- JFreeChart-->
			<dependency>
			<groupId>org.jfree</groupId>
			<artifactId>jfreechart</artifactId>
			<version>1.5.3</version>
			</dependency>
			<!-- Httpclient-->
			<dependency>
			<groupId>org.apache.httpcomponents</groupId>
			<artifactId>httpmime</artifactId>
			<version>4.5.14</version>
			</dependency>
			<!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
			<!-- <dependency>-->
			<!-- <groupId>javax.xml.ws</groupId>-->
			<!-- <artifactId>jaxws-api</artifactId>-->
			<!-- <version>2.3.1</version>-->
			<!-- </dependency>-->
			<!-- <!– https://mvnrepository.com/artifact/org.apache.axis2/axis2-jaxws –>-->
			<!-- <dependency>-->
			<!-- <groupId>org.apache.axis2</groupId>-->
			<!-- <artifactId>axis2-jaxws</artifactId>-->
			<!-- <version>1.8.2</version>-->
			<!-- </dependency>-->
			<!-- <!– https://mvnrepository.com/artifact/org.apache.axis2/axis2-adb –>-->
			<!-- <dependency>-->
			<!-- <groupId>org.apache.axis2</groupId>-->
			<!-- <artifactId>axis2-adb</artifactId>-->
			<!-- <version>1.8.2</version>-->
			<!-- </dependency>-->
			<!-- <!– https://mvnrepository.com/artifact/org.apache.axis2/axis2-transport-base –>-->
			<!-- <dependency>-->
			<!-- <groupId>org.apache.axis2</groupId>-->
			<!-- <artifactId>axis2-transport-base</artifactId>-->
			<!-- <version>1.8.2</version>-->
			<!-- </dependency>-->
			<!-- https://mvnrepository.com/artifact/org.apache.axis2/axis2-kernel -->
			<dependency>
			<groupId>org.apache.axis2</groupId>
			<artifactId>axis2-kernel</artifactId>
			<version>1.8.2</version>
			</dependency>
			<dependency>
			<groupId>org.apache.commons</groupId>
			<artifactId>commons-lang3</artifactId>
			<version>3.17.0</version>
			</dependency>
			<!-- <dependency>-->
			<!-- <groupId>org.docx4j</groupId>-->
			<!-- <artifactId>docx4j-core</artifactId>-->
			<!-- <version>11.4.9</version> <!– 使用最新稳定版 –>-->
			<!-- </dependency>-->
			<!-- <!– 如需处理图片/表格等高级功能，可添加 –>-->
			<!-- <dependency>-->
			<!-- <groupId>org.docx4j</groupId>-->
			<!-- <artifactId>docx4j-ImportXHTML</artifactId>-->
			<!-- <version>11.4.8</version>-->
			<!-- </dependency>-->
			<!-- <!– MockK 单元测试库（用于 Kotlin） –>-->
			<!-- <dependency>-->
			<!-- <groupId>io.mockk</groupId>-->
			<!-- <artifactId>mockk</artifactId>-->
			<!-- <version>1.14.5</version> <!– 使用最新稳定版 –>-->
			<!-- <scope>test</scope>-->
			<!-- </dependency>-->
			<!-- <dependency>-->
			<!-- <groupId>org.junit.jupiter</groupId>-->
			<!-- <artifactId>junit-jupiter</artifactId>-->
			<!-- <version>RELEASE</version>-->
			<!-- <scope>test</scope>-->
			<!-- </dependency>-->



			</dependencies>

			<build>
			<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
			<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
			<sourceDirectory>src/main/kotlin</sourceDirectory>
			<testSourceDirectory>src/test/kotlin</testSourceDirectory>
			<plugins>
			<plugin>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-maven-plugin</artifactId>
			</plugin>
			<!-- <plugin>-->
			<!-- <groupId>org.springframework.boot</groupId>-->
			<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
			<!-- </plugin>-->
			<plugin>
			<groupId>org.jetbrains.kotlin</groupId>
			<artifactId>kotlin-maven-plugin</artifactId>
			@@ -165,15 +343,83 @@
			</dependency>
			</dependencies>
			</plugin>
			<!-- <plugin>-->
			<!-- <groupId>org.jetbrains.kotlin</groupId>-->
			<!-- <artifactId>kotlin-maven-plugin</artifactId>-->
			<!-- <version>${kotlin.version}</version>-->
			<!-- <executions>-->
			<!-- <execution>-->
			<!-- <id>compile</id>-->
			<!-- <phase>compile</phase>-->
			<!-- <goals>-->
			<!-- <goal>compile</goal>-->
			<!-- </goals>-->
			<!-- </execution>-->
			<!-- <execution>-->
			<!-- <id>test-compile</id>-->
			<!-- <phase>test-compile</phase>-->
			<!-- <goals>-->
			<!-- <goal>test-compile</goal>-->
			<!-- </goals>-->
			<!-- </execution>-->
			<!-- </executions>-->
			<!-- <configuration>-->
			<!-- <jvmTarget>1.8</jvmTarget>-->
			<!-- </configuration>-->
			<!-- </plugin>-->
			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-compiler-plugin</artifactId>
			<executions>
			<execution>
			<id>compile</id>
			<phase>compile</phase>
			<goals>
			<goal>compile</goal>
			</goals>
			</execution>
			<execution>
			<id>testCompile</id>
			<phase>test-compile</phase>
			<goals>
			<goal>testCompile</goal>
			</goals>
			</execution>
			</executions>
			</plugin>
			</plugins>
			</build>

			<profiles>
			<profile>
			<id>dev</id>
			<properties>
			<profileActive>dev</profileActive>
			</properties>
			<activation>
			<activeByDefault>true</activeByDefault>
			</activation>
			</profile>
			<profile>
			<id>pro</id>
			<properties>
			<profileActive>pro</profileActive>
			</properties>
			</profile>
			<profile>
			<id>test</id>
			<properties>
			<profileActive>test</profileActive>
			</properties>
			</profile>
			</profiles>

			<!--依赖下载地址-->
			<repositories>
			<repository>
			<id>alimaven</id>
			<name>aliyun maven</name>
			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
			<url>https://maven.aliyun.com/repository/public</url>
			</repository>
			<repository>
			<id>spring-snapshots</id>