From 63d16d75a6f12e783bb36cfe526d9cb518b48823 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 30 六月 2021 17:58:52 +0800
Subject: [PATCH] 1. 新增用电量数据查询接口 2. 新增swagger2库
---
pom.xml | 125 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index ed3e0cc..ae1c2f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,15 +9,15 @@
<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>
+ <description>Uav data server</description>
<properties>
<java.version>1.8</java.version>
- <kotlin.version>1.2.71</kotlin.version>
+ <kotlin.version>1.5.0</kotlin.version>
<!-- tk.mybatis -->
<mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin>
<mapper.Mapper>tk.mybatis.mapper.common.Mapper</mapper.Mapper>
@@ -27,6 +27,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <!-- 鍘婚櫎鏃og渚濊禆 -->
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
@@ -35,10 +42,6 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
@@ -103,16 +106,66 @@
<version>1.2.12</version>
</dependency>
+ <!--澧炲姞log4j2渚濊禆鈫�-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <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/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>
</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>
@@ -152,6 +205,50 @@
</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>
@@ -160,7 +257,7 @@
<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>
--
Gitblit v1.9.3