From dc2725733a6686f093cd1388fc5b30d7f5a4bfac Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Tue, 21 Jan 2020 22:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 3fd857d58be8bafda85eabee180c1612483d39ef
---
 .../modules/SpringBoot/java/config/ScheduleConfig.java          | 1 +
 .../resources/modules/SpringBoot/resources/static/css/base.css  | 2 ++
 .../SpringBoot/resources/templates/screen/module/mgr.ftl        | 2 +-
 .../resources/templates/screen/module/system/dept.ftl           | 2 +-
 .../resources/templates/screen/module/system/dict.ftl           | 2 +-
 .../resources/templates/screen/module/system/dictItem.ftl       | 2 +-
 .../resources/templates/screen/module/system/file.ftl           | 2 +-
 .../SpringBoot/resources/templates/screen/module/system/res.ftl | 2 +-
 .../resources/templates/screen/module/system/role.ftl           | 2 +-
 .../resources/templates/screen/module/system/tokens.ftl         | 2 +-
 .../resources/templates/screen/module/system/user.ftl           | 2 +-
 11 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/config/ScheduleConfig.java b/src/main/resources/modules/SpringBoot/java/config/ScheduleConfig.java
index b21bb794..a3b85327 100644
--- a/src/main/resources/modules/SpringBoot/java/config/ScheduleConfig.java
+++ b/src/main/resources/modules/SpringBoot/java/config/ScheduleConfig.java
@@ -69,6 +69,7 @@ public class ScheduleConfig extends ThreadPoolTaskScheduler implements BeanDefin
 
     private int registryTask(String basePackage, BeanDefinitionRegistry beanDefinitionRegistry) {
         ClassPathBeanDefinitionScanner classPathBeanDefinitionScanner = new ClassPathBeanDefinitionScanner(beanDefinitionRegistry);
+        classPathBeanDefinitionScanner.resetFilters(false);
         classPathBeanDefinitionScanner.addIncludeFilter(new AssignableTypeFilter(RunTask.class));
         classPathBeanDefinitionScanner.setBeanNameGenerator(new BeanNameGenerator() {
             @Override
diff --git a/src/main/resources/modules/SpringBoot/resources/static/css/base.css b/src/main/resources/modules/SpringBoot/resources/static/css/base.css
index cc673da8..0d4a86e8 100644
--- a/src/main/resources/modules/SpringBoot/resources/static/css/base.css
+++ b/src/main/resources/modules/SpringBoot/resources/static/css/base.css
@@ -728,6 +728,8 @@ code {
 .el-table.data .cell {
     max-height: 46px;
     min-height: 23px;
+    text-overflow: ellipsis;
+    word-break: keep-all;
 }
 
 /* 以上为APP样式 */
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
index 7d185030..9ee970b1 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
@@ -110,7 +110,7 @@
             <el-table-column
                     align="center"
                     type="selection"
-                    width="40">
+                    width="45">
             </el-table-column>
             <el-table-column
                     align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
index 4690c878..63a33489 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
@@ -72,7 +72,7 @@
                     <el-table-column
                             align="center"
                             type="selection"
-                            width="40">
+                            width="45">
                     </el-table-column>
                     <el-table-column
                             align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
index ef936024..bdb2b78e 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
@@ -59,7 +59,7 @@
             <el-table-column
                     align="center"
                     type="selection"
-                    width="40">
+                    width="45">
             </el-table-column>
             <el-table-column
                     align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
index c9b6b940..9911a1eb 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
@@ -62,7 +62,7 @@
             <el-table-column
                     align="center"
                     type="selection"
-                    width="40">
+                    width="45">
             </el-table-column>
             <el-table-column
                     align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
index 101351fd..052c21fc 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
@@ -59,7 +59,7 @@
             <el-table-column
                     align="center"
                     type="selection"
-                    width="40">
+                    width="45">
             </el-table-column>
             <el-table-column
                     align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
index eb3fc3c7..f31c221b 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
@@ -67,7 +67,7 @@
                     <el-table-column
                             align="center"
                             type="selection"
-                            width="40">
+                            width="45">
                     </el-table-column>
                     <el-table-column
                             align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
index 8f4650d1..8761a4cd 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
@@ -55,7 +55,7 @@
             <el-table-column
                     align="center"
                     type="selection"
-                    width="40">
+                    width="45">
             </el-table-column>
             <el-table-column
                     align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl
index facf2252..24f7ec4e 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl
@@ -73,7 +73,7 @@
             <el-table-column
                     align="center"
                     type="selection"
-                    width="40">
+                    width="45">
             </el-table-column>
             <el-table-column
                     align="center"
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
index 1e30a07d..3388f65f 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
@@ -62,7 +62,7 @@
             <el-table-column
                     align="center"
                     type="selection"
-                    width="40">
+                    width="45">
             </el-table-column>
             <el-table-column
                     align="center"