root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pom文件修改

Browse Source
This commit is contained in:
ludj
2023-05-05 17:45:13 +08:00
parent 047199776d
commit eb2653f67d
4 changed files with 286 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

501
mes/hd/nladmin-system/pom.xml
View File

@@ -13,17 +13,26 @@
<name>核心模块</name> <name>核心模块</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<log4jdbc.version>1.16</log4jdbc.version>
<swagger.version>2.9.2</swagger.version>
<druid.version>1.1.22</druid.version>
<mapstruct.version>1.2.0.Final</mapstruct.version>
<sa-token.version>1.31.0</sa-token.version>
<hutool.version>5.7.14</hutool.version>
<jjwt.version>0.11.1</jjwt.version> <jjwt.version>0.11.1</jjwt.version>
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 --> <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
<jna.version>5.9.0</jna.version> <jna.version>5.8.0</jna.version>
<sa-token.version>1.31.0</sa-token.version> <configuration.version>1.9</configuration.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- https://mvnrepository.com/artifact/com.belerweb/pinyin4j --> <!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
<dependency> <dependency>
<groupId>com.belerweb</groupId> <groupId>org.jetbrains</groupId>
<artifactId>pinyin4j</artifactId> <artifactId>annotations</artifactId>
<version>2.5.0</version> <version>13.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
@@ -32,14 +41,6 @@
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20131018</version>
</dependency>
<!-- 日志链路追踪 https://tlog.yomahub.com/pages/f62a84/#%E5%90%8C%E6%AD%A5%E6%97%A5%E5%BF%97--> <!-- 日志链路追踪 https://tlog.yomahub.com/pages/f62a84/#%E5%90%8C%E6%AD%A5%E6%97%A5%E5%BF%97-->
<dependency> <dependency>
<groupId>com.yomahub</groupId> <groupId>com.yomahub</groupId>
@@ -47,6 +48,25 @@
<version>1.5.0</version> <version>1.5.0</version>
</dependency> </dependency>
<!-- elasticsearch-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
<version>2.7.5</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>6.1.4</version>
</dependency>
<!-- logback appender日志-->
<dependency>
<groupId>com.internetitem</groupId>
<artifactId>logback-elasticsearch-appender</artifactId>
<version>1.6</version>
</dependency>
<!-- https://onew.me/logback/2018/09/17/logback_win.html--> <!-- https://onew.me/logback/2018/09/17/logback_win.html-->
<dependency> <dependency>
@@ -54,49 +74,17 @@
<artifactId>jansi</artifactId> <artifactId>jansi</artifactId>
<version>1.9</version> <version>1.9</version>
</dependency> </dependency>
<!--redisson-->
<!--工具包-->
<dependency> <dependency>
<groupId>org.redisson</groupId> <groupId>cn.hutool</groupId>
<artifactId>redisson-spring-boot-starter</artifactId> <artifactId>hutool-all</artifactId>
<version>3.16.4</version> <version>${hutool.version}</version>
</dependency> </dependency>
<!--登录相关--> <!--Spring boot 核心 -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>${sa-token.version}</version>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-jwt</artifactId>
<version>${sa-token.version}</version>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-dao-redis</artifactId>
<version>1.31.0</version>
</dependency>
<!--httpclient-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>4.1.4</version>
</dependency>
<!--es-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
<version>2.7.5</version>
</dependency>
<dependency>
<groupId>com.internetitem</groupId>
<artifactId>logback-elasticsearch-appender</artifactId>
<version>1.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
@@ -109,60 +97,220 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!--Spring boot Web容器-->
<dependency> <dependency>
<groupId>nl.basjes.parse.useragent</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>yauaa</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>5.23</version>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>6.6</version>
</dependency> </dependency>
<!-- JetCache Redis 依赖--> <!--Spring boot 测试-->
<dependency> <dependency>
<groupId>com.alicp.jetcache</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>jetcache-starter-redis</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>2.5.14</version> <scope>test</scope>
</dependency>
<dependency>
<groupId>com.alicp.jetcache</groupId>
<artifactId>jetcache-starter-redis-lettuce</artifactId>
<version>2.5.14</version>
</dependency> </dependency>
<!-- Sa-Token 权限认证 安全框架, 在线文档：http://sa-token.dev33.cn/ -->
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>cn.dev33</groupId>
<artifactId>okhttp</artifactId> <artifactId>sa-token-spring-boot-starter</artifactId>
<version>4.8.1</version> <version>${sa-token.version}</version>
</dependency>
<!-- Sa-Token 整合 jwt -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-jwt</artifactId>
<version>${sa-token.version}</version>
</dependency> </dependency>
<!-- ip地址解析--> <!-- spring boot 缓存 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!--监控sql日志-->
<dependency>
<groupId>org.bgee.log4jdbc-log4j2</groupId>
<artifactId>log4jdbc-log4j2-jdbc4.1</artifactId>
<version>${log4jdbc.version}</version>
</dependency>
<!-- Swagger UI 相关 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.21</version>
</dependency>
<!--Mysql依赖包-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<!-- druid数据源驱动 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency> <dependency>
<groupId>net.dreamlu</groupId> <groupId>net.dreamlu</groupId>
<artifactId>mica-ip2region</artifactId> <artifactId>mica-ip2region</artifactId>
<version>2.5.6</version> <version>2.5.6</version>
</dependency> </dependency>
<!--导入excel相关-->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.lionsoul</groupId>
<artifactId>easyexcel</artifactId> <artifactId>ip2region</artifactId>
<version>2.2.6</version> <version>1.7.2</version>
</dependency>
<!--lombok插件-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-dao-redis</artifactId>
<version>1.31.0</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.0</version>
</dependency> </dependency>
<!--导出CSV相关-->
<!--mapStruct依赖-->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.mapstruct</groupId>
<artifactId>commons-csv</artifactId> <artifactId>mapstruct</artifactId>
<version>1.8</version> <version>${mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>org.mapstruct</groupId>
<artifactId>commons-io</artifactId> <artifactId>mapstruct-processor</artifactId>
<version>2.8.0</version> <version>${mapstruct.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<!-- Java图形验证码 -->
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
<version>1.6.2</version>
</dependency>
<!-- 解析客户端操作系统、浏览器信息 -->
<dependency>
<groupId>nl.basjes.parse.useragent</groupId>
<artifactId>yauaa</artifactId>
<version>5.23</version>
</dependency>
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>1.21</version>
</dependency>
<!--WQL-->
<dependency>
<groupId>com.hynnet</groupId>
<artifactId>jxl</artifactId>
<version>2.6.12.1</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
<version>1.8.0</version>
</dependency>
<!--接口限流-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!--模板引擎-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${configuration.version}</version>
</dependency>
<!-- ****************** -->
<dependency>
<groupId>com.alicp.jetcache</groupId>
<artifactId>jetcache-starter-redis</artifactId>
<version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc5</artifactId>
<version>11.2.0.4</version>
</dependency> </dependency>
@@ -173,13 +321,12 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId> <artifactId>spring-boot-starter-websocket</artifactId>
</dependency> </dependency>
<!-- jwt -->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>org.redisson</groupId>
<artifactId>jjwt-api</artifactId> <artifactId>redisson-spring-boot-starter</artifactId>
<version>${jjwt.version}</version> <version>3.16.4</version>
</dependency> </dependency>
<!-- jwt -->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId> <artifactId>jjwt-impl</artifactId>
@@ -209,141 +356,64 @@
<version>0.1.55</version> <version>0.1.55</version>
</dependency> </dependency>
<!-- 获取系统信息 --> <!--访问共享文件-->
<dependency> <dependency>
<groupId>com.github.oshi</groupId> <groupId>jcifs</groupId>
<artifactId>oshi-core</artifactId> <artifactId>jcifs</artifactId>
<version>5.0.1</version> <version>1.3.17</version>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- 导入Excel相关-->
<dependency> <dependency>
<groupId>com.hynnet</groupId> <groupId>com.alibaba</groupId>
<artifactId>jxl</artifactId> <artifactId>easyexcel</artifactId>
<version>2.6.12.1</version> <version>2.2.6</version>
</dependency> </dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
<version>1.8.0</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.14</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.30</version>
</dependency>
<!--mysql数据库驱动 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version> <version>8.0.20</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc5</artifactId>
<version>11.2.0.4</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.4.0.jre8</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>org.json</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>json</artifactId>
<version>3.4.0</version> <version>20131018</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<scope>test</scope> <!-- 特殊处理，不引入父类lib -->
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.4.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration 代码生成：ColUtil -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.9</version>
</dependency>
<!--模板引擎-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>4.0.0</version>
</dependency>
</dependencies> </dependencies>
<!-- 打包 -->
<build> <build>
<finalName>${project.artifactId}</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<!--添加自己的启动类路径！--> <version>2.2.10.RELEASE</version>
<configuration> <configuration>
<mainClass>org.nl.AppRun</mainClass> <mainClass>org.nl.AppRun</mainClass>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration> </configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<!-- 跳过单元测试 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version>
<configuration> <configuration>
<skipTests>true</skipTests> <failOnMissingWebXml>false</failOnMissingWebXml>
</configuration> <warName>${project.artifactId}</warName>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<!-- <executions>-->
<!-- <execution>-->
<!-- <goals>-->
<!-- <goal>java</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<configuration>
<classpathScope>test</classpathScope>
<!-- <mainClass>com.itheima.test.MybatisTest</mainClass>-->
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
@@ -359,7 +429,6 @@
<exclude>**/*.java</exclude> <exclude>**/*.java</exclude>
</excludes> </excludes>
</resource> </resource>
<resource> <resource>
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>
<includes> <includes>
@@ -368,36 +437,6 @@
</resource> </resource>
</resources> </resources>
<!--单元测试时引用src/main/resources下的资源文件-->
<!-- <testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
<testResource>
<directory>src/main/resources</directory>
</testResource>
</testResources>-->
</build> </build>
<!-- <repositories>
<repository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>-->
<!--<repository>
<id>nexus</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>-->
</project> </project>

4
mes/hd/nladmin-system/src/main/resources/config/application-test.yml
View File

@@ -1,9 +1,5 @@
server: server:
port: 8010 port: 8010
#配置数据源
spring:
profiles:
test
datasource: datasource:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource

28
mes/hd/nladmin-system/src/test/java/org/nl/BaseTest.java
View File

@@ -1,28 +0,0 @@
package org.nl;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.nl.modules.wql.WQLCore;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@RunWith(SpringRunner.class)
public class BaseTest {
@Before
public void init() {
WQLCore.defalutDBName = "eladmin";
WQLCore.ROOT = "org.nl";
try {
WQLCore.init();
} catch (Exception e) {
e.printStackTrace();
}
}
@After
public void after() {
System.out.println("测试结束-----------------");
}
}

22
mes/hd/pom.xml
View File

@@ -9,16 +9,26 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>开发平台</name> <name>开发平台</name>
<parent>
<artifactId>nladmin</artifactId> <properties>
<groupId>org.nl</groupId> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version>2.6</version> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</parent> <java.version>1.8</java.version>
</properties>
<modules> <modules>
<module>nladmin-system</module> <module>nladmin-system</module>
</modules> </modules>
<dependencyManagement>
<dependencies> <dependencies>
<!-- SpringBoot的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.2.10.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement>
</project> </project>