fix 未配置节点白名单时直接创建分发项目报错

fix DSL 项目状态不判断 jps 命令是否正常

Author: bwcx-jzy

CHANGELOG.md

@@ -25,6 +25,8 @@
 10. 【server】优化 系统缓存页面显示当前服务器时间、时区信息
 11. 【server】修复 还原数据后备份状态错误问题
     （感谢 [@lin_yeqi](https://gitee.com/lin_yeqi) [Gitee issues I6MVL7](https://gitee.com/dromara/Jpom/issues/I6MVL7) ）
+12. 【agent】修复 DSL 项目状态不判断 jps 命令是否正常（感谢@大灰灰）
+13. 【agent】修复 未配置节点白名单时直接创建分发项目报错（感谢@波比）
 
 ### ❌ 不兼容功能
 

modules/agent/src/main/java/io/jpom/common/commander/AbstractProjectCommander.java

@@ -740,7 +740,12 @@ public int getPid(NodeProjectInfoModel nodeProjectInfoModel, NodeProjectInfoMode
         if (parsePid > 0) {
             PID_JPOM_NAME.put(parsePid, nodeProjectInfoModel.getName());
         } else {
-            Assert.state(JvmUtil.jpsNormal, JvmUtil.JPS_ERROR_MSG);
+            //
+            RunMode runMode = nodeProjectInfoModel.getRunMode();
+            if (runMode != RunMode.Dsl && runMode != RunMode.File) {
+                // 只有 java 项目才判断 jps
+                Assert.state(JvmUtil.jpsNormal, JvmUtil.JPS_ERROR_MSG);
+            }
         }
         return parsePid;
     }

modules/agent/src/main/java/io/jpom/common/interceptor/DecryptionFilter.java

@@ -23,6 +23,7 @@
 package io.jpom.common.interceptor;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.ContentType;
 import io.jpom.encrypt.EncryptFactory;
@@ -64,11 +65,11 @@ public void doFilter(ServletRequest servletRequest, ServletResponse response, Fi
         }
         log.debug("当前请求需要解密：{}", encryptor.name());
         String contentType = request.getContentType();
-        if (ContentType.isFormUrlEncode(contentType)) {
+        if (ContentType.isDefault(contentType)) {
             // 普通表单
             HttpServletRequestWrapper wrapper = new ParameterRequestWrapper(request, encryptor);
             chain.doFilter(wrapper, response);
-        } else if (contentType.contains(MediaType.APPLICATION_JSON_VALUE)) {
+        } else if (StrUtil.startWithIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE)) {
             String body = ServletUtil.getBody(request);
             String temp;
             try {
@@ -84,6 +85,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse response, Fi
             HttpServletRequestWrapper wrapper = new MultipartRequestWrapper(request, encryptor);
             chain.doFilter(wrapper, response);
         } else {
+            log.warn("当前请求类型不支持加密：{}", contentType);
             chain.doFilter(servletRequest, response);
         }
     }

modules/agent/src/main/java/io/jpom/service/WhitelistDirectoryService.java

@@ -23,13 +23,16 @@
 package io.jpom.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import io.jpom.common.AgentConst;
 import io.jpom.model.data.AgentWhitelist;
 import io.jpom.util.JsonFileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,11 +70,16 @@ public AgentWhitelist getWhitelist() {
      * @param item 白名单
      */
     public void addProjectWhiteList(String item) {
-        List<String> checkOk = AgentWhitelist.covertToArray(CollUtil.newArrayList(item), "项目路径白名单不能位于Jpom目录下");
+        ArrayList<String> list = CollUtil.newArrayList(item);
+        List<String> checkOk = AgentWhitelist.covertToArray(list, "项目路径白名单不能位于Jpom目录下");
 
         AgentWhitelist agentWhitelist = getWhitelist();
         List<String> project = agentWhitelist.getProject();
-        project = CollUtil.addAll(project, checkOk).stream().distinct().collect(Collectors.toList());
+        project = ObjectUtil.defaultIfNull(project, Collections.emptyList());
+        project = CollUtil.addAll(project, checkOk)
+            .stream()
+            .distinct()
+            .collect(Collectors.toList());
         agentWhitelist.setProject(project);
         saveWhitelistDirectory(agentWhitelist);
     }

modules/agent/src/test/java/TestStr.java

@@ -20,6 +20,8 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.PatternPool;
 import cn.hutool.core.lang.RegexPool;
@@ -92,4 +94,9 @@ public void testNum() {
     public void testTimeZone() {
         System.out.println(TimeZone.getDefault().getID());
     }
+
+    @Test
+    public void testList() {
+        System.out.println(CollUtil.addAll(null, CollUtil.newArrayList("")));
+    }
 }