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

Merge branch 'prod/20260407' into test

This commit is contained in:
曹鹏飞 2026-04-13 11:28:27 +08:00
parent d39d05be51 5a1e9a1dda
commit e31e8f9790
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -836,19 +836,19 @@ public class TicketController extends ControllerBase {
if (StrUtil.equals(m.getFrom(), "call")) {
if (StrUtil.equals(m.getContent(), "发起了视频通话")) {
if (StrUtil.equals(m.getSenderFrom(), Constant.FROM_ADMIN) && Objects.equals(m.getSenderId(), userId)) {
m.setContent(aliYunTranslate.translateWord("您" + m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord("您" + m.getContent(), aliyunCode).toLowerCase());
} else {
m.setContent(m.getSenderName() + aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(m.getSenderName() + aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
} else {
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
} else {
if (m.isWithdrawn()) {
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
if (Objects.nonNull(m.getQuote()) && m.getQuote().isWithdrawn()) {
m.getQuote().setContent(aliYunTranslate.translateWord(m.getQuote().getContent(), aliyunCode));
m.getQuote().setContent(aliYunTranslate.translateWord(m.getQuote().getContent(), aliyunCode).toLowerCase());
}
}
});

10
nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
View File

@ -418,19 +418,19 @@ public class TicketController extends ControllerBase {
if (StrUtil.equals(m.getFrom(), "call")) {
if (StrUtil.equals(m.getContent(), "发起了视频通话")) {
if (StrUtil.equals(m.getSenderFrom(), Constant.FROM_APP) && Objects.equals(m.getSenderId(), userId)) {
m.setContent(aliYunTranslate.translateWord("您" + m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord("您" + m.getContent(), aliyunCode).toLowerCase());
} else {
m.setContent(m.getSenderName() + aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(m.getSenderName() + aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
} else {
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
} else {
if (m.isWithdrawn()) {
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
if (Objects.nonNull(m.getQuote()) && m.getQuote().isWithdrawn()) {
m.getQuote().setContent(aliYunTranslate.translateWord(m.getQuote().getContent(), aliyunCode));
m.getQuote().setContent(aliYunTranslate.translateWord(m.getQuote().getContent(), aliyunCode).toLowerCase());
}
}
});

10
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java
View File

@ -837,19 +837,19 @@ public class TicketController extends ControllerBase {
if (StrUtil.equals(m.getFrom(), "call")) {
if (StrUtil.equals(m.getContent(), "发起了视频通话")) {
if (StrUtil.equals(m.getSenderFrom(), Constant.FROM_ADMIN) && Objects.equals(m.getSenderId(), userId)) {
m.setContent(aliYunTranslate.translateWord("您" + m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord("您" + m.getContent(), aliyunCode).toLowerCase());
} else {
m.setContent(m.getSenderName() + aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(m.getSenderName() + aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
} else {
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
} else {
if (m.isWithdrawn()) {
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode));
m.setContent(aliYunTranslate.translateWord(m.getContent(), aliyunCode).toLowerCase());
}
if (Objects.nonNull(m.getQuote()) && m.getQuote().isWithdrawn()) {
m.getQuote().setContent(aliYunTranslate.translateWord(m.getQuote().getContent(), aliyunCode));
m.getQuote().setContent(aliYunTranslate.translateWord(m.getQuote().getContent(), aliyunCode).toLowerCase());
}
}
});

1
nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/interceptor/LanguageInterceptor.java
View File

@ -20,7 +20,6 @@ public class LanguageInterceptor implements HandlerInterceptor {
String language = request.getHeader(Constant.HEADER_LANGUAGE);
if (StrUtil.isNotBlank(language)) {
MultilingualUtil.setLanguage(language);
StpUtil.getTokenSession().set(Constant.HEADER_LANGUAGE, language);
}
return true;
}