From 65a938ac527fa7938ed7baf486e01c6461098f65 Mon Sep 17 00:00:00 2001 From: La123123 <617330105@qq.com> Date: Thu, 23 Apr 2026 15:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E9=85=8D=E7=BD=AE=E5=BA=95?= =?UTF-8?q?=E5=B1=82=E5=9F=BA=E7=B1=BB=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LoginController.java | 7 +++-- ...BaiduConfiguration.java => ImSetting.java} | 22 +++++++-------- .../setting/domain/TranslationSetting.java | 19 +++++++++++++ .../mapper/ImBaiduConfigurationMapper.java | 7 ----- .../bx/implatform/mapper/ImSettingMapper.java | 14 ++++++++++ .../service/IImBaiduConfigurationService.java | 11 -------- .../implatform/service/IImSettingService.java | 9 +++++++ ...iceImpl.java => ImSettingServiceImpl.java} | 27 +++++++------------ .../util/BaiduTranslationUtils.java | 13 +++++---- im-web/src/components/chat/ChatBox.vue | 2 +- 10 files changed, 73 insertions(+), 58 deletions(-) rename im-platform/src/main/java/com/bx/implatform/entity/{ImBaiduConfiguration.java => ImSetting.java} (66%) create mode 100644 im-platform/src/main/java/com/bx/implatform/entity/setting/domain/TranslationSetting.java delete mode 100644 im-platform/src/main/java/com/bx/implatform/mapper/ImBaiduConfigurationMapper.java create mode 100644 im-platform/src/main/java/com/bx/implatform/mapper/ImSettingMapper.java delete mode 100644 im-platform/src/main/java/com/bx/implatform/service/IImBaiduConfigurationService.java create mode 100644 im-platform/src/main/java/com/bx/implatform/service/IImSettingService.java rename im-platform/src/main/java/com/bx/implatform/service/impl/{ImBaiduConfigurationServiceImpl.java => ImSettingServiceImpl.java} (51%) diff --git a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java index b3a6223..b1bed1f 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java @@ -7,12 +7,11 @@ import com.bx.implatform.dto.ModifyPwdDTO; import com.bx.implatform.dto.RegisterDTO; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; -import com.bx.implatform.service.IImBaiduConfigurationService; +import com.bx.implatform.service.IImSettingService; import com.bx.implatform.service.ImAgentService; import com.bx.implatform.service.UserService; import com.bx.implatform.util.BaiduTranslationUtils; import com.bx.implatform.vo.LoginVO; -import com.github.xiaoymin.knife4j.annotations.Ignore; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -28,7 +27,7 @@ public class LoginController { private final ImAgentService agentService; - private final IImBaiduConfigurationService baiduConfigurationService; + private final IImSettingService settingService; private final BaiduTranslationUtils baiduTranslationUtils; @@ -99,7 +98,7 @@ public class LoginController { BaiduTranslationUtils translator = baiduTranslationUtils; //如果代理有配置，则使用代理的百度配置 - if(ObjectUtil.isNull(baiduConfigurationService.getByToken())) { + if(ObjectUtil.isNull(settingService.getByToken())) { if (country == null || country.isEmpty()) { trans = translator.translate(str, "zh"); } else { diff --git a/im-platform/src/main/java/com/bx/implatform/entity/ImBaiduConfiguration.java b/im-platform/src/main/java/com/bx/implatform/entity/ImSetting.java similarity index 66% rename from im-platform/src/main/java/com/bx/implatform/entity/ImBaiduConfiguration.java rename to im-platform/src/main/java/com/bx/implatform/entity/ImSetting.java index 2a6874f..fbd49c7 100644 --- a/im-platform/src/main/java/com/bx/implatform/entity/ImBaiduConfiguration.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/ImSetting.java @@ -1,20 +1,20 @@ package com.bx.implatform.entity; - -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.util.Date; +import java.util.Date; /** - * 百度翻译配置对象 im_baidu_configuration + * 配置对象 im_setting * * @author Blue - * @date 2026-04-21 + * @date 2026-04-23 */ @Data -@TableName("im_baidu_configuration") -public class ImBaiduConfiguration { +@TableName("im_setting") +public class ImSetting { /** * 主键ID */ @@ -27,14 +27,14 @@ public class ImBaiduConfiguration { private String uniqueToken; /** - * appId + * 配置名称 */ - private String appId; + private String settingName; /** - * SECRET_KEY + * 配置内容 */ - private String secretKey; + private String settingValue; /** * 备注 diff --git a/im-platform/src/main/java/com/bx/implatform/entity/setting/domain/TranslationSetting.java b/im-platform/src/main/java/com/bx/implatform/entity/setting/domain/TranslationSetting.java new file mode 100644 index 0000000..33d725b --- /dev/null +++ b/im-platform/src/main/java/com/bx/implatform/entity/setting/domain/TranslationSetting.java @@ -0,0 +1,19 @@ +package com.bx.implatform.entity.setting.domain; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class TranslationSetting { + + /** + * 翻译类型 0-默认管理员配置 1-百度翻译 2-谷歌翻译 + */ + private String type = "0"; + + private String appId = ""; + + private String secretKey = ""; + +} diff --git a/im-platform/src/main/java/com/bx/implatform/mapper/ImBaiduConfigurationMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/ImBaiduConfigurationMapper.java deleted file mode 100644 index d8a2d74..0000000 --- a/im-platform/src/main/java/com/bx/implatform/mapper/ImBaiduConfigurationMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bx.implatform.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bx.implatform.entity.ImBaiduConfiguration; - -public interface ImBaiduConfigurationMapper extends BaseMapper { -} diff --git a/im-platform/src/main/java/com/bx/implatform/mapper/ImSettingMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/ImSettingMapper.java new file mode 100644 index 0000000..e544eac --- /dev/null +++ b/im-platform/src/main/java/com/bx/implatform/mapper/ImSettingMapper.java @@ -0,0 +1,14 @@ +package com.bx.implatform.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bx.implatform.entity.ImSetting; + +/** + * 配置Mapper接口 + * + * @author Blue + * @date 2026-04-23 + */ +public interface ImSettingMapper extends BaseMapper { + +} diff --git a/im-platform/src/main/java/com/bx/implatform/service/IImBaiduConfigurationService.java b/im-platform/src/main/java/com/bx/implatform/service/IImBaiduConfigurationService.java deleted file mode 100644 index bafd68f..0000000 --- a/im-platform/src/main/java/com/bx/implatform/service/IImBaiduConfigurationService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.bx.implatform.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.bx.implatform.entity.ImBaiduConfiguration; - - -public interface IImBaiduConfigurationService extends IService { - - ImBaiduConfiguration getByToken(); - -} diff --git a/im-platform/src/main/java/com/bx/implatform/service/IImSettingService.java b/im-platform/src/main/java/com/bx/implatform/service/IImSettingService.java new file mode 100644 index 0000000..1f98228 --- /dev/null +++ b/im-platform/src/main/java/com/bx/implatform/service/IImSettingService.java @@ -0,0 +1,9 @@ +package com.bx.implatform.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bx.implatform.entity.ImSetting; + +public interface IImSettingService extends IService { + + ImSetting getByToken(); +} diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/ImBaiduConfigurationServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/ImSettingServiceImpl.java similarity index 51% rename from im-platform/src/main/java/com/bx/implatform/service/impl/ImBaiduConfigurationServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/ImSettingServiceImpl.java index a89bbf6..9da6bb1 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/ImBaiduConfigurationServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/ImSettingServiceImpl.java @@ -3,29 +3,27 @@ package com.bx.implatform.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bx.implatform.entity.ImBaiduConfiguration; +import com.bx.implatform.entity.ImSetting; import com.bx.implatform.entity.User; -import com.bx.implatform.mapper.ImBaiduConfigurationMapper; +import com.bx.implatform.mapper.ImSettingMapper; import com.bx.implatform.mapper.UserMapper; -import com.bx.implatform.service.IImBaiduConfigurationService; +import com.bx.implatform.service.IImSettingService; import com.bx.implatform.session.SessionContext; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; - @Slf4j @Service @RequiredArgsConstructor -public class ImBaiduConfigurationServiceImpl extends ServiceImpl implements IImBaiduConfigurationService { +public class ImSettingServiceImpl extends ServiceImpl implements IImSettingService { + + private final ImSettingMapper baseMapper; private final UserMapper userMapper; - private final ImBaiduConfigurationMapper baiduConfigurationMapper; - @Override - public ImBaiduConfiguration getByToken() { + public ImSetting getByToken() { Long userId = SessionContext.getSession().getUserId(); if(userId == null){ return null; @@ -39,14 +37,9 @@ public class ImBaiduConfigurationServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ImBaiduConfiguration::getUniqueToken, token); - List list = baiduConfigurationMapper.selectList(queryWrapper); - - if(list == null || list.isEmpty()){ - return null; - } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ImSetting::getUniqueToken, token); - return list.get(0); + return baseMapper.selectOne(queryWrapper); } } diff --git a/im-platform/src/main/java/com/bx/implatform/util/BaiduTranslationUtils.java b/im-platform/src/main/java/com/bx/implatform/util/BaiduTranslationUtils.java index 1b26caf..8e86584 100644 --- a/im-platform/src/main/java/com/bx/implatform/util/BaiduTranslationUtils.java +++ b/im-platform/src/main/java/com/bx/implatform/util/BaiduTranslationUtils.java @@ -6,15 +6,13 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.bx.implatform.entity.ImBaiduConfiguration; -import com.bx.implatform.service.IImBaiduConfigurationService; -import com.bx.implatform.service.ImAgentService; +import com.bx.implatform.entity.ImSetting; +import com.bx.implatform.entity.setting.domain.TranslationSetting; +import com.bx.implatform.service.IImSettingService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -40,7 +38,7 @@ public class BaiduTranslationUtils { */ private static final String SECRET_KEY = "bGdLDbZgM3WMOL09_1qI"; - private final IImBaiduConfigurationService baiduConfigurationService; + private final IImSettingService settingService; /** * 翻译文本 @@ -117,7 +115,8 @@ public class BaiduTranslationUtils { public String translateByAgentConfiguration(String query, String from, String to) { try { - ImBaiduConfiguration configuration = baiduConfigurationService.getByToken(); + ImSetting setting = settingService.getByToken(); + TranslationSetting configuration = JSONUtil.toBean(setting.getSettingValue(), TranslationSetting.class); // 生成随机数 String salt = RandomUtil.randomNumbers(10); diff --git a/im-web/src/components/chat/ChatBox.vue b/im-web/src/components/chat/ChatBox.vue index 73d4124..ca83a07 100644 --- a/im-web/src/components/chat/ChatBox.vue +++ b/im-web/src/components/chat/ChatBox.vue @@ -1368,7 +1368,7 @@ export default { if (res) { // 将翻译结果替换到输入框中 chatInput.setTextContent(res); - this.$message.success("翻译成功111"); + this.$message.success("翻译成功"); } else { this.$message.error(res); }