repackage name

dromara · Dec 24, 2023 · 8ba7da4 · 8ba7da4
1 parent 1f36f57
commit 8ba7da4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/...uoyi-disjob/src/main/java/cn/ponfee/disjob/admin/controller/DisjobInstanceController.java b/...uoyi-disjob/src/main/java/cn/ponfee/disjob/admin/controller/DisjobInstanceController.java
@@ -9,7 +9,11 @@
 package cn.ponfee.disjob.admin.controller;
 
 import cn.ponfee.disjob.admin.util.PageUtils;
-import cn.ponfee.disjob.common.util.*;
+import cn.ponfee.disjob.common.base.TextTokenizer;
+import cn.ponfee.disjob.common.util.Jsons;
+import cn.ponfee.disjob.common.util.Numbers;
+import cn.ponfee.disjob.common.util.SleepWaitUtils;
+import cn.ponfee.disjob.common.util.Strings;
 import cn.ponfee.disjob.core.enums.RunState;
 import cn.ponfee.disjob.core.exception.KeyNotExistsException;
 import cn.ponfee.disjob.supervisor.application.AuthorizeGroupService;

diff --git a/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/mggroup.html b/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/mggroup.html
@@ -193,7 +193,7 @@
 
     function workers(group) {
       table.set();
-      $.modal.popupRight("Workers", prefix + '/worker?group=' + group);
+      $.modal.popupRight("Worker", prefix + '/worker?group=' + group);
     }
 
     function updateOwnUser(field, row, rowIndex, oldValue) {

diff --git a/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/worker.html b/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/worker.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-  <th:block th:include="include :: header('Workers')" />
+  <th:block th:include="include :: header('Worker')" />
 </head>
 <body class="gray-bg">
   <div class="container-div">

diff --git a/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mygroup/mygroup.html b/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mygroup/mygroup.html
@@ -135,7 +135,7 @@
 
     function workers(group) {
       table.set();
-      $.modal.popupRight("Workers", prefix + '/worker?group=' + group);
+      $.modal.popupRight("Worker", prefix + '/worker?group=' + group);
     }
   </script>
 

diff --git a/...fee/disjob/common/util/TextTokenizer.java → ...fee/disjob/common/base/TextTokenizer.java b/...fee/disjob/common/util/TextTokenizer.java → ...fee/disjob/common/base/TextTokenizer.java
@@ -6,7 +6,7 @@
 **                      \/          \/     \/                                   **
 \*                                                                              */
 
-package cn.ponfee.disjob.common.util;
+package cn.ponfee.disjob.common.base;
 
 /**
  * Text tokenizer

diff --git a/disjob-common/src/main/java/cn/ponfee/disjob/common/dag/DAGNode.java b/disjob-common/src/main/java/cn/ponfee/disjob/common/dag/DAGNode.java
@@ -8,7 +8,7 @@
 
 package cn.ponfee.disjob.common.dag;
 
-import cn.ponfee.disjob.common.util.TextTokenizer;
+import cn.ponfee.disjob.common.base.TextTokenizer;
 import org.springframework.util.Assert;
 
 import java.beans.Transient;

diff --git a/disjob-common/src/test/java/cn/ponfee/disjob/common/util/TextTokenizerTest.java b/disjob-common/src/test/java/cn/ponfee/disjob/common/util/TextTokenizerTest.java
@@ -8,6 +8,7 @@
 
 package cn.ponfee.disjob.common.util;
 
+import cn.ponfee.disjob.common.base.TextTokenizer;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...job-registry-redis/src/main/java/cn/ponfee/disjob/registry/redis/RedisServerRegistry.java b/...job-registry-redis/src/main/java/cn/ponfee/disjob/registry/redis/RedisServerRegistry.java
@@ -9,13 +9,13 @@
 package cn.ponfee.disjob.registry.redis;
 
 import cn.ponfee.disjob.common.base.RetryTemplate;
+import cn.ponfee.disjob.common.base.TextTokenizer;
 import cn.ponfee.disjob.common.concurrent.LoopThread;
 import cn.ponfee.disjob.common.concurrent.NamedThreadFactory;
 import cn.ponfee.disjob.common.concurrent.ThreadPoolExecutors;
 import cn.ponfee.disjob.common.concurrent.Threads;
 import cn.ponfee.disjob.common.exception.Throwables.ThrowingRunnable;
 import cn.ponfee.disjob.common.exception.Throwables.ThrowingSupplier;
-import cn.ponfee.disjob.common.util.TextTokenizer;
 import cn.ponfee.disjob.core.base.Server;
 import cn.ponfee.disjob.registry.EventType;
 import cn.ponfee.disjob.registry.ServerRegistry;