update-v3.7

airh2o · Jun 9, 2023 · 03e3c5e · 03e3c5e
1 parent a20666c
commit 03e3c5e
Show file tree

Hide file tree

Showing 9 changed files with 229 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -129,6 +129,14 @@ onleyFullSql=true
 # 版本更新
 
 ``` 
+<em>3.7 版本 更新:</em> <br>
+      <ul>
+          <li>1. 新增数据库全局搜索</li>
+          <li>2. 新增MSTSC远程桌面管理</li>
+          <li>3. 重写优化NCC的Action类和UPM的servlet搜索功能</li>
+          <li>4. 大量弹框增加IDEA侧边栏界面，方便不想要弹框的用户</li>
+      </ul>
+      
 <em>3.3 版本 更新:</em> <br>
       <ul>
           <li>1. 新增NC代码规范检查功能，可支持检查是否client private public 导包存在错误.</li>

diff --git a/idea_plugin_ncdevplugin.zip b/idea_plugin_ncdevplugin.zip
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.air.nc5dev.tool.plugin.nc5devtool</id>
     <name>Yonyou NC Dev Tool</name>
-    <version>v3.6</version>
+    <version>v3.7</version>
     <vendor email="[email protected]" url="https://gitee.com/yhlx">Air [email protected] 微信: yongyourj 欢迎私活联系</vendor>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
@@ -528,6 +528,21 @@
     ]]></description>
 
     <change-notes><![CDATA[
+    <em>3.7 版本 更新:</em> <br>
+      <ul>
+          <li>english:</li>
+            <li>1. New database global search </li>
+            <li>2. Added MSTSC Remote Desktop Management </li>
+            <li>3. Rewrite NCC's Action class and UPM's servlet search function </li>
+            <li>4. Add the IDEA sidebar interface for the convenience of users who do not want to pop-up </li>
+
+          <li>中文:</li>
+              <li>1. 新增数据库全局搜索</li>
+              <li>2. 新增MSTSC远程桌面管理</li>
+              <li>3. 重写优化NCC的Action类和UPM的servlet搜索功能</li>
+              <li>4. 大量弹框增加IDEA侧边栏界面，方便不想要弹框的用户</li>
+      </ul>
+
      <em>version 3.3 updated:</em> <br>
       <ul>
           <li>english:</li>

diff --git a/src/com/air/nc5dev/nccrequstsearch/RequestMappingItemProvider.java b/src/com/air/nc5dev/nccrequstsearch/RequestMappingItemProvider.java
@@ -66,6 +66,14 @@ public List<String> filterNames(@NotNull ChooseByNameBase chooseByNameBase
             , @NotNull String[] names, @NotNull String inputStr) {
         return new ArrayList<>();
     }
+
+    public static String getKey(Project project){
+        if (project == null) {
+            return "";
+        }
+
+        return project.getBasePath();
+    }
 
     /**
      * 用户输入文本后，执行搜索！
@@ -158,8 +166,8 @@ public List<NCCActionInfoVO> search(Project project, String inputStr, boolean ev
         }
 
         Map<String, Map<String, NCCActionInfoVO>> all = new HashMap<>();
-        Map<String, NCCActionInfoVO> map = ALL_ACTIONS.get(project.getBasePath());
-        all.put(project.getBasePath(), map);
+        Map<String, NCCActionInfoVO> map = ALL_ACTIONS.get(getKey(project));
+        all.put(getKey(project), map);
 
         if (CollUtil.isEmpty(map)) {
             return EMPTY_LIST;
@@ -215,7 +223,7 @@ private boolean filterProjectUrls(Project project, boolean everwhere,
                 return true;
             }
 
-            all.put(project.getBasePath(), map2);
+            all.put(getKey(project), map2);
         }
         return false;
     }
@@ -359,8 +367,8 @@ public Collection<String> suggest(String inputStr, Project project, boolean ever
         }
 
         Map<String, Map<String, NCCActionInfoVO>> all = new HashMap<>();
-        Map<String, NCCActionInfoVO> map = ALL_ACTIONS.get(project.getBasePath());
-        all.put(project.getBasePath(), map);
+        Map<String, NCCActionInfoVO> map = ALL_ACTIONS.get(getKey(project));
+        all.put(getKey(project), map);
 
         if (CollUtil.isEmpty(map)) {
             return re;

diff --git a/src/com/air/nc5dev/ui/PatcherDialog.java b/src/com/air/nc5dev/ui/PatcherDialog.java
@@ -798,36 +798,40 @@ public void run(@NotNull ProgressIndicator indicator) {
 
                     File dirToOpen = new File(contentVO.getOutPath());
 
+                    File opendir = null;
                     try {
                         if (contentVO.zip) {
-                            zipPathcers(contentVO, dirToOpen);
+                            opendir = zipPathcers(contentVO, dirToOpen);
                         }
                     } catch (Exception ex) {
                         ex.printStackTrace();
                     }
 
-                    File opendir = null;
                     if (contentVO.isFormat4Ygj()) {
                         if (contentVO.isDeleteDir()) {
                             try {
                                 FileUtil.del(dirToOpen);
                             } catch (Throwable ex) {
                             }
                         }
-
-                        opendir = dirToOpen.getParentFile();
                     } else {
                         if (contentVO.isDeleteDir()) {
                             try {
                                 FileUtil.del(dirToOpen.getParentFile());
                             } catch (Throwable ex) {
                             }
                         }
-                        opendir = dirToOpen.getParentFile().getParentFile();
                     }
 
                     if (opendir != null) {
                         try {
+                            if (!opendir.exists()) {
+                                opendir = opendir.getParentFile();
+                                if (!opendir.exists()) {
+                                    opendir = opendir.getParentFile();
+                                }
+                            }
+
                             IoUtil.tryOpenFileExpolor(opendir);
                         } catch (Throwable ioException) {
                             ioException.printStackTrace();
@@ -862,7 +866,7 @@ private void reBuildNpmPatcther(ExportContentVO contentVO, @NotNull ProgressIndi
         }
     }
 
-    private void zipPathcers(ExportContentVO contentVO, File dirToOpen) {
+    private File zipPathcers(ExportContentVO contentVO, File dirToOpen) {
         File zip = null;
         if (contentVO.isFormat4Ygj()) {
             zip = new File(dirToOpen.getParentFile(), dirToOpen.getName() + ".zip");
@@ -875,6 +879,8 @@ private void zipPathcers(ExportContentVO contentVO, File dirToOpen) {
             zip = new File(dirToOpen.getParentFile().getParentFile(), dirToOpen.getParentFile().getName() + ".zip");
         }
         LogUtil.infoAndHide("自动打包成补丁zip压缩包的硬盘路径： " + zip.getPath());
+
+        return zip;
     }
 
     @Nullable