topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2026-04-21 22:34:28 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'springboot3'

Browse Source 
# Conflicts:
#	chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java
#	chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
#	chat/server/src/main/resources/mapper/ChatContextMapper.xml
#	webapp/pnpm-lock.yaml
This commit is contained in:
wua.ming
2024-12-09 12:16:57 +08:00
parent e55f43c737 b1d0cbfcff
commit 8072e0c79d
87 changed files with 237 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/tencent/supersonic/common/interceptor/LogInterceptor.java
View File

@@ -1,9 +1,10 @@
package com.tencent.supersonic.common.interceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.tencent.supersonic.common.util.TraceIdUtil;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

3
common/src/main/java/com/tencent/supersonic/common/pojo/Aggregator.java
View File

@@ -1,8 +1,7 @@
package com.tencent.supersonic.common.pojo;
import javax.validation.constraints.NotBlank;
import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import java.util.List;

3
common/src/main/java/com/tencent/supersonic/common/pojo/Order.java
View File

@@ -1,8 +1,7 @@
package com.tencent.supersonic.common.pojo;
import javax.validation.constraints.NotBlank;
import com.google.common.base.Objects;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import static com.tencent.supersonic.common.pojo.Constants.ASC_UPPER;