moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加英语2区分区，新注册的英语区默认进入2区

Browse Source
This commit is contained in:
hokli
2025-03-26 18:42:46 +08:00
parent 545693b8b2
commit d8e9a5809f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/partition/PartitionInfoService.java
View File

@@ -3,6 +3,7 @@ package com.accompany.core.service.partition;
import cn.hutool.core.collection.CollectionUtil;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.core.enumeration.PartitionEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.PartitionInfo;
import com.accompany.core.model.Users;
@@ -49,7 +50,8 @@ public class PartitionInfoService implements InitializingBean {
String zhCountry = ZhConverterUtil.toTraditional(dbCountry);*/
String dbCountry = regionNetworkSearchService.getCountry(registerIp);
String zhCountry = ZhConverterUtil.toTraditional(dbCountry);
Optional<PartitionInfo> partitionInfoOptional = partitionInfoList.stream().filter(p -> p.getCountry().contains(zhCountry))
Optional<PartitionInfo> partitionInfoOptional = partitionInfoList.stream().filter(p -> p.getCountry().contains(zhCountry)
&& p.getId() != PartitionEnum.ENGLISH.getId())
.findFirst();
if (partitionInfoOptional.isPresent()) {
return partitionInfoOptional.get().getId();
@@ -57,7 +59,8 @@ public class PartitionInfoService implements InitializingBean {
}
//根据语言
PartitionInfo partitionInfo = partitionInfoList.stream().filter(p -> p.getLanguages().equals(locale.getLanguage()))
PartitionInfo partitionInfo = partitionInfoList.stream().filter(p -> p.getLanguages().equals(locale.getLanguage())
&& p.getId() != PartitionEnum.ENGLISH.getId())
.findFirst()
.orElseGet(() -> partitionInfoList.get(0));
return partitionInfo.getId();

2
accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java
View File

@@ -11,7 +11,7 @@ public enum PartitionEnum {
ARAB(2, "Asia/Riyadh", "阿语区", "ar"),
CHINESS(4, "Asia/Hong_Kong", "中文区", "zh"),
TURKEY(8, "Europe/Istanbul", "土耳其区", "tr"),
ENGLISH2(16, "Asia/Manila", "英语区", "en"),
ENGLISH2(16, "Asia/Manila", "英语2区", "en"),
;
private final int id;