From 77c58572f7ac65ac0c649cc0c67f1fbc3d8ea8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 25 Jul 2025 16:42:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-526=20=E4=BA=A7=E5=93=81=E6=9C=BA?= =?UTF-8?q?=E5=9E=8B=E5=AF=BC=E5=85=A5=E5=8F=82=E6=95=B0=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProductModelController.java | 23 ++++++++++++++++--- .../admin/service/impl/AliYunTranslate.java | 2 -- .../main/resources/bootstrap-sit.properties | 15 ++++++++++++ 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 nflg-mobilebroken-admin/src/main/resources/bootstrap-sit.properties diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index cf92f9af..59b5fec2 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -680,13 +680,20 @@ public class ProductModelController extends ControllerBase{ .setModelParamsId(finalResultId) .setLanguageCode(language.getCode()) .setBatchNumber(batchNumber) - .setIndexName(translate.translateWord(dto.getIndexName(),language.getTranslateCode())) - .setName(translate.translateWord(dto.getName(),language.getTranslateCode())) - .setValue(translate.translateWord(dto.getValue(),language.getTranslateCode())) .setMain(dto.getMain()) .setCompare(dto.getCompare()) .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); + if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) { + ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); + item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode())); + item.setName(translate.translateWord(en.getName(), language.getTranslateCode())); + item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode())); + } else { + item.setIndexName(translate.translateWord(dto.getIndexName(), language.getTranslateCode())); + item.setName(translate.translateWord(dto.getName(), language.getTranslateCode())); + item.setValue(translate.translateWord(dto.getValue(), language.getTranslateCode())); + } items.add(item); }); }); @@ -731,6 +738,16 @@ public class ProductModelController extends ControllerBase{ .setCompare(dto.getCompare()) .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); + if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) { + ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); + item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode())); + item.setName(translate.translateWord(en.getName(), language.getTranslateCode())); + item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode())); + } else { + item.setIndexName(translate.translateWord(dto.getIndexName(), language.getTranslateCode())); + item.setName(translate.translateWord(dto.getName(), language.getTranslateCode())); + item.setValue(translate.translateWord(dto.getValue(), language.getTranslateCode())); + } items.add(item); }); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java index ac8a71e9..8debc6df 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java @@ -65,8 +65,6 @@ public class AliYunTranslate implements ITranslate { .setFormatType(formatType) .setSourceText(text); log.info("翻译,请求参数:{}", JSONUtil.toJsonStr(request)); - System.out.println("Key serializer: " + stringRedisTemplate.getKeySerializer()); - System.out.println("Value serializer: " + stringRedisTemplate.getValueSerializer()); String key = "translate:" + SecureUtil.md5(text) + ":" + targetLanguage; String result = stringRedisTemplate.opsForValue().get(key); if (StrUtil.isNotBlank(result)) { diff --git a/nflg-mobilebroken-admin/src/main/resources/bootstrap-sit.properties b/nflg-mobilebroken-admin/src/main/resources/bootstrap-sit.properties new file mode 100644 index 00000000..2dd2c39e --- /dev/null +++ b/nflg-mobilebroken-admin/src/main/resources/bootstrap-sit.properties @@ -0,0 +1,15 @@ +# Nacos 地址 +nacos.server-addr=${NACOS_SERVER_ADDR:192.168.0.194:8848} +#nacos.server-addr=192.168.0.194:8848 +#spring.cloud.nacos.discovery.username=nacos +#spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_ +#spring.config.activate.on-profile=dev +logging.level.com.nflg=DEBUG +logging.level.com.alibaba.cloud.nacos.config=DEBUG + +#spring.datasource.url=jdbc:mysql://112.74.186.154:13151/mobilebroken?useUnicode=true&characterEncoding=utf8mb4&tinyInt1isBit=false&useSSL=false&rewriteBatchedStatements=true&allowMultiQueries=true&serverTimezone=GMT%2B8 +#spring.datasource.username=nflg +#spring.datasource.password=Aciga@2022 +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +logging.config=classpath:logback-sit.xml \ No newline at end of file