diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..1d970ef --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + {} + { + "isMigrated": true +} + + + + { + "associatedIndex": 5 +} + + + + { + "keyToString": { + "ModuleVcsDetector.initialDetectionPerformed": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.git.unshallow": "true", + "git-widget-placeholder": "main", + "last_opened_file_path": "D:/xiaotieAI/ai-manus", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.stylelint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.stylelint": "", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "SDKs", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.2", + "settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler", + "vue.rearranger.settings.migration": "true" + } +} + + + + + + + + + + 1753147269297 + + + + + + \ No newline at end of file diff --git a/chat-client/.env.development b/chat-client/.env.development index 53dfaf7..659b179 100644 --- a/chat-client/.env.development +++ b/chat-client/.env.development @@ -14,5 +14,5 @@ VUE_APP_API_BASE_URL='http://192.168.8.253:80/brichat' # VUE_APP_BASE_URL='http://192.168.0.33:80/brichat' # VUE_APP_API_BASE_URL='http://192.168.0.33:80/brichat' -VUE_APP_GITHUB_USER_NAME=test -VUE_APP_SECRET_KEY=preview \ No newline at end of file +VUE_APP_GITHUB_USER_NAME=test +VUE_APP_SECRET_KEY=preview diff --git a/chat-client/.env.production b/chat-client/.env.production index 9ee201c..a10fb89 100644 --- a/chat-client/.env.production +++ b/chat-client/.env.production @@ -2,8 +2,8 @@ # 此文件修改后需要重启项目 NODE_ENV=production # VUE_APP_BASE_URL='/vab-mock-server' -# VUE_APP_BASE_URL='http://localhost:10001' -# VUE_APP_API_BASE_URL='http://localhost:10001' +VUE_APP_BASE_URL='http://localhost:10001' +VUE_APP_API_BASE_URL='http://localhost:10001' #北京服务器 # VUE_APP_BASE_URL='http://192.168.1.211:80/brichat' # VUE_APP_API_BASE_URL='http://192.168.1.211:80/brichat' diff --git a/chat-client/library/components/VabApp/index.vue b/chat-client/library/components/VabApp/index.vue index 7838832..cd56774 100644 --- a/chat-client/library/components/VabApp/index.vue +++ b/chat-client/library/components/VabApp/index.vue @@ -1,7 +1,7 @@ diff --git a/chat-server/pom.xml b/chat-server/pom.xml index c25f522..8fd00c7 100644 --- a/chat-server/pom.xml +++ b/chat-server/pom.xml @@ -254,6 +254,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + -Xlint:unchecked + + + + org.mybatis.generator diff --git a/chat-server/src/main/java/com/bjtds/brichat/controller/PrologueController.java b/chat-server/src/main/java/com/bjtds/brichat/controller/PrologueController.java new file mode 100644 index 0000000..c7733f0 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/controller/PrologueController.java @@ -0,0 +1,51 @@ +package com.bjtds.brichat.controller; + +import com.bjtds.brichat.entity.sys.ApiKey; +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; +import com.bjtds.brichat.service.PrologueService; +import com.bjtds.brichat.util.ResultUtils; +import com.netflix.discovery.converters.Auto; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Api(tags = "开场白配置") +@RestController +@Slf4j +@CrossOrigin(value = "*",maxAge = 3600) +@RequestMapping("/prologue") +public class PrologueController { + + @Autowired + private PrologueService prologueService; + + @GetMapping("/getRemark") + public ResultUtils getRemark(@RequestParam String chatType) { + SystemRemark systemRemark = prologueService.getRemark(chatType); + return ResultUtils.success(systemRemark); + } + + @PostMapping("/saveRemark") + public ResultUtils saveRemark(@RequestBody SystemRemark remark) { + return ResultUtils.success(prologueService.saveOrUpdate(remark)); + } + + @GetMapping("/getRecommendations") + public ResultUtils getRecommendations(@RequestParam String chatType) { + List questions = prologueService.getRecommendations(chatType); + return ResultUtils.success(questions); + } + + @DeleteMapping("/deleteRecommendation") + public ResultUtils deleteRecommendation(@RequestParam Integer id) { + return ResultUtils.success(prologueService.deleteRecommendQuestionById(id)); + } + +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/entity/sys/PrologueQuestion.java b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/PrologueQuestion.java new file mode 100644 index 0000000..df1db49 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/PrologueQuestion.java @@ -0,0 +1,25 @@ +package com.bjtds.brichat.entity.sys; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PrologueQuestion { + private Integer id; + + // 聊天类型（1 表示诊断助手，2 表示通用问答...） + private String chatType; + + // 推荐问题内容 + private String questionContent; + + // 更新时间 + private LocalDateTime updatedAt; + +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/entity/sys/SystemRemark.java b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/SystemRemark.java new file mode 100644 index 0000000..d095359 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/SystemRemark.java @@ -0,0 +1,25 @@ +package com.bjtds.brichat.entity.sys; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor + +public class SystemRemark { + private Integer id; + + // 聊天类型（1 表示诊断助手，2 表示通用问答...） + private String chatType; + + // 开场白内容 + private String content; + + // 更新时间 + private LocalDateTime updatedAt; +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/PrologueMapper.java b/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/PrologueMapper.java new file mode 100644 index 0000000..bfc933c --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/PrologueMapper.java @@ -0,0 +1,19 @@ +package com.bjtds.brichat.mapper.opengauss; + +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface PrologueMapper { + + SystemRemark findByChatType(String chatType); + + Boolean updateRemark(SystemRemark remark); + + List getQuestionsbyChatType(String chatType); + + Boolean deleteQuesById(Integer id); +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/PrologueService.java b/chat-server/src/main/java/com/bjtds/brichat/service/PrologueService.java new file mode 100644 index 0000000..61ce143 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/service/PrologueService.java @@ -0,0 +1,18 @@ +package com.bjtds.brichat.service; + + +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; + +import java.util.List; + +public interface PrologueService { + + SystemRemark getRemark(String chatType); + + Boolean saveOrUpdate(SystemRemark remark); + + List getRecommendations(String chatType); + + Boolean deleteRecommendQuestionById(Integer id); +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/impl/PrologueServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/impl/PrologueServiceImpl.java new file mode 100644 index 0000000..0db08c8 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/service/impl/PrologueServiceImpl.java @@ -0,0 +1,45 @@ +package com.bjtds.brichat.service.impl; + +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; +import com.bjtds.brichat.mapper.opengauss.PrologueMapper; +import com.bjtds.brichat.service.PrologueService; +import com.netflix.discovery.converters.Auto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Slf4j +@Service +public class PrologueServiceImpl implements PrologueService { + + @Autowired + private PrologueMapper prologueMapper; + + @Override + public SystemRemark getRemark(String chatType) { + return prologueMapper.findByChatType(chatType); + } + + @Override + public Boolean saveOrUpdate(SystemRemark remark) { + SystemRemark re = new SystemRemark(); + re.setContent(remark.getContent()); + re.setChatType(remark.getChatType()); + re.setUpdatedAt(LocalDateTime.now()); + return prologueMapper.updateRemark(re); + } + + @Override + public List getRecommendations(String chatType) { + return prologueMapper.getQuestionsbyChatType(chatType); + } + + @Override + public Boolean deleteRecommendQuestionById(Integer id) { + return prologueMapper.deleteQuesById(id); + } +} diff --git a/chat-server/src/main/resources/application-beijing.yml b/chat-server/src/main/resources/application-beijing.yml index d875e11..b8f4057 100644 --- a/chat-server/src/main/resources/application-beijing.yml +++ b/chat-server/src/main/resources/application-beijing.yml @@ -48,4 +48,4 @@ dify: email: bjtds@bjtds.com # 请替换为实际的 Dify 服务邮箱，若不需要调用 server相关接口可不填 password: 123456Aa # 请替换为实际的 Dify 服务密码，若不需要调用 server相关接口可不填 dataset: - api-key: ${dify-dataset-api-key:dataset-0Hij9IwoWYbJe1vvwVh8y7DS} # 请替换为实际的知识库api-key, 若不需要调用知识库可不填 \ No newline at end of file + api-key: ${dify-dataset-api-key:dataset-zVa4uJBUem96P19o8iBtyihQ} # 请替换为实际的知识库api-key, 若不需要调用知识库可不填 \ No newline at end of file diff --git a/chat-server/src/main/resources/application.yml b/chat-server/src/main/resources/application.yml index b566f89..a48b8b5 100644 --- a/chat-server/src/main/resources/application.yml +++ b/chat-server/src/main/resources/application.yml @@ -18,7 +18,7 @@ spring: # 可选值: wuhan, beijing # 线上部署时可通过环境变量 SPRING_PROFILES_ACTIVE 覆盖 profiles: - active: wuhan + active: beijing # 文件上传配置 servlet: diff --git a/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/PrologueMapper.xml b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/PrologueMapper.xml new file mode 100644 index 0000000..ec7e8c6 --- /dev/null +++ b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/PrologueMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + update bripg.t_chat_prologue + set content= #{content} , updated_at =#{updatedAt} + where chat_type = #{chatType} + + + DELETE FROM bripg.t_chat_recommendations + WHERE id = #{id} + + + + + \ No newline at end of file diff --git a/web-server/.idea/compiler.xml b/web-server/.idea/compiler.xml index 8618d30..874bce8 100644 --- a/web-server/.idea/compiler.xml +++ b/web-server/.idea/compiler.xml @@ -18,10 +18,10 @@ \ No newline at end of file diff --git a/web-server/.idea/jarRepositories.xml b/web-server/.idea/jarRepositories.xml index 2d293f2..ec99225 100644 --- a/web-server/.idea/jarRepositories.xml +++ b/web-server/.idea/jarRepositories.xml @@ -1,6 +1,16 @@ + + + + + - + \ No newline at end of file diff --git a/web-server/common/pom.xml b/web-server/common/pom.xml index d259d50..7e67b2e 100644 --- a/web-server/common/pom.xml +++ b/web-server/common/pom.xml @@ -16,6 +16,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.8 + 1.8 + 1.8 @@ -105,6 +107,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + diff --git a/web-server/common/target/surefire-reports/TEST-com.bjtds.common.CommonTest.xml b/web-server/common/target/surefire-reports/TEST-com.bjtds.common.CommonTest.xml index 1bed613..b500c14 100644 --- a/web-server/common/target/surefire-reports/TEST-com.bjtds.common.CommonTest.xml +++ b/web-server/common/target/surefire-reports/TEST-com.bjtds.common.CommonTest.xml @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -17,46 +17,47 @@ - - - + + + - + - - + + - - + + - - + + - + - + - - - + + + + - + - - + + diff --git a/web-server/eureka-server/pom.xml b/web-server/eureka-server/pom.xml index cd32bd6..7a22762 100644 --- a/web-server/eureka-server/pom.xml +++ b/web-server/eureka-server/pom.xml @@ -18,8 +18,12 @@ 1.8 Greenwich.RELEASE bjtds + 1.8 + 1.8 + + org.springframework.boot @@ -55,6 +59,19 @@ org.springframework.boot spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + -Xlint:unchecked + + + com.spotify diff --git a/web-server/face-proc/pom.xml b/web-server/face-proc/pom.xml index 145304f..b4d6025 100644 --- a/web-server/face-proc/pom.xml +++ b/web-server/face-proc/pom.xml @@ -19,6 +19,8 @@ UTF-8 UTF-8 2.1.2.RELEASE + 1.8 + 1.8 diff --git a/web-server/infrastructure/pom.xml b/web-server/infrastructure/pom.xml index 2718bc2..13823ab 100644 --- a/web-server/infrastructure/pom.xml +++ b/web-server/infrastructure/pom.xml @@ -18,6 +18,8 @@ 1.8 Greenwich.RELEASE bjtds + 1.8 + 1.8 @@ -189,6 +191,19 @@ spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + -Xlint:unchecked + + + +