rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/product' into test

This commit is contained in:
曹鹏飞 2025-07-25 16:49:20 +08:00
parent b13c88946a 77c58572f7
commit 7dfc07fbf9
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
View File

@ -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);
});
}

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java
View File

@ -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)) {

15
nflg-mobilebroken-admin/src/main/resources/bootstrap-sit.properties Normal file
View File

@ -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

9
nflg-mobilebroken-admin/src/main/resources/bootstrap.properties
View File

@ -1,10 +1,11 @@
spring.application.name=admin
spring.profiles.active=dev
server.port=8082
# 设置最大文件大小 (默认为1MB)
spring.servlet.multipart.max-file-size=100MB
# 设置所有文件总大小 (默认为10MB)
spring.servlet.multipart.max-request-size=500MB
spring.servlet.multipart.enabled=true
spring.servlet.multipart.max-file-size=1024MB
spring.servlet.multipart.max-request-size=1024MB
spring.servlet.multipart.file-size-threshold=10MB
spring.servlet.multipart.location=/tmp
#spring.config.import=classpath:application-${spring.profiles.active}.properties,nacos:
#spring.config.import=nacos:
logging.level.root=info