getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2024-09-20 15:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

code style

Browse source
This commit is contained in:
RB 2022-05-13 11:05:59 +08:00
parent b4a005277d
commit 09af5893c6
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
@rbv

@ -1 +1 @@
Subproject commit ab1d26ce623c3f437cbf8094848ffe1914e783a4
Subproject commit e7246dd43c4cd8c8c163b5204dbf04cddb0b7f74

22
src/main/java/com/rebuild/core/configuration/NavBuilder.java
View file

@ -105,9 +105,13 @@ public class NavBuilder extends NavManager {
nav.put("sub", buildAvailableProjects(user));
}
}
PTOKEN_IFNEED.remove();
return navs;
}
private static final ThreadLocal<String> PTOKEN_IFNEED = new ThreadLocal<>();
/**
* 是否需要过滤掉
*
@ -138,14 +142,14 @@ public class NavBuilder extends NavManager {
// https://getrebuild.com/docs/rbv/openapi/page-token-verify
if (value.contains("$RBTOKEN$") || value.contains("%24RBTOKEN%24")) {
String rbtoken = RBTOKEN.get();
if (rbtoken == null) {
rbtoken = PageTokenVerify.generate(UserContextHolder.getUser());
RBTOKEN.set(rbtoken);
String ptoken = PTOKEN_IFNEED.get();
if (ptoken == null) {
ptoken = PageTokenVerify.generate(UserContextHolder.getUser());
PTOKEN_IFNEED.set(ptoken);
}
if (value.contains("$RBTOKEN$")) value = value.replace("$RBTOKEN$", rbtoken);
else value = value.replace("%24RBTOKEN%24", rbtoken);
if (value.contains("$RBTOKEN$")) value = value.replace("$RBTOKEN$", ptoken);
else value = value.replace("%24RBTOKEN%24", ptoken);
item.put("value", value);
}
@ -256,8 +260,6 @@ public class NavBuilder extends NavManager {
return navsHtml.toString();
}
private static final ThreadLocal<String> RBTOKEN = new ThreadLocal<>();
/**
* 渲染导航菜單
*
@ -357,16 +359,18 @@ public class NavBuilder extends NavManager {
if (activeNav.startsWith("nav_entity-") || activeNav.startsWith("nav_project-")) {
Element navParent = nav.parent();
if (navParent != null && navParent.hasClass("sub-menu-ul")) {
//noinspection ConstantConditions
navParent.parent().parent().parent().parent().addClass("open active");
}
}
}
//noinspection ConstantConditions
return navBody.selectFirst("li").outerHtml();
}
return navHtml.toString();
}
// FIXME 目前仅处理了默认导航
// TODO 目前仅处理了默认导航
private static JSONArray replaceLang(JSONArray resource) {
JSONArray clone = (JSONArray) resource.clone();

2
src/main/java/com/rebuild/web/RebuildWebInterceptor.java
View file

@ -288,7 +288,7 @@ public class RebuildWebInterceptor implements AsyncHandlerInterceptor, InstallSt
private void checkSafeUse(String ipAddr, String requestUri) throws DefinedException {
if (!License.isRbvAttached()) return;
if (ipAddr.equals("localhost") || ipAddr.equals("127.0.0.1")) {
if ("localhost".equals(ipAddr) || "127.0.0.1".equals(ipAddr)) {
log.warn("Allow localhost/127.0.0.1 use : {}", requestUri);
return;
}

1
src/main/resources/web/assets/css/rb-page.css
View file

@ -886,6 +886,7 @@ select.form-control:not([disabled]) {
.form-layout > .row .form-group.col-sm-4 {
padding-right: 0;
}
.form-layout > .row .form-group.col-sm-3 > .col-form-label,
.form-layout > .row .form-group.col-sm-4 > .col-form-label {
width: 110px;