Merge branch 'main' into chat_context

# Conflicts:
#	mallchat-common/pom.xml
#	mallchat-custom-server/pom.xml
#	mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java
This commit is contained in:
zhaoyuhang
2023-07-10 22:46:20 +08:00
81 changed files with 1870 additions and 455 deletions

View File

@@ -123,6 +123,16 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>5.3.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>