wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: (feature/REQ-3167) 修改同步前端资源的问题

Browse Source
This commit is contained in:
李龙 2024-11-29 13:52:13 +08:00
parent 3bd46911c8
commit 6e4a26f839
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tyr-server/src/main/java/cn/axzo/tyr/server/config/exception/BizResultCode.java
View File

@ -29,7 +29,8 @@ public enum BizResultCode implements IResultCode {
PARAM_ERROR("100019", "参数错误"),
FEATURE_NAME_EXIST("100020", "菜单组件名字已经存在:{}"),
TERMINAL_EXIST("100021", "新端已经存在:{}"),
TERMINAL_NOT_FOUND("100022", "原端不存在:{}");
TERMINAL_NOT_FOUND("100022", "原端不存在:{}"),
FEATURE_CODE_OVER_LENGTH("100023", "组件code不能超过100个字符:{}");
private String errorCode;

3
tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java
View File

@ -15,6 +15,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import java.util.List;
@ -198,6 +199,8 @@ public class SaasPageElement extends BaseEntity<SaasPageElement> {
PageElementResp pageElementResp = PageElementResp.builder().build();
BeanUtils.copyProperties(this, pageElementResp);
pageElementResp.setIosRouterUrl(pageElementResp.resolveIosRouterUrl());
pageElementResp.setAndroidRouterUrl(pageElementResp.resolveAndroidRouterUrl());
List<SaasPageElement.Application> applications = this.covertToExt().getApplications();
// 把这个平铺出去，方便使用
if (CollectionUtils.isNotEmpty(applications)) {

5
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
View File

@ -94,6 +94,7 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import static cn.axzo.tyr.server.config.exception.BizResultCode.FEATURE_CODE_EXIST;
import static cn.axzo.tyr.server.config.exception.BizResultCode.FEATURE_CODE_OVER_LENGTH;
import static cn.axzo.tyr.server.config.exception.BizResultCode.FEATURE_NAME_EXIST;
import static cn.axzo.tyr.server.config.exception.BizResultCode.FEATURE_RESOURCE_NOT_FOUND;
import static cn.axzo.tyr.server.config.exception.BizResultCode.TERMINAL_EXIST;
@ -1287,6 +1288,8 @@ public class SaasFeatureResourceServiceImpl extends ServiceImpl<SaasFeatureResou
private String replaceUnicode(String newTerminalFeatureCodePrefix, String oldUniCode) {
int i = oldUniCode.indexOf(":");
return i < 0 ? newTerminalFeatureCodePrefix + ":" + oldUniCode : newTerminalFeatureCodePrefix + oldUniCode.substring(i);
String newCode = i < 0 ? newTerminalFeatureCodePrefix + ":" + oldUniCode : newTerminalFeatureCodePrefix + oldUniCode.substring(i);
Axssert.check(100 > newCode.length(), FEATURE_CODE_OVER_LENGTH, FEATURE_CODE_OVER_LENGTH.getErrorMessage(), newCode);
return newCode;
}
}