merge-4.2

.deploy/gulpfile.js

@@ -34,7 +34,7 @@ function compileJs(m) {
     .pipe(babel(BABEL_OPTIONS))
     .pipe(
       debug({
-        title: 'Compiled .js : ',
+        title: 'Compiled .js   :',
       })
     )
     .pipe(dest(`${OUT_ROOT}/assets/js`))
@@ -45,7 +45,7 @@ function compileCss(m) {
     .pipe(cleanCSS())
     .pipe(
       debug({
-        title: 'Compiled .css : ',
+        title: 'Compiled .css  :',
       })
     )
     .pipe(dest(`${OUT_ROOT}/assets/css`))
@@ -121,7 +121,7 @@ function compileHtml(m) {
     )
     .pipe(
       debug({
-        title: 'Compiled .html : ',
+        title: 'Compiled .html :',
       })
     )
     .pipe(dest(OUT_ROOT))

.eslintrc.js

@@ -85,6 +85,7 @@ module.exports = {
     UserSelector: true,
     UserShow: true,
     DateShow: true,
+    FileShow: true,
     DeleteConfirm: true,
     RbFormModal: true,
     DlgAssign: true,
@@ -135,6 +136,7 @@ module.exports = {
     $formattedCode: true,
     CodeViewport: true,
     $clipboard: true,
+    $clipboard2: true,
     $getScript: true,
     $sec2Time: true,
     $removeHtml: true,
@@ -159,5 +161,8 @@ module.exports = {
     marked: true,
     $focus2End: true,
     RecordSelectorModal: true,
+    $fetchMetaInfo: true,
+    FileRename: true,
+    $syncGet: true,
   },
 }

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.rebuild</groupId>
     <artifactId>rebuild</artifactId>
-    <version>4.1.8</version>
+    <version>4.2.0-dev</version>
     <name>rebuild</name>
     <description>Building your business-systems freely!</description>
     <url>https://getrebuild.com/</url>
@@ -343,12 +343,12 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>4.4.8</version>
+            <version>6.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
-            <version>7.15.1</version>
+            <version>7.19.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.whvcse</groupId>
@@ -358,17 +358,17 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>6.6.1</version>
+            <version>6.8.3</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.17.2</version>
+            <version>1.21.2</version>
         </dependency>
         <dependency>
             <groupId>com.hankcs</groupId>
             <artifactId>hanlp</artifactId>
-            <version>portable-1.8.4</version>
+            <version>portable-1.8.6</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
@@ -404,12 +404,12 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.5</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.3.4</version>
+            <version>4.0.3</version>
             <exclusions>
                 <exclusion>
                     <artifactId>ehcache</artifactId>
@@ -429,22 +429,22 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>5.2.5</version>
+            <version>5.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>5.2.5</version>
+            <version>5.4.1</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.2.224</version>
+            <version>2.3.232</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.aviator</groupId>
             <artifactId>aviator</artifactId>
-            <version>5.4.1</version>
+            <version>5.4.3</version>
         </dependency>
         <dependency>
             <groupId>net.coobird</groupId>
@@ -464,12 +464,12 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
-            <version>3.33.0</version>
+            <version>3.51.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
-            <version>1.5</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>eu.bitwalker</groupId>
@@ -490,17 +490,17 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
-            <version>5.8.36</version>
+            <version>5.8.40</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-jwt</artifactId>
-            <version>5.8.36</version>
+            <version>5.8.40</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.14.0</version>
+            <version>3.18.0</version>
         </dependency>
         <!-- Need JDK11+ -->
         <!--
@@ -513,7 +513,7 @@
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>
-            <version>2.4.1</version>
+            <version>2.4.2</version>
         </dependency>
         <dependency>
             <groupId>com.getui.push</groupId>
@@ -535,12 +535,12 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.16.1</version>
+            <version>2.20.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.26.2</version>
+            <version>1.28.0</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>

src/main/java/com/rebuild/api/ApiGateway.java

@@ -7,6 +7,7 @@
 
 package com.rebuild.api;
 
+import cn.devezhao.bizz.security.AccessDeniedException;
 import cn.devezhao.commons.CalendarUtils;
 import cn.devezhao.commons.EncryptUtils;
 import cn.devezhao.commons.ObjectUtils;
@@ -103,7 +104,7 @@ public void api(HttpServletRequest request, HttpServletResponse response) {
 
         if (RRL.overLimitWhenIncremented("ip:" + remoteIp)) {
             JSON error = formatFailure("Request frequency exceeded", ApiInvokeException.ERR_FREQUENCY);
-            log.error("{} : {}", requestId, error.toJSONString());
+            log.error("ReqId: {}\nReqParams: {}\nRespError: {}", requestId, request.getQueryString(), error.toJSONString());
             ServletUtils.writeJson(response, error.toJSONString());
             return;
         }
@@ -137,14 +138,21 @@ public void api(HttpServletRequest request, HttpServletResponse response) {
         } catch (RepeatedRecordsException ex) {
             errorCode = ApiInvokeException.ERR_DATASPEC;
             errorMsg = ex.getLocalizedMessage();
-            errorData40 = ((RepeatedRecordsException) ex).getRepeatedRecords();
+            errorData40 = ex.getRepeatedRecords();
+        } catch (AccessDeniedException ex) {
+            errorCode = ApiInvokeException.ERR_NOPRIV;
+            errorMsg = ex.getLocalizedMessage();
         } catch (Throwable ex) {
             errorCode = Controller.CODE_SERV_ERROR;
-            errorMsg = ThrowableUtils.getRootCause(ex).getLocalizedMessage();
-            log.error("Server Internal Error ({})", requestId, ex);
 
             String knownError = KnownExceptionConverter.convert2ErrorMsg(ex);
-            if (knownError != null) errorMsg = "Server Internal Error : " + knownError;
+            if (knownError == null) {
+                errorMsg = ThrowableUtils.getRootCause(ex).getLocalizedMessage();
+                log.error("ReqId: {}\nReqParams: {}\nRespError: {}", requestId, request.getQueryString(), errorMsg, ex);
+            } else {
+                errorMsg = knownError;
+                log.error("ReqId: {}\nReqParams: {}\nRespError: {}", requestId, request.getQueryString(), errorMsg);
+            }
 
         } finally {
             UserContextHolder.clear();
@@ -158,8 +166,9 @@ public void api(HttpServletRequest request, HttpServletResponse response) {
         } catch (Exception ignored) {
         }
 
-        log.error("{} : {}", requestId, error.toJSONString());
-        ServletUtils.writeJson(response, error.toJSONString());
+        errorMsg = error.toJSONString();
+        log.error("ReqId: {}\nReqParams: {}\nRespError: {}", requestId, request.getQueryString(), errorMsg);
+        ServletUtils.writeJson(response, errorMsg);
     }
 
     /**

src/main/java/com/rebuild/api/ApiInvokeException.java

@@ -28,6 +28,8 @@ public class ApiInvokeException extends RebuildException {
     public static final int ERR_BADPARAMS = 410;
     // 违反数据约束
     public static final int ERR_DATASPEC = 420;
+    // 权限不足
+    public static final int ERR_NOPRIV = 430;
 
     private int errorCode = Controller.CODE_ERROR;
 

src/main/java/com/rebuild/core/Application.java

@@ -76,11 +76,11 @@ public class Application implements ApplicationListener<ApplicationStartedEvent>
     /**
      * Rebuild Version
      */
-    public static final String VER = "4.1.8";
+    public static final String VER = "4.2.0-dev";
     /**
      * Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2}
      */
-    public static final int BUILD = 4010813;
+    public static final int BUILD = 4020000;
 
     static {
         // Driver for DB

src/main/java/com/rebuild/core/configuration/NavBuilder.java

@@ -30,11 +30,13 @@
 import com.rebuild.core.support.KVStorage;
 import com.rebuild.core.support.License;
 import com.rebuild.core.support.general.RecordBuilder;
+import com.rebuild.core.support.i18n.I18nUtils;
 import com.rebuild.core.support.i18n.Language;
 import com.rebuild.utils.AppUtils;
 import com.rebuild.utils.CommonsUtils;
 import com.rebuild.utils.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -88,11 +90,32 @@ public JSONArray getUserNav(ID user) {
     }
 
     /**
+     * 获取指定用户的制定导航菜单
+     *
      * @param user
      * @param useNav
      * @return
      */
     public JSONArray getUserNav(ID user, String useNav) {
+        JSONArray navs = getUserNav42(user, useNav);
+
+        // v4.2
+        for (Object item : navs) {
+            JSONArray s = ((JSONObject) item).getJSONArray("sub");
+            if (CollectionUtils.isNotEmpty(s)) {
+                s = (JSONArray) I18nUtils.replaceLP(s, "text");
+                ((JSONObject) item).put("sub", s);
+            }
+        }
+        return (JSONArray) I18nUtils.replaceLP(navs, "text");
+    }
+
+    /**
+     * @param user
+     * @param useNav
+     * @return
+     */
+    private JSONArray getUserNav42(ID user, String useNav) {
         ConfigBean config = null;
 
         if (useNav != null) {
@@ -112,12 +135,10 @@ public JSONArray getUserNav(ID user, String useNav) {
             }
         }
 
-        if (config == null) {
-            config = getLayoutOfNav(user);
-        }
+        if (config == null) config = getLayoutOfNav(user);
 
         if (config == null) {
-            JSONArray useDefault = replaceLang(NAVS_DEFAULT);
+            JSONArray useDefault = (JSONArray) JSONUtils.clone(NAVS_DEFAULT);
             ((JSONObject) useDefault.get(3)).put("sub", buildAvailableProjects(user));
             return useDefault;
         }
@@ -244,9 +265,7 @@ private JSONArray buildAvailableProjects(ID user) {
 
         // 管理员显示新建项目入口
         if (UserHelper.isAdmin(user)) {
-            JSONObject add = NAV_PROJECT__ADD.clone();
-            replaceLang(add);
-            navsOfProjects.add(add);
+            navsOfProjects.add(NAV_PROJECT__ADD.clone());
         }
         return navsOfProjects;
     }
@@ -278,7 +297,7 @@ private JSONArray buildAvailableDashboards(ID user) {
      * @param initEntity
      */
     public void addInitNavOnInstall(String[] initEntity) {
-        JSONArray initNav = replaceLang(NAVS_DEFAULT);
+        JSONArray initNav = (JSONArray) JSONUtils.clone(NAVS_DEFAULT);
 
         for (String e : initEntity) {
             EasyEntity entity = EasyMetaFactory.valueOf(e);
@@ -336,7 +355,7 @@ public List<Object[]> getAllowTopNav(ID user) {
                 if ((isAdmin && RoleService.ADMIN_ROLE.equals(d[5])) || isShareTo((String) d[1], user)) {
                     ID useDash = ID.isId(dash) ? ID.valueOf(dash) : null;
                     String useLabel = StringUtils.defaultIfBlank((String) d[4], Language.L("未命名"));
-                    allow.add(new Object[] { useNav, useDash, useLabel });
+                    allow.add(new Object[]{useNav, useDash, I18nUtils.LP(useLabel)});
                     break;
                 }
             }
@@ -512,23 +531,6 @@ static String renderNavItem(JSONObject item, String activeNav) {
         return navHtml.toString();
     }
 
-    private static JSONArray replaceLang(JSONArray items) {
-        JSONArray clone = (JSONArray) items.clone();
-        for (Object o : clone) {
-            replaceLang((JSONObject) o);
-        }
-
-        // TODO 导航条
-
-        return clone;
-    }
-
-    // TODO 目前仅处理了默认导航
-    private static void replaceLang(JSONObject item) {
-        String text = item.getString("text");
-        item.put("text", Language.L(text));
-    }
-
     /**
      * 顶部菜单
      *