From 81bd0388494d45463de42cd91bd8c33f10f0030a Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期四, 17 六月 2021 10:27:21 +0800 Subject: [PATCH] 1. 新增用电量数据的接收协议 2. 调整socket接收模块的代码结构 --- pom.xml | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 152 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 946f63e..4e9ea76 100644 --- a/pom.xml +++ b/pom.xml @@ -9,21 +9,31 @@ <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>com.flightfeather</groupId> - <artifactId>obd</artifactId> - <version>0.0.1-SNAPSHOT</version> + <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> + <!-- tk.mybatis --> + <mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin> + <mapper.Mapper>tk.mybatis.mapper.common.Mapper</mapper.Mapper> </properties> <dependencies> <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> @@ -59,36 +69,160 @@ <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> + + <!--mybatis--> + <dependency> + <groupId>org.mybatis.spring.boot</groupId> + <artifactId>mybatis-spring-boot-starter</artifactId> + <version>2.1.0</version> + </dependency> + <dependency> + <groupId>org.mybatis.generator</groupId> + <artifactId>mybatis-generator-core</artifactId> + <version>1.3.7</version> + </dependency> + + <!--tk.mybatis--> + <dependency> + <groupId>tk.mybatis</groupId> + <artifactId>mapper-spring-boot-starter</artifactId> + <version>2.1.5</version> + </dependency> + + <!--Netty--> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>4.1.39.Final</version> + </dependency> + + <!--Gson--> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.8.5</version> + </dependency> + + <!--鍒嗛〉--> + <dependency> + <groupId>com.github.pagehelper</groupId> + <artifactId>pagehelper-spring-boot-starter</artifactId> + <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> </dependencies> <build> <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory> <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory> <plugins> +<!-- <plugin>--> +<!-- <groupId>org.springframework.boot</groupId>--> +<!-- <artifactId>spring-boot-maven-plugin</artifactId>--> +<!-- </plugin>--> +<!-- <plugin>--> +<!-- <groupId>org.jetbrains.kotlin</groupId>--> +<!-- <artifactId>kotlin-maven-plugin</artifactId>--> +<!-- <configuration>--> +<!-- <args>--> +<!-- <arg>-Xjsr305=strict</arg>--> +<!-- </args>--> +<!-- <compilerPlugins>--> +<!-- <plugin>spring</plugin>--> +<!-- </compilerPlugins>--> +<!-- </configuration>--> +<!-- <dependencies>--> +<!-- <dependency>--> +<!-- <groupId>org.jetbrains.kotlin</groupId>--> +<!-- <artifactId>kotlin-maven-allopen</artifactId>--> +<!-- <version>${kotlin.version}</version>--> +<!-- </dependency>--> +<!-- </dependencies>--> +<!-- </plugin>--> + <!-- mybatis generator 鑷姩鐢熸垚浠g爜鎻掍欢 --> <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-maven-plugin</artifactId> + <groupId>org.mybatis.generator</groupId> + <artifactId>mybatis-generator-maven-plugin</artifactId> + <version>1.3.7</version> <configuration> - <args> - <arg>-Xjsr305=strict</arg> - </args> - <compilerPlugins> - <plugin>spring</plugin> - </compilerPlugins> + <configurationFile>${basedir}/src/main/resources/generator/generatorConfig.xml</configurationFile> + <overwrite>true</overwrite> + <verbose>true</verbose> </configuration> + <dependencies> + <!-- https://mvnrepository.com/artifact/tk.mybatis/mapper --> <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-maven-allopen</artifactId> - <version>${kotlin.version}</version> + <groupId>tk.mybatis</groupId> + <artifactId>mapper</artifactId> + <version>4.1.5</version> </dependency> </dependencies> </plugin> </plugins> </build> + <!--渚濊禆涓嬭浇鍦板潃--> + <repositories> + <repository> + <id>alimaven</id> + <name>aliyun maven</name> + <url>http://maven.aliyun.com/nexus/content/groups/public/</url> + </repository> + <repository> + <id>spring-snapshots</id> + <name>Spring Snapshots</name> + <url>https://repo.spring.io/snapshot</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>spring-snapshots</id> + <name>Spring Snapshots</name> + <url>https://repo.spring.io/snapshot</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </project> -- Gitblit v1.9.3