diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
index 77d6c55f..75d6c13c 100644
--- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
+++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
@@ -49,6 +49,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.Locale;
+
 /**
  * 全局请求Controller，如果无特殊请求，则不需再增加其他Controller
  * 全局htm后缀入口{@link GlobalController#page(Model, HttpServletRequest, HttpServletResponse)}
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java
index b9fd3168..ec2f51aa 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java
@@ -1,5 +1,6 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
@@ -70,7 +71,15 @@ public class DeptAjax {
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(Dept.class).read(file.getBytes(), new WExcel.Processor<Dept>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(Dept.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<Dept>() {
                 @Override
                 public List<String> exec(Dept o, int index) {
                     DeptCreateRequest request = MapperUtil.map(o, DeptCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java
index a59316d6..e2df18be 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java
@@ -1,5 +1,6 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
@@ -70,7 +71,15 @@ public class DictAjax {
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(Dict.class).read(file.getBytes(), new WExcel.Processor<Dict>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(Dict.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<Dict>() {
                 @Override
                 public List<String> exec(Dict o, int index) {
                     DictCreateRequest request = MapperUtil.map(o, DictCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java
index 20ab0f6d..826ac2f7 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java
@@ -1,5 +1,6 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
@@ -64,7 +65,15 @@ public class DictItemAjax {
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(DictItem.class).read(file.getBytes(), new WExcel.Processor<DictItem>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(DictItem.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<DictItem>() {
                 @Override
                 public List<String> exec(DictItem o, int index) {
                     DictItemCreateRequest request = MapperUtil.map(o, DictItemCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java
index 1909874c..d17f779e 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java
@@ -1,5 +1,6 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -64,7 +65,15 @@ public class FileAjax {
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(File.class).read(file.getBytes(), new WExcel.Processor<File>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(File.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<File>() {
                 @Override
                 public List<String> exec(File o, int index) {
                     FileCreateRequest request = MapperUtil.map(o, FileCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/LogerrAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/LogerrAjax.java
index fdec745c..6e07367e 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/LogerrAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/LogerrAjax.java
@@ -1,17 +1,7 @@
 package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
-import ${domain}.frame.base.BaseResponse;
-import ${domain}.frame.base.ErrorType;
-import ${domain}.frame.excel.WExcel;
-import ${domain}.frame.excel.exception.TemplateNotMatchException;
-import ${domain}.frame.utils.LogUtil;
-import ${domain}.frame.utils.MapperUtil;
-import ${domain}.frame.utils.ResponseUtil;
-import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.wsys.ent.Logerr;
 import ${domain}.module.wsys.mgr.LogerrManager;
 import ${domain}.module.wsys.req.LogerrCreateRequest;
 import ${domain}.module.wsys.req.LogerrDeleteRequest;
@@ -22,9 +12,6 @@ import ${domain}.module.wsys.rsp.LogerrDeleteResponse;
 import ${domain}.module.wsys.rsp.LogerrFindResponse;
 import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
 
-import java.io.IOException;
-import java.util.List;
-
 public class LogerrAjax {
 
     @Autowired
@@ -45,45 +32,4 @@ public class LogerrAjax {
     public LogerrFindResponse find(LogerrFindRequest request) {
         return logerrManager.find(request, LocalData.getToken());
     }
-
-    public Object template(){
-        return ResponseUtil.apply(new WExcel<>(Logerr.class));
-    }
-
-    public Object exports(LogerrFindRequest request) {
-        LogerrFindResponse response = logerrManager.find(request, LocalData.getToken());
-        if (response.hasError()) {
-            return response;
-        } else if (response.getTotalCount() == 0) {
-            response.addError(ErrorType.BUSINESS_ERROR, "导出数据为空");
-            return response;
-        }
-        return ResponseUtil.apply(new WExcel<>(Logerr.class).addDatas(response.getResult()));
-    }
-
-    public Object imports(MultipartFile file) {
-        BaseResponse baseResponse = new BaseResponse();
-        try {
-            WExcel sheet = new WExcel<>(Logerr.class).read(file.getBytes(), new WExcel.Processor<Logerr>() {
-                @Override
-                public List<String> exec(Logerr o, int index) {
-                    LogerrCreateRequest request = MapperUtil.map(o, LogerrCreateRequest.class);
-                    return ValidationUtil.validate(request);
-                }
-            });
-
-            if (sheet.hasError()) {
-                return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
-            } else {
-                return baseResponse;
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            LogUtil.dumpException(e);
-            baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件出错");
-        } catch (TemplateNotMatchException e) {
-            baseResponse.addError(ErrorType.BUSINESS_ERROR, e.getMessage());
-        }
-        return baseResponse;
-    }
 }
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java
index 75648520..49fb89a0 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java
@@ -1,16 +1,17 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
-import ${domain}.frame.excel.WExcel;
-import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.auth.LocalData;
+import ${domain}.frame.base.BaseResponse;
 import ${domain}.frame.base.ErrorType;
+import ${domain}.frame.excel.WExcel;
+import ${domain}.frame.excel.exception.TemplateNotMatchException;
+import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.utils.MapperUtil;
-import ${domain}.frame.base.BaseResponse;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.frame.excel.exception.TemplateNotMatchException;
 import ${domain}.module.wsys.ent.Profiles;
 import ${domain}.module.wsys.mgr.ProfilesManager;
 import ${domain}.module.wsys.req.ProfilesCreateRequest;
@@ -25,7 +26,7 @@ import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
 import java.io.IOException;
 import java.util.List;
 
-public class ProfilesAjax{
+public class ProfilesAjax {
 
     @Autowired
     private ProfilesManager profilesManager;
@@ -46,7 +47,7 @@ public class ProfilesAjax{
         return profilesManager.find(request, LocalData.getToken());
     }
 
-    public Object template(){
+    public Object template() {
         return ResponseUtil.apply(new WExcel<>(Profiles.class));
     }
 
@@ -64,7 +65,15 @@ public class ProfilesAjax{
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(Profiles.class).read(file.getBytes(), new WExcel.Processor<Profiles>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(Profiles.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<Profiles>() {
                 @Override
                 public List<String> exec(Profiles o, int index) {
                     ProfilesCreateRequest request = MapperUtil.map(o, ProfilesCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java
index 8b64e17a..7ee5a461 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java
@@ -1,5 +1,6 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
@@ -70,7 +71,15 @@ public class ResAjax {
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(Res.class).read(file.getBytes(), new WExcel.Processor<Res>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(Res.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<Res>() {
                 @Override
                 public List<String> exec(Res o, int index) {
                     ResCreateRequest request = MapperUtil.map(o, ResCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java
index 7719a28f..5d1e7548 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java
@@ -1,5 +1,6 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
@@ -70,7 +71,15 @@ public class RoleAjax {
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(Role.class).read(file.getBytes(), new WExcel.Processor<Role>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(Role.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<Role>() {
                 @Override
                 public List<String> exec(Role o, int index) {
                     RoleCreateRequest request = MapperUtil.map(o, RoleCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ScheduleAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ScheduleAjax.java
index cafce8f0..f610058b 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ScheduleAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ScheduleAjax.java
@@ -14,7 +14,6 @@ import ${domain}.module.wsys.rsp.ScheduleStopResponse;
 import java.util.Iterator;
 import java.util.List;
 
-
 public class ScheduleAjax {
 
     @Autowired
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java
index 23bb543c..4164840f 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java
@@ -1,17 +1,17 @@
 package ${domain}.action.ajax.wsys;
 
-import com.fasterxml.jackson.core.TreeNode;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
-import ${domain}.frame.excel.WExcel;
-import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.auth.LocalData;
+import ${domain}.frame.base.BaseResponse;
 import ${domain}.frame.base.ErrorType;
+import ${domain}.frame.excel.WExcel;
+import ${domain}.frame.excel.exception.TemplateNotMatchException;
+import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.utils.MapperUtil;
-import ${domain}.frame.base.BaseResponse;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.frame.excel.exception.TemplateNotMatchException;
 import ${domain}.module.wsys.ent.TaskSql;
 import ${domain}.module.wsys.mgr.TaskSqlManager;
 import ${domain}.module.wsys.req.TaskSqlCreateRequest;
@@ -26,7 +26,7 @@ import ${domain}.module.wsys.rsp.TaskSqlUpdateResponse;
 import java.io.IOException;
 import java.util.List;
 
-public class TaskSqlAjax{
+public class TaskSqlAjax {
 
     @Autowired
     private TaskSqlManager taskSqlManager;
@@ -47,7 +47,7 @@ public class TaskSqlAjax{
         return taskSqlManager.find(request, LocalData.getToken());
     }
 
-    public Object template(){
+    public Object template() {
         return ResponseUtil.apply(new WExcel<>(TaskSql.class));
     }
 
@@ -65,7 +65,15 @@ public class TaskSqlAjax{
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(TaskSql.class).read(file.getBytes(), new WExcel.Processor<TaskSql>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(TaskSql.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<TaskSql>() {
                 @Override
                 public List<String> exec(TaskSql o, int index) {
                     TaskSqlCreateRequest request = MapperUtil.map(o, TaskSqlCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TokensAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TokensAjax.java
index 98d86930..4ad5a0b7 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TokensAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TokensAjax.java
@@ -1,17 +1,7 @@
 package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
-import ${domain}.frame.base.BaseResponse;
-import ${domain}.frame.base.ErrorType;
-import ${domain}.frame.excel.WExcel;
-import ${domain}.frame.excel.exception.TemplateNotMatchException;
-import ${domain}.frame.utils.LogUtil;
-import ${domain}.frame.utils.MapperUtil;
-import ${domain}.frame.utils.ResponseUtil;
-import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.wsys.ent.Tokens;
 import ${domain}.module.wsys.mgr.TokensManager;
 import ${domain}.module.wsys.req.TokensCreateRequest;
 import ${domain}.module.wsys.req.TokensDeleteRequest;
@@ -24,9 +14,6 @@ import ${domain}.module.wsys.rsp.TokensFindResponse;
 import ${domain}.module.wsys.rsp.TokensLogoutResponse;
 import ${domain}.module.wsys.rsp.TokensUpdateResponse;
 
-import java.io.IOException;
-import java.util.List;
-
 public class TokensAjax {
 
     @Autowired
@@ -51,45 +38,4 @@ public class TokensAjax {
     public TokensLogoutResponse logout(TokensLogoutRequest request) {
         return tokensManager.logout(request, LocalData.getToken());
     }
-
-    public Object template() {
-        return ResponseUtil.apply(new WExcel<>(Tokens.class));
-    }
-
-    public Object exports(TokensFindRequest request) {
-        TokensFindResponse response = tokensManager.find(request, LocalData.getToken());
-        if (response.hasError()) {
-            return response;
-        } else if (response.getTotalCount() == 0) {
-            response.addError(ErrorType.BUSINESS_ERROR, "导出数据为空");
-            return response;
-        }
-        return ResponseUtil.apply(new WExcel<>(Tokens.class).addDatas(response.getResult()));
-    }
-
-    public Object imports(MultipartFile file) {
-        BaseResponse baseResponse = new BaseResponse();
-        try {
-            WExcel sheet = new WExcel<>(Tokens.class).read(file.getBytes(), new WExcel.Processor<Tokens>() {
-                @Override
-                public List<String> exec(Tokens o, int index) {
-                    TokensCreateRequest request = MapperUtil.map(o, TokensCreateRequest.class);
-                    return ValidationUtil.validate(request);
-                }
-            });
-
-            if (sheet.hasError()) {
-                return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
-            } else {
-                return baseResponse;
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            LogUtil.dumpException(e);
-            baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件出错");
-        } catch (TemplateNotMatchException e) {
-            baseResponse.addError(ErrorType.BUSINESS_ERROR, e.getMessage());
-        }
-        return baseResponse;
-    }
 }
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java
index 142cebed..2563f5ec 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java
@@ -1,5 +1,8 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.auth.Token;
 import ${domain}.frame.base.BaseResponse;
@@ -16,24 +19,22 @@ import ${domain}.module.wsys.mgr.TokensManager;
 import ${domain}.module.wsys.mgr.UserManager;
 import ${domain}.module.wsys.req.TokensLogoutRequest;
 import ${domain}.module.wsys.req.UserChangePwdRequest;
-import ${domain}.module.wsys.req.UserResetPwdRequest;
 import ${domain}.module.wsys.req.UserCreateRequest;
 import ${domain}.module.wsys.req.UserDeleteRequest;
 import ${domain}.module.wsys.req.UserFindRequest;
 import ${domain}.module.wsys.req.UserLoginRequest;
 import ${domain}.module.wsys.req.UserLogoutRequest;
+import ${domain}.module.wsys.req.UserResetPwdRequest;
 import ${domain}.module.wsys.req.UserUpdateRequest;
 import ${domain}.module.wsys.rsp.TokensLogoutResponse;
 import ${domain}.module.wsys.rsp.UserChangePwdResponse;
-import ${domain}.module.wsys.rsp.UserResetPwdResponse;
 import ${domain}.module.wsys.rsp.UserCreateResponse;
 import ${domain}.module.wsys.rsp.UserDeleteResponse;
 import ${domain}.module.wsys.rsp.UserFindResponse;
 import ${domain}.module.wsys.rsp.UserLoginResponse;
 import ${domain}.module.wsys.rsp.UserLogoutResponse;
+import ${domain}.module.wsys.rsp.UserResetPwdResponse;
 import ${domain}.module.wsys.rsp.UserUpdateResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
@@ -121,7 +122,15 @@ public class UserAjax {
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(User.class).read(file.getBytes(), new WExcel.Processor<User>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(User.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<User>() {
                 @Override
                 public List<String> exec(User o, int index) {
                     UserCreateRequest request = MapperUtil.map(o, UserCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java
index 04b17c36..048d9bd3 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java
@@ -1,5 +1,6 @@
 package ${domain}.action.ajax.wsys;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
@@ -25,7 +26,7 @@ import ${domain}.module.wsys.rsp.VisitorUpdateResponse;
 import java.io.IOException;
 import java.util.List;
 
-public class VisitorAjax{
+public class VisitorAjax {
 
     @Autowired
     private VisitorManager visitorManager;
@@ -46,7 +47,7 @@ public class VisitorAjax{
         return visitorManager.find(request, LocalData.getToken());
     }
 
-    public Object template(){
+    public Object template() {
         return ResponseUtil.apply(new WExcel<>(Visitor.class));
     }
 
@@ -64,7 +65,15 @@ public class VisitorAjax{
     public Object imports(MultipartFile file) {
         BaseResponse baseResponse = new BaseResponse();
         try {
-            WExcel sheet = new WExcel<>(Visitor.class).read(file.getBytes(), new WExcel.Processor<Visitor>() {
+            // 检查文件格式
+            String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
+            if (originalFilename.matches("\\.xlsx?")) {
+                baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
+                return baseResponse;
+            }
+            // 兼容2003以前老版本.xls
+            ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
+            WExcel sheet = new WExcel<>(Visitor.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<Visitor>() {
                 @Override
                 public List<String> exec(Visitor o, int index) {
                     VisitorCreateRequest request = MapperUtil.map(o, VisitorCreateRequest.class);
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorResAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorResAjax.java
index 49f96007..d9ef7bc3 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorResAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorResAjax.java
@@ -12,7 +12,7 @@ import ${domain}.module.wsys.rsp.VisitorResDeleteResponse;
 import ${domain}.module.wsys.rsp.VisitorResFindResponse;
 import ${domain}.module.wsys.rsp.VisitorResUpdateResponse;
 
-public class VisitorResAjax{
+public class VisitorResAjax {
 
     @Autowired
     private VisitorResManager visitorResManager;
diff --git a/src/main/resources/modules/SpringBoot/java/action/page/control/Header.java b/src/main/resources/modules/SpringBoot/java/action/page/control/Header.java
index c8e77614..a03fcf7f 100644
--- a/src/main/resources/modules/SpringBoot/java/action/page/control/Header.java
+++ b/src/main/resources/modules/SpringBoot/java/action/page/control/Header.java
@@ -6,6 +6,15 @@ import org.springframework.ui.Model;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+/**
+ * 对应resources/templates/control/header.ftl，当页面引入<${r'#'}include controlHolder("nav")/> 访问对应页面时会执行该控制器。
+ * <br>
+ * 在该对象中可以设置公共信息获取部分业务代码，而不需要每个页面访问Screen中都获取一次
+ *
+ * @author author
+ * @version 0.0.1
+ * @since 2020-11-01
+ */
 public class Header extends Control {
 
     @Override
diff --git a/src/main/resources/modules/SpringBoot/java/action/page/screen/Index.java b/src/main/resources/modules/SpringBoot/java/action/page/screen/Index.java
index 07573a5b..bf9515d6 100644
--- a/src/main/resources/modules/SpringBoot/java/action/page/screen/Index.java
+++ b/src/main/resources/modules/SpringBoot/java/action/page/screen/Index.java
@@ -7,6 +7,13 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+/**
+ * 对应resources/templates/screen/index.ftl，访问对应页面时会执行该Screen。
+ *
+ * @author author
+ * @version 0.0.1
+ * @since 2020-11-01
+ */
 public class Index extends Screen {
 
     @Override
diff --git a/src/main/resources/modules/SpringBoot/java/frame/validation/DictValidator.java b/src/main/resources/modules/SpringBoot/java/frame/validation/DictValidator.java
index 02334765..f51ef8c6 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/validation/DictValidator.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/validation/DictValidator.java
@@ -3,11 +3,14 @@ package ${domain}.frame.validation;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl;
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.utils.StringUtil;
+import ${domain}.module.wsys.ent.DictItem;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 public class DictValidator implements ConstraintValidator<Dict, String> {
 
@@ -21,6 +24,7 @@ public class DictValidator implements ConstraintValidator<Dict, String> {
     @Override
     public boolean isValid(String o, ConstraintValidatorContext constraintValidatorContext) {
         String fieldName = "";
+        // 获取注解的字段名称，用于快速定位排查
         if (constraintValidatorContext instanceof ConstraintValidatorContextImpl) {
             ConstraintValidatorContextImpl validatorContext = (ConstraintValidatorContextImpl) constraintValidatorContext;
             if (validatorContext.getConstraintViolationCreationContexts() != null
@@ -30,41 +34,49 @@ public class DictValidator implements ConstraintValidator<Dict, String> {
             }
         }
 
-        if (StringUtil.isEmpty(o)) {
+        if (StringUtil.isEmpty(o)) {// 当值为空字符时，认为值有效
             return true;
-        } else if (name == null) {
+        } else if (name == null) {// 当字典名称为空时，说明未指定字典，提示错误
+            // 禁用默认错误信息，防止错误信息与自定义信息乱串
             constraintValidatorContext.disableDefaultConstraintViolation();
             String message = String.format(Locale.CHINESE, "[ %s ] 未指定字典名称！", fieldName);
             constraintValidatorContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
             return false;
-        } else {
+        } else {// 加载字典，并验证提交值是否包含在内
             // name 字典名称
             ${domain}.module.wsys.req.DictLoadRequest dictLoadRequest = new ${domain}.module.wsys.req.DictLoadRequest();
             dictLoadRequest.setDictName(name);
             ${domain}.module.wsys.mgr.DictManager dictManager = LocalData.getBean(${domain}.module.wsys.mgr.DictManager.class);
             ${domain}.module.wsys.rsp.DictLoadResponse dictLoadResponse = dictManager.load(dictLoadRequest, LocalData.getSysToken());
 
+            // 如果加载字典出现错误，返回验证错误
             if (dictLoadResponse.hasError()) {
+                // 禁用默认错误信息，防止错误信息与自定义信息乱串
                 constraintValidatorContext.disableDefaultConstraintViolation();
                 String message = String.format(Locale.CHINESE, "[ %s ] 验证字典 [ %s ] 值出现异常-> %s！", fieldName, name, dictLoadResponse.getErrors().get(0).getMessage());
                 constraintValidatorContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
                 return false;
             }
 
-            List<${domain}.module.wsys.ent.DictItem> dictItems = dictLoadResponse.getDictItems();
-            int i = 0;
-            for (; i < dictItems.size(); i++) {
-                ${domain}.module.wsys.ent.DictItem dictItem = dictItems.get(i);
-                if (o.equals(dictItem.getKey())) {
-                    break;
+            List<DictItem> dictItems = dictLoadResponse.getDictItems();
+            Stream<DictItem> list = dictItems.stream().filter(new Predicate<DictItem>() {
+                @Override
+                public boolean test(DictItem dictItem) {
+                    if (o.equals(dictItem.getKey())) {
+                        return true;
+                    }
+                    return false;
                 }
-            }
-            if (i < dictItems.size()) {
-                return true;
-            } else {
-                String message = String.format(Locale.CHINESE, "%s 指定的字典 [ %s ] 中，未找到字典值(%s)！", fieldName, name, o);
+            });
+            // 当未找到字典项时，认为值无效，返回验证错误
+            if (list.count() == 0) {
+                // 禁用默认错误信息，防止错误信息与自定义信息乱串
+                constraintValidatorContext.disableDefaultConstraintViolation();
+                String message = String.format(Locale.CHINESE, "[ %s ] 指定的字典 [ %s ] 中，未找到字典枚举(%s)！", fieldName, name, o);
                 constraintValidatorContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
                 return false;
+            } else {
+                return true;
             }
         }
     }
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Dict.java b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Dict.java
index 7060b3f4..50e4b121 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Dict.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Dict.java
@@ -19,14 +19,14 @@ public class Dict extends BaseEntity {
      * DICT_NAME - 字典名称
      */
     @ExcelProperty("字典名称")
-    @ExcelNote("1-50长度的字典名称")
+    @ExcelNote("1-50长度的字典名称，中英文皆可")
     private String dictName;
     /**
-     * DICT_COMMENT - 字典代码
+     * DICT_NOTE - 字典描述
      */
     @ExcelProperty("字典描述")
     @ExcelNote("1-50长度的字典描述")
-    private String dictComment;
+    private String dictNote;
     /**
      * VERSION - 字典版本
      */
@@ -37,7 +37,7 @@ public class Dict extends BaseEntity {
      * VALID - 是否有效
      */
     @ExcelProperty("是否有效")
-    @ExcelNote("Y/N,是/否")
+    @ExcelNote("描述字典有效或启用状态；Y/N,是/否")
     private Boolean valid;
 
     public String getDictName() {
@@ -48,12 +48,12 @@ public class Dict extends BaseEntity {
         this.dictName = dictName;
     }
 
-    public String getDictComment() {
-        return this.dictComment;
+    public String getDictNote() {
+        return this.dictNote;
     }
 
-    public void setDictComment(String dictComment) {
-        this.dictComment = dictComment;
+    public void setDictNote(String dictNote) {
+        this.dictNote = dictNote;
     }
 
     public String getVersion() {
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/DictItem.java b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/DictItem.java
index 016cab52..05f93ef7 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/DictItem.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/DictItem.java
@@ -19,35 +19,35 @@ public class DictItem extends BaseEntity {
      * DICT_NAME - 字典名称
      */
     @ExcelProperty("字典名称")
-    @ExcelNote("字典名称，可为中文或英文，且不能出现重复")
+    @ExcelNote("字典名称")
     private String dictName;
 
     /**
-     * KEY - 字典键
+     * KEY - 字典枚举
      */
-    @ExcelProperty("字典键")
-    @ExcelNote("字典键一般使用数字或字母 01,02... A,B...")
+    @ExcelProperty("字典枚举")
+    @ExcelNote("字典枚举一般使用数字或字母 01,02... A,B...")
     private String key;
 
     /**
-     * VALUE - 字典值
+     * VALUE - 字典描述
      */
-    @ExcelProperty("字典值")
-    @ExcelNote("字典值一般是实际意思字符或文字\n 长度在(1-100)之间")
+    @ExcelProperty("字典描述")
+    @ExcelNote("字典描述一般是实际意思字符或文字\n 长度在(1-100)之间")
     private String value;
 
     /**
      * SORT - 排序
      */
     @ExcelProperty("字典排序值")
-    @ExcelNote("用于标识字典值排列顺序、必须为数字")
+    @ExcelNote("用于标识字典描述排列顺序、必须为数字")
     private Integer sort;
 
     /**
      * VALID - 是否有效
      */
     @ExcelProperty("是否有效")
-    @ExcelNote("用于标识该字典值是否有效")
+    @ExcelNote("用于标识该字典项是否有效")
     private Boolean valid;
 
     public String getDictName() {
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java
index 01f22dfa..f9508461 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java
@@ -81,4 +81,13 @@ public interface ProfilesManager {
      * @return
      */
     long getLong(String key, long defaultValue);
+
+    /**
+     * 获得当前环境配置
+     *
+     * @param key          配置项名
+     * @param defaultValue 默认值
+     * @return
+     */
+    boolean getBoolean(String key, boolean defaultValue);
 }
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java
index e8412302..13fc651a 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java
@@ -187,6 +187,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa
         if (profilesFindResponse.getResult().size() == 0) {
             // 主动保存未设置的键值
             Profiles entity = new Profiles();
+            entity.setId(IDgenerator.nextId());
             entity.setActive(LocalData.getActive());
             entity.setKey(key);
             entity.setValue(defaultValue);
@@ -206,7 +207,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa
      */
     @Override
     public int getInt(String key, int defaultValue) {
-        String string = this.getString(key, "");
+        String string = this.getString(key, String.valueOf(defaultValue));
         if (!StringUtil.isEmpty(string)) {
             try {
                 return Integer.parseInt(string);
@@ -226,7 +227,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa
      */
     @Override
     public long getLong(String key, long defaultValue) {
-        String string = this.getString(key, "");
+        String string = this.getString(key, String.valueOf(defaultValue));
         if (!StringUtil.isEmpty(string)) {
             try {
                 return Long.parseLong(string);
@@ -236,4 +237,24 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa
         }
         return defaultValue;
     }
+
+    /**
+     * 获得当前环境配置
+     *
+     * @param key          配置项名
+     * @param defaultValue 默认值
+     * @return
+     */
+    @Override
+    public boolean getBoolean(String key, boolean defaultValue) {
+        String string = this.getString(key, String.valueOf(defaultValue));
+        if (!StringUtil.isEmpty(string)) {
+            try {
+                return Boolean.parseBoolean(string);
+            } catch (Exception ignored) {
+
+            }
+        }
+        return defaultValue;
+    }
 }
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java
index 1ac2e1c3..380e9800 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java
@@ -11,6 +11,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${domain}.config.CacheConfig;
+import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.auth.Token;
 import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.base.SortType;
@@ -20,7 +21,6 @@ import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
 import ${domain}.module.wsys.ent.Tokens;
 import ${domain}.module.wsys.mpr.TokensMapper;
-import ${domain}.module.wsys.req.ResFindRequest;
 import ${domain}.module.wsys.req.ResLoadRequest;
 import ${domain}.module.wsys.req.TokensBuildRequest;
 import ${domain}.module.wsys.req.TokensCreateRequest;
@@ -28,7 +28,6 @@ import ${domain}.module.wsys.req.TokensDeleteRequest;
 import ${domain}.module.wsys.req.TokensFindRequest;
 import ${domain}.module.wsys.req.TokensLogoutRequest;
 import ${domain}.module.wsys.req.TokensUpdateRequest;
-import ${domain}.module.wsys.rsp.ResFindResponse;
 import ${domain}.module.wsys.rsp.ResLoadResponse;
 import ${domain}.module.wsys.rsp.TokensBuildResponse;
 import ${domain}.module.wsys.rsp.TokensCreateResponse;
@@ -90,7 +89,9 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
             for (Tokens tokens : tokensFindResponse.getResult()) {
                 TokensLogoutRequest tokensLogoutRequest = new TokensLogoutRequest();
                 tokensLogoutRequest.setToken(tokens.getToken());
-                TokensLogoutResponse tokensLogoutResponse = this.logout(tokensLogoutRequest, token);
+                // 为何不是直接使用this？如果直接this调用无法被Spring代理，注解即失效
+                TokensManager tokensManager = LocalData.getBean(TokensManager.class);
+                TokensLogoutResponse tokensLogoutResponse = tokensManager.logout(tokensLogoutRequest, token);
                 if (tokensLogoutResponse.hasError()) {
                     response.addErrors(tokensLogoutResponse.getErrors());
                     return response;
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DataMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DataMapper.xml
deleted file mode 100644
index cb96f0ff..00000000
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DataMapper.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="xyz.wbsite.module.wsys.mpr.DataMapper">
-
-    <select id="total" resultType="xyz.wbsite.module.wsys.ent.DataTotal">
-        SELECT
-            ( SELECT COUNT( 1 ) + 1 FROM SYS_USER WHERE IS_DELETED = 0 AND USER_STATUS = '0' ) USER_ALL,
-            ( SELECT COUNT( 1 ) FROM SYS_TOKENS WHERE IS_DELETED = 0 AND VALID = '1' ) USER_LINE,
-            ( SELECT COUNT( 1 ) FROM SYS_DEPT WHERE IS_DELETED = 0 ) DEPT_ALL,
-            ( SELECT COUNT( 1 ) FROM SYS_LOGERR WHERE IS_DELETED = 0 AND LOG_STATE = '0' ) ERROR_UN,
-            ( SELECT COUNT( 1 ) FROM SYS_LOGERR WHERE IS_DELETED = 0 ) ERROR_ALL
-    </select>
-
-    <select id="login" resultType="xyz.wbsite.module.wsys.ent.DataCount">
-        SELECT * FROM
-        <foreach collection="list" item="item" index="index" open="(" close=")" separator="UNION ALL">
-             SELECT #{item.date1} "DATE",COUNT(1) "COUNT" FROM SYS_TOKENS WHERE date(LOGIN_TIME/1000,'unixepoch') = #{item.date2}
-        </foreach>
-        ORDER BY DATE
-    </select>
-
-    <select id="error" resultType="xyz.wbsite.module.wsys.ent.DataCount">
-        SELECT * FROM
-        <foreach collection="list" item="item" index="index" open="(" close=")" separator="UNION ALL">
-            SELECT #{item.date1} "DATE",COUNT( 1 ) "COUNT" FROM SYS_LOGERR WHERE date(CREATE_TIME) = #{item.date2}
-        </foreach>
-        ORDER BY DATE
-    </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictMapper.xml
index 207243ad..431bf3e9 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictMapper.xml
@@ -7,13 +7,13 @@
     <sql id="table">`SYS_DICT`</sql>
 
     <sql id="entityColumnList">
-        `ID`,`DICT_NAME`,`DICT_COMMENT`,`VERSION`,`VALID`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
+        `ID`,`DICT_NAME`,`DICT_NOTE`,`VERSION`,`VALID`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
     </sql>
 
     <resultMap id="dict" type="${domain}.module.wsys.ent.Dict">
         <result column="ID"  jdbcType="BIGINT" property="id"/>
         <result column="DICT_NAME"  jdbcType="VARCHAR" property="dictName"/>
-        <result column="DICT_COMMENT"  jdbcType="VARCHAR" property="dictComment"/>
+        <result column="DICT_NOTE"  jdbcType="VARCHAR" property="dictNote"/>
         <result column="VERSION"  jdbcType="VARCHAR" property="version"/>
         <result column="VALID"  jdbcType="BIT" property="valid"/>
         <result column="ROW_VERSION"  jdbcType="BIGINT" property="rowVersion"/>
@@ -34,7 +34,7 @@
         (
         ${r"#"}{request.id},
         ${r"#"}{request.dictName,jdbcType=VARCHAR},
-        ${r"#"}{request.dictComment,jdbcType=VARCHAR},
+        ${r"#"}{request.dictNote,jdbcType=VARCHAR},
         ${r"#"}{request.version,jdbcType=VARCHAR},
         ${r"#"}{request.valid,jdbcType=BIT},
         0,
@@ -56,7 +56,7 @@
         <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
             ${r"#"}{item.id},
             ${r"#"}{item.dictName,jdbcType=VARCHAR},
-            ${r"#"}{item.dictComment,jdbcType=VARCHAR},
+            ${r"#"}{item.dictNote,jdbcType=VARCHAR},
             ${r"#"}{item.version,jdbcType=VARCHAR},
             ${r"#"}{item.valid,jdbcType=BIT},
             0,
@@ -92,7 +92,7 @@
         <include refid="table"/>
         SET
         `DICT_NAME` = ${r"#"}{request.dictName,jdbcType=VARCHAR},
-        `DICT_COMMENT` = ${r"#"}{request.dictComment,jdbcType=VARCHAR},
+        `DICT_NOTE` = ${r"#"}{request.dictNote,jdbcType=VARCHAR},
         `VERSION` = ${r"#"}{request.version,jdbcType=VARCHAR},
         `VALID` = ${r"#"}{request.valid,jdbcType=BIT},
         `ROW_VERSION` = `ROW_VERSION` + 1,
@@ -112,8 +112,8 @@
         <if test="request.dictName != null and request.dictName != ''">
             AND `DICT_NAME` = ${r"#"}{request.dictName}
         </if>
-        <if test="request.dictComment != null and request.dictComment != ''">
-            AND `DICT_COMMENT` = ${r"#"}{request.dictComment}
+        <if test="request.dictNote != null and request.dictNote != ''">
+            AND `DICT_NOTE` = ${r"#"}{request.dictNote}
         </if>
         <if test="request.valid != null">
             AND `VALID` = ${r"#"}{request.valid}
@@ -129,8 +129,8 @@
         <if test="request.dictName != null and request.dictName != ''">
             AND `DICT_NAME` = ${r"#"}{request.dictName}
         </if>
-        <if test="request.dictComment != null and request.dictComment != ''">
-            AND `DICT_COMMENT` = ${r"#"}{request.dictComment}
+        <if test="request.dictNote != null and request.dictNote != ''">
+            AND `DICT_NOTE` = ${r"#"}{request.dictNote}
         </if>
         <if test="request.valid != null">
             AND `VALID` = ${r"#"}{request.valid}
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_DictMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_DictMapper.xml
index 4447977f..56194177 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_DictMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_DictMapper.xml
@@ -7,13 +7,13 @@
     <sql id="table">"SYS_DICT"</sql>
 
     <sql id="entityColumnList">
-        "ID","DICT_NAME","DICT_COMMENT","VERSION","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+        "ID","DICT_NAME","DICT_NOTE","VERSION","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
     </sql>
 
     <resultMap id="dict" type="${domain}.module.wsys.ent.Dict">
         <result column="ID" jdbcType="BIGINT" property="id"/>
         <result column="DICT_NAME" jdbcType="VARCHAR" property="dictName"/>
-        <result column="DICT_COMMENT" jdbcType="VARCHAR" property="dictComment"/>
+        <result column="DICT_NOTE" jdbcType="VARCHAR" property="dictNote"/>
         <result column="VERSION" jdbcType="VARCHAR" property="version"/>
         <result column="VALID" jdbcType="BIT" property="valid"/>
         <result column="ROW_VERSION" jdbcType="BIGINT" property="rowVersion"/>
@@ -34,7 +34,7 @@
         (
         ${r'#'}{request.id},
         ${r'#'}{request.dictName,jdbcType=VARCHAR},
-        ${r'#'}{request.dictComment,jdbcType=VARCHAR},
+        ${r'#'}{request.dictNote,jdbcType=VARCHAR},
         ${r'#'}{request.version,jdbcType=VARCHAR},
         ${r'#'}{request.valid,jdbcType=BIT},
         0,
@@ -56,7 +56,7 @@
         <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
             ${r'#'}{item.id},
             ${r'#'}{item.dictName,jdbcType=VARCHAR},
-            ${r'#'}{item.dictComment,jdbcType=VARCHAR},
+            ${r'#'}{item.dictNote,jdbcType=VARCHAR},
             ${r'#'}{item.version,jdbcType=VARCHAR},
             ${r'#'}{item.valid,jdbcType=BIT},
             0,
@@ -92,7 +92,7 @@
         <include refid="table"/>
         SET
         "DICT_NAME" = ${r'#'}{request.dictName,jdbcType=VARCHAR},
-        "DICT_COMMENT" = ${r'#'}{request.dictComment,jdbcType=VARCHAR},
+        "DICT_NOTE" = ${r'#'}{request.dictNote,jdbcType=VARCHAR},
         "VERSION" = ${r'#'}{request.version,jdbcType=VARCHAR},
         "VALID" = ${r'#'}{request.valid,jdbcType=BIT},
         "ROW_VERSION" = "ROW_VERSION" + 1,
@@ -113,8 +113,8 @@
         <if test="request.dictName != null and request.dictName != ''">
             AND "DICT_NAME" = ${r'#'}{request.dictName}
         </if>
-        <if test="request.dictComment != null and request.dictComment != ''">
-            AND "DICT_COMMENT" = ${r'#'}{request.dictComment}
+        <if test="request.dictNote != null and request.dictNote != ''">
+            AND "DICT_NOTE" = ${r'#'}{request.dictNote}
         </if>
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
@@ -131,8 +131,8 @@
         <if test="request.dictName != null and request.dictName != ''">
             AND "DICT_NAME" = ${r'#'}{request.dictName}
         </if>
-        <if test="request.dictComment != null and request.dictComment != ''">
-            AND "DICT_COMMENT" = ${r'#'}{request.dictComment}
+        <if test="request.dictNote != null and request.dictNote != ''">
+            AND "DICT_NOTE" = ${r'#'}{request.dictNote}
         </if>
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DictMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DictMapper.xml
index bdb727e5..496c1a4c 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DictMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DictMapper.xml
@@ -7,13 +7,13 @@
     <sql id="table">"SYS_DICT"</sql>
 
     <sql id="entityColumnList">
-        "ID","DICT_NAME","DICT_COMMENT","VERSION","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+        "ID","DICT_NAME","DICT_NOTE","VERSION","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
     </sql>
 
     <resultMap id="dict" type="${domain}.module.wsys.ent.Dict">
         <result column="ID"  jdbcType="BIGINT" property="id"/>
         <result column="DICT_NAME"  jdbcType="VARCHAR" property="dictName"/>
-        <result column="DICT_COMMENT"  jdbcType="VARCHAR" property="dictComment"/>
+        <result column="DICT_NOTE"  jdbcType="VARCHAR" property="dictNote"/>
         <result column="VERSION"  jdbcType="VARCHAR" property="version"/>
         <result column="VALID"  jdbcType="BIT" property="valid"/>
         <result column="ROW_VERSION"  jdbcType="BIGINT" property="rowVersion"/>
@@ -34,7 +34,7 @@
         (
         ${r"#"}{request.id},
         ${r"#"}{request.dictName,jdbcType=VARCHAR},
-        ${r"#"}{request.dictComment,jdbcType=VARCHAR},
+        ${r"#"}{request.dictNote,jdbcType=VARCHAR},
         ${r"#"}{request.version,jdbcType=VARCHAR},
         ${r"#"}{request.valid,jdbcType=BIT},
         0,
@@ -56,7 +56,7 @@
         <foreach collection="list" item= "item" index ="index" separator="," open="(" close=")">
         ${r"#"}{item.id},
         ${r"#"}{item.dictName,jdbcType=VARCHAR},
-        ${r"#"}{item.dictComment,jdbcType=VARCHAR},
+        ${r"#"}{item.dictNote,jdbcType=VARCHAR},
         ${r"#"}{item.version,jdbcType=VARCHAR},
         ${r"#"}{item.valid,jdbcType=BIT},
         0,
@@ -92,7 +92,7 @@
         <include refid="table"/>
         SET
         DICT_NAME = ${r"#"}{request.dictName,jdbcType=VARCHAR},
-        DICT_COMMENT = ${r"#"}{request.dictComment,jdbcType=VARCHAR},
+        DICT_NOTE = ${r"#"}{request.dictNote,jdbcType=VARCHAR},
         VERSION = ${r"#"}{request.version,jdbcType=VARCHAR},
         VALID = ${r"#"}{request.valid,jdbcType=BIT},
         "ROW_VERSION" = "ROW_VERSION" + 1,
@@ -112,8 +112,8 @@
         <if test="request.dictName != null and request.dictName != ''">
             AND DICT_NAME = ${r"#"}{request.dictName}
         </if>
-        <if test="request.dictComment != null and request.dictComment != ''">
-            AND DICT_COMMENT = ${r"#"}{request.dictComment}
+        <if test="request.dictNote != null and request.dictNote != ''">
+            AND DICT_NOTE = ${r"#"}{request.dictNote}
         </if>
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
@@ -129,8 +129,8 @@
         <if test="request.dictName != null and request.dictName != ''">
             AND DICT_NAME = ${r"#"}{request.dictName}
         </if>
-        <if test="request.dictComment != null and request.dictComment != ''">
-            AND DICT_COMMENT = ${r"#"}{request.dictComment}
+        <if test="request.dictNote != null and request.dictNote != ''">
+            AND DICT_NOTE = ${r"#"}{request.dictNote}
         </if>
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictCreateRequest.java
index 04eed5d6..2b59d8cd 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictCreateRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictCreateRequest.java
@@ -24,9 +24,9 @@ public class DictCreateRequest extends BaseRequest {
     /**
      * 字典代码
      */
-    @NotBlank(message = "[dictComment]字典描述不能为空")
+    @NotBlank(message = "[dictNote]字典描述不能为空")
     @Length(min = 1, max = 50, message = "字典描述长度不合法(1-50)")
-    private String dictComment;
+    private String dictNote;
 
     /**
      * 字典版本
@@ -49,12 +49,12 @@ public class DictCreateRequest extends BaseRequest {
         this.dictName = dictName;
     }
 
-    public String getDictComment() {
-        return this.dictComment;
+    public String getDictNote() {
+        return this.dictNote;
     }
 
-    public void setDictComment(String dictComment) {
-        this.dictComment = dictComment;
+    public void setDictNote(String dictNote) {
+        this.dictNote = dictNote;
     }
 
     public String getVersion() {
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictFindRequest.java
index 0c623532..c704bb71 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictFindRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictFindRequest.java
@@ -25,7 +25,7 @@ public class DictFindRequest extends BaseFindRequest {
     /**
      * 字典代码
      */
-    private String dictComment;
+    private String dictNote;
 
     /**
      * 是否有效
@@ -58,12 +58,12 @@ public class DictFindRequest extends BaseFindRequest {
         this.dictName = dictName;
     }
 
-    public String getDictComment() {
-        return this.dictComment;
+    public String getDictNote() {
+        return this.dictNote;
     }
 
-    public void setDictComment(String dictComment) {
-        this.dictComment = dictComment;
+    public void setDictNote(String dictNote) {
+        this.dictNote = dictNote;
     }
 
     public Boolean getValid() {
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemCreateRequest.java
index cf823b39..760ad798 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemCreateRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemCreateRequest.java
@@ -21,15 +21,15 @@ public class DictItemCreateRequest extends BaseRequest {
     private String dictName;
 
     /**
-     * 字典键
+     * 字典枚举
      */
-    @Length(min = 1, max = 20, message = "[key]字典键长度不合法(1-20)")
+    @Length(min = 1, max = 20, message = "[key]字典枚举长度不合法(1-20)")
     private String key;
 
     /**
-     * 字典值
+     * 字典描述
      */
-    @Length(min = 1, max = 100, message = "[value]字典值长度不合法(1-100)")
+    @Length(min = 1, max = 100, message = "[value]字典描述长度不合法(1-100)")
     private String value;
 
     /**
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemFindRequest.java
index 9c1dde4d..583a8220 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemFindRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemFindRequest.java
@@ -24,12 +24,12 @@ public class DictItemFindRequest extends BaseFindRequest {
     private String dictName;
 
     /**
-     * 字典键
+     * 字典枚举
      */
     private String key;
 
     /**
-     * 字典值
+     * 字典描述
      */
     private String value;
 
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemUpdateRequest.java
index 581d2fa1..c3564e00 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemUpdateRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictItemUpdateRequest.java
@@ -21,15 +21,15 @@ public class DictItemUpdateRequest extends BaseUpdateRequest {
     private Long id;
 
     /**
-     * 字典键
+     * 字典枚举
      */
-    @Length(min = 0, max = 10, message = "[key]字典键长度不合法(0-10)")
+    @Length(min = 0, max = 10, message = "[key]字典枚举长度不合法(0-10)")
     private String key;
 
     /**
-     * 字典值
+     * 字典描述
      */
-    @Length(min = 0, max = 100, message = "[value]字典值长度不合法(0-100)")
+    @Length(min = 0, max = 100, message = "[value]字典描述长度不合法(0-100)")
     private String value;
 
     /**
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictUpdateRequest.java
index 400a846b..9a1924c6 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictUpdateRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/DictUpdateRequest.java
@@ -31,9 +31,9 @@ public class DictUpdateRequest extends BaseUpdateRequest {
     /**
      * 字典代码
      */
-    @NotBlank(message = "[dictComment]字典描述不能为空")
-    @Length(min = 0, max = 50, message = "[dictComment]字典描述长度不合法(0-50)")
-    private String dictComment;
+    @NotBlank(message = "[dictNote]字典描述不能为空")
+    @Length(min = 0, max = 50, message = "[dictNote]字典描述长度不合法(0-50)")
+    private String dictNote;
 
     /**
      * 字典版本
@@ -64,12 +64,12 @@ public class DictUpdateRequest extends BaseUpdateRequest {
         this.dictName = dictName;
     }
 
-    public String getDictComment() {
-        return this.dictComment;
+    public String getDictNote() {
+        return this.dictNote;
     }
 
-    public void setDictComment(String dictComment) {
-        this.dictComment = dictComment;
+    public void setDictNote(String dictNote) {
+        this.dictNote = dictNote;
     }
 
     public String getVersion() {
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java
index 5c4f2be1..3ced5dd7 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java
@@ -42,7 +42,6 @@ public class ProfilesCreateRequest extends BaseRequest {
     /**
      * 配置描述.
      */
-    @NotBlank(message = "[note]配置描述值不能为空")
     @Length(min = 0, max = 255, message = "[note]配置描述长度不合法(0-50)")
     private String note;
 
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java
index 827a7bec..0774106e 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java
@@ -48,7 +48,6 @@ public class ProfilesUpdateRequest extends BaseUpdateRequest {
     /**
      * 配置描述.
      */
-    @NotBlank(message = "[note]配置描述不能为空")
     @Length(min = 0, max = 255, message = "[note]配置描述长度不合法(0-255)")
     private String note;
 
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml
index df000e9c..45618c95 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml
@@ -5,7 +5,7 @@
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" methods="[]" msvr="false" pageAdd="true" pageExp="true" pageImp="true" search="false" sys="true" tableComment="字典" tableName="DICT" update="true">
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="字典名称" fieldLength="50" fieldName="DICT_NAME" fieldType="String_var50" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="字典描述" fieldLength="50" fieldName="DICT_COMMENT" fieldType="String_var50" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="字典描述" fieldLength="50" fieldName="DICT_NOTE" fieldType="String_var50" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="字典版本" fieldLength="50" fieldName="VERSION" fieldType="String_var50" isLike="false" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="是否有效" fieldLength="0" fieldName="VALID" fieldType="Boolean" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
@@ -18,8 +18,8 @@
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" methods="[]" msvr="false" pageAdd="true" pageExp="true" pageImp="true" search="false" sys="true" tableComment="字典项" tableName="DICT_ITEM" update="true">
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="字典名称" fieldLength="50" fieldName="DICT_NAME" fieldType="String_var50" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="字典键" fieldLength="20" fieldName="KEY" fieldType="String_var" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="字典值" fieldLength="50" fieldName="VALUE" fieldType="String_var50" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="字典枚举" fieldLength="20" fieldName="KEY" fieldType="String_var" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="字典描述" fieldLength="50" fieldName="VALUE" fieldType="String_var50" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="排序" fieldLength="0" fieldName="SORT" fieldType="Integer" isLike="false" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="是否有效" fieldLength="0" fieldName="VALID" fieldType="Boolean" isLike="false" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql
index 9fea7e3f..d88fd9a9 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql
@@ -7,7 +7,7 @@
 CREATE TABLE `SYS_DICT` (
     `ID` BIGINT(20) NOT NULL COMMENT '主键',
     `DICT_NAME` VARCHAR(50) COMMENT '字典名称',
-    `DICT_COMMENT` VARCHAR(50) COMMENT '字典描述',
+    `DICT_NOTE` VARCHAR(50) COMMENT '字典描述',
     `VERSION` VARCHAR(50) COMMENT '字典版本',
     `VALID` TINYINT(1) COMMENT '是否有效',
     `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
@@ -28,8 +28,8 @@ PRIMARY KEY (`ID`)
 CREATE TABLE `SYS_DICT_ITEM` (
     `ID` BIGINT(20) NOT NULL COMMENT '主键',
     `DICT_NAME` VARCHAR(50) COMMENT '字典名称',
-    `KEY` VARCHAR(20) COMMENT '字典键',
-    `VALUE` VARCHAR(50) COMMENT '字典值',
+    `KEY` VARCHAR(20) COMMENT '字典枚举',
+    `VALUE` VARCHAR(50) COMMENT '字典描述',
     `SORT` INTEGER(10) COMMENT '排序',
     `VALID` TINYINT(1) COMMENT '是否有效',
     `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
@@ -349,7 +349,7 @@ CREATE TABLE `SYS_PROFILES` (
     `ACTIVE` VARCHAR(20) NOT NULL COMMENT '配置环境',
     `KEY` VARCHAR(50) NOT NULL COMMENT '配置项名',
     `VALUE` VARCHAR(50) NOT NULL COMMENT '配置项值',
-    `NOTE` VARCHAR(255) NOT NULL COMMENT '配置描述',
+    `NOTE` VARCHAR(255) DEFAULT NULL COMMENT '配置描述',
     `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
     `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',
     `CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户',
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT.sql
index ace3790a..faffc55a 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT.sql
@@ -7,7 +7,7 @@
 CREATE TABLE `SYS_DICT` (
         `ID` BIGINT(20) NOT NULL COMMENT '主键',
         `DICT_NAME` VARCHAR(50) COMMENT '字典名称',
-        `DICT_COMMENT` VARCHAR(50) COMMENT '字典描述',
+        `DICT_NOTE` VARCHAR(50) COMMENT '字典描述',
         `VERSION` VARCHAR(50) COMMENT '字典版本',
         `VALID` TINYINT(1) COMMENT '是否有效',
         `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT_ITEM.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT_ITEM.sql
index ecd85528..770f4a01 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT_ITEM.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_DICT_ITEM.sql
@@ -7,8 +7,8 @@
 CREATE TABLE `SYS_DICT_ITEM` (
         `ID` BIGINT(20) NOT NULL COMMENT '主键',
         `DICT_NAME` VARCHAR(50) COMMENT '字典名称',
-        `KEY` VARCHAR(20) COMMENT '字典键',
-        `VALUE` VARCHAR(50) COMMENT '字典值',
+        `KEY` VARCHAR(20) COMMENT '字典枚举',
+        `VALUE` VARCHAR(50) COMMENT '字典描述',
         `SORT` INTEGER(10) COMMENT '排序',
         `VALID` TINYINT(1) COMMENT '是否有效',
         `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql
index 50b2fd26..5be59add 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql
@@ -9,7 +9,7 @@ CREATE TABLE `SYS_PROFILES` (
         `ACTIVE` VARCHAR(20) NOT NULL COMMENT '配置环境',
         `KEY` VARCHAR(50) NOT NULL COMMENT '配置项名',
         `VALUE` VARCHAR(50) NOT NULL COMMENT '配置项值',
-        `NOTE` VARCHAR(255) NOT NULL COMMENT '配置描述',
+        `NOTE` VARCHAR(255) DEFAULT NULL COMMENT '配置描述',
         `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
         `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',
         `CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户',
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql
index 03c1c0ed..1ad23e68 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql
@@ -7,7 +7,7 @@
 CREATE TABLE "SYS_DICT" (
 "ID" NUMBER(19) NOT NULL,
 "DICT_NAME" VARCHAR2(50) NULL,
-"DICT_COMMENT" VARCHAR2(50) NULL,
+"DICT_NOTE" VARCHAR2(50) NULL,
 "VERSION" VARCHAR2(50) NULL,
 "VALID" CHAR(1) NULL,
 "ROW_VERSION" NUMBER(19) NOT NULL,
@@ -20,7 +20,7 @@ CREATE TABLE "SYS_DICT" (
 COMMENT ON TABLE "SYS_DICT" is '字典';
 COMMENT ON COLUMN "SYS_DICT"."ID" is '主键';
 COMMENT ON COLUMN "SYS_DICT"."DICT_NAME" is '字典名称';
-COMMENT ON COLUMN "SYS_DICT"."DICT_COMMENT" is '字典描述';
+COMMENT ON COLUMN "SYS_DICT"."DICT_NOTE" is '字典描述';
 COMMENT ON COLUMN "SYS_DICT"."VERSION" is '字典版本';
 COMMENT ON COLUMN "SYS_DICT"."VALID" is '是否有效';
 COMMENT ON COLUMN "SYS_DICT"."ROW_VERSION" is '行版本';
@@ -53,8 +53,8 @@ CREATE TABLE "SYS_DICT_ITEM" (
 COMMENT ON TABLE "SYS_DICT_ITEM" is '字典项';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."ID" is '主键';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."DICT_NAME" is '字典名称';
-COMMENT ON COLUMN "SYS_DICT_ITEM"."KEY" is '字典键';
-COMMENT ON COLUMN "SYS_DICT_ITEM"."VALUE" is '字典值';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."KEY" is '字典枚举';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."VALUE" is '字典描述';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."SORT" is '排序';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."VALID" is '是否有效';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."ROW_VERSION" is '行版本';
@@ -539,8 +539,8 @@ COMMENT ON COLUMN "SYS_LOGERR"."LAST_UPDATE_TIME" is '最后更新时间';
 CREATE TABLE "SYS_PROFILES" (
 "ID" NUMBER(19) NOT NULL,
 "ACTIVE" VARCHAR(20) NULL,
-"KEY" VARCHAR2(50) NULL,
-"VALUE" VARCHAR2(50) NULL,
+"KEY" VARCHAR2(50) NOT NULL,
+"VALUE" VARCHAR2(50) NOT NULL,
 "NOTE" VARCHAR2(255) NULL,
 "ROW_VERSION" NUMBER(19) NOT NULL,
 "IS_DELETED" CHAR(1) NOT NULL,
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT.sql
index 4de2398a..01c96044 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT.sql
@@ -7,7 +7,7 @@
 CREATE TABLE "SYS_DICT" (
     "ID" NUMBER(19) NOT NULL,
     "DICT_NAME" VARCHAR2(50) NULL,
-    "DICT_COMMENT" VARCHAR2(50) NULL,
+    "DICT_NOTE" VARCHAR2(50) NULL,
     "VERSION" VARCHAR2(50) NULL,
     "VALID" CHAR(1) NULL,
     "ROW_VERSION" NUMBER(19) NOT NULL,
@@ -21,7 +21,7 @@ CREATE TABLE "SYS_DICT" (
 COMMENT ON TABLE "SYS_DICT" is '字典';
 COMMENT ON COLUMN "SYS_DICT"."ID" is '主键';
 COMMENT ON COLUMN "SYS_DICT"."DICT_NAME" is '字典名称';
-COMMENT ON COLUMN "SYS_DICT"."DICT_COMMENT" is '字典描述';
+COMMENT ON COLUMN "SYS_DICT"."DICT_NOTE" is '字典描述';
 COMMENT ON COLUMN "SYS_DICT"."VERSION" is '字典版本';
 COMMENT ON COLUMN "SYS_DICT"."VALID" is '是否有效';
 COMMENT ON COLUMN "SYS_DICT"."ROW_VERSION" is '行版本';
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT_ITEM.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT_ITEM.sql
index 18734f25..6a7e76fb 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT_ITEM.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_DICT_ITEM.sql
@@ -22,8 +22,8 @@ CREATE TABLE "SYS_DICT_ITEM" (
 COMMENT ON TABLE "SYS_DICT_ITEM" is '字典项';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."ID" is '主键';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."DICT_NAME" is '字典名称';
-COMMENT ON COLUMN "SYS_DICT_ITEM"."KEY" is '字典键';
-COMMENT ON COLUMN "SYS_DICT_ITEM"."VALUE" is '字典值';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."KEY" is '字典枚举';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."VALUE" is '字典描述';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."SORT" is '排序';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."VALID" is '是否有效';
 COMMENT ON COLUMN "SYS_DICT_ITEM"."ROW_VERSION" is '行版本';
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql
index 3c47754f..ac390c0d 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql
@@ -7,7 +7,7 @@
 CREATE TABLE IF NOT EXISTS SYS_DICT (
     "ID" BIGINT PRIMARY KEY NOT NULL,
     "DICT_NAME" VARCHAR(50),
-    "DICT_COMMENT" VARCHAR(50),
+    "DICT_NOTE" VARCHAR(50),
     "VERSION" VARCHAR(50),
     "VALID" BOOLEAN,
     "ROW_VERSION" BIGINT NOT NULL,
@@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS SYS_PROFILES (
     "ACTIVE" VARCHAR(20) NOT NULL,
     "KEY" VARCHAR(50) NOT NULL,
     "VALUE" VARCHAR(50) NOT NULL,
-    "NOTE" VARCHAR(255) NOT NULL,
+    "NOTE" VARCHAR(255),
     "ROW_VERSION" BIGINT NOT NULL,
     "IS_DELETED" BOOLEAN NOT NULL,
     "CREATE_BY" BIGINT NOT NULL,
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_DICT.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_DICT.sql
index 46ddc506..650d263c 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_DICT.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_DICT.sql
@@ -7,7 +7,7 @@
 CREATE TABLE IF NOT EXISTS SYS_DICT (
     "ID" BIGINT PRIMARY KEY NOT NULL,
     "DICT_NAME" VARCHAR(50) NOT NULL,
-    "DICT_COMMENT" VARCHAR(50) NOT NULL,
+    "DICT_NOTE" VARCHAR(50) NOT NULL,
     "VERSION" VARCHAR(50) NOT NULL,
     "VALID" BOOLEAN NOT NULL,
     "ROW_VERSION" BIGINT NOT NULL,
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql
index 32c8fcd7..9778a09f 100644
--- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql
+++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS SYS_PROFILES (
     "ACTIVE" VARCHAR(20) NOT NULL,
     "KEY" VARCHAR(50) NOT NULL,
     "VALUE" VARCHAR(50) NOT NULL,
-    "NOTE" VARCHAR(255) NOT NULL,
+    "NOTE" VARCHAR(255),
     "ROW_VERSION" BIGINT NOT NULL,
     "IS_DELETED" BOOLEAN NOT NULL,
     "CREATE_BY" BIGINT NOT NULL,
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
index 302c5be3..c60382de 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
@@ -1,1009 +1,1025 @@
+<#-- 此宏包含《网络请求》《vue通用设置》《实用小工具》，为引用方便集成到一个宏里 -->
 <script>
-    var jsonService = axios.create({
-        method: 'post',
-        timeout: 30000,
-        baseURL: '${context?default("")}',
-        headers: {'Content-Type': 'application/json;charset=UTF-8'},
-    });
-    var downloadService = axios.create({
-        method: 'post',
-        timeout: 3 * 60 * 1000,
-        baseURL: '${context?default("")}',
-        responseType: 'blob',
-        headers: {'Content-Type': 'application/json;charset=UTF-8'},
-    });
-    var uploadService = axios.create({
-        method: 'post',
-        timeout: 3 * 60 * 1000,
-        baseURL: '${context?default("")}',
-        headers: {'Content-Type': 'multipart/form-data'},
-        onUploadProgress: function (progressEvent) {
-            var complete = (progressEvent.loaded / progressEvent.total * 100 | 0) + '%'
-            nav.tipShow("上传中(" + complete + ")")
-            if (complete === '100%') {
-                nav.tipShow("处理中，请稍等..")
-            }
-        },
-    });
-    var importService = axios.create({
-        method: 'post',
-        timeout: 3 * 60 * 1000,
-        baseURL: '${context?default("")}',
-        responseType: 'blob',
-        headers: {'Content-Type': 'multipart/form-data'},
-        onUploadProgress: function (progressEvent) {
-            var complete = (progressEvent.loaded / progressEvent.total * 100 | 0) + '%'
-            nav.tipShow("上传中(" + complete + ")")
-            if (complete === '100%') {
-                nav.tipShow("处理中，请稍等..")
+    // 网络请求
+    {
+        var jsonService = axios.create({
+            method: 'post',
+            timeout: 30000,
+            baseURL: '${context?default("")}',
+            headers: {'Content-Type': 'application/json;charset=UTF-8'},
+        });
+        var downloadService = axios.create({
+            method: 'post',
+            timeout: 3 * 60 * 1000,
+            baseURL: '${context?default("")}',
+            responseType: 'blob',
+            headers: {'Content-Type': 'application/json;charset=UTF-8'},
+        });
+        var uploadService = axios.create({
+            method: 'post',
+            timeout: 3 * 60 * 1000,
+            baseURL: '${context?default("")}',
+            headers: {'Content-Type': 'multipart/form-data'},
+            onUploadProgress: function (progressEvent) {
+                var complete = (progressEvent.loaded / progressEvent.total * 100 | 0) + '%'
+                nav.tipShow("上传中(" + complete + ")")
+                if (complete === '100%') {
+                    nav.tipShow("处理中，请稍等..")
+                }
+            },
+        });
+        var importService = axios.create({
+            method: 'post',
+            timeout: 3 * 60 * 1000,
+            baseURL: '${context?default("")}',
+            responseType: 'blob',
+            headers: {'Content-Type': 'multipart/form-data'},
+            onUploadProgress: function (progressEvent) {
+                var complete = (progressEvent.loaded / progressEvent.total * 100 | 0) + '%'
+                nav.tipShow("上传中(" + complete + ")")
+                if (complete === '100%') {
+                    nav.tipShow("处理中，请稍等..")
+                }
+            },
+        });
+        function handleError(status) {
+            switch (status) {
+                case 401:
+                    return {message: "未授权，请登录(401)"};
+                case 403:
+                    return {message: "拒绝访问(403)"};
+                case 404:
+                    return {message: "请求地址错误(404)"};
+                case 408:
+                    return {message: "请求超时(408)"};
+                case 500:
+                    return {message: "服务器内部错误(500)"};
+                case 501:
+                    return {message: "服务未实现(501)"};
+                default:
+                    return {message: "请求错误(" + error.response.status + ")"};
             }
-        },
-    });
-    function handleError(status) {
-        switch (status) {
-            case 401:
-                return {message: "未授权，请登录(401)"};
-            case 403:
-                return {message: "拒绝访问(403)"};
-            case 404:
-                return {message: "请求地址错误(404)"};
-            case 408:
-                return {message: "请求超时(408)"};
-            case 500:
-                return {message: "服务器内部错误(500)"};
-            case 501:
-                return {message: "服务未实现(501)"};
-            default:
-                return {message: "请求错误(" + error.response.status + ")"};
         }
-    }
-    function jsonRequest(data) {
-        nav.barShow();
-        return jsonService.request(data)
-                .then(function (response) {
-                    if (response.data.errors && response.data.errors.length == 0) {
-                        nav.barFinish();
-                    } else if (response.data.errors && response.data.errors.length > 0) {
-                        nav.barError();
-                    } else {
-                        response.data = {errors: [{message: '服务器响应错误'}]};
-                        nav.barError();
-                    }
-                    return Promise.resolve(response.data);
-                }, function (error) {
-                    nav.barError();
-                    const rsp = {errors: []};
-                    if (!error.response) {
-                        rsp.errors.push({message: error.message});
-                    } else {
-                        rsp.errors.push(handleError(error.response.status));
-                    }
-                    return Promise.resolve(rsp);
-                })
-    };
-    function uploadRequest(data) {
-        nav.barShow();
-        nav.tipShow("上传中...");
-        var fd = new FormData();
-        fd.append("file", data.data);
-        data.data = fd;
-        return uploadService.request(data)
-                .then(function (response) {
-                    nav.tipClose();
-                    if (response.data.errors && response.data.errors.length == 0) {
-                        nav.barFinish();
-                    } else if (response.data.errors && response.data.errors.length > 0) {
-                        nav.barError();
-                    } else {
-                        response.data = {errors: [{message: '服务器响应错误'}]};
-                        nav.barError();
-                    }
-                    return Promise.resolve(response.data);
-                }, function (error) {
-                    nav.barError();
-                    const rsp = {errors: []};
-                    if (!error.response) {
-                        rsp.errors.push({message: error.message});
-                    } else {
-                        rsp.errors.push(handleError(error.response.status));
-                    }
-                    return Promise.resolve(rsp);
-                })
-    };
-    function importRequest(data) {
-        nav.barShow();
-        nav.tipShow("上传中...");
-        var fd = new FormData();
-        fd.append("file", data.data);
-        data.data = fd;
-        return importService.request(data)
-                .then(function (response) {
-                    nav.tipClose();
-                    if (!response.data) {
-                        nav.barError();
-                        return Promise.resolve({errors: [{message: '下载错误'}]});
-                    } else if ("application/json" == response.data.type) {
-                        var reader = new FileReader();
-                        reader.addEventListener("loadend", function () {
-                            var rsp = JSON.parse(reader.result);
-                            if (rsp.errors.length > 0) {
-                                nav.barError();
-                                nav.e(rsp.errors[0].message)
-                            } else {
-                                nav.barFinish();
-                            }
-                        });
-                        reader.readAsText(response.data, "utf-8");
-                        return Promise.resolve({errors: []});
-                    } else {
-                        nav.barFinish();
-                        // 获取响应header中文件信息
-                        var dis = response.headers['content-disposition'];
-                        // 正则匹配文件名
-                        var fileName = dis.match(/filename="(.*\..*)"/)[1];
-                        // 模拟下载
-                        utils.blobtoDown(decodeURIComponent(fileName), new Blob([response.data]))
-                        return Promise.resolve({errors: []});
-                    }
-                }, function (error) {
-                    nav.tipClose();
-                    nav.barError();
-                    const rsp = {errors: []};
-                    if (!error.response) {
-                        rsp.errors.push({message: error.message});
-                    } else {
-                        rsp.errors.push(handleError(error.response.status));
-                    }
-                    return Promise.resolve(rsp);
-                })
-    };
-    function downRequest(data) {
-        nav.barShow();
-        return downloadService.request(data)
-                .then(function (response) {
-                    if (!response.data) {
+        function jsonRequest(data) {
+            nav.barShow();
+            return jsonService.request(data)
+                    .then(function (response) {
+                        if (response.data.errors && response.data.errors.length == 0) {
+                            nav.barFinish();
+                        } else if (response.data.errors && response.data.errors.length > 0) {
+                            nav.barError();
+                        } else {
+                            response.data = {errors: [{message: '服务器响应错误'}]};
+                            nav.barError();
+                        }
+                        return Promise.resolve(response.data);
+                    }, function (error) {
                         nav.barError();
-                        return Promise.resolve({errors: [{message: '下载错误'}]});
-                    } else if ("application/json" == response.data.type) {
-                        var reader = new FileReader();
-                        reader.addEventListener("loadend", function () {
-                            var rsp = JSON.parse(reader.result);
-                            if (rsp.errors.length > 0) {
-                                nav.barError();
-                                nav.e(rsp.errors[0].message)
-                            } else {
-                                nav.barFinish();
-                            }
-                        });
-                        reader.readAsText(response.data, "utf-8");
-                        return Promise.resolve({errors: []});
-                    } else {
-                        nav.barFinish();
-                        // 获取响应header中文件信息
-                        var dis = response.headers['content-disposition'];
-                        // 正则匹配文件名
-                        var fileName = dis.match(/filename="(.*\..*)"/)[1];
-                        // 模拟下载
-                        utils.blobtoDown(decodeURIComponent(fileName), new Blob([response.data]))
-                        return Promise.resolve({errors: []});
-                    }
-                }, function (error) {
-                    nav.tipClose();
-                    nav.barError();
-                    const rsp = {errors: []};
-                    if (!error.response) {
-                        rsp.errors.push({message: error.message});
-                    } else {
-                        rsp.errors.push(handleError(error.response.status));
-                    }
-                    return Promise.resolve(rsp);
-                })
-    };
-    function Ajax(module, target, method) {
-        this.mModule = module;
-        this.mTarget = target;
-        this.mMethod = method;
-
-        this.method = function (method) {
-            this.mMethod = method;
-            return this;
-        };
-        this.post = function (data, callback) {
-            switch (this.mMethod) {
-                case "upload":
-                    return uploadRequest({
-                        url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
-                        data: data
-                    }).then(callback);
-                    break;
-                case "imports":
-                    return importRequest({
-                        url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
-                        data: data
-                    }).then(callback);
-                    break;
-                case "exports":
-                    return downRequest({
-                        url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
-                        data: JSON.stringify(data)
-                    }).then(callback)
-                    break;
-                case "template":
-                    return downRequest({
-                        url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
-                        data: JSON.stringify(data)
-                    }).then(callback);
-                    break;
-                default:
-                    return jsonRequest({
-                        url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
-                        data: JSON.stringify(data)
-                    }).then(callback);
-            }
-        };
-        this.create = function (data, callback) {
-            this.mMethod = "create";
-            this.post(data, callback);
-        };
-        this.delete = function (data, callback) {
-            this.mMethod = "delete";
-            this.post(data, callback);
-        };
-        this.update = function (data, callback) {
-            this.mMethod = "update";
-            this.post(data, callback);
-        };
-        this.find = function (data, callback) {
-            this.mMethod = "find";
-            this.post(data, callback);
-        };
-        this.get = function (data, callback) {
-            this.mMethod = "get";
-            this.post(data, callback);
-        };
-        this.load = function (data, callback) {
-            this.mMethod = "load";
-            this.post(data, callback);
-        };
-        this.template = function (data, callback) {
-            this.mMethod = "template";
-            this.post(data, callback);
+                        const rsp = {errors: []};
+                        if (!error.response) {
+                            rsp.errors.push({message: error.message});
+                        } else {
+                            rsp.errors.push(handleError(error.response.status));
+                        }
+                        return Promise.resolve(rsp);
+                    })
         };
-        this.imports = function (data, callback) {
-            this.mMethod = "imports";
-            this.post(data, callback);
+        function uploadRequest(data) {
+            nav.barShow();
+            nav.tipShow("上传中...");
+            var fd = new FormData();
+            fd.append("file", data.data);
+            data.data = fd;
+            return uploadService.request(data)
+                    .then(function (response) {
+                        nav.tipClose();
+                        if (response.data.errors && response.data.errors.length == 0) {
+                            nav.barFinish();
+                        } else if (response.data.errors && response.data.errors.length > 0) {
+                            nav.barError();
+                        } else {
+                            response.data = {errors: [{message: '服务器响应错误'}]};
+                            nav.barError();
+                        }
+                        return Promise.resolve(response.data);
+                    }, function (error) {
+                        nav.barError();
+                        const rsp = {errors: []};
+                        if (!error.response) {
+                            rsp.errors.push({message: error.message});
+                        } else {
+                            rsp.errors.push(handleError(error.response.status));
+                        }
+                        return Promise.resolve(rsp);
+                    })
         };
-        this.exports = function (data, callback) {
-            this.mMethod = "exports";
-            this.post(data, callback);
+        function importRequest(data) {
+            nav.barShow();
+            nav.tipShow("上传中...");
+            var fd = new FormData();
+            fd.append("file", data.data);
+            data.data = fd;
+            return importService.request(data)
+                    .then(function (response) {
+                        nav.tipClose();
+                        if (!response.data) {
+                            nav.barError();
+                            return Promise.resolve({errors: [{message: '下载错误'}]});
+                        } else if ("application/json" == response.data.type) {
+                            var reader = new FileReader();
+                            reader.addEventListener("loadend", function () {
+                                var rsp = JSON.parse(reader.result);
+                                if (rsp.errors.length > 0) {
+                                    nav.barError();
+                                    nav.e(rsp.errors[0].message)
+                                } else {
+                                    nav.barFinish();
+                                }
+                            });
+                            reader.readAsText(response.data, "utf-8");
+                            return Promise.resolve({errors: []});
+                        } else {
+                            nav.barFinish();
+                            // 获取响应header中文件信息
+                            var dis = response.headers['content-disposition'];
+                            // 正则匹配文件名
+                            var fileName = dis.match(/filename="(.*\..*)"/)[1];
+                            // 模拟下载
+                            utils.blobtoDown(decodeURIComponent(fileName), new Blob([response.data]))
+                            return Promise.resolve({errors: []});
+                        }
+                    }, function (error) {
+                        nav.tipClose();
+                        nav.barError();
+                        const rsp = {errors: []};
+                        if (!error.response) {
+                            rsp.errors.push({message: error.message});
+                        } else {
+                            rsp.errors.push(handleError(error.response.status));
+                        }
+                        return Promise.resolve(rsp);
+                    })
         };
-        this.upload = function (data, callback) {
-            this.mMethod = "upload";
-            this.post(data, callback);
+        function downRequest(data) {
+            nav.barShow();
+            return downloadService.request(data)
+                    .then(function (response) {
+                        if (!response.data) {
+                            nav.barError();
+                            return Promise.resolve({errors: [{message: '下载错误'}]});
+                        } else if ("application/json" == response.data.type) {
+                            var reader = new FileReader();
+                            reader.addEventListener("loadend", function () {
+                                var rsp = JSON.parse(reader.result);
+                                if (rsp.errors.length > 0) {
+                                    nav.barError();
+                                    nav.e(rsp.errors[0].message)
+                                } else {
+                                    nav.barFinish();
+                                }
+                            });
+                            reader.readAsText(response.data, "utf-8");
+                            return Promise.resolve({errors: []});
+                        } else {
+                            nav.barFinish();
+                            // 获取响应header中文件信息
+                            var dis = response.headers['content-disposition'];
+                            // 正则匹配文件名
+                            var fileName = dis.match(/filename="(.*\..*)"/)[1];
+                            // 模拟下载
+                            utils.blobtoDown(decodeURIComponent(fileName), new Blob([response.data]))
+                            return Promise.resolve({errors: []});
+                        }
+                    }, function (error) {
+                        nav.tipClose();
+                        nav.barError();
+                        const rsp = {errors: []};
+                        if (!error.response) {
+                            rsp.errors.push({message: error.message});
+                        } else {
+                            rsp.errors.push(handleError(error.response.status));
+                        }
+                        return Promise.resolve(rsp);
+                    })
         };
-    }
+        function Ajax(module, target, method) {
+            this.mModule = module;
+            this.mTarget = target;
+            this.mMethod = method;
 
-    Vue.config.productionTip = false;
-    Vue.prototype.$dictMap = {};
-    var mixin = {
-        data: {
-            activeIndex: 'home',
-            context: '${context?default("")}',
-            isSubmit: false,
-            result: [],
-            select: []
-        },
-        methods: {
-            onSearch: function () {
-                this.vm.pageNumber = 1;
-                this.onFind();
-            },
-            onReset: function (form) {
-                this.$refs[form].resetFields();
-                nav.s('重置成功');
-            },
-            onPageChange: function (pageNumber) {
-                this.vm.pageNumber = pageNumber;
-                this.onFind();
-            },
-            onPageSizeChange: function (pageSize) {
-                this.vm.pageSize = pageSize;
-                this.onFind();
-            },
-            onSelectionChange: function (select) {
-                this.select = select;
+            this.method = function (method) {
+                this.mMethod = method;
+                return this;
+            };
+            this.post = function (data, callback) {
+                switch (this.mMethod) {
+                    case "upload":
+                        return uploadRequest({
+                            url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
+                            data: data
+                        }).then(callback);
+                        break;
+                    case "imports":
+                        return importRequest({
+                            url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
+                            data: data
+                        }).then(callback);
+                        break;
+                    case "exports":
+                        return downRequest({
+                            url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
+                            data: JSON.stringify(data)
+                        }).then(callback)
+                        break;
+                    case "template":
+                        return downRequest({
+                            url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
+                            data: JSON.stringify(data)
+                        }).then(callback);
+                        break;
+                    default:
+                        return jsonRequest({
+                            url: '/ajax/' + this.mModule + "/" + this.mTarget + "/" + this.mMethod,
+                            data: JSON.stringify(data)
+                        }).then(callback);
+                }
+            };
+            this.create = function (data, callback) {
+                this.mMethod = "create";
+                this.post(data, callback);
+            };
+            this.delete = function (data, callback) {
+                this.mMethod = "delete";
+                this.post(data, callback);
+            };
+            this.update = function (data, callback) {
+                this.mMethod = "update";
+                this.post(data, callback);
+            };
+            this.find = function (data, callback) {
+                this.mMethod = "find";
+                this.post(data, callback);
+            };
+            this.get = function (data, callback) {
+                this.mMethod = "get";
+                this.post(data, callback);
+            };
+            this.load = function (data, callback) {
+                this.mMethod = "load";
+                this.post(data, callback);
+            };
+            this.template = function (data, callback) {
+                this.mMethod = "template";
+                this.post(data, callback);
+            };
+            this.imports = function (data, callback) {
+                this.mMethod = "imports";
+                this.post(data, callback);
+            };
+            this.exports = function (data, callback) {
+                this.mMethod = "exports";
+                this.post(data, callback);
+            };
+            this.upload = function (data, callback) {
+                this.mMethod = "upload";
+                this.post(data, callback);
+            };
+        }
+    }
+    // vue通用设置
+    {
+        // 关闭生产提示
+        Vue.config.productionTip = false;
+        // 字典缓存对象
+        Vue.prototype.$dictMap = {};
+        // 全局提交标记
+        Vue.prototype.$isSubmit = false;
+        // 字典组件
+        Vue.component('el-input-dict', {
+            data: function () {
+                return {
+                    item: {},
+                    options: []
+                }
             },
-            onTemplate: function () {
-                new Ajax(this.module, this.target).method("template").post({}, function (response) {
-                    if (response.errors.length > 0) {
-                        nav.e(response.errors[0].message);
+            props: {
+                value: {
+                    type: String | Object,
+                    default: ''
+                },
+                valueFor: {
+                    type: String,
+                    default: 'key',
+                    validator: function (value) {
+                        var r = (['key', 'value', 'item'].indexOf(value) !== -1);
+                        if (!r) {
+                            console.error("value-for的值只能是['key','value','item']中的一个.")
+                        }
+                        return r;
                     }
-                })
+                },
+                dictName: {
+                    type: String,
+                    default: ''
+                },
+                size: {
+                    type: String,
+                    default: 'small'
+                },
+                placeholder: {
+                    type: String,
+                    default: ''
+                },
+                change: {
+                    type: Function,
+                    default: function (item) {
+
+                    }
+                }
             },
-            onImport: function (item) {
-                utils.selectFile(function (files) {
-                    new Ajax(this.module, this.target).method("imports").post(files[0], function (response) {
-                        if (response.errors.length > 0) {
-                            nav.e(response.errors[0].message);
-                        }
-                    });
-                }.bind(this))
+            watch: {
+                value: function (val, old) {
+                    this.init();
+                }
             },
-            onExport: function () {
-                var req = JSON.parse(JSON.stringify(this.vm));
-                req.pageSize = 0;
-                new Ajax(this.module, this.target).method("exports").post(req, function (response) {
-                    if (response.errors.length > 0) {
-                        nav.e(response.errors[0].message);
+            methods: {
+                input: function (item) {
+                    this.item = item;
+                    switch (this.valueFor) {
+                        case "key":
+                            this.$emit('input', item.key);
+                            break;
+                        case "value":
+                            this.$emit('input', item.value);
+                            break;
+                        case "item":
+                            this.$emit('input', item);
+                            break;
                     }
-                });
-            },
-            onSave: function () {
-                this.$refs['form'].validate(function (valid) {
-                    if (valid) {
-                        if (this.form.id) {
-                            new Ajax(this.module, this.target).update(this.form, function (response) {
+                },
+                init: function () {
+                    if (this.dictName) {
+                        var dictItems = Vue.prototype.$dictMap[this.dictName];
+                        if (typeof(dictItems) === "undefined") {
+                            new Ajax("wsys", "dict", "load").post({
+                                dictName: this.dictName
+                            }, function (response) {
                                 if (response.errors.length > 0) {
-                                    nav.e(response.errors[0].message);
+                                    console.error(response.errors[0].message)
                                 } else {
-                                    this.onFind();
-                                    this.$refs['form'].resetFields();
-                                    this.form.formShow = false;
+                                    Vue.prototype.$dictMap[this.dictName] = response.dictItems;
                                 }
-                            }.bind(this))
+                            }.bind(this));
+                            Vue.prototype.$dictMap[this.dictName] = [];
+                            this.init();
+                        } else if (dictItems.length === 0) {
+                            setTimeout(function () {
+                                this.init()
+                            }.bind(this), 100);
                         } else {
-                            new Ajax(this.module, this.target).create(this.form, function (response) {
-                                if (response.errors.length > 0) {
-                                    nav.e(response.errors[0].message);
-                                } else {
-                                    this.onFind();
-                                    this.$refs['form'].resetFields();
-                                    this.form.formShow = false;
+                            this.options = dictItems;
+                            this.item = {};
+                            for (var i = 0; i < this.options.length; i++) {
+                                if (this.options[i].key == this.value) {
+                                    this.item = this.options[i];
                                 }
-                            }.bind(this))
+                            }
                         }
-                    } else {
-                        return false;
                     }
-                }.bind(this));
+                }
             },
-            onFind: function () {
-                new Ajax(this.module, this.target).find(this.vm, function (response) {
-                    if (response.errors.length > 0) {
-                        nav.e(response.errors[0].message);
-                    } else {
-                        this.result = response.result;
-                        this.vm.totalCount = Number(response.totalCount);
-                    }
-                }.bind(this))
+            created: function () {
+                this.init();
             },
-            onDelete: function (item) {
-                this.$confirm('将删除该项, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(function () {
-                    new Ajax(this.module, this.target).delete({id: item.id}, function (response) {
-                        if (response.errors.length > 0) {
-                            nav.e(response.errors[0].message);
-                        } else {
-                            nav.s("删除成功");
-                            this.onFind();
-                        }
-                    }.bind(this))
-                }.bind(this)).catch(function (action) {
-
-                });
+            template: '' +
+            '<el-select :value="item.value" @input="input" filterable clearable placeholder="请选择" :size="size" :placeholder="placeholder" @change="change">' +
+            ' <el-option v-for="item in options" :key="item.key" :label="item.value" :value="item">' +
+            '  <span style="float: left">{{ item.value }}</span>' +
+            '  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.key }}</span>' +
+            ' </el-option>' +
+            '</el-select>'
+        });
+        // 字典组件
+        Vue.component('el-view-dict', {
+            data: function () {
+                return {
+                    item: {},
+                }
             },
-            onBitchDelete: function () {
-                if (this.select.length == 0) {
-                    nav.w("至少选中一项");
-                } else {
-                    this.$confirm('将删除已选择的项, 是否继续?', '提示', {
-                        confirmButtonText: '确定',
-                        cancelButtonText: '取消',
-                        type: 'warning'
-                    }).then(function () {
-                        nav.tipShow("删除中...");
-                        this.select.forAsync(function (item, next) {
-                            new Ajax(this.module, this.target).delete({id: item.id}, function (response) {
+            props: {
+                value: {
+                    type: String,
+                    default: ''
+                },
+                dictName: {
+                    type: String,
+                    default: ''
+                },
+            },
+            watch: {
+                value: function (val, old) {
+                    this.init();
+                }
+            },
+            methods: {
+                init: function () {
+                    if (this.dictName) {
+                        var dictItems = Vue.prototype.$dictMap[this.dictName];
+                        if (typeof(dictItems) === "undefined") {
+                            new Ajax("wsys", "dict", "load").post({
+                                dictName: this.dictName
+                            }, function (response) {
                                 if (response.errors.length > 0) {
-                                    nav.e(response.errors[0].message);
+                                    console.error(response.errors[0].message)
                                 } else {
-                                    this.result.remove(item)
+                                    Vue.prototype.$dictMap[this.dictName] = response.dictItems;
                                 }
-                                next();
-                            }.bind(this))
-                        }.bind(this), function () {
-                            nav.tipClose();
-                            nav.i("批量删除结束.")
-                            this.onFind();
-                        }.bind(this))
-                    }.bind(this)).catch(function (action) {
-
-                    });
-                }
-            }
-        },
-        created: function () {
-        },
-        mounted: function () {
-        },
-        filters: {},
-        watch: {}
-    };
-    // 实例化工具
-    window.nav = new Vue({
-        data: {
-            loadingTip: '',
-            loadingBar: '',
-            context: '${context?default("")}',
-        },
-        methods: {
-            tipShow: function (msg) {
-                var message = "<i class='el-icon-loading'></i> 正在加载 ..."
-                if (msg) {
-                    message = "<i class='el-icon-loading'></i> " + msg
-                }
-                if (!this.loadingTip) {
-                    this.loadingTip = this.$message({
-                        type: '',
-                        duration: 0,
-                        dangerouslyUseHTMLString: true,
-                        message: message
-                    });
-                } else {
-                    this.loadingTip.message = message;
+                            }.bind(this));
+                            Vue.prototype.$dictMap[this.dictName] = [];
+                            this.init();
+                        } else if (dictItems.length === 0) {
+                            setTimeout(function () {
+                                this.init()
+                            }.bind(this), 100);
+                        } else {
+                            this.options = dictItems;
+                            for (var i = 0; i < this.options.length; i++) {
+                                if (this.options[i].key == this.value) {
+                                    this.item = this.options[i];
+                                }
+                            }
+                        }
+                    }
                 }
             },
-            tipClose: function (msg) {
-                if (this.loadingTip) {
-                    this.loadingTip.close();
-                    this.loadingTip = '';
-                }
+            created: function () {
+                this.init();
             },
-            barShow: function () {
-                if (window.index) {
-                    window.index.barStart();
-                } else if (window.parent.index) {
-                    window.parent.index.barStart();
+            template: '' +
+            '<span>{{item.value}}</span>'
+        });
+        // 机构选择
+        Vue.component('el-input-dept', {
+            data: function () {
+                return {
+                    options: [],
+                    props: {
+                        multiple: false,
+                        checkStrictly: true
+                    }
                 }
             },
-            barFinish: function () {
-                if (window.index) {
-                    window.index.barFinish();
-                } else if (window.parent.index) {
-                    window.parent.index.barFinish();
-                }
+            props: {
+                value: {
+                    type: String,
+                    default: ''
+                },
+                size: {
+                    type: String,
+                    default: 'small'
+                },
+                clearable: {
+                    type: Boolean,
+                    default: true
+                },
+                placeholder: {
+                    type: String,
+                    default: ''
+                },
             },
-            barError: function () {
-                if (window.index) {
-                    window.index.barError();
-                } else if (window.parent.index) {
-                    window.parent.index.barError();
+            methods: {
+                input: function (value) {
+                    this.$emit('input', value[value.length - 1]);
                 }
             },
-            i: function (message, callback) {
-                this.$message({
-                    type: "info",
-                    showClose: true,
-                    message: message,
-                    duration: 1500,
-                    onClose: callback
-                });
-            },
-            e: function (message, callback) {
-                this.$message({
-                    type: "error",
-                    showClose: true,
-                    message: message,
-                    duration: 1500,
-                    onClose: callback
-                });
-            },
-            w: function (message, callback) {
-                this.$message({
-                    type: "warning",
-                    showClose: true,
-                    message: message,
-                    duration: 1500,
-                    onClose: callback
-                });
-            },
-            s: function (message, callback) {
-                this.$message({
-                    type: "success",
-                    showClose: true,
-                    message: message,
-                    duration: 1500,
-                    onClose: callback
-                });
-            },
-            boxYes: function (title, message, callback) {
-                this.$alert(message, title, {
-                    confirmButtonText: '确定'
-                }).then(function () {
-                    callback ? callback(true) : '';
-                }).catch(function () {
-                    callback ? callback(false) : '';
-                });
-            },
-            boxYesNo: function (title, message, callback) {
-                this.$confirm(message, title, {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消'
-                }).then(function () {
-                    callback ? callback(true) : '';
-                }).catch(function () {
-                    callback ? callback(false) : '';
-                });
-            },
-            boxInput: function (title, message, callback) {
-                this.$prompt(message, title, {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消'
-                }).then(function (value) {
-                    callback ? callback(value.value) : '';
-                }).catch(function () {
-
-                });
-            },
-            boxHtml: function (title, html) {
-                this.$alert(html, title, {
-                    dangerouslyUseHTMLString: true
-                });
-            },
-            // 本标签打开
-            toOpen: function (url) {
-                window.location.open(url)
-            },
-            // 新标签打开
-            toOpenNew: function (url) {
-                window.location.openNew(url)
-            },
-            // 回到首页
-            toHome: function () {
-                this.tipShow();
-                location.href = this.context + "/"
-            },
-            // 打开一个新Tab
-            tabOpen: function (tab) {
-                if (window.index) {
-                    window.index.addTab(tab)
-                } else if (window.parent.index) {
-                    window.parent.index.addTab(tab)
-                }
+            created: function () {
+                new Ajax("wsys", "dept").method("tree").post({
+                    dictName: this.dictName
+                }, function (response) {
+                    if (response.errors.length > 0) {
+                        console.error(response.errors[0].message)
+                    } else {
+                        this.options = response.result;
+                    }
+                }.bind(this))
             },
-            // 关闭Tab
-            tabClose: function (tabName) {
-                if (window.index) {
-                    window.index.removeTab(tabName)
-                } else if (window.parent.index) {
-                    window.parent.index.removeTab(tabName)
+            template: '' +
+            '<el-cascader  ' +
+            ' :value="value" ' +
+            ' @input="input" ' +
+            ' :show-all-levels="false" ' +
+            ' :options="options" ' +
+            ' :clearable="clearable" ' +
+            ' :size="size" ' +
+            ' :props="props" ' +
+            ' filterable ' +
+            ' :placeholder="placeholder">' +
+            '</el-cascader>'
+        });
+        // 下拉按钮
+        Vue.component('wb-dropdown', {
+            data: function () {
+                return {
+                    items: []
                 }
             },
-            // 关闭当前Tab
-            tabCloseCur: function () {
-                if (window.index) {
-                    window.index.removeTab(window.index.activeTabName)
-                } else if (window.parent.index) {
-                    window.parent.index.removeTab(window.parent.index.activeTabName)
+            props: {
+                size: {
+                    type: String,
+                    default: 'mini'
+                },
+                type: {
+                    type: String,
+                    default: 'primary'
+                },
+                splitButton: {
+                    type: Boolean,
+                    default: false
+                },
+                arg: {
+                    type: Object | String | Number,
+                    default: {}
                 }
             },
-            // 全屏
-            screenFull: function () {
-                if (window.isFull)return;
-                window.isFull = true;
-                var docElm = document.documentElement;
-                if (docElm.requestFullscreen) {//W3C
-                    docElm.requestFullscreen();
-                } else if (docElm.mozRequestFullScreen) {//FireFox
-                    docElm.mozRequestFullScreen();
-                } else if (docElm.webkitRequestFullScreen) {//Chrome等
-                    docElm.webkitRequestFullScreen();
-                } else if (elem.msRequestFullscreen) {//IE11
-                    elem.msRequestFullscreen();
-                } else if (typeof window.ActiveXObject !== "undefined") {
-                    //for IE，这里其实就是模拟了按下键盘的F11，使浏览器全屏
-                    var wscript = new ActiveXObject("WScript.Shell");
-                    if (wscript != null) {
-                        wscript.SendKeys("{F11}");
+            methods: {
+                input: function (value) {
+                    this.$emit('input', value[value.length - 1]);
+                },
+                onCommand: function (index) {
+                    if (this.items[index].click) {
+                        this.items[index].click(this.arg);
                     }
                 }
             },
-            // 取消全屏
-            screenNotFull: function () {
-                if (!window.isFull)return;
-                window.isFull = false;
-                if (document.exitFullscreen) {//W3C
-                    document.exitFullscreen();
-                } else if (document.mozCancelFullScreen) {//FireFox
-                    document.mozCancelFullScreen();
-                } else if (document.webkitCancelFullScreen) {//Chrome等
-                    document.webkitCancelFullScreen();
-                } else if (document.msExitFullscreen) {//IE11
-                    document.msExitFullscreen();
-                } else if (typeof window.ActiveXObject !== "undefined") {
-                    //for IE，这里和fullScreen相同，模拟按下F11键退出全屏
-                    var wscript = new ActiveXObject("WScript.Shell");
-                    if (wscript != null) {
-                        wscript.SendKeys("{F11}");
+            created: function () {
+                if (this.$slots['dropdown'] && this.$slots['dropdown'].length > 0) {
+                    for (var i = 0; i < this.$slots['dropdown'][0].children.length; i++) {
+                        var item = this.$slots['dropdown'][0].children[i];
+                        if (item.tag === 'wb-dropdown-item') {
+                            var t = item.children.filter(function (item) {
+                                return typeof item.tag === 'undefined';
+                            });
+                            this.items.push({
+                                text: t[0].text,
+                                icon: item.data && item.data.attrs ? item.data.attrs['icon'] : null,
+                                click: item.data && item.data.on ? item.data.on['click'] : null
+                            })
+                        }
                     }
                 }
             },
-            // 添加Cookie,expiretime可选
-            setCookie: function (name, value, expiretime) {
-                if (typeof expiretime == 'undefined') {
-                    document.cookie = name + "=" + encodeURIComponent(value) + ";path=/";
-                } else {
-                    var exdate = new Date();
-                    exdate.setDate(exdate.getTime() + expiretime);
-                    document.cookie = name + "=" + encodeURIComponent(value) + ";expires=" + exdate.toGMTString() + ";path=/";
+            template: '' +
+            '<el-dropdown ' +
+            ' :size="size" ' +
+            ' :type="type" ' +
+            ' :split-button="splitButton" ' +
+            ' @click="onCommand(0)" ' +
+            ' @command="onCommand">' +
+            '<slot></slot>' +
+            '  <el-dropdown-menu slot="dropdown">' +
+            '    <el-dropdown-item v-for="(item,index) in items" :key="index" :command="index" :icon="item.icon">' +
+            '      {{item.text}}' +
+            '    </el-dropdown-item>' +
+            '  </el-dropdown-menu>' +
+            '</el-dropdown>'
+        });
+        // 表数据操作,动态操作项
+        Vue.component('wb-table-ops', {
+            data: function () {
+                return {
+                    items: []
                 }
             },
-            // 获取Cookie
-            getCookie: function (name) {
-                var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
-                if (arr = document.cookie.match(reg)) {
-                    return decodeURIComponent(arr[2]);
-                } else {
-                    return "";
+            props: {
+                size: {
+                    type: String,
+                    default: 'mini'
+                },
+                type: {
+                    type: String,
+                    default: 'primary'
+                },
+                splitButton: {
+                    type: Boolean,
+                    default: true
+                },
+                arg: {
+                    type: Object | String | Number,
+                    default: {}
                 }
             },
-            // 删除Cookie
-            clearCookie: function (name) {
-                this.setCookie(name, "", -1);
-            }
-        }
-    });
-    //字典组件
-    Vue.component('el-input-dict', {
-        data: function () {
-            return {
-                item: {},
-                options: []
-            }
-        },
-        props: {
-            value: {
-                type: String | Object,
-                default: ''
-            },
-            valueFor: {
-                type: String,
-                default: 'key',
-                validator: function (value) {
-                    var r = (['key', 'value', 'item'].indexOf(value) !== -1);
-                    if (!r) {
-                        console.error("value-for的值只能是['key','value','item']中的一个.")
+            methods: {
+                input: function (value) {
+                    this.$emit('input', value[value.length - 1]);
+                },
+                onCommand: function (index) {
+                    if (this.items[index].click) {
+                        this.items[index].click(this.arg);
                     }
-                    return r;
                 }
             },
-            dictName: {
-                type: String,
-                default: ''
-            },
-            size: {
-                type: String,
-                default: 'small'
-            },
-            placeholder: {
-                type: String,
-                default: ''
-            },
-            change: {
-                type: Function,
-                default: function (item) {
-
-                }
-            }
-        },
-        watch: {
-            value: function (val, old) {
-                this.init();
-            }
-        },
-        methods: {
-            input: function (item) {
-                this.item = item;
-                switch (this.valueFor) {
-                    case "key":
-                        this.$emit('input', item.key);
-                        break;
-                    case "value":
-                        this.$emit('input', item.value);
-                        break;
-                    case "item":
-                        this.$emit('input', item);
-                        break;
+            created: function () {
+                for (var i = 0; i < this.$slots.default.length; i++) {
+                    var tag = this.$slots.default[i];
+                    if (tag.tag === 'wb-table-op') {
+                        this.items.push({
+                            value: tag.data.attrs ? tag.data.attrs['value'] : "",
+                            icon: tag.data.attrs ? tag.data.attrs['icon'] : "",
+                            click: tag.data.on ? tag.data.on['click'] : undefined
+                        })
+                    }
                 }
             },
-            init: function () {
-                if (this.dictName) {
-                    var dictItems = Vue.prototype.$dictMap[this.dictName];
-                    if (typeof(dictItems) === "undefined") {
-                        new Ajax("wsys", "dict", "load").post({
-                            dictName: this.dictName
-                        }, function (response) {
+            template: '' +
+            '<el-dropdown ' +
+            ' :size="size" ' +
+            ' :type="type" ' +
+            ' :split-button="splitButton" ' +
+            ' @click="onCommand(0)" ' +
+            ' @command="onCommand"><i :class="items[0].icon"></i>{{items[0].value}}' +
+            '  <el-dropdown-menu slot="dropdown" style="white-space: nowrap">' +
+            '    <el-dropdown-item v-for="(item,index) in items" :key="index" v-if="index != 0" :command="index" :icon="item.icon">' +
+            '      {{item.value}}' +
+            '    </el-dropdown-item>' +
+            '  </el-dropdown-menu>' +
+            '</el-dropdown>'
+        });
+        // Vue复用组件
+        var mixinForMgr = {
+            data: {
+                //上下文
+                context: '${context?default("")}',
+                //列表查询存放集合
+                result: [],
+                //列表选择集合
+                select: []
+            },
+            methods: {
+                onSearch: function () {
+                    this.vm.pageNumber = 1;
+                    this.onFind();
+                },
+                onReset: function (form) {
+                    this.$refs[form].resetFields();
+                    nav.s('重置成功');
+                },
+                onPageChange: function (pageNumber) {
+                    this.vm.pageNumber = pageNumber;
+                    this.onFind();
+                },
+                onPageSizeChange: function (pageSize) {
+                    this.vm.pageSize = pageSize;
+                    this.onFind();
+                },
+                onSelectionChange: function (select) {
+                    this.select = select;
+                },
+                onTemplate: function () {
+                    new Ajax(this.module, this.target).method("template").post({}, function (response) {
+                        if (response.errors.length > 0) {
+                            nav.e(response.errors[0].message);
+                        }
+                    })
+                },
+                onImport: function (item) {
+                    utils.selectFile(function (files) {
+                        new Ajax(this.module, this.target).method("imports").post(files[0], function (response) {
                             if (response.errors.length > 0) {
-                                console.error(response.errors[0].message)
-                            } else {
-                                Vue.prototype.$dictMap[this.dictName] = response.dictItems;
+                                nav.e(response.errors[0].message);
                             }
-                        }.bind(this));
-                        Vue.prototype.$dictMap[this.dictName] = [];
-                        this.init();
-                    } else if (dictItems.length === 0) {
-                        setTimeout(function () {
-                            this.init()
-                        }.bind(this), 100);
-                    } else {
-                        this.options = dictItems;
-                        this.item = {};
-                        for (var i = 0; i < this.options.length; i++) {
-                            if (this.options[i].key == this.value) {
-                                this.item = this.options[i];
+                        });
+                    }.bind(this))
+                },
+                onExport: function () {
+                    var req = JSON.parse(JSON.stringify(this.vm));
+                    req.pageSize = 0;
+                    new Ajax(this.module, this.target).method("exports").post(req, function (response) {
+                        if (response.errors.length > 0) {
+                            nav.e(response.errors[0].message);
+                        }
+                    });
+                },
+                onSave: function () {
+                    this.$refs['form'].validate(function (valid) {
+                        if (valid) {
+                            if (this.form.id) {
+                                new Ajax(this.module, this.target).update(this.form, function (response) {
+                                    if (response.errors.length > 0) {
+                                        nav.e(response.errors[0].message);
+                                    } else {
+                                        this.onFind();
+                                        this.$refs['form'].resetFields();
+                                        this.form.formShow = false;
+                                    }
+                                }.bind(this))
+                            } else {
+                                new Ajax(this.module, this.target).create(this.form, function (response) {
+                                    if (response.errors.length > 0) {
+                                        nav.e(response.errors[0].message);
+                                    } else {
+                                        this.onFind();
+                                        this.$refs['form'].resetFields();
+                                        this.form.formShow = false;
+                                    }
+                                }.bind(this))
                             }
+                        } else {
+                            return false;
                         }
-                    }
-                }
-            }
-        },
-        created: function () {
-            this.init();
-        },
-        template: '' +
-        '<el-select :value="item.value" @input="input" filterable clearable placeholder="请选择" :size="size" :placeholder="placeholder" @change="change">' +
-        ' <el-option v-for="item in options" :key="item.key" :label="item.value" :value="item">' +
-        '  <span style="float: left">{{ item.value }}</span>' +
-        '  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.key }}</span>' +
-        ' </el-option>' +
-        '</el-select>'
-    });
-    //字典组件
-    Vue.component('el-view-dict', {
-        data: function () {
-            return {
-                item: {},
-            }
-        },
-        props: {
-            value: {
-                type: String,
-                default: ''
-            },
-            dictName: {
-                type: String,
-                default: ''
-            },
-        },
-        watch: {
-            value: function (val, old) {
-                this.init();
-            }
-        },
-        methods: {
-            init: function () {
-                if (this.dictName) {
-                    var dictItems = Vue.prototype.$dictMap[this.dictName];
-                    if (typeof(dictItems) === "undefined") {
-                        new Ajax("wsys", "dict", "load").post({
-                            dictName: this.dictName
-                        }, function (response) {
+                    }.bind(this));
+                },
+                onFind: function () {
+                    new Ajax(this.module, this.target).find(this.vm, function (response) {
+                        if (response.errors.length > 0) {
+                            nav.e(response.errors[0].message);
+                        } else {
+                            this.result = response.result;
+                            this.vm.totalCount = Number(response.totalCount);
+                        }
+                    }.bind(this))
+                },
+                onDelete: function (item) {
+                    this.$confirm('将删除该项, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(function () {
+                        new Ajax(this.module, this.target).delete({id: item.id}, function (response) {
                             if (response.errors.length > 0) {
-                                console.error(response.errors[0].message)
+                                nav.e(response.errors[0].message);
                             } else {
-                                Vue.prototype.$dictMap[this.dictName] = response.dictItems;
+                                nav.s("删除成功");
+                                this.onFind();
                             }
-                        }.bind(this));
-                        Vue.prototype.$dictMap[this.dictName] = [];
-                        this.init();
-                    } else if (dictItems.length === 0) {
-                        setTimeout(function () {
-                            this.init()
-                        }.bind(this), 100);
+                        }.bind(this))
+                    }.bind(this)).catch(function (action) {
+
+                    });
+                },
+                onBitchDelete: function () {
+                    if (this.select.length == 0) {
+                        nav.w("至少选中一项");
                     } else {
-                        this.options = dictItems;
-                        for (var i = 0; i < this.options.length; i++) {
-                            if (this.options[i].key == this.value) {
-                                this.item = this.options[i];
-                            }
-                        }
+                        this.$confirm('将删除已选择的项, 是否继续?', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(function () {
+                            nav.tipShow("删除中...");
+                            this.select.forAsync(function (item, next) {
+                                new Ajax(this.module, this.target).delete({id: item.id}, function (response) {
+                                    if (response.errors.length > 0) {
+                                        nav.e(response.errors[0].message);
+                                    } else {
+                                        this.result.remove(item)
+                                    }
+                                    next();
+                                }.bind(this))
+                            }.bind(this), function () {
+                                nav.tipClose();
+                                nav.i("批量删除结束.")
+                                this.onFind();
+                            }.bind(this))
+                        }.bind(this)).catch(function (action) {
+
+                        });
                     }
                 }
-            }
-        },
-        created: function () {
-            this.init();
-        },
-        template: '' +
-        '<span>{{item.value}}</span>'
-    });
-    //机构选择
-    Vue.component('el-input-dept', {
-        data: function () {
-            return {
-                options: [],
-                props: {
-                    multiple: false,
-                    checkStrictly: true
-                }
-            }
-        },
-        props: {
-            value: {
-                type: String,
-                default: ''
-            },
-            size: {
-                type: String,
-                default: 'small'
             },
-            clearable: {
-                type: Boolean,
-                default: true
+            created: function () {
             },
-            placeholder: {
-                type: String,
-                default: ''
-            },
-        },
-        methods: {
-            input: function (value) {
-                this.$emit('input', value[value.length - 1]);
-            }
-        },
-        created: function () {
-            new Ajax("wsys", "dept").method("tree").post({
-                dictName: this.dictName
-            }, function (response) {
-                if (response.errors.length > 0) {
-                    console.error(response.errors[0].message)
-                } else {
-                    this.options = response.result;
-                }
-            }.bind(this))
-        },
-        template: '' +
-        '<el-cascader  ' +
-        ' :value="value" ' +
-        ' @input="input" ' +
-        ' :show-all-levels="false" ' +
-        ' :options="options" ' +
-        ' :clearable="clearable" ' +
-        ' :size="size" ' +
-        ' :props="props" ' +
-        ' filterable ' +
-        ' :placeholder="placeholder">' +
-        '</el-cascader>'
-    });
-    //下拉按钮
-    Vue.component('wb-dropdown', {
-        data: function () {
-            return {
-                items: []
-            }
-        },
-        props: {
-            size: {
-                type: String,
-                default: 'mini'
+            mounted: function () {
             },
-            type: {
-                type: String,
-                default: 'primary'
-            },
-            splitButton: {
-                type: Boolean,
-                default: false
-            },
-            arg: {
-                type: Object | String | Number,
-                default: {}
-            }
-        },
-        methods: {
-            input: function (value) {
-                this.$emit('input', value[value.length - 1]);
+            filters: {},
+            watch: {}
+        };
+    }
+    // 实用小工具
+    {
+        window.nav = new Vue({
+            data: {
+                loadingTip: '',
+                loadingBar: '',
+                context: '${context?default("")}',
             },
-            onCommand: function (index) {
-                if (this.items[index].click) {
-                    this.items[index].click(this.arg);
-                }
-            }
-        },
-        created: function () {
-            if (this.$slots['dropdown'] && this.$slots['dropdown'].length > 0) {
-                for (var i = 0; i < this.$slots['dropdown'][0].children.length; i++) {
-                    var item = this.$slots['dropdown'][0].children[i];
-                    if (item.tag === 'wb-dropdown-item') {
-                        var t = item.children.filter(function (item) {
-                            return typeof item.tag === 'undefined';
+            methods: {
+                tipShow: function (msg) {
+                    var message = "<i class='el-icon-loading'></i> 正在加载 ..."
+                    if (msg) {
+                        message = "<i class='el-icon-loading'></i> " + msg
+                    }
+                    if (!this.loadingTip) {
+                        this.loadingTip = this.$message({
+                            type: '',
+                            duration: 0,
+                            dangerouslyUseHTMLString: true,
+                            message: message
                         });
-                        this.items.push({
-                            text: t[0].text,
-                            icon: item.data && item.data.attrs ? item.data.attrs['icon'] : null,
-                            click: item.data && item.data.on ? item.data.on['click'] : null
-                        })
+                    } else {
+                        this.loadingTip.message = message;
                     }
+                },
+                tipClose: function (msg) {
+                    if (this.loadingTip) {
+                        this.loadingTip.close();
+                        this.loadingTip = '';
+                    }
+                },
+                barShow: function () {
+                    if (window.index) {
+                        window.index.barStart();
+                    } else if (window.parent.index) {
+                        window.parent.index.barStart();
+                    }
+                },
+                barFinish: function () {
+                    if (window.index) {
+                        window.index.barFinish();
+                    } else if (window.parent.index) {
+                        window.parent.index.barFinish();
+                    }
+                },
+                barError: function () {
+                    if (window.index) {
+                        window.index.barError();
+                    } else if (window.parent.index) {
+                        window.parent.index.barError();
+                    }
+                },
+                i: function (message, callback) {
+                    this.$message({
+                        type: "info",
+                        showClose: true,
+                        message: message,
+                        duration: 1500,
+                        onClose: callback
+                    });
+                },
+                e: function (message, callback) {
+                    this.$message({
+                        type: "error",
+                        showClose: true,
+                        message: message,
+                        duration: 1500,
+                        onClose: callback
+                    });
+                },
+                w: function (message, callback) {
+                    this.$message({
+                        type: "warning",
+                        showClose: true,
+                        message: message,
+                        duration: 1500,
+                        onClose: callback
+                    });
+                },
+                s: function (message, callback) {
+                    this.$message({
+                        type: "success",
+                        showClose: true,
+                        message: message,
+                        duration: 1500,
+                        onClose: callback
+                    });
+                },
+                boxYes: function (title, message, callback) {
+                    this.$alert(message, title, {
+                        confirmButtonText: '确定'
+                    }).then(function () {
+                        callback ? callback(true) : '';
+                    }).catch(function () {
+                        callback ? callback(false) : '';
+                    });
+                },
+                boxYesNo: function (title, message, callback) {
+                    this.$confirm(message, title, {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消'
+                    }).then(function () {
+                        callback ? callback(true) : '';
+                    }).catch(function () {
+                        callback ? callback(false) : '';
+                    });
+                },
+                boxInput: function (title, message, callback) {
+                    this.$prompt(message, title, {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消'
+                    }).then(function (value) {
+                        callback ? callback(value.value) : '';
+                    }).catch(function () {
+
+                    });
+                },
+                boxHtml: function (title, html) {
+                    this.$alert(html, title, {
+                        dangerouslyUseHTMLString: true
+                    });
+                },
+                // 本标签打开
+                toOpen: function (url) {
+                    window.location.open(url)
+                },
+                // 新标签打开
+                toOpenNew: function (url) {
+                    window.location.openNew(url)
+                },
+                // 回到首页
+                toHome: function () {
+                    this.tipShow();
+                    location.href = this.context + "/"
+                },
+                // 打开一个新Tab
+                tabOpen: function (tab) {
+                    if (window.index) {
+                        window.index.addTab(tab)
+                    } else if (window.parent.index) {
+                        window.parent.index.addTab(tab)
+                    }
+                },
+                // 关闭Tab
+                tabClose: function (tabName) {
+                    if (window.index) {
+                        window.index.removeTab(tabName)
+                    } else if (window.parent.index) {
+                        window.parent.index.removeTab(tabName)
+                    }
+                },
+                // 关闭当前Tab
+                tabCloseCur: function () {
+                    if (window.index) {
+                        window.index.removeTab(window.index.activeTabName)
+                    } else if (window.parent.index) {
+                        window.parent.index.removeTab(window.parent.index.activeTabName)
+                    }
+                },
+                // 全屏
+                screenFull: function () {
+                    if (window.isFull)return;
+                    window.isFull = true;
+                    var docElm = document.documentElement;
+                    // 如果首次全屏是程序发起而不是用户发起，则会出现fullscreen error
+                    if (docElm.requestFullscreen) {//W3C
+                        docElm.requestFullscreen();
+                    } else if (docElm.mozRequestFullScreen) {//FireFox
+                        docElm.mozRequestFullScreen();
+                    } else if (docElm.webkitRequestFullScreen) {//Chrome等
+                        docElm.webkitRequestFullScreen();
+                    } else if (elem.msRequestFullscreen) {//IE11
+                        elem.msRequestFullscreen();
+                    } else if (typeof window.ActiveXObject !== "undefined") {
+                        //for IE，这里其实就是模拟了按下键盘的F11，使浏览器全屏
+                        var wscript = new ActiveXObject("WScript.Shell");
+                        if (wscript != null) {
+                            wscript.SendKeys("{F11}");
+                        }
+                    }
+                },
+                // 取消全屏
+                screenNotFull: function () {
+                    if (!window.isFull)return;
+                    window.isFull = false;
+                    if (document.exitFullscreen) {//W3C
+                        document.exitFullscreen();
+                    } else if (document.mozCancelFullScreen) {//FireFox
+                        document.mozCancelFullScreen();
+                    } else if (document.webkitCancelFullScreen) {//Chrome等
+                        document.webkitCancelFullScreen();
+                    } else if (document.msExitFullscreen) {//IE11
+                        document.msExitFullscreen();
+                    } else if (typeof window.ActiveXObject !== "undefined") {
+                        //for IE，这里和fullScreen相同，模拟按下F11键退出全屏
+                        var wscript = new ActiveXObject("WScript.Shell");
+                        if (wscript != null) {
+                            wscript.SendKeys("{F11}");
+                        }
+                    }
+                },
+                // 添加Cookie,expiretime可选
+                setCookie: function (name, value, expiretime) {
+                    if (typeof expiretime == 'undefined') {
+                        document.cookie = name + "=" + encodeURIComponent(value) + ";path=/";
+                    } else {
+                        var exdate = new Date();
+                        exdate.setDate(exdate.getTime() + expiretime);
+                        document.cookie = name + "=" + encodeURIComponent(value) + ";expires=" + exdate.toGMTString() + ";path=/";
+                    }
+                },
+                // 获取Cookie
+                getCookie: function (name) {
+                    var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+                    if (arr = document.cookie.match(reg)) {
+                        return decodeURIComponent(arr[2]);
+                    } else {
+                        return "";
+                    }
+                },
+                // 删除Cookie
+                clearCookie: function (name) {
+                    this.setCookie(name, "", -1);
                 }
             }
-        },
-        template: '' +
-        '<el-dropdown ' +
-        ' :size="size" ' +
-        ' :type="type" ' +
-        ' :split-button="splitButton" ' +
-        ' @click="onCommand(0)" ' +
-        ' @command="onCommand">' +
-        '<slot></slot>' +
-        '  <el-dropdown-menu slot="dropdown">' +
-        '    <el-dropdown-item v-for="(item,index) in items" :key="index" :command="index" :icon="item.icon">' +
-        '      {{item.text}}' +
-        '    </el-dropdown-item>' +
-        '  </el-dropdown-menu>' +
-        '</el-dropdown>'
-    });
-    //表数据操作,动态操作项
-    Vue.component('wb-table-ops', {
-        data: function () {
-            return {
-                items: []
-            }
-        },
-        props: {
-            size: {
-                type: String,
-                default: 'mini'
-            },
-            type: {
-                type: String,
-                default: 'primary'
-            },
-            splitButton: {
-                type: Boolean,
-                default: true
-            },
-            arg: {
-                type: Object | String | Number,
-                default: {}
-            }
-        },
-        methods: {
-            input: function (value) {
-                this.$emit('input', value[value.length - 1]);
-            },
-            onCommand: function (index) {
-                if (this.items[index].click) {
-                    this.items[index].click(this.arg);
-                }
-            }
-        },
-        created: function () {
-            for (var i = 0; i < this.$slots.default.length; i++) {
-                var tag = this.$slots.default[i];
-                if (tag.tag === 'wb-table-op') {
-                    this.items.push({
-                        value: tag.data.attrs ? tag.data.attrs['value'] : "",
-                        icon: tag.data.attrs ? tag.data.attrs['icon'] : "",
-                        click: tag.data.on ? tag.data.on['click'] : undefined
-                    })
-                }
-            }
-        },
-        template: '' +
-        '<el-dropdown ' +
-        ' :size="size" ' +
-        ' :type="type" ' +
-        ' :split-button="splitButton" ' +
-        ' @click="onCommand(0)" ' +
-        ' @command="onCommand"><i :class="items[0].icon"></i>{{items[0].value}}' +
-        '  <el-dropdown-menu slot="dropdown" style="white-space: nowrap">' +
-        '    <el-dropdown-item v-for="(item,index) in items" :key="index" v-if="index != 0" :command="index" :icon="item.icon">' +
-        '      {{item.value}}' +
-        '    </el-dropdown-item>' +
-        '  </el-dropdown-menu>' +
-        '</el-dropdown>'
-    });
+        });
+    }
+
 </script>
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/helpDev.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/helpDev.ftl
index 59ab9cc9..6f42a9f0 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/helpDev.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/helpDev.ftl
@@ -1272,7 +1272,7 @@
 </style>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             fileList: [],
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
index c14be011..be088cfa 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
@@ -135,7 +135,7 @@
 </style>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             dataTotal: {}
@@ -317,7 +317,7 @@
 
                         var option = {
                             title: {
-                                text: '登录凭证任务执行情况',
+                                text: '任务执行情况',
                                 subtext: '最近100次执行情况',
                                 textStyle: {
                                     color: '#515151',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
index e375d4ab..4893aaef 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
@@ -562,11 +562,11 @@
         created: function () {
         },
         mounted: function () {
-            this.prop.menu = nav.getCookie("prop.menu") === 'true';
-            this.prop.open = nav.getCookie("prop.open") === 'true';
-            this.prop.coll = nav.getCookie("prop.coll") === 'true';
-            this.prop.tran = nav.getCookie("prop.tran") === 'true';
-            this.prop.full = nav.getCookie("prop.full") === 'true';
+            this.prop.menu = nav.getCookie("prop.menu");
+            this.prop.open = nav.getCookie("prop.open").length>0?JSON.parse(nav.getCookie("prop.open")):this.prop.open;
+            this.prop.coll = nav.getCookie("prop.coll").length>0?JSON.parse(nav.getCookie("prop.coll")):this.prop.coll;
+            this.prop.tran = nav.getCookie("prop.tran").length>0?JSON.parse(nav.getCookie("prop.tran")):this.prop.tran;
+            this.prop.full = nav.getCookie("prop.full").length>0?JSON.parse(nav.getCookie("prop.full")):this.prop.full;
             if (this.prop.full) {
                 nav.screenFull();
             } else {
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl
index 0de52621..4b477d72 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl
@@ -14,7 +14,7 @@
                     <el-input placeholder="密码" v-model="form.password" size="small" type="password" prefix-icon="el-icon-lock"></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" style="width: 100%" size="small"  :loading="isSubmit" :disabled="isSubmit" @click="submitForm('form')">登录</el-button>
+                    <el-button type="primary" style="width: 100%" size="small"  :loading="$isSubmit" :disabled="$isSubmit" @click="submitForm('form')">登录</el-button>
                 </el-form-item>
             </el-form>
 
@@ -88,7 +88,7 @@
 
 <script type="text/javascript">
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             form: {
@@ -101,7 +101,7 @@
                 ],
                 password: [
                     {required: true, message: '请输入密码', trigger: 'change'}
-                ],
+                ]
             }
         },
         mounted: function () {
@@ -156,9 +156,9 @@
             submitForm: function (formName) {
                 this.$refs[formName].validate(function (valid) {
                     if (valid) {
-                        this.isSubmit = true;
+                        this.$isSubmit = true;
                         new Ajax("wsys", "User").method("login").post(this.form, function (response) {
-                            this.isSubmit = false;
+                            this.$isSubmit = false;
                             if (response.errors.length > 0) {
                                 nav.e(response.errors[0].message);
                             } else {
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 352c6e11..c9ece07c 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
@@ -109,7 +109,7 @@
             <el-button-group style="float: right;">
             <#if table.isPageImp()>
                 ${print('<#if token.hasRes("/ajax/${module.name}/${table.getFName()}/template")>')}
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
                 ${print('</#if>')}
@@ -449,7 +449,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: '${module.getName()}',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
index 81734cf8..0d31a6d0 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
@@ -48,12 +48,12 @@
                 <el-button type="danger" size="mini" icon="el-icon-delete" @click="onBitchDelete">删除</el-button>
                 </#if>
 
-                <el-button type="warning" size="mini" icon="el-icon-share" @click="treeShow = true">树状</el-button>
-            </<el-button-group>>
+                <el-button type="warning" size="mini" icon="el-icon-share" @click="treeShow = true">结构</el-button>
+            </el-button-group>
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/dept/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -231,10 +231,10 @@
                     </el-col>
                     <el-col :span="11" offset="1">
                         <el-button-group>
-                            <el-tooltip effect="dark" content="过滤树" placement="bottom">
+                            <el-tooltip effect="dark" content="过滤" placement="bottom">
                                 <el-button size="mini" type="primary" icon="el-icon-search" @click="$refs.tree.filter(treeFilter)">过滤</el-button>
                             </el-tooltip>
-                            <el-tooltip effect="dark" content="批量删除" placement="bottom">
+                            <el-tooltip effect="dark" content="删除" placement="bottom">
                                 <el-button size="mini" type="primary" icon="el-icon-delete" @click="onTreeDelete">删除</el-button>
                             </el-tooltip>
                             <el-tooltip effect="dark" content="刷新" placement="bottom">
@@ -281,7 +281,7 @@
 </style>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
index bb123ab9..fe55c929 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
@@ -5,8 +5,8 @@
             <el-form-item label="字典名称" prop="dictName">
                 <el-input v-model="vm.dictName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典名称"></el-input>
             </el-form-item>
-            <el-form-item label="字典描述" prop="dictComment">
-                <el-input v-model="vm.dictComment" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典描述"></el-input>
+            <el-form-item label="字典描述" prop="dictNote">
+                <el-input v-model="vm.dictNote" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典描述"></el-input>
             </el-form-item>
             <el-form-item label="是否有效" prop="valid">
                 <el-radio-group v-model="vm.valid">
@@ -37,11 +37,11 @@
                 <#if token.hasRes("/ajax/wsys/dict/delete")>
                 <el-button type="danger" size="mini" icon="el-icon-delete" @click="onBitchDelete">删除</el-button>
                 </#if>
-            <el-button-group>
+            </el-button-group>
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/dict/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -101,7 +101,7 @@
             <el-table-column
                     align="center"
                     min-width="150"
-                    prop="dictComment"
+                    prop="dictNote"
                     label="字典描述">
             </el-table-column>
             <el-table-column
@@ -164,8 +164,8 @@
             <el-form-item label="字典名称" prop="dictName">
                 <el-input v-model="form.dictName" clearable size="mini" placeholder="请输入字典名称"></el-input>
             </el-form-item>
-            <el-form-item label="字典描述" prop="dictComment">
-                <el-input v-model="form.dictComment" clearable size="mini" placeholder="请输入字典描述"></el-input>
+            <el-form-item label="字典描述" prop="dictNote">
+                <el-input v-model="form.dictNote" clearable size="mini" placeholder="请输入字典描述"></el-input>
             </el-form-item>
             <el-form-item label="字典版本" prop="version">
                 <el-date-picker
@@ -192,7 +192,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
@@ -200,7 +200,7 @@
             vm: {
                 id: null,
                 dictName: null,
-                dictComment: null,
+                dictNote: null,
                 valid: null,
                 startDate: null,
                 endDate: null,
@@ -217,7 +217,7 @@
                 formShow: false,
                 id: null,
                 dictName: null,
-                dictComment: null,
+                dictNote: null,
                 version: null,
                 valid: false,
                 rowVersion: null
@@ -227,7 +227,7 @@
                     {required: true, message: '请输入字典名称', trigger: 'blur'},
                     {min: 1, max: 50, message: '长度在 3 到 5 个字符', trigger: 'blur'}
                 ],
-                dictComment: [
+                dictNote: [
                     {required: true, message: '字典描述不能为空', trigger: 'blur'},
                     {min: 1, max: 50, message: '字典描述长度在 1 到 50 个字符', trigger: 'blur'}
                 ],
@@ -246,7 +246,7 @@
                 this.form.formShow = true;
                 this.form.id = '';
                 this.form.dictName = '';
-                this.form.dictComment = '';
+                this.form.dictNote = '';
                 this.form.version = '';
                 this.form.valid = true;
             },
@@ -255,7 +255,7 @@
                 this.form.formShow = true;
                 this.form.id = item.id;
                 this.form.dictName = item.dictName;
-                this.form.dictComment = item.dictComment;
+                this.form.dictNote = item.dictNote;
                 this.form.version = item.version;
                 this.form.valid = item.valid;
                 this.form.rowVersion = item.rowVersion;
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
index bde55683..531c88d0 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
@@ -5,11 +5,11 @@
             <el-form-item label="字典名称" prop="dictName">
                 <el-input v-model="vm.dictName" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典名称" readonly></el-input>
             </el-form-item>
-            <el-form-item label="字典键" prop="key">
-                <el-input v-model="vm.key" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典键"></el-input>
+            <el-form-item label="字典枚举" prop="key">
+                <el-input v-model="vm.key" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典枚举"></el-input>
             </el-form-item>
-            <el-form-item label="字典值" prop="value">
-                <el-input v-model="vm.value" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典值"></el-input>
+            <el-form-item label="字典描述" prop="value">
+                <el-input v-model="vm.value" @keyup.enter.native="onSearch" clearable size="mini" placeholder="请输入字典描述"></el-input>
             </el-form-item>
             <el-form-item label="是否有效" prop="valid">
                 <el-radio-group v-model="vm.valid" clearable>
@@ -44,7 +44,7 @@
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/dictItem/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -99,13 +99,13 @@
                     align="center"
                     min-width="100"
                     prop="key"
-                    label="字典键">
+                    label="字典枚举">
             </el-table-column>
             <el-table-column
                     align="center"
                     min-width="150"
                     prop="value"
-                    label="字典值">
+                    label="字典描述">
             </el-table-column>
             <el-table-column
                     align="center"
@@ -163,13 +163,13 @@
 
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
                  label-position="right" label-width="90px">
-            <el-form-item label="字典键" prop="key">
-                <el-input v-model="form.key" clearable size="mini" placeholder="请输入字典键"></el-input>
+            <el-form-item label="字典枚举" prop="key">
+                <el-input v-model="form.key" clearable size="mini" placeholder="请输入字典枚举"></el-input>
             </el-form-item>
-            <el-form-item label="字典值" prop="value">
-                <el-input v-model="form.value" clearable size="mini" placeholder="请输入字典值"></el-input>
+            <el-form-item label="字典描述" prop="value">
+                <el-input v-model="form.value" clearable size="mini" placeholder="请输入字典描述"></el-input>
             </el-form-item>
-            <el-form-item label="排序值" prop="sort">
+            <el-form-item label="字典排序" prop="sort">
                 <el-input-number size="mini" v-model="form.sort" :min="1" :max="10000"
                                  label="描述文字"></el-input-number>
             </el-form-item>
@@ -188,7 +188,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
@@ -219,11 +219,11 @@
             },
             formRules: {
                 key: [
-                    {required: true, message: '请输入字典键', trigger: 'blur'},
+                    {required: true, message: '请输入字典枚举', trigger: 'blur'},
                     {min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur'}
                 ],
                 value: [
-                    {required: true, message: '请输入字典值', trigger: 'blur'},
+                    {required: true, message: '请输入字典描述', trigger: 'blur'},
                     {min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur'}
                 ],
                 sort: [
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
index 5e51f742..83e5c4ef 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
@@ -44,7 +44,7 @@
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/file/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -186,7 +186,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
index ad449700..4418f365 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
@@ -142,7 +142,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
index 4b94c55a..5efbb6d2 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
@@ -57,7 +57,7 @@
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/logtask/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -111,7 +111,7 @@
                     label="执行状态">
                 <template slot-scope="scope">
                     <el-tag size="mini" v-if="scope.row.execState == '1'">成功</el-tag>
-                    <el-tag size="mini" v-if="scope.row.execState == '0'">失败</el-tag>
+                    <el-tag size="mini" v-if="scope.row.execState == '0'" type="danger">失败</el-tag>
                 </template>
             </el-table-column>
             <el-table-column
@@ -154,8 +154,8 @@
                     label="操作">
                 <template slot-scope="scope">
                     <wb-table-ops :arg="scope.row">
-                    <#if token.hasRes("/ajax/wsys/logtask/update")>
-                        <wb-table-op value="编辑" icon="el-icon-edit" @click="onEdit"></wb-table-op>
+                    <#if token.hasRes("/ajax/wsys/logtask/view")>
+                        <wb-table-op value="查看" icon="el-icon-view" @click="onView"></wb-table-op>
                     </#if>
                     <#if token.hasRes("/ajax/wsys/logtask/delete")>
                         <wb-table-op value="删除" icon="el-icon-delete" @click="onDelete"></wb-table-op>
@@ -177,10 +177,57 @@
                 :total="vm.totalCount">
         </el-pagination>
     </el-card>
+
+    <el-dialog
+            :fullscreen="false"
+            :title="form.formTitle"
+            :custom-class="'dialog'"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :modal-append-to-body="true"
+            :visible.sync="form.formShow">
+
+        <el-page-header slot="title" @back="form.formShow = false" :content="form.formTitle"></el-page-header>
+
+        <el-form class="form" :model="form" :inline="true" :rules="formRules" ref="form" label-position="right" label-width="90px">
+            <el-form-item label="任务ID" prop="taskId">
+                <el-input v-model="form.taskId" size="mini" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="任务名称" prop="taskName">
+                <el-input v-model="form.taskName" size="mini" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="开始时间" prop="startTime">
+                <el-input v-model="form.startTime" size="mini" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="结束时间" prop="endTime">
+                <el-input v-model="form.endTime" size="mini" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="执行耗时" prop="execTime">
+                <el-input :value="form.execTime + 'ms'" size="mini" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="执行状态" prop="execState">
+                <el-select v-model="form.execState" clearable size="mini" readonly>
+                    <el-option key="1" label="成功" value="1"></el-option>
+                    <el-option key="0" label="失败" value="0"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="执行结果" prop="execResult">
+                <el-input v-model="form.execResult" style="width: 504px;"
+                          size="mini"
+                          rows="10"
+                          type="textarea"
+                          maxlength="500"
+                          show-word-limit readonly></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+			<el-button size="mini" @click="form.formShow = false">关 闭</el-button>
+		</span>
+    </el-dialog>
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
@@ -198,11 +245,25 @@
                 totalCount: 0,
                 sortKey:'CREATE_TIME',
                 sortType:'DESC'
-            }
+            },
+            form: {
+                formTitle: "",
+                formShow: false,
+                id: "",
+                taskId: "",
+                taskName: "",
+                startTime: "",
+                endTime: "",
+                execTime: "",
+                execState: "",
+                execResult: "",
+                rowVersion: ""
+            },
+            formRules: {}
         },
         methods: {
-            onEdit: function (item) {
-                this.form.formTitle = "任务日志编辑";
+            onView: function (item) {
+                this.form.formTitle = "任务日志详情查看";
                 this.form.formShow = true;
                 this.form.id = item.id;
                 this.form.taskId = item.taskId;
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
index be3ffa00..4fa05f36 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
@@ -40,7 +40,7 @@
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/profiles/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -178,7 +178,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
index afcc3d62..c88f485e 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
@@ -54,12 +54,12 @@
                 <el-button type="danger" size="mini" icon="el-icon-delete" @click="onBitchDelete">删除</el-button>
                 </#if>
 
-                <el-button type="warning" size="mini" icon="el-icon-share" @click="treeShow = true">树状</el-button>
+                <el-button type="warning" size="mini" icon="el-icon-share" @click="treeShow = true">结构</el-button>
             </el-button-group>
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/res/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -209,7 +209,7 @@
                           placeholder="请输入资源描述"></el-input>
             </el-form-item>
             <el-form-item label="是否免费" prop="free">
-                <el-tooltip effect="dark" content="对于不希望将模块完全或部分授权与角色时，可置为免费，即不需要授权情况下也拥有此资源。" placement="bottom">
+                <el-tooltip effect="dark" content="对于希望不授权也可以访问的资源可置为免费，即公共资源。" placement="bottom">
                     <el-switch v-model="form.free" active-text="免费" inactive-text="授权" clearable size="mini"></el-switch>
                 </el-tooltip>
             </el-form-item>
@@ -252,15 +252,15 @@
                     </el-col>
                     <el-col :span="11" offset="1">
                         <el-button-group>
-                            <el-tooltip effect="dark" content="过滤树" placement="bottom">
+                            <el-tooltip effect="dark" content="过滤" placement="bottom">
                                 <el-button size="mini" type="primary" icon="el-icon-search" @click="$refs.tree.filter(treeFilter)">查询</el-button>
                             </el-tooltip>
+                            <el-tooltip effect="dark" content="删除" placement="bottom">
+                                <el-button size="mini" type="primary" icon="el-icon-delete" @click="onTreeDelete">删除</el-button>
+                            </el-tooltip>
                             <el-tooltip effect="dark" content="刷新" placement="bottom">
                                 <el-button size="mini" type="primary" icon="el-icon-refresh" @click="onTreeLoad">刷新</el-button>
                             </el-tooltip>
-                            <el-tooltip effect="dark" content="批量删除" placement="bottom">
-                                <el-button size="mini" type="primary" icon="el-icon-delete" @click="onTreeDelete">删除</el-button>
-                            </el-tooltip>
                         </el-button-group>
                     </el-col>
                 </el-row>
@@ -305,7 +305,7 @@
 </style>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
index 5e29b9f4..293a528f 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
@@ -37,7 +37,7 @@
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/role/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -220,7 +220,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl
index 90c721a7..5dbee53d 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl
@@ -78,7 +78,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
index b7d2ef87..92161b9c 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
@@ -47,7 +47,7 @@
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/taskSql/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -221,7 +221,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
index 752bb12f..01c56d3d 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
@@ -184,7 +184,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
index fa438af3..02bae8b5 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
@@ -48,7 +48,7 @@
 
             <el-button-group >
             <#if token.hasRes("/ajax/wsys/user/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -220,7 +220,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
index 6eb9e800..16a3f238 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
@@ -45,7 +45,7 @@
 
             <el-button-group>
             <#if token.hasRes("/ajax/wsys/visitor/template")>
-                <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                <el-tooltip effect="dark" content="Excel导入模板下载" placement="bottom">
                     <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
                 </el-tooltip>
             </#if>
@@ -224,7 +224,7 @@
 </div>
 <script>
     var app = new Vue({
-        mixins: [mixin],
+        mixins: [mixinForMgr],
         el: "#app",
         data: {
             module: 'wsys',
diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java
index 4e3c2ab1..1325777f 100644
--- a/src/main/resources/modules/SpringBoot/test/DataInit.java
+++ b/src/main/resources/modules/SpringBoot/test/DataInit.java
@@ -104,7 +104,6 @@ public class DataInit {
             List<Res> forDev = new ArrayList<>();
             {// 初始化开发角色特有资源
                 forDev.add(createRes("0001", "核心设置菜单", "WEB", "DEV"));
-                forDev.add(createRes("000100", "开发帮助页", "WEB", "/helpDev.htm"));
                 forDev.add(createRes("000101", "系统配置菜单", "WEB", "DEV_PROFILES"));
                 forDev.add(createRes("00010101", "系统配置管理页", "WEB", "/wsys/profiles.htm"));
                 forDev.add(createRes("0001010101", "系统配置模板", "WEB", "/ajax/wsys/profiles/template"));
@@ -355,7 +354,7 @@ public class DataInit {
         if (dictFindResponse.getResult().size() == 0) {
             DictCreateRequest dictCreateRequest = new DictCreateRequest();
             dictCreateRequest.setDictName(name);
-            dictCreateRequest.setDictComment(comment);
+            dictCreateRequest.setDictNote(comment);
             dictCreateRequest.setVersion(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             dictCreateRequest.setValid(true);
             DictCreateResponse dictCreateResponse = dictManager.create(dictCreateRequest, token);
diff --git a/src/main/resources/modules/SpringBoot/test/wsys/DictTest.java b/src/main/resources/modules/SpringBoot/test/wsys/DictTest.java
index 1248fb46..07fad936 100644
--- a/src/main/resources/modules/SpringBoot/test/wsys/DictTest.java
+++ b/src/main/resources/modules/SpringBoot/test/wsys/DictTest.java
@@ -48,7 +48,7 @@ public class DictTest {
     public void testCreate() {
         DictCreateRequest request = new DictCreateRequest();
         request.setDictName("字典名称");
-        request.setDictComment("字典描述");
+        request.setDictNote("字典描述");
         request.setVersion("字典版本号");
         request.setValid(true);
 
@@ -63,7 +63,7 @@ public class DictTest {
         //创建数据
         DictCreateRequest createRequest = new DictCreateRequest();
         createRequest.setDictName("字典名称");
-        createRequest.setDictComment("字典描述");
+        createRequest.setDictNote("字典描述");
         createRequest.setVersion("字典版本号");
         createRequest.setValid(true);
 
@@ -84,7 +84,7 @@ public class DictTest {
         //创建数据
         DictCreateRequest createRequest = new DictCreateRequest();
         createRequest.setDictName("字典名称");
-        createRequest.setDictComment("字典描述");
+        createRequest.setDictNote("字典描述");
         createRequest.setVersion("字典版本号");
         createRequest.setValid(true);
 
@@ -94,7 +94,7 @@ public class DictTest {
         DictUpdateRequest request = new DictUpdateRequest();
         request.setId(createResponse.getId());
         request.setDictName("字典名称");
-        request.setDictComment("字典描述");
+        request.setDictNote("字典描述");
         request.setVersion("字典版本号");
         request.setValid(true);
 
@@ -107,7 +107,7 @@ public class DictTest {
     public void testFind() {
         DictFindRequest request = new DictFindRequest();
         request.setDictName("字典名称");
-        request.setDictComment("字典描述");
+        request.setDictNote("字典描述");
         request.setValid(true);
 
         DictFindResponse response = dictManager.find(request, token);
@@ -120,7 +120,7 @@ public class DictTest {
         //创建数据
         DictCreateRequest createRequest = new DictCreateRequest();
         createRequest.setDictName("字典名称");
-        createRequest.setDictComment("字典描述");
+        createRequest.setDictNote("字典描述");
         createRequest.setVersion("字典版本号");
         createRequest.setValid(true);