czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/es' into es_release_0.1

Browse Source 
# Conflicts:
#	src/main/java/com/sqx/modules/app/entity/UserEntity.java
#	src/main/java/com/sqx/modules/app/entity/UserInfo.java
#	src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java
#	src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
#	src/main/java/com/sqx/modules/course/entity/CourseCollect.java
#	src/main/java/com/sqx/modules/course/entity/CourseUser.java
#	src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java
#	src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
#	src/main/java/com/sqx/modules/pay/entity/CashOut.java
#	src/main/java/com/sqx/modules/pay/entity/PayDetails.java
#	src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java
#	src/main/java/com/sqx/modules/userSign/entity/UserSignRecord.java
#	src/main/resources/application-dev.yml
#	src/main/resources/application.yml
This commit is contained in:
Tankaikai
2025-01-13 10:22:04 +08:00
parent 6c45e24c77 a8f1871a48
commit f27ca3228c
80 changed files with 1426 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pom.xml
View File

@@ -245,6 +245,16 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -497,11 +507,21 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!--<dependency>-->
<!--<groupId>com.baidu.aip</groupId>-->
<!--            <artifactId>java-sdk</artifactId>-->
<!--            <version>4.11.3</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>7.14.0</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>7.14.0</version>
</dependency>
<dependency>
<groupId>org.dromara.easy-es</groupId>
<artifactId>easy-es-boot-starter</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
<build>