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

Merge branch 'feature/sanxian_acs_1213' into feature/sanxianacs1213

Browse Source 
# Conflicts:
#	wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
#	wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
#	wcs/nladmin-system/src/main/resources/config/application-dev.yml
#	wcs/nladmin-system/src/main/resources/config/application-prod.yml
#	wcs/nladmin-system/src/main/resources/config/application-test.yml
#	wcs/nladmin-system/src/main/resources/config/application.yml
#	wcs/nladmin-system/src/main/resources/logback-spring.xml
This commit is contained in:
zhangzq
2024-02-19 17:00:49 +08:00
parent 93185c9bfa 990fcb563a
commit 4afc8d43b2
23 changed files with 1139 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wcs/nladmin-system/pom.xml
View File

@@ -237,6 +237,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/transmittable-thread-local -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>2.14.2</version>
</dependency>
<!--Spring boot 测试-->
<dependency>
@@ -409,19 +415,6 @@
<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>-->
<!-- Lucence核心包 -->
<dependency>
<groupId>com.yomahub</groupId>
@@ -473,9 +466,20 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
</dependency>
</dependencies>
<!--mqtt依赖-->
<distributionManagement>
<!--正式版本-->
<repository>