diff --git a/@rbv b/@rbv index 951a8f0c45..e2802498e7 160000 --- a/@rbv +++ b/@rbv @@ -1 +1 @@ -Subproject commit 951a8f0c45c39f65e3f7356e0807e70d2ba9451f +Subproject commit e2802498e73305c30663775a6bfa5bd195e84017 diff --git a/src/main/java/com/rebuild/api/ApiGateway.java b/src/main/java/com/rebuild/api/ApiGateway.java index ebdf354898..9336382789 100644 --- a/src/main/java/com/rebuild/api/ApiGateway.java +++ b/src/main/java/com/rebuild/api/ApiGateway.java @@ -202,27 +202,27 @@ protected ApiContext verfiy(HttpServletRequest request, ApiContext base, @Suppre throw new ApiInvokeException(ApiInvokeException.ERR_BADAUTH, "Invalid [timestamp] : " + timestamp); } - StringBuilder sign2 = new StringBuilder(); + StringBuilder sb = new StringBuilder(); for (Map.Entry e : sortedMap.entrySet()) { - sign2.append(e.getKey()) + sb.append(e.getKey()) .append('=') .append(e.getValue()) .append('&'); } - sign2.append(appid) + sb.append(appid) .append('.') .append(apiConfig.getString("appSecret")); - String sign2sign; + String signCheck; if ("MD5".equals(signType)) { - sign2sign = EncryptUtils.toMD5Hex(sign2.toString()); + signCheck = EncryptUtils.toMD5Hex(sb.toString()); } else if ("SHA1".equals(signType)) { - sign2sign = EncryptUtils.toSHA1Hex(sign2.toString()); + signCheck = EncryptUtils.toSHA1Hex(sb.toString()); } else { throw new ApiInvokeException(ApiInvokeException.ERR_BADAUTH, "Invalid [sign_type] : " + signType); } - if (!sign.equals(sign2sign)) { + if (!sign.equals(signCheck)) { throw new ApiInvokeException(ApiInvokeException.ERR_BADAUTH, "Invalid [sign] : " + sign); } } diff --git a/src/main/java/com/rebuild/core/privileges/PrivilegesGuardInterceptor.java b/src/main/java/com/rebuild/core/privileges/PrivilegesGuardInterceptor.java index edc0e673fb..4f6abb537a 100644 --- a/src/main/java/com/rebuild/core/privileges/PrivilegesGuardInterceptor.java +++ b/src/main/java/com/rebuild/core/privileges/PrivilegesGuardInterceptor.java @@ -52,9 +52,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable { @Override public void checkGuard(Object object) throws SecurityException { final MethodInvocation invocation = (MethodInvocation) object; - if (!isGuardMethod(invocation)) { - return; - } + if (!isGuardMethod(invocation)) return; final ID caller = UserContextHolder.getUser(); if (Application.devMode()) log.info("User [ {} ] call : {}", caller, invocation.getMethod()); @@ -67,9 +65,7 @@ public void checkGuard(Object object) throws SecurityException { } // 仅 EntityService 或子类会验证角色权限 - if (!EntityService.class.isAssignableFrom(invocationClass)) { - return; - } + if (!EntityService.class.isAssignableFrom(invocationClass)) return; boolean isBulk = invocation.getMethod().getName().startsWith("bulk"); if (isBulk) { @@ -221,10 +217,7 @@ private String formatHumanMessage(Permission action, Entity entity, ID target) { actionHuman = Language.L("审批"); } - if (target == null) { - return Language.L("你没有%s%s权限", actionHuman, EasyMetaFactory.getLabel(entity)); - } else { - return Language.L("你没有%s此记录的权限", actionHuman); - } + if (target == null) return Language.L("你没有%s%s权限", actionHuman, EasyMetaFactory.getLabel(entity)); + return Language.L("你没有%s此记录的权限", actionHuman); } } diff --git a/src/main/resources/web/assets/js/mdi7-icons.js b/src/main/resources/web/assets/js/mdi7-icons.js index c965c0b8a2..0527e01a98 100644 --- a/src/main/resources/web/assets/js/mdi7-icons.js +++ b/src/main/resources/web/assets/js/mdi7-icons.js @@ -6728,4 +6728,56 @@ const MDI7_ICONS_IGNORE = [ 'mdi-regex', 'mdi-page-first', 'mdi-page-last', + 'mdi-abjad-arabic', + 'mdi-apple-keyboard-control', + 'mdi-arrow-bottom-left-thin', + 'mdi-arrow-bottom-right-thin', + 'mdi-arrow-projectile', + 'mdi-brightness-3', + 'mdi-bulma', + 'mdi-call-merge', + 'mdi-call-missed', + 'mdi-cellphone-basic', + 'mdi-decimal', + 'mdi-decimal-comma', + 'mdi-decimal-comma-decrease', + 'mdi-decimal-decrease', + 'mdi-decimal-increase', + 'mdi-dots-horizontal', + 'mdi-drag-horizontal', + 'mdi-drag-horizontal-variant', + 'mdi-drag-vertical', + 'mdi-drag-vertical-variant', + 'mdi-eject-outline', + 'mdi-electric-switch', + 'mdi-electric-switch-closed', + 'mdi-epsilon', + 'mdi-exclamation', + 'mdi-goodreads', + 'mdi-loading', + 'mdi-math-integral', + 'mdi-math-norm', + 'mdi-middleware', + 'mdi-middleware-outline', + 'mdi-midi', + 'mdi-minus', + 'mdi-minus-thick', + 'mdi-oar', + 'mdi-ocarina', + 'mdi-rake', + 'mdi-record', + 'mdi-rivet', + 'mdi-window-close', + 'mdi-unfold-more-vertical', + 'mdi-train-car-flatbed', + 'mdi-tilde', + 'mdi-tilde-off', + 'mdi-texture', + 'mdi-texture-box', + 'mdi-soundbar', + 'mdi-soundcloud', + 'mdi-sign-pole', + 'mdi-plus', + 'mdi-pan-vertical', + 'mdi-music-accidental-flat', ] diff --git a/src/main/resources/web/assets/js/metadata/entity-new2.js b/src/main/resources/web/assets/js/metadata/entity-new2.js index 7e6114e76d..7f3f3b07b9 100644 --- a/src/main/resources/web/assets/js/metadata/entity-new2.js +++ b/src/main/resources/web/assets/js/metadata/entity-new2.js @@ -93,11 +93,10 @@ class EntityNew2 extends RbModalHandler { {this.state.entities && this.state.entities.map((item) => { if (item.mainEntity) return null - if (item.detailEntity && !window.__BOSSKEY) return null + if (item.detailEntity && rb.commercial < 10) return null return ( ) })} diff --git a/src/main/resources/web/common/search-icon.html b/src/main/resources/web/common/search-icon.html index e1ff57070c..f696626861 100644 --- a/src/main/resources/web/common/search-icon.html +++ b/src/main/resources/web/common/search-icon.html @@ -48,20 +48,18 @@