服务和WEB隔离

Former-commit-id: 3956cfe8ee7360e1287f40a11dc6ce67e041707d

src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java

@@ -789,7 +789,7 @@ public class JavaFxApplication extends Application {
                             field.setFieldType(FieldType.Date.name());
                         }
                         if (newValue.toUpperCase().endsWith("_TYPE")) {
-                            field.setFieldType(FieldType.Dict.name());
+                            field.setFieldType(FieldType.Select.name());
                         }
                     }
                 });

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionSelectController.java

@@ -13,7 +13,6 @@ import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.util.Callback;
 import javafx.util.converter.DefaultStringConverter;
 import xyz.wbsite.dbtool.javafx.po.SelectItem;
-import xyz.wbsite.dbtool.javafx.po.SelectItem;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -113,6 +112,28 @@ public class OptionSelectController {
                 };
             }
         });
+        columns.get(1).setCellValueFactory(new PropertyValueFactory("label"));
+        columns.get(1).setCellFactory(new Callback<TableColumn, TableCell>() {
+            @Override
+            public TableCell call(TableColumn param) {
+
+                param.setOnEditCommit(new EventHandler<TableColumn.CellEditEvent>() {
+                    @Override
+                    public void handle(TableColumn.CellEditEvent event) {
+                        int row = event.getTablePosition().getRow();
+                        SelectItem field = data.get(row);
+                        field.setLabel((String) event.getNewValue());
+                    }
+                });
+                return new TextFieldTableCell(new DefaultStringConverter()) {
+                    @Override
+                    public void updateItem(Object item, boolean empty) {
+                        super.updateItem(item, empty);
+                        int index = this.getTableRow().getIndex();
+                    }
+                };
+            }
+        });
 
         ObservableList<SelectItem> ObservableList = FXCollections.observableArrayList();
         ObservableList.addAll(data);
@@ -127,7 +148,9 @@ public class OptionSelectController {
 
     public SelectItem getNewSelectItem() {
         String baseValue = "VALUE";
+        String baseLabel = "值";
         String value = baseValue;
+        String label = baseLabel;
         int k = 0;
         do {
             int i;
@@ -139,9 +162,11 @@ public class OptionSelectController {
             if (i < data.size()) {
                 k++;
                 value = baseValue + k;
+                label = baseLabel + k;
             } else {
                 SelectItem SelectItem = new SelectItem();
                 SelectItem.setValue(value);
+                SelectItem.setLabel(label);
                 return SelectItem;
             }
         } while (true);

src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java

@@ -230,7 +230,7 @@ public class XmlManager {
                 String value = annotation.value();
                 Method method = ClassUtil.getMethod(field.getName(), o.getClass());
                 Object invoke = method.invoke(o);
-                element.setAttribute(value, invoke.toString());
+                element.setAttribute(value, invoke == null ? "" : invoke.toString());
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java

@@ -203,9 +203,9 @@ public class SpringBootCallable implements Callable {
                         freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/java/action/ajax/wsys/" + name, ctx);
                     }
 
-                    File wmnt = Tool.createPath(ajax, "wmnt");
+                    File wsvr = Tool.createPath(ajax, "wsvr");
-                    for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/ajax/wmnt/")) {
+                    for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/ajax/wsvr/")) {
-                        freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/java/action/ajax/wmnt/" + name, ctx);
+                        freeMarkerManager.outputTemp(Tool.createFile(wsvr, name), "SpringBoot/java/action/ajax/wsvr/" + name, ctx);
                     }
                 }
             }
@@ -359,6 +359,8 @@ public class SpringBootCallable implements Callable {
     }
 
     public void generateModuleFor服务框架(File root, Project project) {
+        Module wsvrModule = tryGetModule(project, "wsvr");
+        if (wsvrModule == null || !wsvrModule.getNeedGenerate()) {// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("project", project);
             ctx.put("domain", project.getDomain());
@@ -389,8 +391,11 @@ public class SpringBootCallable implements Callable {
                 freeMarkerManager.outputTemp(Tool.createFile(rsp, name), "SpringBoot/java/module/wsvr/rsp/" + name, ctx);
             }
         }
+    }
 
     public void generateModuleFor接口框架(File root, Project project) {
+        Module wsysModule = tryGetModule(project, "wsys");
+        if (wsysModule == null || !wsysModule.getNeedGenerate()) {// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("project", project);
             ctx.put("domain", project.getDomain());
@@ -432,8 +437,11 @@ public class SpringBootCallable implements Callable {
                 }
             }
         }
+    }
 
     public void generateModuleFor网页框架(File root, Project project) {
+        Module wsysModule = tryGetModule(project, "wsys");
+        if (wsysModule == null || !wsysModule.getNeedGenerate()) {// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("project", project);
             ctx.put("domain", project.getDomain());
@@ -473,6 +481,7 @@ public class SpringBootCallable implements Callable {
                 freeMarkerManager.outputTemp(Tool.createFile(rsp, name), "SpringBoot/java/module/wsys/rsp/" + name, ctx);
             }
         }
+    }
 
 
     /**
@@ -760,13 +769,20 @@ public class SpringBootCallable implements Callable {
 
                 //生成网页
                 if (project.getFrame().value() >= Frame.网页框架.value()) {
+                    Module wsysModule = tryGetModule(project, "wsys");// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
+                    if (wsysModule == null || !wsysModule.getNeedGenerate()) {
                         File wsys = Tool.createPath(screen, "wsys");
                         for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/wsys/")) {
                             Tool.outputResource("SpringBoot/resources/templates/screen/module/wsys/" + name, Tool.createFile(wsys, name));
                         }
-                    File wmnt = Tool.createPath(screen, "wmnt");
+                    }
-                    for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/wmnt/")) {
+
-                        Tool.outputResource("SpringBoot/resources/templates/screen/module/wmnt/" + name, Tool.createFile(wmnt, name));
+                    Module wsvrModule = tryGetModule(project, "wsvr");// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
+                    if (wsvrModule == null || !wsvrModule.getNeedGenerate()) {
+                        File wsvr = Tool.createPath(screen, "wsvr");
+                        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/wsvr/")) {
+                            Tool.outputResource("SpringBoot/resources/templates/screen/module/wsvr/" + name, Tool.createFile(wsvr, name));
+                        }
                     }
                 }
             }
@@ -882,4 +898,13 @@ public class SpringBootCallable implements Callable {
             freeMarkerManager.outputTemp(Tool.createFile(root, "ExcelTest.java"), "SpringBoot/test/ExcelTest.java", ctx);
         }
     }
+
+    private Module tryGetModule(Project project, String moduleName) {
+        for (Module module : project.getModules()) {
+            if (module.getModuleName().equals(moduleName)) {
+                return module;
+            }
+        }
+        return null;
+    }
 }

src/main/java/xyz/wbsite/dbtool/javafx/po/SelectItem.java

@@ -6,6 +6,8 @@ import xyz.wbsite.dbtool.javafx.annotation.Property;
 public class SelectItem {
     @Property("value")
     private String value;
+    @Property("label")
+    private String label;
 
     public String getValue() {
         return value;
@@ -14,4 +16,12 @@ public class SelectItem {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
 }

src/main/resources/fxml/OptionSelect.fxml

@@ -24,7 +24,8 @@
     <center>
         <TableView fx:id="datas" prefHeight="170.0" prefWidth="300.0" BorderPane.alignment="CENTER">
             <columns>
-                <TableColumn prefWidth="198.0" text="选项值"/>
+                <TableColumn prefWidth="140.0" text="选项值"/>
+                <TableColumn prefWidth="140.0" text="选项标签"/>
             </columns>
         </TableView>
     </center>

src/main/resources/modules/SpringBoot/java/action/ajax/wsvr/LogerrAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.wmnt;
+package ${domain}.action.ajax.wsvr;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
@@ -11,63 +11,63 @@ 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.wsvr.ent.Logerr;
-import ${domain}.module.wsys.mgr.LogErrManager;
+import ${domain}.module.wsvr.mgr.LogerrManager;
-import ${domain}.module.wsys.req.LogErrCreateRequest;
+import ${domain}.module.wsvr.req.LogerrCreateRequest;
-import ${domain}.module.wsys.req.LogErrDeleteRequest;
+import ${domain}.module.wsvr.req.LogerrDeleteRequest;
-import ${domain}.module.wsys.req.LogErrFindRequest;
+import ${domain}.module.wsvr.req.LogerrFindRequest;
-import ${domain}.module.wsys.req.LogErrUpdateRequest;
+import ${domain}.module.wsvr.req.LogerrUpdateRequest;
-import ${domain}.module.wsys.rsp.LogErrCreateResponse;
+import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
-import ${domain}.module.wsys.rsp.LogErrDeleteResponse;
+import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
-import ${domain}.module.wsys.rsp.LogErrFindResponse;
+import ${domain}.module.wsvr.rsp.LogerrFindResponse;
-import ${domain}.module.wsys.rsp.LogErrUpdateResponse;
+import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;
 
-public class LogErrAjax {
+public class LogerrAjax {
 
     @Autowired
-    private LogErrManager logErrManager;
+    private LogerrManager logerrManager;
 
-    public LogErrCreateResponse create(LogErrCreateRequest request) {
+    public LogerrCreateResponse create(LogerrCreateRequest request) {
-        return logErrManager.create(request, LocalData.getToken());
+        return logerrManager.create(request, LocalData.getToken());
     }
 
-    public LogErrDeleteResponse delete(LogErrDeleteRequest request) {
+    public LogerrDeleteResponse delete(LogerrDeleteRequest request) {
-        return logErrManager.delete(request, LocalData.getToken());
+        return logerrManager.delete(request, LocalData.getToken());
     }
 
-    public LogErrUpdateResponse update(LogErrUpdateRequest request) {
+    public LogerrUpdateResponse update(LogerrUpdateRequest request) {
-        return logErrManager.update(request, LocalData.getToken());
+        return logerrManager.update(request, LocalData.getToken());
     }
 
-    public LogErrFindResponse find(LogErrFindRequest request) {
+    public LogerrFindResponse find(LogerrFindRequest request) {
-        return logErrManager.find(request, LocalData.getToken());
+        return logerrManager.find(request, LocalData.getToken());
     }
 
     public Object template(){
-        return ResponseUtil.apply(new WExcel<>(LogErr.class));
+        return ResponseUtil.apply(new WExcel<>(Logerr.class));
     }
 
-    public Object exports(LogErrFindRequest request) {
+    public Object exports(LogerrFindRequest request) {
-        LogErrFindResponse response = logErrManager.find(request, LocalData.getToken());
+        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()));
+        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>() {
+            WExcel sheet = new WExcel<>(Logerr.class).read(file.getBytes(), new WExcel.Processor<Logerr>() {
                 @Override
-                public List<String> exec(LogErr o, int index) {
+                public List<String> exec(Logerr o, int index) {
-                    LogErrCreateRequest request = MapperUtil.map(o, LogErrCreateRequest.class);
+                    LogerrCreateRequest request = MapperUtil.map(o, LogerrCreateRequest.class);
                     return ValidationUtil.validate(request);
                 }
             });

src/main/resources/modules/SpringBoot/java/action/ajax/wsvr/ProfilesAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.wsys;
+package ${domain}.action.ajax.wsvr;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
@@ -11,16 +11,16 @@ 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.wsvr.ent.Profiles;
-import ${domain}.module.wsys.mgr.ProfilesManager;
+import ${domain}.module.wsvr.mgr.ProfilesManager;
-import ${domain}.module.wsys.req.ProfilesCreateRequest;
+import ${domain}.module.wsvr.req.ProfilesCreateRequest;
-import ${domain}.module.wsys.req.ProfilesDeleteRequest;
+import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
-import ${domain}.module.wsys.req.ProfilesFindRequest;
+import ${domain}.module.wsvr.req.ProfilesFindRequest;
-import ${domain}.module.wsys.req.ProfilesUpdateRequest;
+import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
-import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
+import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
-import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
+import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
-import ${domain}.module.wsys.rsp.ProfilesFindResponse;
+import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
-import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
+import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java

@@ -83,7 +83,7 @@ public class Scheduler extends ThreadPoolTaskScheduler implements ErrorHandler {
         if (matcher.find()) {
             String taskName = matcher.group(1);
             String taskId = matcher.group(2);
-            ${domain}.module.wsys.mgr.LogErrManager logErrManager = xyz.wbsite.frame.auth.LocalData.getBean(${domain}.module.wsys.mgr.LogErrManager.class);
+            xyz.wbsite.module.wsvr.mgr.LogerrManager logErrManager = xyz.wbsite.frame.auth.LocalData.getBean(xyz.wbsite.module.wsvr.mgr.LogerrManager.class);
             if (logErrManager != null)
                 logErrManager.addErr("SYS_ERR", "任务" + taskName + "执行错误", "任务" + taskName + "执行错误" + "，任务ID" + taskId);
         }

src/main/resources/modules/SpringBoot/java/frame/validation/Select.java

@@ -1,6 +1,7 @@
 package ${domain}.frame.validation;
 
 import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
@@ -15,4 +16,8 @@ public @interface Select {
     String message() default "选项验证错误";
 
     String[] value() default {};
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
 }

src/main/resources/modules/SpringBoot/java/module/wsvr/ent/Logerr.java

@@ -0,0 +1,74 @@
+package ${domain}.module.wsvr.ent;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import ${domain}.frame.base.BaseEntity;
+import ${domain}.frame.excel.annotation.ExcelNote;
+import ${domain}.frame.excel.annotation.ExcelSheet;
+
+/**
+ * LOGERR - 错误日志
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+@ExcelSheet("错误日志")
+public class Logerr extends BaseEntity {
+
+    /**
+     * LOG_TYPE - 日志类型
+     */
+    @ExcelProperty("日志类型")
+    @ExcelNote("")
+    private String logType;
+    /**
+     * LOG_TITLE - 任务标题
+     */
+    @ExcelProperty("任务标题")
+    @ExcelNote("")
+    private String logTitle;
+    /**
+     * LOG_NOTE - 日志描述
+     */
+    @ExcelProperty("日志描述")
+    @ExcelNote("")
+    private String logNote;
+    /**
+     * LOG_STATE - 日志状态
+     */
+    @ExcelProperty("日志状态")
+    @ExcelNote("")
+    private String logState;
+
+    public String getLogType() {
+        return this.logType;
+    }
+
+    public void setLogType(String logType) {
+        this.logType = logType;
+    }
+
+    public String getLogTitle() {
+        return this.logTitle;
+    }
+
+    public void setLogTitle(String logTitle) {
+        this.logTitle = logTitle;
+    }
+
+    public String getLogNote() {
+        return this.logNote;
+    }
+
+    public void setLogNote(String logNote) {
+        this.logNote = logNote;
+    }
+
+    public String getLogState() {
+        return this.logState;
+    }
+
+    public void setLogState(String logState) {
+        this.logState = logState;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/ent/Profiles.java

@@ -1,16 +1,16 @@
-package ${domain}.module.wsys.ent;
+package ${domain}.module.wsvr.ent;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import ${domain}.frame.base.BaseEntity;
 import ${domain}.frame.excel.annotation.ExcelNote;
-import com.alibaba.excel.annotation.ExcelProperty;
 import ${domain}.frame.excel.annotation.ExcelSheet;
 
 /**
  * PROFILES - 系统配置
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 @ExcelSheet("系统配置")
 public class Profiles extends BaseEntity {
@@ -22,15 +22,15 @@ public class Profiles extends BaseEntity {
     @ExcelNote("")
     private String active;
     /**
-     * KEY - 键
+     * KEY - 配置键
      */
-    @ExcelProperty("键")
+    @ExcelProperty("配置键")
     @ExcelNote("")
     private String key;
     /**
-     * VALUE - 值
+     * VALUE - 配置值
      */
-    @ExcelProperty("值")
+    @ExcelProperty("配置值")
     @ExcelNote("")
     private String value;
 

src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/LogerrManager.java

@@ -0,0 +1,67 @@
+package ${domain}.module.wsvr.mgr;
+
+import ${domain}.frame.auth.Token;
+import ${domain}.module.wsvr.req.LogerrCreateRequest;
+import ${domain}.module.wsvr.req.LogerrDeleteRequest;
+import ${domain}.module.wsvr.req.LogerrFindRequest;
+import ${domain}.module.wsvr.req.LogerrUpdateRequest;
+import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
+import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
+import ${domain}.module.wsvr.rsp.LogerrFindResponse;
+import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
+
+/**
+ * 错误日志
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public interface LogerrManager {
+
+    /**
+     * 插入
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    LogerrCreateResponse create(LogerrCreateRequest request, Token token);
+
+    /**
+     * 逻辑删除
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    LogerrDeleteResponse delete(LogerrDeleteRequest request, Token token);
+
+    /**
+     * 更新
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    LogerrUpdateResponse update(LogerrUpdateRequest request, Token token);
+
+    /**
+     * 查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    LogerrFindResponse find(LogerrFindRequest request, Token token);
+
+    /**
+     * 快速添加错误日志
+     *
+     * @param logType 日志类型
+     * @param logTitle 标题
+     * @param logNote 描述
+     * @return
+     */
+    boolean addErr(String logType, String logTitle, String logNote);
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/LogerrManagerImpl.java

@@ -1,4 +1,4 @@
-package ${domain}.module.wsys.mgr;
+package ${domain}.module.wsvr.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -7,36 +7,36 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${domain}.frame.auth.LocalData;
-import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.auth.Token;
+import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.wsys.ent.LogErr;
+import ${domain}.module.wsvr.ent.Logerr;
-import ${domain}.module.wsys.mpr.LogErrMapper;
+import ${domain}.module.wsvr.mpr.LogerrMapper;
-import ${domain}.module.wsys.req.LogErrCreateRequest;
+import ${domain}.module.wsvr.req.LogerrCreateRequest;
-import ${domain}.module.wsys.req.LogErrDeleteRequest;
+import ${domain}.module.wsvr.req.LogerrDeleteRequest;
-import ${domain}.module.wsys.req.LogErrFindRequest;
+import ${domain}.module.wsvr.req.LogerrFindRequest;
-import ${domain}.module.wsys.req.LogErrUpdateRequest;
+import ${domain}.module.wsvr.req.LogerrUpdateRequest;
-import ${domain}.module.wsys.rsp.LogErrCreateResponse;
+import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
-import ${domain}.module.wsys.rsp.LogErrDeleteResponse;
+import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
-import ${domain}.module.wsys.rsp.LogErrFindResponse;
+import ${domain}.module.wsvr.rsp.LogerrFindResponse;
-import ${domain}.module.wsys.rsp.LogErrUpdateResponse;
+import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
 
 /**
- * LOG_ERR - 错误日志
+ * LOGERR - 错误日志
  *
  * @author wangbing
  * @version 0.0.1
- * @since 2017-01-01
+ * @since 2020-07-06
  */
 @Transactional
 @Service
-public class LogErrManagerImpl implements LogErrManager {
+public class LogerrManagerImpl implements LogerrManager {
 
     @Autowired
-    private LogErrMapper logErrMapper;
+    private LogerrMapper logerrMapper;
 
     /**
      * 插入
@@ -45,8 +45,8 @@ public class LogErrManagerImpl implements LogErrManager {
      * @param token   令牌
      * @return 响应
      */
-    public LogErrCreateResponse create(LogErrCreateRequest request, Token token) {
+    public LogerrCreateResponse create(LogerrCreateRequest request, Token token) {
-        LogErrCreateResponse response = new LogErrCreateResponse();
+        LogerrCreateResponse response = new LogerrCreateResponse();
 
         ValidationUtil.validate(request, response);
         if (response.hasError()) {
@@ -54,10 +54,10 @@ public class LogErrManagerImpl implements LogErrManager {
         }
 
         long id = IDgenerator.nextId();
-        LogErr entity = MapperUtil.map(request, LogErr.class);
+        ${domain}.module.wsvr.ent.Logerr entity = MapperUtil.map(request, ${domain}.module.wsvr.ent.Logerr.class);
         entity.setId(id);
 
-        long result = logErrMapper.insert(entity, token);
+        long result = logerrMapper.insert(entity, token);
         if (1L != result) {
             response.addError(ErrorType.BUSINESS_ERROR, Message.CREATE_FAILURE);
             return response;
@@ -74,15 +74,15 @@ public class LogErrManagerImpl implements LogErrManager {
      * @param token   令牌
      * @return 响应
      */
-    public LogErrDeleteResponse delete(LogErrDeleteRequest request, Token token) {
+    public LogerrDeleteResponse delete(LogerrDeleteRequest request, Token token) {
-        LogErrDeleteResponse response = new LogErrDeleteResponse();
+        LogerrDeleteResponse response = new LogerrDeleteResponse();
 
         ValidationUtil.validate(request, response);
         if (response.hasError()) {
             return response;
         }
 
-        long result = logErrMapper.delete(request.getId(), token);
+        long result = logerrMapper.delete(request.getId(), token);
         if (1L != result) {
             response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
             return response;
@@ -99,22 +99,22 @@ public class LogErrManagerImpl implements LogErrManager {
      * @param token   令牌
      * @return 响应
      */
-    public LogErrUpdateResponse update(LogErrUpdateRequest request, Token token) {
+    public LogerrUpdateResponse update(LogerrUpdateRequest request, Token token) {
-        LogErrUpdateResponse response = new LogErrUpdateResponse();
+        LogerrUpdateResponse response = new LogerrUpdateResponse();
 
         ValidationUtil.validate(request, response);
         if (response.hasError()) {
             return response;
         }
 
-        LogErr entity = logErrMapper.getById(request.getId(), token);
+        ${domain}.module.wsvr.ent.Logerr entity = logerrMapper.getById(request.getId(), token);
         if (entity == null) {
             response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
             return response;
         }
 
         MapperUtil.map(request, entity);
-        long result = logErrMapper.update(entity, token);
+        long result = logerrMapper.update(entity, token);
         if (1L != result) {
             response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
             return response;
@@ -132,8 +132,8 @@ public class LogErrManagerImpl implements LogErrManager {
      * @return 响应
      */
     @Transactional(readOnly = true)
-    public LogErrFindResponse find(LogErrFindRequest request, Token token) {
+    public LogerrFindResponse find(LogerrFindRequest request, Token token) {
-        LogErrFindResponse response = new LogErrFindResponse();
+        LogerrFindResponse response = new LogerrFindResponse();
 
         ValidationUtil.validate(request, response);
         if (response.hasError()) {
@@ -146,7 +146,7 @@ public class LogErrManagerImpl implements LogErrManager {
         if (StringUtil.isNotEmpty(request.getSortKey())) {
             PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
         }
-        PageInfo<LogErr> pageInfo = new PageInfo<>(logErrMapper.find(request, token));
+        PageInfo<${domain}.module.wsvr.ent.Logerr> pageInfo = new PageInfo<>(logerrMapper.find(request, token));
 
         response.setResult(pageInfo.getList());
         response.setTotalCount(pageInfo.getTotal());
@@ -157,20 +157,20 @@ public class LogErrManagerImpl implements LogErrManager {
     /**
      * 快速添加错误日志
      *
-     * @param LogErrType SYS_ERR、BIZ_ERR
+     * @param logType 日志类型
      * @param logTitle 标题
      * @param logNote 描述
      * @return
      */
-    public boolean addErr(String LogErrType, String logTitle, String logNote){
+    public boolean addErr(String logType, String logTitle, String logNote){
-        LogErr entity = new LogErr();
+        Logerr entity = new Logerr();
         entity.setId(IDgenerator.nextId());
         entity.setLogTitle(logTitle);
         entity.setLogNote(logNote);
-        entity.setLogErrType(LogErrType);
+        entity.setLogType(logType);
-        entity.setLogErrResult("0");
+        entity.setLogState("0");
 
-        long result = logErrMapper.insert(entity, LocalData.getSysToken());
+        long result = logerrMapper.insert(entity, LocalData.getSysToken());
         if (1L != result) {
             return false;
         }

src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/ProfilesManager.java

@@ -1,21 +1,21 @@
-package ${domain}.module.wsys.mgr;
+package ${domain}.module.wsvr.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.wsys.req.ProfilesCreateRequest;
+import ${domain}.module.wsvr.req.ProfilesCreateRequest;
-import ${domain}.module.wsys.req.ProfilesDeleteRequest;
+import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
-import ${domain}.module.wsys.req.ProfilesFindRequest;
+import ${domain}.module.wsvr.req.ProfilesFindRequest;
-import ${domain}.module.wsys.req.ProfilesUpdateRequest;
+import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
-import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
+import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
-import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
+import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
-import ${domain}.module.wsys.rsp.ProfilesFindResponse;
+import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
-import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
+import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
 
 /**
  * 系统配置
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public interface ProfilesManager {
 

src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/ProfilesManagerImpl.java

@@ -1,7 +1,8 @@
-package ${domain}.module.wsys.mgr;
+package ${domain}.module.wsvr.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,30 +12,27 @@ import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
-import ${domain}.frame.utils.StringUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.wsys.ent.Profiles;
+import ${domain}.module.wsvr.mpr.ProfilesMapper;
-import ${domain}.module.wsys.mpr.ProfilesMapper;
+import ${domain}.module.wsvr.req.ProfilesCreateRequest;
-import ${domain}.module.wsys.req.ProfilesCreateRequest;
+import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
-import ${domain}.module.wsys.req.ProfilesDeleteRequest;
+import ${domain}.module.wsvr.req.ProfilesFindRequest;
-import ${domain}.module.wsys.req.ProfilesFindRequest;
+import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
-import ${domain}.module.wsys.req.ProfilesUpdateRequest;
+import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
-import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
+import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
-import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
+import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
-import ${domain}.module.wsys.rsp.ProfilesFindResponse;
+import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
-import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
-
 
 /**
  * PROFILES - 系统配置
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 @Transactional
 @Service
-public class ProfilesManagerImpl implements ProfilesManager {
+public class ProfilesManagerImpl implements ${domain}.module.wsvr.mgr.ProfilesManager {
 
     @Autowired
     private ProfilesMapper profilesMapper;
@@ -54,22 +52,21 @@ public class ProfilesManagerImpl implements ProfilesManager {
             return response;
         }
 
-        {// 键唯一检查
+        {// 配置键唯一检查
             ProfilesFindRequest profilesFindRequest = new ProfilesFindRequest();
-            profilesFindRequest.setActive(request.getActive());
             profilesFindRequest.setKey(request.getKey());
             ProfilesFindResponse profilesFindResponse = this.find(profilesFindRequest, token);
             if (profilesFindResponse.hasError()) {
                 response.addErrors(profilesFindResponse.getErrors());
                 return response;
             } else if (profilesFindResponse.getTotalCount() > 0) {
-                response.addError(ErrorType.UNIQUENESS_ERROR, "[" + request.getKey() + "]键已存在，请检查!");
+                response.addError(ErrorType.UNIQUENESS_ERROR, "[key]配置键已存在，请检查!");
                 return response;
             }
         }
 
         long id = IDgenerator.nextId();
-        Profiles entity = MapperUtil.map(request, Profiles.class);
+        ${domain}.module.wsvr.ent.Profiles entity = MapperUtil.map(request, ${domain}.module.wsvr.ent.Profiles.class);
         entity.setId(id);
 
         long result = profilesMapper.insert(entity, token);
@@ -122,7 +119,7 @@ public class ProfilesManagerImpl implements ProfilesManager {
             return response;
         }
 
-        Profiles entity = profilesMapper.getById(request.getId(), token);
+        ${domain}.module.wsvr.ent.Profiles entity = profilesMapper.getById(request.getId(), token);
         if (entity == null) {
             response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
             return response;
@@ -161,7 +158,7 @@ public class ProfilesManagerImpl implements ProfilesManager {
         if (StringUtil.isNotEmpty(request.getSortKey())) {
             PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
         }
-        PageInfo<Profiles> pageInfo = new PageInfo<>(profilesMapper.find(request, token));
+        PageInfo<${domain}.module.wsvr.ent.Profiles> pageInfo = new PageInfo<>(profilesMapper.find(request, token));
 
         response.setResult(pageInfo.getList());
         response.setTotalCount(pageInfo.getTotal());

src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/LogerrMapper.java

@@ -1,21 +1,21 @@
-package ${domain}.module.wsys.mpr;
+package ${domain}.module.wsvr.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import ${domain}.frame.auth.Token;
-import ${domain}.module.wsys.ent.LogErr;
+import ${domain}.module.wsvr.ent.Logerr;
-import ${domain}.module.wsys.req.LogErrFindRequest;
+import ${domain}.module.wsvr.req.LogerrFindRequest;
 
 import java.util.List;
 
 /**
- * LOG_ERR - 错误日志
+ * LOGERR - 错误日志
  *
  * @author wangbing
- * @since 2020-06-27
+ * @since 2020-07-06
  */
 @Mapper
-public interface LogErrMapper {
+public interface LogerrMapper {
 
     /**
      * 插入
@@ -24,7 +24,7 @@ public interface LogErrMapper {
      * @param token   令牌
      * @return 返回数量
      */
-    long insert(@Param("request") LogErr request, @Param("token") Token token);
+    long insert(@Param("request") Logerr request, @Param("token") Token token);
 
     /**
      * 批量插入
@@ -33,7 +33,7 @@ public interface LogErrMapper {
      * @param token 令牌
      * @return 返回数量
      */
-    long insertBatch(@Param("list") List<LogErr> list, @Param("token") Token token);
+    long insertBatch(@Param("list") List<Logerr> list, @Param("token") Token token);
 
     /**
      * 逻辑删除
@@ -60,7 +60,7 @@ public interface LogErrMapper {
      * @param token   令牌
      * @return 返回数量
      */
-    long update(@Param("request") LogErr request, @Param("token") Token token);
+    long update(@Param("request") Logerr request, @Param("token") Token token);
 
     /**
      * 查询
@@ -69,7 +69,7 @@ public interface LogErrMapper {
      * @param token   令牌
      * @return 返回对象
      */
-    List<LogErr> find(@Param("request") LogErrFindRequest request, @Param("token") Token token);
+    List<Logerr> find(@Param("request") LogerrFindRequest request, @Param("token") Token token);
 
     /**
      * 获得对象
@@ -78,7 +78,7 @@ public interface LogErrMapper {
      * @param token 令牌
      * @return 返回对象
      */
-    LogErr getById(@Param("id") Long id, @Param("token") Token token);
+    Logerr getById(@Param("id") Long id, @Param("token") Token token);
 
     /**
      * 获得对象
@@ -87,5 +87,5 @@ public interface LogErrMapper {
      * @param token 令牌
      * @return 返回对象
      */
-    List<LogErr> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
+    List<Logerr> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
 }

src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/ProfilesMapper.java

@@ -1,10 +1,10 @@
-package ${domain}.module.wsys.mpr;
+package ${domain}.module.wsvr.mpr;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import ${domain}.frame.auth.Token;
-import ${domain}.module.wsys.ent.Profiles;
+import ${domain}.module.wsvr.ent.Profiles;
-import ${domain}.module.wsys.req.ProfilesFindRequest;
+import ${domain}.module.wsvr.req.ProfilesFindRequest;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * PROFILES - 系统配置
  *
  * @author wangbing
- * @since 2020-06-27
+ * @since 2020-07-06
  */
 @Mapper
 public interface ProfilesMapper {

src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SQLite_LogerrMapper.xml

@@ -0,0 +1,157 @@
+<?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="${domain}.module.wsvr.mpr.LogerrMapper">
+
+    <sql id="table">"SYS_LOGERR"</sql>
+	
+    <sql id="entityColumnList">
+        "ID","LOG_TYPE","LOG_TITLE","LOG_NOTE","LOG_STATE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+    </sql>
+	
+    <resultMap id="logerr" type="${domain}.module.wsvr.ent.Logerr">
+        <result column="ID"  jdbcType="BIGINT" property="id"/>
+        <result column="LOG_TYPE"  jdbcType="VARCHAR" property="logType"/>
+        <result column="LOG_TITLE"  jdbcType="VARCHAR" property="logTitle"/>
+        <result column="LOG_NOTE"  jdbcType="VARCHAR" property="logNote"/>
+        <result column="LOG_STATE"  jdbcType="VARCHAR" property="logState"/>
+        <result column="ROW_VERSION"  jdbcType="BIGINT" property="rowVersion"/>
+        <result column="IS_DELETED"  jdbcType="BIT" property="isDeleted"/>
+        <result column="CREATE_BY"  jdbcType="BIGINT" property="createBy"/>
+        <result column="CREATE_TIME"  jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="LAST_UPDATE_BY"  jdbcType="BIGINT" property="lastUpdateBy"/>
+        <result column="LAST_UPDATE_TIME"  jdbcType="TIMESTAMP" property="lastUpdateTime"/>
+    </resultMap>
+	
+    <insert id="insert">
+        INSERT INTO
+        <include refid="table"/>
+        (
+        <include refid="entityColumnList"/>
+        )
+        VALUES
+        (
+        ${r'#'}{request.id},
+        ${r'#'}{request.logType,jdbcType=VARCHAR},
+        ${r'#'}{request.logTitle,jdbcType=VARCHAR},
+        ${r'#'}{request.logNote,jdbcType=VARCHAR},
+        ${r'#'}{request.logState,jdbcType=VARCHAR},
+        0,
+        0,
+        ${r'#'}{token.userId,jdbcType=NUMERIC},
+        datetime('now','localtime'),
+        NULL,
+        NULL
+        )
+    </insert>
+
+    <insert id="insertBatch">
+        INSERT INTO
+        <include refid="table"/>
+        (
+        <include refid="entityColumnList"/>
+        )
+        VALUES
+        <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
+        ${r'#'}{item.id},
+        ${r'#'}{item.logType,jdbcType=VARCHAR},
+        ${r'#'}{item.logTitle,jdbcType=VARCHAR},
+        ${r'#'}{item.logNote,jdbcType=VARCHAR},
+        ${r'#'}{item.logState,jdbcType=VARCHAR},
+        0,
+        0,
+        ${r'#'}{token.userId,jdbcType=NUMERIC},
+        datetime('now','localtime'),
+        NULL,
+        NULL
+        </foreach >
+    </insert>
+	
+    <update id="delete">
+        UPDATE
+        <include refid="table"/>
+        SET "IS_DELETED" = 1
+        WHERE "IS_DELETED" = 0
+        AND "ID" = ${r'#'}{id}
+    </update>
+	
+    <update id="deleteBatch">
+        UPDATE
+        <include refid="table"/>
+        SET "IS_DELETED" = 1
+        WHERE "IS_DELETED" = 0
+        AND "ID" IN
+        <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
+		    ${r'#'}{item}
+	    </foreach>
+    </update>
+
+    <update id="update">
+        UPDATE
+        <include refid="table"/>
+        SET
+        LOG_TYPE = ${r'#'}{request.logType,jdbcType=VARCHAR},
+        LOG_TITLE = ${r'#'}{request.logTitle,jdbcType=VARCHAR},
+        LOG_NOTE = ${r'#'}{request.logNote,jdbcType=VARCHAR},
+        LOG_STATE = ${r'#'}{request.logState,jdbcType=VARCHAR},
+        "ROW_VERSION" = "ROW_VERSION" + 1,
+        "LAST_UPDATE_BY" = ${r'#'}{token.userId},
+        "LAST_UPDATE_TIME" = datetime('now','localtime')
+        WHERE "IS_DELETED" = 0
+        AND "ID" = ${r'#'}{request.id}
+        AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
+    </update>
+
+    <select id="find" resultMap="logerr">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.logType != null and request.logType != ''">
+            AND "LOG_TYPE" = ${r'#'}{request.logType}
+        </if>
+        <if test="request.logTitle != null and request.logTitle != ''">
+            AND "LOG_TITLE" = ${r'#'}{request.logTitle}
+        </if>
+        <if test="request.logState != null and request.logState != ''">
+            AND "LOG_STATE" = ${r'#'}{request.logState}
+        </if>
+        <if test="request.startDate != null">
+            AND strftime('%s',"CREATE_TIME", 'utc')*1000 &gt;= ${r'#'}{{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND strftime('%s',"CREATE_TIME", 'utc')*1000 &lt;= ${r'#'}{{request.endDate}
+        </if>
+    </select>
+
+    <select id="search" resultMap="logerr">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+    </select>
+
+    <select id="getById" resultMap="logerr">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        AND "ID" = ${r'#'}{id}
+    </select>
+	
+    <select id="getByIds" resultMap="logerr">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        AND "ID" IN
+        <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
+		    ${r'#'}{item}
+	    </foreach>
+    </select>
+</mapper>

src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SQLite_ProfilesMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${domain}.module.wsys.mpr.ProfilesMapper">
+<mapper namespace="${domain}.module.wsvr.mpr.ProfilesMapper">
 
     <sql id="table">"SYS_PROFILES"</sql>
 	
@@ -10,7 +10,7 @@
         "ID","ACTIVE","KEY","VALUE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
     </sql>
 	
-    <resultMap id="profiles" type="${domain}.module.wsys.ent.Profiles">
+    <resultMap id="profiles" type="${domain}.module.wsvr.ent.Profiles">
         <result column="ID"  jdbcType="BIGINT" property="id"/>
         <result column="ACTIVE"  jdbcType="VARCHAR" property="active"/>
         <result column="KEY"  jdbcType="VARCHAR" property="key"/>
@@ -31,13 +31,13 @@
         )
         VALUES
         (
-        ${r"#"}{request.id},
+        ${r'#'}{request.id},
-        ${r"#"}{request.active,jdbcType=VARCHAR},
+        ${r'#'}{request.active,jdbcType=VARCHAR},
-        ${r"#"}{request.key,jdbcType=VARCHAR},
+        ${r'#'}{request.key,jdbcType=VARCHAR},
-        ${r"#"}{request.value,jdbcType=VARCHAR},
+        ${r'#'}{request.value,jdbcType=VARCHAR},
         0,
         0,
-        ${r"#"}{token.userId,jdbcType=NUMERIC},
+        ${r'#'}{token.userId,jdbcType=NUMERIC},
         datetime('now','localtime'),
         NULL,
         NULL
@@ -52,13 +52,13 @@
         )
         VALUES
         <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
-            ${r"#"}{item.id},
+        ${r'#'}{item.id},
-            ${r"#"}{item.active,jdbcType=VARCHAR},
+        ${r'#'}{item.active,jdbcType=VARCHAR},
-            ${r"#"}{item.key,jdbcType=VARCHAR},
+        ${r'#'}{item.key,jdbcType=VARCHAR},
-            ${r"#"}{item.value,jdbcType=VARCHAR},
+        ${r'#'}{item.value,jdbcType=VARCHAR},
         0,
         0,
-            ${r"#"}{token.userId,jdbcType=NUMERIC},
+        ${r'#'}{token.userId,jdbcType=NUMERIC},
         datetime('now','localtime'),
         NULL,
         NULL
@@ -88,15 +88,15 @@
         UPDATE
         <include refid="table"/>
         SET
-        ACTIVE = ${r"#"}{request.active,jdbcType=VARCHAR},
+        ACTIVE = ${r'#'}{request.active,jdbcType=VARCHAR},
-        KEY = ${r"#"}{request.key,jdbcType=VARCHAR},
+        KEY = ${r'#'}{request.key,jdbcType=VARCHAR},
-        VALUE = ${r"#"}{request.value,jdbcType=VARCHAR},
+        VALUE = ${r'#'}{request.value,jdbcType=VARCHAR},
         "ROW_VERSION" = "ROW_VERSION" + 1,
-        "LAST_UPDATE_BY" = ${r"#"}{token.userId},
+        "LAST_UPDATE_BY" = ${r'#'}{token.userId},
         "LAST_UPDATE_TIME" = datetime('now','localtime')
         WHERE "IS_DELETED" = 0
-        AND "ID" = ${r"#"}{request.id}
+        AND "ID" = ${r'#'}{request.id}
-        AND "ROW_VERSION" = ${r"#"}{request.rowVersion}
+        AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
     </update>
 
     <select id="find" resultMap="profiles">
@@ -104,19 +104,18 @@
         <include refid="entityColumnList"/>
         FROM
         <include refid="table"/>
-        WHERE
+        WHERE "IS_DELETED" = 0
-        "IS_DELETED" = 0
         <if test="request.active != null and request.active != ''">
-            AND ACTIVE = ${r"#"}{request.active}
+            AND "ACTIVE" = ${r'#'}{request.active}
         </if>
         <if test="request.key != null and request.key != ''">
-            AND KEY = ${r"#"}{request.key}
+            AND "KEY" = ${r'#'}{request.key}
         </if>
         <if test="request.startDate != null">
-            AND strftime('%s',"CREATE_TIME", 'utc')*1000 &gt;= ${r'#'}{request.startDate}
+            AND strftime('%s',"CREATE_TIME", 'utc')*1000 &gt;= ${r'#'}{{request.startDate}
         </if>
         <if test="request.endDate != null">
-            AND strftime('%s',"CREATE_TIME", 'utc')*1000 &lt;= ${r'#'}{request.endDate}
+            AND strftime('%s',"CREATE_TIME", 'utc')*1000 &lt;= ${r'#'}{{request.endDate}
         </if>
     </select>
 
@@ -125,8 +124,7 @@
         <include refid="entityColumnList"/>
         FROM
         <include refid="table"/>
-        WHERE
+        WHERE "IS_DELETED" = 0
-        "IS_DELETED" = 0
     </select>
 
     <select id="getById" resultMap="profiles">

src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrCreateRequest.java

@@ -0,0 +1,77 @@
+package ${domain}.module.wsvr.req;
+
+import org.hibernate.validator.constraints.Length;
+import ${domain}.frame.base.BaseRequest;
+import ${domain}.frame.validation.Select;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * LogerrCreateRequest - 错误日志新增
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class LogerrCreateRequest extends BaseRequest {
+
+    /**
+     * 日志类型.
+     */
+    @NotNull(message = "[logType]日志类型不能为NULL")
+    @Select({"系统错误", "任务错误", "业务错误"})
+    private String logType;
+
+    /**
+     * 任务标题.
+     */
+    @NotBlank(message = "[logTitle]任务标题不能为空")
+    @Length(min = 0, max = 50, message = "[logTitle]任务标题长度不合法(0-50)")
+    private String logTitle;
+
+    /**
+     * 日志描述.
+     */
+    @Length(min = 0, max = 500, message = "[logNote]日志描述长度不合法(0-500)")
+    private String logNote;
+
+    /**
+     * 日志状态.
+     */
+    @NotNull(message = "[logState]日志状态不能为NULL")
+    @Select({"0", "1", "2"})
+    private String logState;
+
+    public String getLogType() {
+        return this.logType;
+    }
+
+    public void setLogType(String logType) {
+        this.logType = logType;
+    }
+
+    public String getLogTitle() {
+        return this.logTitle;
+    }
+
+    public void setLogTitle(String logTitle) {
+        this.logTitle = logTitle;
+    }
+
+    public String getLogNote() {
+        return this.logNote;
+    }
+
+    public void setLogNote(String logNote) {
+        this.logNote = logNote;
+    }
+
+    public String getLogState() {
+        return this.logState;
+    }
+
+    public void setLogState(String logState) {
+        this.logState = logState;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrDeleteRequest.java

@@ -0,0 +1,29 @@
+package ${domain}.module.wsvr.req;
+
+import ${domain}.frame.base.BaseRequest;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * LogerrDeleteRequest - 错误日志删除
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class LogerrDeleteRequest extends BaseRequest {
+
+    /**
+     * 主键.
+     */
+    @NotNull(message = "[id]主键不能为空")
+    private long id;
+
+    public long getId() {
+        return this.id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrFindRequest.java

@@ -1,35 +1,35 @@
-package ${domain}.module.wsys.req;
+package ${domain}.module.wsvr.req;
 
 import ${domain}.frame.base.BaseFindRequest;
-import ${domain}.frame.validation.Dict;
+import ${domain}.frame.validation.Select;
 
 import java.util.Date;
 
 /**
- * LogErrFindRequest - 错误日志查询
+ * LogerrFindRequest - 错误日志查询
  *
  * @author wangbing
  * @version 0.0.1
- * @since 2020-06-07
+ * @since 2020-07-06
  */
-public class LogErrFindRequest extends BaseFindRequest {
+public class LogerrFindRequest extends BaseFindRequest {
 
     /**
-     * 错误类型.
+     * 日志类型.
      */
-    @Dict(name = "LOG_ERR_TYPE")
+    @Select({"系统错误", "任务错误", "业务错误"})
-    private String logErrType;
+    private String logType;
 
     /**
-     * 日志标题.
+     * 任务标题.
      */
     private String logTitle;
 
     /**
-     * 处理结果.
+     * 日志状态.
      */
-    @Dict(name = "LOG_ERR_RESULT")
+    @Select({"0", "1", "2"})
-    private String logErrResult;
+    private String logState;
 
     /**
      * 开始日期
@@ -41,12 +41,12 @@ public class LogErrFindRequest extends BaseFindRequest {
      */
     private Date endDate;
 
-    public String getLogErrType() {
+    public String getLogType() {
-        return this.logErrType;
+        return this.logType;
     }
 
-    public void setLogErrType(String logErrType) {
+    public void setLogType(String logType) {
-        this.logErrType = logErrType;
+        this.logType = logType;
     }
 
     public String getLogTitle() {
@@ -57,12 +57,12 @@ public class LogErrFindRequest extends BaseFindRequest {
         this.logTitle = logTitle;
     }
 
-    public String getLogErrResult() {
+    public String getLogState() {
-        return this.logErrResult;
+        return this.logState;
     }
 
-    public void setLogErrResult(String logErrResult) {
+    public void setLogState(String logState) {
-        this.logErrResult = logErrResult;
+        this.logState = logState;
     }
 
     public Date getStartDate() {

src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrUpdateRequest.java

@@ -0,0 +1,91 @@
+package ${domain}.module.wsvr.req;
+
+import org.hibernate.validator.constraints.Length;
+import ${domain}.frame.base.BaseUpdateRequest;
+import ${domain}.frame.validation.Select;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * LogerrUpdateRequest - 错误日志更新
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class LogerrUpdateRequest extends BaseUpdateRequest {
+
+    /**
+     * 主键.
+     */
+    @NotNull(message = "[id]主键不能为NULL")
+    private Long id;
+
+    /**
+     * 日志类型.
+     */
+    @NotNull(message = "[logType]日志类型不能为NULL")
+    @Select({"系统错误", "任务错误", "业务错误"})
+    private String logType;
+
+    /**
+     * 任务标题.
+     */
+    @NotBlank(message = "[logTitle]任务标题不能为空")
+    @Length(min = 0, max = 50, message = "[logTitle]任务标题长度不合法(0-50)")
+    private String logTitle;
+
+    /**
+     * 日志描述.
+     */
+    @Length(min = 0, max = 500, message = "[logNote]日志描述长度不合法(0-500)")
+    private String logNote;
+
+    /**
+     * 日志状态.
+     */
+    @NotNull(message = "[logState]日志状态不能为NULL")
+    @Select({"0", "1", "2"})
+    private String logState;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLogType() {
+        return this.logType;
+    }
+
+    public void setLogType(String logType) {
+        this.logType = logType;
+    }
+
+    public String getLogTitle() {
+        return this.logTitle;
+    }
+
+    public void setLogTitle(String logTitle) {
+        this.logTitle = logTitle;
+    }
+
+    public String getLogNote() {
+        return this.logNote;
+    }
+
+    public void setLogNote(String logNote) {
+        this.logNote = logNote;
+    }
+
+    public String getLogState() {
+        return this.logState;
+    }
+
+    public void setLogState(String logState) {
+        this.logState = logState;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesCreateRequest.java

@@ -1,8 +1,8 @@
-package ${domain}.module.wsys.req;
+package ${domain}.module.wsvr.req;
 
-import ${domain}.frame.base.BaseRequest;
-import ${domain}.frame.validation.Dict;
 import org.hibernate.validator.constraints.Length;
+import ${domain}.frame.base.BaseRequest;
+import ${domain}.frame.validation.Select;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -10,9 +10,9 @@ import javax.validation.constraints.NotNull;
 /**
  * ProfilesCreateRequest - 系统配置新增
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public class ProfilesCreateRequest extends BaseRequest {
 
@@ -20,21 +20,21 @@ public class ProfilesCreateRequest extends BaseRequest {
      * 环境.
      */
     @NotNull(message = "[active]环境不能为NULL")
-    @Dict(name = "ACTIVE")
+    @Select({"dev", "prod"})
     private String active;
 
     /**
-     * 键
+     * 配置键.
      */
-    @NotBlank(message = "[key]键不能为空")
+    @NotBlank(message = "[key]配置键不能为空")
-    @Length(min = 0, max = 50, message = "[key]键长度不合法(0-50)")
+    @Length(min = 0, max = 50, message = "[key]配置键长度不合法(0-50)")
     private String key;
 
     /**
-     * 值
+     * 配置值.
      */
-    @NotBlank(message = "[value]值不能为空")
+    @NotBlank(message = "[value]配置值不能为空")
-    @Length(min = 0, max = 50, message = "[value]值长度不合法(0-50)")
+    @Length(min = 0, max = 50, message = "[value]配置值长度不合法(0-50)")
     private String value;
 
     public String getActive() {

src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesDeleteRequest.java

@@ -1,4 +1,4 @@
-package ${domain}.module.wsys.req;
+package ${domain}.module.wsvr.req;
 
 import ${domain}.frame.base.BaseRequest;
 
@@ -7,14 +7,14 @@ import javax.validation.constraints.NotNull;
 /**
  * ProfilesDeleteRequest - 系统配置删除
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public class ProfilesDeleteRequest extends BaseRequest {
 
     /**
-     * 主键
+     * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
     private long id;

src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesFindRequest.java

@@ -1,25 +1,27 @@
-package ${domain}.module.wsys.req;
+package ${domain}.module.wsvr.req;
 
 import ${domain}.frame.base.BaseFindRequest;
+import ${domain}.frame.validation.Select;
 
 import java.util.Date;
 
 /**
  * ProfilesFindRequest - 系统配置查询
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public class ProfilesFindRequest extends BaseFindRequest {
 
     /**
-     * 环境
+     * 环境.
      */
+    @Select({"dev", "prod"})
     private String active;
 
     /**
-     * 键
+     * 配置键.
      */
     private String key;
 

src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesUpdateRequest.java

@@ -1,8 +1,8 @@
-package ${domain}.module.wsys.req;
+package ${domain}.module.wsvr.req;
 
-import ${domain}.frame.base.BaseUpdateRequest;
-import ${domain}.frame.validation.Dict;
 import org.hibernate.validator.constraints.Length;
+import ${domain}.frame.base.BaseUpdateRequest;
+import ${domain}.frame.validation.Select;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -10,14 +10,14 @@ import javax.validation.constraints.NotNull;
 /**
  * ProfilesUpdateRequest - 系统配置更新
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public class ProfilesUpdateRequest extends BaseUpdateRequest {
 
     /**
-     * 主键
+     * 主键.
      */
     @NotNull(message = "[id]主键不能为NULL")
     private Long id;
@@ -26,21 +26,21 @@ public class ProfilesUpdateRequest extends BaseUpdateRequest {
      * 环境.
      */
     @NotNull(message = "[active]环境不能为NULL")
-    @Dict(name = "ACTIVE")
+    @Select({"dev", "prod"})
     private String active;
 
     /**
-     * 键
+     * 配置键.
      */
-    @NotBlank(message = "[key]键不能为空")
+    @NotBlank(message = "[key]配置键不能为空")
-    @Length(min = 0, max = 50, message = "[key]键长度不合法(0-50)")
+    @Length(min = 0, max = 50, message = "[key]配置键长度不合法(0-50)")
     private String key;
 
     /**
-     * 值
+     * 配置值.
      */
-    @NotBlank(message = "[value]值不能为空")
+    @NotBlank(message = "[value]配置值不能为空")
-    @Length(min = 0, max = 50, message = "[value]值长度不合法(0-50)")
+    @Length(min = 0, max = 50, message = "[value]配置值长度不合法(0-50)")
     private String value;
 
     public Long getId() {

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrCreateResponse.java

@@ -0,0 +1,26 @@
+package ${domain}.module.wsvr.rsp;
+
+import ${domain}.frame.base.BaseResponse;
+
+/**
+ * LogerrCreateResponse - 错误日志
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class LogerrCreateResponse extends BaseResponse {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrDeleteResponse.java

@@ -0,0 +1,26 @@
+package ${domain}.module.wsvr.rsp;
+
+import ${domain}.frame.base.BaseResponse;
+
+/**
+ * LogerrDeleteResponse - 错误日志
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class LogerrDeleteResponse extends BaseResponse {
+
+    /**
+     * 删除数目
+     */
+    private Long result;
+
+    public Long getResult() {
+        return this.result;
+    }
+
+    public void setResult(Long result) {
+        this.result = result;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrFindResponse.java

@@ -0,0 +1,14 @@
+package ${domain}.module.wsvr.rsp;
+
+import ${domain}.frame.base.BaseFindResponse;
+import ${domain}.module.wsvr.ent.Logerr;
+
+/**
+ * LogerrFindResponse - 错误日志
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class LogerrFindResponse extends BaseFindResponse<Logerr> {
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrUpdateResponse.java

@@ -0,0 +1,26 @@
+package ${domain}.module.wsvr.rsp;
+
+import ${domain}.frame.base.BaseResponse;
+
+/**
+ * LogerrUpdateResponse - 错误日志
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class LogerrUpdateResponse extends BaseResponse {
+
+    /**
+     * 更新数目
+     */
+    private Long result;
+
+    public Long getResult() {
+        return this.result;
+    }
+
+    public void setResult(Long result) {
+        this.result = result;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesCreateResponse.java

@@ -1,13 +1,13 @@
-package ${domain}.module.wsys.rsp;
+package ${domain}.module.wsvr.rsp;
 
 import ${domain}.frame.base.BaseResponse;
 
 /**
  * ProfilesCreateResponse - 系统配置
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public class ProfilesCreateResponse extends BaseResponse {
 

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesDeleteResponse.java

@@ -1,13 +1,13 @@
-package ${domain}.module.wsys.rsp;
+package ${domain}.module.wsvr.rsp;
 
 import ${domain}.frame.base.BaseResponse;
 
 /**
  * ProfilesDeleteResponse - 系统配置
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public class ProfilesDeleteResponse extends BaseResponse {
 

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesFindResponse.java

@@ -0,0 +1,13 @@
+package ${domain}.module.wsvr.rsp;
+
+import ${domain}.frame.base.BaseFindResponse;
+
+/**
+ * ProfilesFindResponse - 系统配置
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+public class ProfilesFindResponse extends BaseFindResponse<${domain}.module.wsvr.ent.Profiles> {
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesUpdateResponse.java

@@ -1,13 +1,13 @@
-package ${domain}.module.wsys.rsp;
+package ${domain}.module.wsvr.rsp;
 
 import ${domain}.frame.base.BaseResponse;
 
 /**
  * ProfilesUpdateResponse - 系统配置
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 public class ProfilesUpdateResponse extends BaseResponse {
 

src/main/resources/modules/SpringBoot/java/module/wsys/ent/LogErr.java

@@ -1,117 +0,0 @@
-package ${domain}.module.wsys.ent;
-
-import ${domain}.frame.excel.annotation.ExcelNote;
-import ${domain}.frame.excel.annotation.ExcelSelect;
-import com.alibaba.excel.annotation.ExcelProperty;
-import ${domain}.frame.excel.annotation.ExcelSheet;
-import ${domain}.frame.base.BaseEntity;
-
-/**
- * LOG_ERR - 错误日志
- *
- * @author wangbing
- * @version 0.0.1
- * @since 2020-06-07
- */
-@ExcelSheet("错误日志")
-public class LogErr extends BaseEntity {
-
-    /**
-     * LOG_ERR_TYPE - 错误类型
-     */
-    @ExcelProperty("错误类型")
-    @ExcelNote("")
-    private String logErrType;
-    /**
-     * LOG_TITLE - 日志标题
-     */
-    @ExcelProperty("日志标题")
-    @ExcelNote("")
-    private String logTitle;
-    /**
-     * LOG_NOTE - 日志内容
-     */
-    @ExcelProperty("日志内容")
-    @ExcelNote("")
-    private String logNote;
-    /**
-     * LOG_ERR_RESULT - 处理结果
-     */
-    @ExcelProperty("处理结果")
-    @ExcelNote("")
-    private String logErrResult;
-    /**
-     * LOG_ATTR1 - 属性1
-     */
-    @ExcelProperty("属性1")
-    @ExcelNote("")
-    private String logAttr1;
-    /**
-     * LOG_ATTR2 - 属性2
-     */
-    @ExcelProperty("属性2")
-    @ExcelNote("")
-    private String logAttr2;
-    /**
-     * LOG_ATTR3 - 属性3
-     */
-    @ExcelProperty("属性3")
-    @ExcelNote("")
-    private String logAttr3;
-
-    public String getLogErrType() {
-        return this.logErrType;
-    }
-
-    public void setLogErrType(String logErrType) {
-        this.logErrType = logErrType;
-    }
-
-    public String getLogTitle() {
-        return this.logTitle;
-    }
-
-    public void setLogTitle(String logTitle) {
-        this.logTitle = logTitle;
-    }
-
-    public String getLogNote() {
-        return this.logNote;
-    }
-
-    public void setLogNote(String logNote) {
-        this.logNote = logNote;
-    }
-
-    public String getLogErrResult() {
-        return this.logErrResult;
-    }
-
-    public void setLogErrResult(String logErrResult) {
-        this.logErrResult = logErrResult;
-    }
-
-    public String getLogAttr1() {
-        return this.logAttr1;
-    }
-
-    public void setLogAttr1(String logAttr1) {
-        this.logAttr1 = logAttr1;
-    }
-
-    public String getLogAttr2() {
-        return this.logAttr2;
-    }
-
-    public void setLogAttr2(String logAttr2) {
-        this.logAttr2 = logAttr2;
-    }
-
-    public String getLogAttr3() {
-        return this.logAttr3;
-    }
-
-    public void setLogAttr3(String logAttr3) {
-        this.logAttr3 = logAttr3;
-    }
-}

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogErrManager.java

@@ -1,66 +0,0 @@
-package ${domain}.module.wsys.mgr;
-
-import ${domain}.frame.auth.Token;
-import ${domain}.module.wsys.req.LogErrCreateRequest;
-import ${domain}.module.wsys.req.LogErrDeleteRequest;
-import ${domain}.module.wsys.req.LogErrFindRequest;
-import ${domain}.module.wsys.req.LogErrUpdateRequest;
-import ${domain}.module.wsys.rsp.LogErrCreateResponse;
-import ${domain}.module.wsys.rsp.LogErrDeleteResponse;
-import ${domain}.module.wsys.rsp.LogErrFindResponse;
-import ${domain}.module.wsys.rsp.LogErrUpdateResponse;
-
-/**
- * 错误日志
- *
- * @author wangbing
- * @version 0.0.1
- * @since 2017-01-01
- */
-public interface LogErrManager {
-
-    /**
-     * 插入
-     *
-     * @param request 请求对象
-     * @param token   令牌
-     * @return
-     */
-    LogErrCreateResponse create(LogErrCreateRequest request, Token token);
-
-    /**
-     * 逻辑删除
-     *
-     * @param request 请求对象
-     * @param token   令牌
-     * @return
-     */
-    LogErrDeleteResponse delete(LogErrDeleteRequest request, Token token);
-
-    /**
-     * 更新
-     *
-     * @param request 请求对象
-     * @param token   令牌
-     * @return
-     */
-    LogErrUpdateResponse update(LogErrUpdateRequest request, Token token);
-
-    /**
-     * 查询
-     *
-     * @param request 请求对象
-     * @param token   令牌
-     * @return
-     */
-    LogErrFindResponse find(LogErrFindRequest request, Token token);
-
-    /**
-     * 快速添加错误日志
-     * @param LogErrType SYS_ERR、BIZ_ERR
-     * @param title 标题
-     * @param content 描述
-     * @return
-     */
-    boolean addErr(String LogErrType, String title, String content);
-}

src/main/resources/modules/SpringBoot/java/module/wsys/req/LogErrCreateRequest.java

@@ -1,116 +0,0 @@
-package ${domain}.module.wsys.req;
-
-import ${domain}.frame.base.BaseRequest;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import org.hibernate.validator.constraints.Length;
-import ${domain}.frame.validation.Dict;
-
-/**
- * LogErrCreateRequest - 错误日志新增
- *
- * @author wangbing
- * @version 0.0.1
- * @since 2020-06-07
- */
-public class LogErrCreateRequest extends BaseRequest {
-
-    /**
-     * 错误类型.
-     */
-    @Dict(name = "LOG_ERR_TYPE")
-    private String logErrType;
-
-    /**
-     * 日志标题.
-     */
-    @NotBlank(message = "[logTitle]日志标题不能为空")
-    @Length(min = 0, max = 50, message = "[logTitle]日志标题长度不合法(0-50)")
-    private String logTitle;
-
-    /**
-     * 日志内容.
-     */
-    private String logNote;
-
-    /**
-     * 处理结果.
-     */
-    @NotNull(message = "[logErrResult]处理结果不能为NULL")
-    @Dict(name = "LOG_ERR_RESULT")
-    private String logErrResult;
-
-    /**
-     * 属性1.
-     */
-    @Length(min = 0, max = 50, message = "[logAttr1]属性1长度不合法(0-50)")
-    private String logAttr1;
-
-    /**
-     * 属性2.
-     */
-    @Length(min = 0, max = 50, message = "[logAttr2]属性2长度不合法(0-50)")
-    private String logAttr2;
-
-    /**
-     * 属性3.
-     */
-    @Length(min = 0, max = 50, message = "[logAttr3]属性3长度不合法(0-50)")
-    private String logAttr3;
-
-    public String getLogErrType() {
-        return this.logErrType;
-    }
-
-    public void setLogErrType(String logErrType) {
-        this.logErrType = logErrType;
-    }
-
-    public String getLogTitle() {
-        return this.logTitle;
-    }
-
-    public void setLogTitle(String logTitle) {
-        this.logTitle = logTitle;
-    }
-
-    public String getLogNote() {
-        return this.logNote;
-    }
-
-    public void setLogNote(String logNote) {
-        this.logNote = logNote;
-    }
-
-    public String getLogErrResult() {
-        return this.logErrResult;
-    }
-
-    public void setLogErrResult(String logErrResult) {
-        this.logErrResult = logErrResult;
-    }
-
-    public String getLogAttr1() {
-        return this.logAttr1;
-    }
-
-    public void setLogAttr1(String logAttr1) {
-        this.logAttr1 = logAttr1;
-    }
-
-    public String getLogAttr2() {
-        return this.logAttr2;
-    }
-
-    public void setLogAttr2(String logAttr2) {
-        this.logAttr2 = logAttr2;
-    }
-
-    public String getLogAttr3() {
-        return this.logAttr3;
-    }
-
-    public void setLogAttr3(String logAttr3) {
-        this.logAttr3 = logAttr3;
-    }
-}

src/main/resources/modules/SpringBoot/java/module/wsys/req/LogErrUpdateRequest.java

@@ -1,47 +0,0 @@
-package ${domain}.module.wsys.req;
-
-import ${domain}.frame.base.BaseUpdateRequest;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotEmpty;
-import ${domain}.frame.validation.Dict;
-
-/**
- * LogErrUpdateRequest - 错误日志更新
- *
- * @author wangbing
- * @version 0.0.1
- * @since 2020-06-07
- */
-public class LogErrUpdateRequest extends BaseUpdateRequest {
-
-    /**
-     * 主键.
-     */
-    @NotNull(message = "[id]主键不能为NULL")
-    private Long id;
-
-    /**
-     * 处理结果.
-     */
-    @NotNull(message = "[logErrResult]处理结果不能为NULL")
-    @Dict(name = "LOG_ERR_RESULT")
-    private String logErrResult;
-
-    public Long getId() {
-        return this.id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getLogErrResult() {
-        return this.logErrResult;
-    }
-
-    public void setLogErrResult(String logErrResult) {
-        this.logErrResult = logErrResult;
-    }
-}

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogErrFindResponse.java

@@ -1,14 +0,0 @@
-package ${domain}.module.wsys.rsp;
-
-import ${domain}.frame.base.BaseFindResponse;
-import ${domain}.module.wsys.ent.LogErr;
-
-/**
- * LogErrFindResponse - 错误日志
- *
- * @author wangbing
- * @version 0.0.1
- * @since 2017-01-01
- */
-public class LogErrFindResponse extends BaseFindResponse<LogErr> {
-}

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/ProfilesFindResponse.java

@@ -1,14 +0,0 @@
-package ${domain}.module.wsys.rsp;
-
-import ${domain}.module.wsys.ent.Profiles;
-import ${domain}.frame.base.BaseFindResponse;
-
-/**
- * ProfilesFindResponse - 系统配置
- *
- * @author author
- * @version 0.0.1
- * @since 2020-05-24
- */
-public class ProfilesFindResponse extends BaseFindResponse<Profiles> {
-}

src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml

@@ -1,10 +1,61 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project author="wangbing" database="SQLite" domain="xyz.wbsite" name="wadmin" needAsync="false" needCloud="false" needEMail="false" needMoreDB="false" needSys="true" needWeb="false">
+<project author="wangbing" database="SQLite" domain="xyz.wbsite" frame="网页框架" name="wadmin" needAsync="false" needCloud="false" needEMail="false" needMoreDB="false">
 <modules>
+<module name="wsvr" needGenerate="false" note="基础服务" prefix="SYS_">
+<table ajax="false" api="false" create="true" delete="true" find="true" get="false" html="false" search="false" sys="true" tableComment="序列" tableName="SEQUENCE" update="true">
+<field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="序列名称" fieldLength="50" fieldName="SEQ_NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="序列备注" fieldLength="50" fieldName="SEQ_NOTE" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="年" fieldLength="4" fieldName="YEAR" fieldType="String_var" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="月" fieldLength="2" fieldName="MONTH" fieldType="String_var" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="日" fieldLength="2" fieldName="DATE" fieldType="String_var" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="下一个值" fieldLength="0" fieldName="NEXT_VALUE" fieldType="Integer" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="创建用户" fieldLength="0" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+</table>
+<table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="错误日志" tableName="LOGERR" update="true">
+<field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="日志类型" fieldLength="20" fieldName="LOG_TYPE" fieldType="Select" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
+<selectItem label="系统错误" value="系统错误"/>
+<selectItem label="任务错误" value="任务错误"/>
+<selectItem label="业务错误" value="业务错误"/>
+</field>
+<field defaultValue="NULL" fieldComment="任务标题" fieldLength="50" fieldName="LOG_TITLE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="日志描述" fieldLength="500" fieldName="LOG_NOTE" fieldType="String_var500" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="日志状态" fieldLength="20" fieldName="LOG_STATE" fieldType="Select" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
+<selectItem label="待处理" value="0"/>
+<selectItem label="处理中" value="1"/>
+<selectItem label="已处理" value="2"/>
+</field>
+<field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="创建用户" fieldLength="0" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+</table>
+<table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="系统配置" tableName="PROFILES" update="true">
+<field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="环境" fieldLength="20" fieldName="ACTIVE" fieldType="Select" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
+<selectItem label="开发环境" value="dev"/>
+<selectItem label="生产环境" value="prod"/>
+</field>
+<field defaultValue="NULL" fieldComment="配置键" fieldLength="50" fieldName="KEY" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="true"/>
+<field defaultValue="NULL" fieldComment="配置值" fieldLength="50" fieldName="VALUE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="创建用户" fieldLength="0" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+<field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
+</table>
+</module>
 <module name="wsys" needGenerate="false" note="系统" prefix="SYS_">
-<tables>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="字典" tableName="DICT" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="字典名称" fieldLength="50" fieldName="DICT_NAME" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="字典描述" fieldLength="50" fieldName="DICT_COMMENT" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -16,10 +67,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="字典项" tableName="DICT_ITEM" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="字典名称" fieldLength="50" fieldName="DICT_NAME" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="字典键" fieldLength="20" fieldName="KEY" fieldType="String_var" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -32,10 +81,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="资源" tableName="RES" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="资源代码" fieldLength="50" fieldName="RES_CODE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="资源名称" fieldLength="50" fieldName="RES_NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -51,10 +98,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="19" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="用户" tableName="USER" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="用户账户" fieldLength="100" fieldName="USER_NAME" fieldType="String_var100" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="用户代码" fieldLength="50" fieldName="USER_CODE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -74,10 +119,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="19" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="部门" tableName="DEPT" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="部门代码" fieldLength="50" fieldName="DEPT_CODE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="部门名称" fieldLength="100" fieldName="DEPT_NAME" fieldType="String_var100" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -91,10 +134,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="角色" tableName="ROLE" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="角色代码" fieldLength="50" fieldName="CODE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="角色名称" fieldLength="50" fieldName="NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -105,10 +146,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="通行证" tableName="TOKENS" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="登录令牌" fieldLength="50" fieldName="TOKEN" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="用户主键" fieldLength="0" fieldName="USER_ID" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -132,10 +171,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="文件" tableName="FILE" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="文件名称" fieldLength="255" fieldName="NAME" fieldType="String_var255" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="文件类型" fieldLength="20" fieldName="FILE_TYPE" fieldType="Dict" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
@@ -152,10 +189,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="false" search="false" sys="true" tableComment="用户角色授权" tableName="USER_ROLE" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="用户主键" fieldLength="0" fieldName="USER_ID" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="用户代码" fieldLength="50" fieldName="USER_CODE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -167,10 +202,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="false" search="false" sys="true" tableComment="角色资源关系" tableName="ROLE_RES" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="角色主键" fieldLength="0" fieldName="ROLE_ID" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="角色代码" fieldLength="50" fieldName="ROLE_CODE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -182,35 +215,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
-</table>
-<table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="错误日志" tableName="LOG_ERR" update="true">
-<fields>
-<field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="错误类型" fieldLength="20" fieldName="LOG_ERR_TYPE" fieldType="Dict" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
-<dictItem key="SYS_ERR" value="系统错误"/>
-<dictItem key="BIZ_ERR" value="业务错误"/>
-</field>
-<field defaultValue="NULL" fieldComment="日志标题" fieldLength="50" fieldName="LOG_TITLE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="日志内容" fieldLength="0" fieldName="LOG_NOTE" fieldType="String_super" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="处理结果" fieldLength="20" fieldName="LOG_ERR_RESULT" fieldType="Dict" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
-<dictItem key="0" value="待处理"/>
-<dictItem key="1" value="已处理"/>
-<dictItem key="3" value="搁置"/>
-</field>
-<field defaultValue="NULL" fieldComment="属性1" fieldLength="50" fieldName="LOG_ATTR1" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="属性2" fieldLength="50" fieldName="LOG_ATTR2" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="属性3" fieldLength="50" fieldName="LOG_ATTR3" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="创建用户" fieldLength="19" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="最后更新用户" fieldLength="19" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="SQL任务" tableName="TASK_SQL" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="任务名称" fieldLength="50" fieldName="TASK_NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="详细注释" fieldLength="255" fieldName="TASK_NOTE" fieldType="String_var255" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -228,27 +234,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
-</table>
-<table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" search="false" sys="true" tableComment="系统配置" tableName="PROFILES" update="true">
-<fields>
-<field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="环境" fieldLength="20" fieldName="ACTIVE" fieldType="Dict" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
-<dictItem key="dev" value="开发环境"/>
-<dictItem key="prod" value="生产环境"/>
-</field>
-<field defaultValue="NULL" fieldComment="键" fieldLength="50" fieldName="KEY" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="true"/>
-<field defaultValue="NULL" fieldComment="值" fieldLength="50" fieldName="VALUE" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="创建用户" fieldLength="0" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="false" search="false" sys="true" tableComment="应用接入" tableName="VISITOR" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="应用名称" fieldLength="50" fieldName="APP_NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="应用简介" fieldLength="255" fieldName="APP_NOTE" fieldType="String_var255" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
@@ -261,10 +248,8 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
 <table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="false" search="false" sys="true" tableComment="应用资源关系" tableName="VISITOR_RES" update="true">
-<fields>
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="应用主键" fieldLength="0" fieldName="APP_ID" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="应用码" fieldLength="50" fieldName="APP_KEY" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
@@ -276,26 +261,7 @@
 <field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
-</table>
-<table ajax="false" api="false" create="true" delete="true" find="true" get="false" html="false" search="false" sys="true" tableComment="序列" tableName="SEQUENCE" update="true">
-<fields>
-<field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="序列名称" fieldLength="50" fieldName="SEQ_NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="序列备注" fieldLength="50" fieldName="SEQ_NOTE" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="年" fieldLength="4" fieldName="YEAR" fieldType="String_var" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="月" fieldLength="2" fieldName="MONTH" fieldType="String_var" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="日" fieldLength="2" fieldName="DATE" fieldType="String_var" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="下一个值" fieldLength="0" fieldName="NEXT_VALUE" fieldType="Integer" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
-<field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="创建用户" fieldLength="0" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-<field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
-</fields>
 </table>
-</tables>
 </module>
 </modules>
 </project>

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/MySQL_ALL_TABLE.sql

@@ -229,50 +229,6 @@ CREATE TABLE `SYS_ROLE_RES` (
 PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色资源关系';
 
--- ----------------------------
--- Table structure for LOG_ERR - 错误日志
--- Target   : MySQL
--- Author   : wangbing
--- Date:    : 2020-06-07
--- ----------------------------
-CREATE TABLE `SYS_LOG_ERR` (
-        `ID` BIGINT(20) NOT NULL COMMENT '主键',
-        `LOG_ERR_TYPE` VARCHAR(20) COMMENT '错误类型',
-        `LOG_TITLE` VARCHAR(50) NOT NULL COMMENT '日志标题',
-        `LOG_NOTE` TEXT COMMENT '日志内容',
-        `LOG_ERR_RESULT` VARCHAR(20) NOT NULL COMMENT '处理结果',
-        `LOG_ATTR1` VARCHAR(50) COMMENT '属性1',
-        `LOG_ATTR2` VARCHAR(50) COMMENT '属性2',
-        `LOG_ATTR3` VARCHAR(50) COMMENT '属性3',
-        `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 '创建用户',
-        `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间',
-        `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户',
-        `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间',
-PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志';
-
--- ----------------------------
--- Table structure for PROFILES - 系统配置
--- Target   : MySQL
--- Author   : wangbing
--- Date:    : 2020-06-08
--- ----------------------------
-CREATE TABLE `SYS_PROFILES` (
-        `ID` BIGINT(20) NOT NULL COMMENT '主键',
-        `ACTIVE` VARCHAR(20) NOT NULL COMMENT '环境',
-        `KEY` VARCHAR(50) NOT NULL COMMENT '键',
-        `VALUE` VARCHAR(50) NOT 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 '创建用户',
-        `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间',
-        `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户',
-        `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间',
-PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统配置';
-
 -- ----------------------------
 -- Table structure for TASK_SQL - SQL任务
 -- Target   : MySQL

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/MySQL_LOG_ERR.sql

@@ -1,23 +0,0 @@
--- ----------------------------
--- Table structure for LOG_ERR - 错误日志
--- Target   : MySQL
--- Author   : wangbing
--- Date:    : 2020-06-07
--- ----------------------------
-CREATE TABLE `SYS_LOG_ERR` (
-        `ID` BIGINT(20) NOT NULL COMMENT '主键',
-        `LOG_ERR_TYPE` VARCHAR(20) COMMENT '错误类型',
-        `LOG_TITLE` VARCHAR(50) NOT NULL COMMENT '日志标题',
-        `LOG_NOTE` TEXT COMMENT '日志内容',
-        `LOG_ERR_RESULT` VARCHAR(20) NOT NULL COMMENT '处理结果',
-        `LOG_ATTR1` VARCHAR(50) COMMENT '属性1',
-        `LOG_ATTR2` VARCHAR(50) COMMENT '属性2',
-        `LOG_ATTR3` VARCHAR(50) COMMENT '属性3',
-        `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 '创建用户',
-        `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间',
-        `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户',
-        `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间',
-PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/MySQL_PROFILES.sql

@@ -1,19 +0,0 @@
--- ----------------------------
--- Table structure for PROFILES - 系统配置
--- Target   : MySQL
--- Author   : wangbing
--- Date:    : 2020-06-08
--- ----------------------------
-CREATE TABLE `SYS_PROFILES` (
-        `ID` BIGINT(20) NOT NULL COMMENT '主键',
-        `ACTIVE` VARCHAR(20) NOT NULL COMMENT '环境',
-        `KEY` VARCHAR(50) NOT NULL COMMENT '键',
-        `VALUE` VARCHAR(50) NOT 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 '创建用户',
-        `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间',
-        `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户',
-        `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间',
-PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统配置';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/Oracle_ALL_TABLE.sql

@@ -360,44 +360,6 @@ COMMENT ON COLUMN "SYS_ROLE_RES"."CREATE_TIME" is '创建时间';
 COMMENT ON COLUMN "SYS_ROLE_RES"."LAST_UPDATE_BY" is '最后更新用户';
 COMMENT ON COLUMN "SYS_ROLE_RES"."LAST_UPDATE_TIME" is '最后更新时间';
 
--- ----------------------------
--- Table structure for LOG_ERR - 错误日志
--- Target   : Oracle
--- Author   : wangbing
--- Date:    : 2020-06-18
--- ----------------------------
-CREATE TABLE "SYS_LOG_ERR" (
-"ID" NUMBER(19) NOT NULL,
-"LOG_ERR_TYPE" VARCHAR(20) NULL,
-"LOG_TITLE" VARCHAR2(50) NULL,
-"LOG_NOTE" LONG NULL,
-"LOG_ERR_RESULT" VARCHAR(20) NULL,
-"LOG_ATTR1" VARCHAR2(50) NULL,
-"LOG_ATTR2" VARCHAR2(50) NULL,
-"LOG_ATTR3" VARCHAR2(50) NULL,
-"ROW_VERSION" NUMBER(19) NOT NULL,
-"IS_DELETED" CHAR(1) NOT NULL,
-"CREATE_BY" NUMBER(19) NOT NULL,
-"CREATE_TIME" DATE NOT NULL,
-"LAST_UPDATE_BY" NUMBER(19) NULL,
-"LAST_UPDATE_TIME" DATE NULL
-);
-COMMENT ON TABLE "SYS_LOG_ERR" is '错误日志';
-COMMENT ON COLUMN "SYS_LOG_ERR"."ID" is '主键';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ERR_TYPE" is '错误类型';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_TITLE" is '日志标题';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_NOTE" is '日志内容';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ERR_RESULT" is '处理结果';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ATTR1" is '属性1';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ATTR2" is '属性2';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ATTR3" is '属性3';
-COMMENT ON COLUMN "SYS_LOG_ERR"."ROW_VERSION" is '行版本';
-COMMENT ON COLUMN "SYS_LOG_ERR"."IS_DELETED" is '是否已删除';
-COMMENT ON COLUMN "SYS_LOG_ERR"."CREATE_BY" is '创建用户';
-COMMENT ON COLUMN "SYS_LOG_ERR"."CREATE_TIME" is '创建时间';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LAST_UPDATE_BY" is '最后更新用户';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LAST_UPDATE_TIME" is '最后更新时间';
-
 -- ----------------------------
 -- Table structure for TASK_SQL - SQL任务
 -- Target   : Oracle
@@ -434,36 +396,6 @@ COMMENT ON COLUMN "SYS_TASK_SQL"."CREATE_TIME" is '创建时间';
 COMMENT ON COLUMN "SYS_TASK_SQL"."LAST_UPDATE_BY" is '最后更新用户';
 COMMENT ON COLUMN "SYS_TASK_SQL"."LAST_UPDATE_TIME" is '最后更新时间';
 
--- ----------------------------
--- Table structure for PROFILES - 系统配置
--- Target   : Oracle
--- Author   : wangbing
--- Date:    : 2020-06-18
--- ----------------------------
-CREATE TABLE "SYS_PROFILES" (
-"ID" NUMBER(19) NOT NULL,
-"ACTIVE" VARCHAR(20) NULL,
-"KEY" VARCHAR2(50) NULL,
-"VALUE" VARCHAR2(50) NULL,
-"ROW_VERSION" NUMBER(19) NOT NULL,
-"IS_DELETED" CHAR(1) NOT NULL,
-"CREATE_BY" NUMBER(19) NOT NULL,
-"CREATE_TIME" DATE NOT NULL,
-"LAST_UPDATE_BY" NUMBER(19) NULL,
-"LAST_UPDATE_TIME" DATE NULL
-);
-COMMENT ON TABLE "SYS_PROFILES" is '系统配置';
-COMMENT ON COLUMN "SYS_PROFILES"."ID" is '主键';
-COMMENT ON COLUMN "SYS_PROFILES"."ACTIVE" is '环境';
-COMMENT ON COLUMN "SYS_PROFILES"."KEY" is '键';
-COMMENT ON COLUMN "SYS_PROFILES"."VALUE" is '值';
-COMMENT ON COLUMN "SYS_PROFILES"."ROW_VERSION" is '行版本';
-COMMENT ON COLUMN "SYS_PROFILES"."IS_DELETED" is '是否已删除';
-COMMENT ON COLUMN "SYS_PROFILES"."CREATE_BY" is '创建用户';
-COMMENT ON COLUMN "SYS_PROFILES"."CREATE_TIME" is '创建时间';
-COMMENT ON COLUMN "SYS_PROFILES"."LAST_UPDATE_BY" is '最后更新用户';
-COMMENT ON COLUMN "SYS_PROFILES"."LAST_UPDATE_TIME" is '最后更新时间';
-
 -- ----------------------------
 -- Table structure for DEVELOPER - 开发商
 -- Target   : Oracle

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/Oracle_LOG_ERR.sql

@@ -1,38 +0,0 @@
--- ----------------------------
--- Table structure for LOG_ERR - 错误日志
--- Target   : Oracle
--- Author   : wangbing
--- Date:    : 2020-06-18
--- ----------------------------
-CREATE TABLE "SYS_LOG_ERR" (
-    "ID" NUMBER(19) NOT NULL,
-    "LOG_ERR_TYPE" VARCHAR(20) NULL,
-    "LOG_TITLE" VARCHAR2(50) NULL,
-    "LOG_NOTE" LONG NULL,
-    "LOG_ERR_RESULT" VARCHAR(20) NULL,
-    "LOG_ATTR1" VARCHAR2(50) NULL,
-    "LOG_ATTR2" VARCHAR2(50) NULL,
-    "LOG_ATTR3" VARCHAR2(50) NULL,
-    "ROW_VERSION" NUMBER(19) NOT NULL,
-    "IS_DELETED" CHAR(1) NOT NULL,
-    "CREATE_BY" NUMBER(19) NOT NULL,
-    "CREATE_TIME" DATE NOT NULL,
-    "LAST_UPDATE_BY" NUMBER(19) NULL,
-    "LAST_UPDATE_TIME" DATE NULL
-);
-
-COMMENT ON TABLE "SYS_LOG_ERR" is '错误日志';
-COMMENT ON COLUMN "SYS_LOG_ERR"."ID" is '主键';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ERR_TYPE" is '错误类型';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_TITLE" is '日志标题';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_NOTE" is '日志内容';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ERR_RESULT" is '处理结果';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ATTR1" is '属性1';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ATTR2" is '属性2';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LOG_ATTR3" is '属性3';
-COMMENT ON COLUMN "SYS_LOG_ERR"."ROW_VERSION" is '行版本';
-COMMENT ON COLUMN "SYS_LOG_ERR"."IS_DELETED" is '是否已删除';
-COMMENT ON COLUMN "SYS_LOG_ERR"."CREATE_BY" is '创建用户';
-COMMENT ON COLUMN "SYS_LOG_ERR"."CREATE_TIME" is '创建时间';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LAST_UPDATE_BY" is '最后更新用户';
-COMMENT ON COLUMN "SYS_LOG_ERR"."LAST_UPDATE_TIME" is '最后更新时间';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/Oracle_PROFILES.sql

@@ -1,30 +0,0 @@
--- ----------------------------
--- Table structure for PROFILES - 系统配置
--- Target   : Oracle
--- Author   : wangbing
--- Date:    : 2020-06-18
--- ----------------------------
-CREATE TABLE "SYS_PROFILES" (
-    "ID" NUMBER(19) NOT NULL,
-    "ACTIVE" VARCHAR(20) NULL,
-    "KEY" VARCHAR2(50) NULL,
-    "VALUE" VARCHAR2(50) NULL,
-    "ROW_VERSION" NUMBER(19) NOT NULL,
-    "IS_DELETED" CHAR(1) NOT NULL,
-    "CREATE_BY" NUMBER(19) NOT NULL,
-    "CREATE_TIME" DATE NOT NULL,
-    "LAST_UPDATE_BY" NUMBER(19) NULL,
-    "LAST_UPDATE_TIME" DATE NULL
-);
-
-COMMENT ON TABLE "SYS_PROFILES" is '系统配置';
-COMMENT ON COLUMN "SYS_PROFILES"."ID" is '主键';
-COMMENT ON COLUMN "SYS_PROFILES"."ACTIVE" is '环境';
-COMMENT ON COLUMN "SYS_PROFILES"."KEY" is '键';
-COMMENT ON COLUMN "SYS_PROFILES"."VALUE" is '值';
-COMMENT ON COLUMN "SYS_PROFILES"."ROW_VERSION" is '行版本';
-COMMENT ON COLUMN "SYS_PROFILES"."IS_DELETED" is '是否已删除';
-COMMENT ON COLUMN "SYS_PROFILES"."CREATE_BY" is '创建用户';
-COMMENT ON COLUMN "SYS_PROFILES"."CREATE_TIME" is '创建时间';
-COMMENT ON COLUMN "SYS_PROFILES"."LAST_UPDATE_BY" is '最后更新用户';
-COMMENT ON COLUMN "SYS_PROFILES"."LAST_UPDATE_TIME" is '最后更新时间';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/SQLite_ALL_TABLE.sql

@@ -209,28 +209,6 @@ CREATE TABLE IF NOT EXISTS SYS_ROLE_RES (
     "LAST_UPDATE_TIME" DATETIME
 );
 -- ----------------------------
--- Table structure for LOG_ERR - 错误日志
--- Target   : SQLite
--- Author   : wangbing
--- Date:    : 2020-06-07
--- ----------------------------
-CREATE TABLE IF NOT EXISTS SYS_LOG_ERR (
-    "ID" BIGINT PRIMARY KEY NOT NULL,
-    "LOG_ERR_TYPE" VARCHAR(20),
-    "LOG_TITLE" VARCHAR(50) NOT NULL,
-    "LOG_NOTE" TEXT,
-    "LOG_ERR_RESULT" VARCHAR(20) NOT NULL,
-    "LOG_ATTR1" VARCHAR(50),
-    "LOG_ATTR2" VARCHAR(50),
-    "LOG_ATTR3" VARCHAR(50),
-    "ROW_VERSION" BIGINT NOT NULL,
-    "IS_DELETED" BOOLEAN NOT NULL,
-    "CREATE_BY" BIGINT NOT NULL,
-    "CREATE_TIME" DATETIME NOT NULL,
-    "LAST_UPDATE_BY" BIGINT,
-    "LAST_UPDATE_TIME" DATETIME
-);
--- ----------------------------
 -- Table structure for TASK_SQL - SQL任务
 -- Target   : SQLite
 -- Author   : author
@@ -251,21 +229,3 @@ CREATE TABLE IF NOT EXISTS SYS_TASK_SQL (
     "LAST_UPDATE_BY" BIGINT,
     "LAST_UPDATE_TIME" DATETIME
 );
--- ----------------------------
--- Table structure for PROFILES - 系统配置
--- Target   : SQLite
--- Author   : author
--- Date:    : 2020-06-04
--- ----------------------------
-CREATE TABLE IF NOT EXISTS SYS_PROFILES (
-    "ID" BIGINT PRIMARY KEY NOT NULL,
-    "ACTIVE" VARCHAR(20) NOT NULL,
-    "KEY" VARCHAR(50) NOT NULL,
-    "VALUE" VARCHAR(50) NOT NULL,
-    "ROW_VERSION" BIGINT NOT NULL,
-    "IS_DELETED" BOOLEAN NOT NULL,
-    "CREATE_BY" BIGINT NOT NULL,
-    "CREATE_TIME" DATETIME NOT NULL,
-    "LAST_UPDATE_BY" BIGINT,
-    "LAST_UPDATE_TIME" DATETIME
-);

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/SQLite_LOG_ERR.sql

@@ -1,22 +0,0 @@
--- ----------------------------
--- Table structure for LOG_ERR - 错误日志
--- Target   : SQLite
--- Author   : wangbing
--- Date:    : 2020-06-07
--- ----------------------------
-CREATE TABLE IF NOT EXISTS SYS_LOG_ERR (
-    "ID" BIGINT PRIMARY KEY NOT NULL,
-    "LOG_ERR_TYPE" VARCHAR(20),
-    "LOG_TITLE" VARCHAR(50) NOT NULL,
-    "LOG_NOTE" TEXT,
-    "LOG_ERR_RESULT" VARCHAR(20) NOT NULL,
-    "LOG_ATTR1" VARCHAR(50),
-    "LOG_ATTR2" VARCHAR(50),
-    "LOG_ATTR3" VARCHAR(50),
-    "ROW_VERSION" BIGINT NOT NULL,
-    "IS_DELETED" BOOLEAN NOT NULL,
-    "CREATE_BY" BIGINT NOT NULL,
-    "CREATE_TIME" DATETIME NOT NULL,
-    "LAST_UPDATE_BY" BIGINT,
-    "LAST_UPDATE_TIME" DATETIME
-);

src/main/resources/modules/SpringBoot/resources/dbtool/wsys/SQLite_PROFILES.sql

@@ -1,18 +0,0 @@
--- ----------------------------
--- Table structure for PROFILES - 系统配置
--- Target   : SQLite
--- Author   : author
--- Date:    : 2020-06-04
--- ----------------------------
-CREATE TABLE IF NOT EXISTS SYS_PROFILES (
-    "ID" BIGINT PRIMARY KEY NOT NULL,
-    "ACTIVE" VARCHAR(20) NOT NULL,
-    "KEY" VARCHAR(50) NOT NULL,
-    "VALUE" VARCHAR(50) NOT NULL,
-    "ROW_VERSION" BIGINT NOT NULL,
-    "IS_DELETED" BOOLEAN NOT NULL,
-    "CREATE_BY" BIGINT NOT NULL,
-    "CREATE_TIME" DATETIME NOT NULL,
-    "LAST_UPDATE_BY" BIGINT,
-    "LAST_UPDATE_TIME" DATETIME
-);

src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl

@@ -28,7 +28,7 @@
                     <span slot="title">核心设置</span>
                 </template>
                 ${print('<#if token.hasRes("DEV_PROFILES")>')}
-                <el-menu-item index="${uuid()}" @click="addTab({title: '系统配置', name: 'profiles', url: '${r'${context}'}/wsys/profiles.htm'})">系统配置</el-menu-item>
+                <el-menu-item index="${uuid()}" @click="addTab({title: '系统配置', name: 'profiles', url: '${r'${context}'}/wsvr/profiles.htm'})">系统配置</el-menu-item>
                 ${print('</#if>')}
                 ${print('<#if token.hasRes("DEV_RES")>')}
                 <el-menu-item index="${uuid()}" @click="addTab({title: '资源管理', name: 'res', url: '${r'${context}'}/wsys/res.htm'})">资源管理</el-menu-item>
@@ -48,10 +48,10 @@
                     <span slot="title">监控运行</span>
                 </template>
                 ${print('<#if token.hasRes("OBS_SCHEDULE")>')}
-                <el-menu-item index="${uuid()}" @click="addTab({title: '调度监控', name: 'schedule', url: '${r'${context}'}/wmnt/schedule.htm'})">调度监控</el-menu-item>
+                <el-menu-item index="${uuid()}" @click="addTab({title: '调度监控', name: 'schedule', url: '${r'${context}'}/wsys/schedule.htm'})">调度监控</el-menu-item>
                 ${print('</#if>')}
                 ${print('<#if token.hasRes("OBS_LOG_ERR")>')}
-                <el-menu-item index="${uuid()}" @click="addTab({title: '错误日志', name: 'logErr', url: '${r'${context}'}/wmnt/logErr.htm'})">错误日志</el-menu-item>
+                <el-menu-item index="${uuid()}" @click="addTab({title: '错误日志', name: 'logErr', url: '${r'${context}'}/wsvr/logErr.htm'})">错误日志</el-menu-item>
                 ${print('</#if>')}
             </el-submenu>
             ${print('</#if>')}
@@ -59,7 +59,7 @@
             <el-submenu index="${uuid()}" >
                 <template slot="title">
                     <i class="el-icon-setting"></i>
-                    <span slot="title">基本设置</span>
+                    <span slot="title">基础设置</span>
                 </template>
                 <el-menu-item index="${uuid()}" @click="addTab({title: '字典管理', name: 'dict', url: '${r'${context}'}/wsys/dict.htm'})">字典管理</el-menu-item>
                 <el-menu-item index="${uuid()}" @click="addTab({title: '角色管理', name: 'role', url: '${r'${context}'}/wsys/role.htm'})">角色管理</el-menu-item>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl

@@ -62,7 +62,7 @@
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-select v-model="vm.${item.getFName()}" clearable size="mini" filterable placeholder="请输入${item.fieldComment?default("")}">
                     <#list item.selectItems as st>
-                    <el-option key="${st.value}" label="${st.value}" value="${st.value}"></el-option>
+                    <el-option key="${st.value}" label="${st.label}" value="${st.value}"></el-option>
                     </#list>
                 </el-select>
             </el-form-item>
@@ -318,11 +318,13 @@
                 <el-input-dict v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" dict-name="${item.getFieldName()}" ></el-input-dict>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType == "Select">
-            <el-select v-model="vm.${item.getFName()}" clearable size="mini" filterable placeholder="请输入${item.fieldComment?default("")}">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-select v-model="form.${item.getFName()}" clearable size="mini" filterable placeholder="请输入${item.fieldComment?default("")}">
                     <#list item.selectItems as st>
-                    <el-option key="${st.value}" label="${st.value}" value="${st.value}"></el-option>
+                        <el-option key="${st.value}" label="${st.label}" value="${st.value}"></el-option>
                     </#list>
                 </el-select>
+            </el-form-item>
         <#elseif item.getFieldTypeJava() =="String" && item.getFieldLength() lte 50 &&  item.fieldType != "Dict">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" maxlength="${item.getFieldLength()}"></el-input>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wmnt/logErr.ftl

@@ -1,254 +0,0 @@
-<div id="app" v-cloak>
-    <el-card class="box-card">
-        <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
-            <el-form-item label="错误类型" prop="logErrType">
-                <el-input-dict v-model="vm.logErrType" clearable size="mini" placeholder="请输入错误类型"
-                               dict-name="LOG_ERR_TYPE"></el-input-dict>
-            </el-form-item>
-            <el-form-item label="错误标题" prop="logTitle">
-                <el-input v-model="vm.logTitle" clearable size="mini" placeholder="请输入错误标题"></el-input>
-            </el-form-item>
-            <el-form-item label="处理结果" prop="logErrResult">
-                <el-input-dict v-model="vm.logErrResult" clearable size="mini" placeholder="请输入处理结果"
-                               dict-name="LOG_ERR_RESULT"></el-input-dict>
-            </el-form-item>
-            <el-form-item label="开始日期" prop="startDate">
-                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="结束日期" prop="endDate">
-                <el-date-picker v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
-                <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
-            </el-form-item>
-        </el-form>
-    </el-card>
-
-    <el-card class="box-card">
-        <el-row>
-            <el-col :span="12">
-                <el-button type="success" size="mini" icon="el-icon-check" @click="onBitchSolve">解决</el-button>
-
-                <el-button type="warning" size="mini" icon="el-icon-minus" @click="onBitchShelve">搁置</el-button>
-            </el-col>
-
-            <el-col :span="12">
-                <el-button-group style="float: right;">
-                    <el-tooltip effect="dark" content="解决" placement="bottom">
-                        <el-button size="mini" icon="el-icon-check" @click="onBitchSolve"></el-button>
-                    </el-tooltip>
-
-                    <el-tooltip effect="dark" content="搁置" placement="bottom">
-                        <el-button size="mini" icon="el-icon-minus" @click="onBitchShelve"></el-button>
-                    </el-tooltip>
-
-                    <el-tooltip effect="dark" content="刷新" placement="bottom">
-                        <el-button size="mini" icon="el-icon-refresh" @click="onFind"></el-button>
-                    </el-tooltip>
-                </el-button-group>
-            </el-col>
-        </el-row>
-
-        <el-table
-                class="data"
-                @selection-change="onSelectionChange"
-                empty-text="无数据"
-                :stripe="true"
-                :data="result"
-                size="mini">
-            <el-table-column
-                    align="center"
-                    width="45"
-                    type="selection">
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    width="140"
-                    prop="id"
-                    label="主键">
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    width="90"
-                    prop="logErrType"
-                    label="错误类型">
-                <template slot-scope="scope">
-                    <el-view-dict v-model="scope.row.logErrType" dict-name="LOG_ERR_TYPE"></el-view-dict>
-                </template>
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    prop="logTitle"
-                    label="错误标题">
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    prop="logNote"
-                    label="错误内容">
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    prop="logErrResult"
-                    label="处理结果">
-                <template slot-scope="scope">
-                    <el-view-dict v-model="scope.row.logErrResult" dict-name="LOG_ERR_RESULT"></el-view-dict>
-                </template>
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    width="140"
-                    prop="createTime"
-                    label="创建时间">
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    fixed="right"
-                    width="120"
-                    label="操作">
-                <template slot-scope="scope">
-                    <wb-dropdown :arg="scope.row">
-                        <wb-dropdown-item value="解决" icon="el-icon-edit" @click="onSolve"></wb-dropdown-item>
-                        <wb-dropdown-item value="搁置" icon="el-icon-edit" @click="onShelve"></wb-dropdown-item>
-                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
-                    </wb-dropdown>
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <el-pagination
-                background
-                v-if="vm.totalCount > vm.pageSize"
-                style="margin-top: 10px"
-                @current-change="onPageChange"
-                @size-change="onPageSizeChange"
-                :current-page="vm.pageNumber"
-                :page-size="vm.pageSize"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="vm.totalCount">
-        </el-pagination>
-    </el-card>
-</div>
-<script>
-    var app = new Vue({
-        mixins: [mixin],
-        el: "#app",
-        data: {
-            module: 'wmnt',
-            target: 'logErr',
-            vm: {//条件及分页参数
-                logErrType: null,
-                logTitle: null,
-                logErrResult: null,
-                logAttr1: null,
-                logAttr2: null,
-                logAttr3: null,
-                startDate: null,
-                endDate: null,
-                pageNumber: 1,
-                pageSize: 10,
-                totalCount: 0,
-                sortKey: 'CREATE_TIME',
-                sortType: 'DESC'
-            }
-        },
-        methods: {
-            onSolve: function (item) {
-                new Ajax("wsys", "logErr").update({
-                    id: item.id,
-                    logErrResult: '1',
-                    rowVersion: item.rowVersion
-                },function (response) {
-                    if (response.errors.length > 0) {
-                        nav.e(response.errors[0].message);
-                    } else {
-                        nav.s("更新成功.");
-                        this.onFind();
-                    }
-                }.bind(this))
-            },
-            onShelve: function (item) {
-                new Ajax("wsys", "logErr").update({
-                    id: item.id,
-                    logErrResult: '2',
-                    rowVersion: item.rowVersion
-                },function (response) {
-                    if (response.errors.length > 0) {
-                        nav.e(response.errors[0].message);
-                    } else {
-                        nav.s("更新成功.");
-                        this.onFind();
-                    }
-                }.bind(this))
-            },
-            onBitchSolve: function () {
-                if (this.select.length == 0) {
-                    nav.w("至少选中一项!");
-                } else {
-                    nav.tipShow("批量处理中...");
-                    this.select.forAsync(function (item, next) {
-                        new Ajax("wsys", "logErr").update({
-                            id: item.id,
-                            logErrResult: '1',
-                            rowVersion: item.rowVersion
-                        }, function (response) {
-                            if (response.errors.length > 0) {
-                                nav.e(response.errors[0].message);
-                            }
-                            next();
-                        }.bind(this))
-                    }, function () {
-                        nav.tipClose();
-                        nav.s("批量处理完成.")
-                        this.onFind();
-                    }.bind(this))
-                }
-            },
-            onBitchShelve: function () {
-                if (this.select.length == 0) {
-                    nav.w("至少选中一项!");
-                } else {
-                    nav.tipShow("批量处理中...");
-                    this.select.forAsync(function (item, next) {
-                        new Ajax("wsys", "logErr").update({
-                            id: item.id,
-                            logErrResult: '2',
-                            rowVersion: item.rowVersion
-                        }, function (response) {
-                            if (response.errors.length > 0) {
-                                nav.e(response.errors[0].message);
-                            } else {
-                                next();
-                            }
-                        }.bind(this))
-                    }, function () {
-                        nav.tipClose();
-                        nav.s("批量处理完成.")
-                        this.onFind();
-                    }.bind(this))
-                }
-            },
-            onDelete: function (item) {
-                this.$confirm('将删除该项, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(function () {
-                    new Ajax("wsys", "logErr").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) {
-
-                });
-            },
-        },
-        mounted: function () {
-            this.onFind();
-        }
-    })
-</script>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsvr/logerr.ftl

@@ -0,0 +1,263 @@
+<div id="app" v-cloak>
+    <el-card class="box-card">
+        <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
+            <el-form-item label="日志类型" prop="logType">
+                <el-select v-model="vm.logType" clearable size="mini" filterable placeholder="请输入日志类型">
+                    <el-option key="系统错误" label="系统错误" value="系统错误"></el-option>
+                    <el-option key="任务错误" label="任务错误" value="任务错误"></el-option>
+                    <el-option key="业务错误" label="业务错误" value="业务错误"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="任务标题" prop="logTitle">
+                <el-input v-model="vm.logTitle" clearable size="mini" placeholder="请输入任务标题"></el-input>
+            </el-form-item>
+            <el-form-item label="日志状态" prop="logState">
+                <el-select v-model="vm.logState" clearable size="mini" filterable placeholder="请输入日志状态">
+                    <el-option key="0" label="待处理" value="0"></el-option>
+                    <el-option key="1" label="处理中" value="1"></el-option>
+                    <el-option key="2" label="已处理" value="2"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
+                <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
+            </el-form-item>
+        </el-form>
+    </el-card>
+
+    <el-card class="box-card">
+        <el-row>
+            <el-col :span="12">
+                <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
+
+                <el-button type="warning" size="mini" icon="el-icon-download" @click="onExport">导出</el-button>
+            </el-col>
+
+            <el-col :span="12">
+                <el-button-group style="float: right;">
+                    <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
+                        <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
+                    </el-tooltip>
+
+                    <el-tooltip effect="dark" content="Excel导入" placement="bottom">
+                        <el-button size="mini" icon="el-icon-upload2" @click="onImport"></el-button>
+                    </el-tooltip>
+
+                    <el-tooltip effect="dark" content="批量删除" placement="bottom">
+                        <el-button size="mini" icon="el-icon-delete" @click="onBitchDelete"></el-button>
+                    </el-tooltip>
+
+                    <el-tooltip effect="dark" content="刷新" placement="bottom">
+                        <el-button size="mini" icon="el-icon-refresh" @click="onFind"></el-button>
+                    </el-tooltip>
+                </el-button-group>
+            </el-col>
+        </el-row>
+
+        <el-table
+                class="data"
+                @selection-change="onSelectionChange"
+                empty-text="无数据"
+                :stripe="true"
+                :data="result"
+                size="mini">
+            <el-table-column
+                    align="center"
+                    width="45"
+                    type="selection">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    width="140"
+                    prop="id"
+                    label="主键">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    width="100"
+                    prop="logType"
+                    label="日志类型">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    width="180"
+                    prop="logTitle"
+                    label="任务标题">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    width="180"
+                    prop="logNote"
+                    label="日志描述">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    width="100"
+                    prop="logState"
+                    label="日志状态">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    width="140"
+                    prop="createTime"
+                    label="创建时间">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    width="120"
+                    fixed="right"
+                    label="操作">
+                <template slot-scope="scope">
+                    <wb-dropdown :arg="scope.row">
+                        <wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
+                        <wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
+                    </wb-dropdown>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-pagination
+                background
+                v-if="vm.totalCount > vm.pageSize"
+                style="margin-top: 10px"
+                @current-change="onPageChange"
+                @size-change="onPageSizeChange"
+                :current-page="vm.pageNumber"
+                :page-size="vm.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="vm.totalCount">
+        </el-pagination>
+    </el-card>
+
+	<el-dialog
+            :custom-class="'dialog'"
+            :title="form.formTitle"
+            :close-on-click-modal="false"
+            :visible.sync="form.formShow">
+		<el-form class="form" :model="form" :inline="true" :rules="formRules" ref="form" label-position="right" label-width="90px">
+            <el-form-item label="日志类型" prop="logType">
+                <el-select v-model="form.logType" clearable size="mini" filterable placeholder="请输入日志类型">
+                        <el-option key="系统错误" label="系统错误" value="系统错误"></el-option>
+                        <el-option key="任务错误" label="任务错误" value="任务错误"></el-option>
+                        <el-option key="业务错误" label="业务错误" value="业务错误"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="任务标题" prop="logTitle">
+                <el-input v-model="form.logTitle" clearable size="mini" placeholder="请输入任务标题" maxlength="50"></el-input>
+            </el-form-item>
+            <el-form-item label="日志描述" prop="logNote">
+                <el-input v-model="form.logNote"
+                          clearable
+                          size="mini"
+                          placeholder="请输入日志描述"
+                          type="textarea"
+                          maxlength="500"
+                          show-word-limit></el-input>
+            </el-form-item>
+            <el-select v-model="vm.logState" clearable size="mini" filterable placeholder="请输入日志状态">
+                    <el-option key="0" label="待处理" value="0"></el-option>
+                    <el-option key="1" label="处理中" value="1"></el-option>
+                    <el-option key="2" label="已处理" value="2"></el-option>
+            </el-select>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button size="mini" @click="form.formShow = false">取 消</el-button>
+			<el-button size="mini" type="primary" @click="onSave">保存</el-button>
+		</span>
+    </el-dialog>
+</div>
+<script>
+    var app = new Vue({
+        mixins: [mixin],
+        el: "#app",
+        data: {
+            module: 'wsvr',
+            target: 'logerr',
+            vm: {//条件及分页参数
+                logType: null,
+                logTitle: null,
+                logState: null,
+                startDate: null,
+                endDate: null,
+                pageNumber: 1,
+                pageSize: 10,
+                totalCount: 0,
+                sortKey:'CREATE_TIME',
+                sortType:'DESC'
+            },
+            form: {//待提交表单
+                formTitle: "",
+                formShow: false,
+                id: null,
+                logType: null,
+                logTitle: null,
+                logNote: null,
+                logState: null,
+                rowVersion: null
+            },
+            formRules: {
+                logType: [
+                    {required: true, message: '日志类型不能为空', trigger: 'blur'},
+                ],
+                logTitle: [
+                    {required: true, message: '任务标题不能为空', trigger: 'blur'},
+                    {min: 1, max: 50, message: '任务标题长度在 1 到 50 个字符', trigger: 'blur'}
+                ],
+                logNote: [
+                    {min: 1, max: 500, message: '日志描述长度在 1 到 500 个字符', trigger: 'blur'}
+                ],
+                logState: [
+                    {required: true, message: '日志状态不能为空', trigger: 'blur'},
+                ],
+            }
+        },
+        methods: {
+            onCreate: function () {
+                this.form.formTitle = "错误日志新增";
+                this.form.formShow = true;
+                this.form.id = "";
+                this.form.logType = "";
+                this.form.logTitle = "";
+                this.form.logNote = "";
+                this.form.logState = "";
+            },
+            onEdit: function (item) {
+                this.form.formTitle = "错误日志编辑";
+                this.form.formShow = true;
+                this.form.id = item.id;
+                this.form.logType = item.logType;
+                this.form.logTitle = item.logTitle;
+                this.form.logNote = item.logNote;
+                this.form.logState = item.logState;
+                this.form.rowVersion = item.rowVersion;
+            },
+            onDelete: function (item) {
+                this.$confirm('将删除该项, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    new Ajax("E:\wangbing\source\dbtool\target\project\wadmin\src\main\resources\templates\screen\wsvr", "logerr").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) {
+
+                });
+            }
+        },
+        mounted: function () {
+            this.onFind();
+        },
+    })
+</script>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsvr/profiles.ftl

@@ -2,10 +2,13 @@
     <el-card class="box-card">
         <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
             <el-form-item label="环境" prop="active">
-                <el-input-dict v-model="vm.active" clearable size="mini" placeholder="请输入环境" dict-name="ACTIVE" ></el-input-dict>
+                <el-select v-model="vm.active" clearable size="mini" filterable placeholder="请输入环境">
+                    <el-option key="dev" label="开发环境" value="dev"></el-option>
+                    <el-option key="prod" label="生产环境" value="prod"></el-option>
+                </el-select>
             </el-form-item>
-            <el-form-item label="键" prop="key">
+            <el-form-item label="配置键" prop="key">
-                <el-input v-model="vm.key" clearable size="mini" placeholder="请输入键"></el-input>
+                <el-input v-model="vm.key" clearable size="mini" placeholder="请输入配置键"></el-input>
             </el-form-item>
             <el-form-item label="开始日期" prop="startDate">
                 <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -69,21 +72,21 @@
             </el-table-column>
             <el-table-column
                     align="center"
+                    width="100"
                     prop="active"
                     label="环境">
-                <template slot-scope="scope">
-                    <el-view-dict v-model="scope.row.active" dict-name="ACTIVE"></el-view-dict>
-                </template>
             </el-table-column>
             <el-table-column
                     align="center"
+                    width="180"
                     prop="key"
-                    label="键">
+                    label="配置键">
             </el-table-column>
             <el-table-column
                     align="center"
+                    width="180"
                     prop="value"
-                    label="值">
+                    label="配置值">
             </el-table-column>
             <el-table-column
                     align="center"
@@ -125,13 +128,16 @@
             :visible.sync="form.formShow">
 		<el-form class="form" :model="form" :inline="true" :rules="formRules" ref="form" label-position="right" label-width="90px">
             <el-form-item label="环境" prop="active">
-                <el-input-dict v-model="form.active" clearable size="mini" placeholder="请输入环境" dict-name="ACTIVE" ></el-input-dict>
+                <el-select v-model="form.active" clearable size="mini" filterable placeholder="请输入环境">
+                        <el-option key="dev" label="开发环境" value="dev"></el-option>
+                        <el-option key="prod" label="生产环境" value="prod"></el-option>
+                </el-select>
             </el-form-item>
-            <el-form-item label="键" prop="key">
+            <el-form-item label="配置键" prop="key">
-                <el-input v-model="form.key" clearable size="mini" placeholder="请输入键"></el-input>
+                <el-input v-model="form.key" clearable size="mini" placeholder="请输入配置键" maxlength="50"></el-input>
             </el-form-item>
-            <el-form-item label="值" prop="value">
+            <el-form-item label="配置值" prop="value">
-                <el-input v-model="form.value" clearable size="mini" placeholder="请输入值"></el-input>
+                <el-input v-model="form.value" clearable size="mini" placeholder="请输入配置值" maxlength="50"></el-input>
             </el-form-item>
 		</el-form>
 		<span slot="footer" class="dialog-footer">
@@ -145,7 +151,7 @@
         mixins: [mixin],
         el: "#app",
         data: {
-            module: 'wsys',
+            module: 'wsvr',
             target: 'profiles',
             vm: {//条件及分页参数
                 active: null,
@@ -159,7 +165,7 @@
                 sortType:'DESC'
             },
             form: {//待提交表单
-                formTitle: null,
+                formTitle: "",
                 formShow: false,
                 id: null,
                 active: null,
@@ -172,12 +178,12 @@
                     {required: true, message: '环境不能为空', trigger: 'blur'},
                 ],
                 key: [
-                    {required: true, message: '键不能为空', trigger: 'blur'},
+                    {required: true, message: '配置键不能为空', trigger: 'blur'},
-                    {min: 1, max: 50, message: '键长度在 1 到 50 个字符', trigger: 'blur'}
+                    {min: 1, max: 50, message: '配置键长度在 1 到 50 个字符', trigger: 'blur'}
                 ],
                 value: [
-                    {required: true, message: '值不能为空', trigger: 'blur'},
+                    {required: true, message: '配置值不能为空', trigger: 'blur'},
-                    {min: 1, max: 50, message: '值长度在 1 到 50 个字符', trigger: 'blur'}
+                    {min: 1, max: 50, message: '配置值长度在 1 到 50 个字符', trigger: 'blur'}
                 ],
             }
         },
@@ -205,7 +211,7 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(function () {
-                    new Ajax("wsys", "profiles").delete({id: item.id}, function (response) {
+                    new Ajax("E:\wangbing\source\dbtool\target\project\wadmin\src\main\resources\templates\screen\wsvr", "profiles").delete({id: item.id}, function (response) {
                         if (response.errors.length > 0) {
                             nav.e(response.errors[0].message);
                         } else {

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/schedule.ftl

@@ -78,7 +78,7 @@
         mixins: [mixin],
         el: "#app",
         data: {
-            module: 'wmnt',
+            module: 'wsys',
             target: 'schedule',
             vm: {//条件及分页参数
                 taskId: null,

src/main/resources/modules/SpringBoot/test/wsvr/LogerrTest.java

@@ -0,0 +1,112 @@
+package ${domain}.wsvr;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+import ${domain}.frame.auth.Token;
+import ${domain}.module.wsvr.mgr.LogerrManager;
+import ${domain}.module.wsvr.req.LogerrCreateRequest;
+import ${domain}.module.wsvr.req.LogerrDeleteRequest;
+import ${domain}.module.wsvr.req.LogerrFindRequest;
+import ${domain}.module.wsvr.req.LogerrUpdateRequest;
+import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
+import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
+import ${domain}.module.wsvr.rsp.LogerrFindResponse;
+import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
+
+import static junit.framework.TestCase.assertTrue;
+
+/**
+ * LogerrTest -  - 错误日志测试用例
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-07-06
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Transactional
+public class LogerrTest {
+
+    @Autowired
+    private Token token;
+
+    @Autowired
+    private LogerrManager logerrManager;
+
+    @Test
+    public void testCreate() {
+        LogerrCreateRequest request = new LogerrCreateRequest();
+        request.setLogType("value");
+        request.setLogTitle("任务标题");
+        request.setLogNote("日志描述");
+        request.setLogState("value");
+
+        LogerrCreateResponse response = logerrManager.create(request,token);
+
+        assertTrue(!response.hasError());
+    }
+
+    @Test
+    public void testDelete() {
+
+        //创建数据
+        LogerrCreateRequest createRequest = new LogerrCreateRequest();
+        createRequest.setLogType("value");
+        createRequest.setLogTitle("任务标题");
+        createRequest.setLogNote("日志描述");
+        createRequest.setLogState("value");
+
+        LogerrCreateResponse createResponse = logerrManager.create(createRequest,token);
+
+        assertTrue(!createResponse.hasError() && createResponse.getId() > 0);
+        //删除数据
+        LogerrDeleteRequest request = new LogerrDeleteRequest();
+        request.setId(createResponse.getId());
+
+        LogerrDeleteResponse response = logerrManager.delete(request,token);
+
+        assertTrue(!response.hasError() && response.getResult() == 1L);
+    }
+
+    @Test
+    public void testUpdate() {
+        //创建数据
+        LogerrCreateRequest createRequest = new LogerrCreateRequest();
+        createRequest.setLogType("value");
+        createRequest.setLogTitle("任务标题");
+        createRequest.setLogNote("日志描述");
+        createRequest.setLogState("value");
+
+        LogerrCreateResponse createResponse = logerrManager.create(createRequest, token);
+
+        assertTrue(!createResponse.hasError());
+
+        //更新数据
+        LogerrUpdateRequest request = new LogerrUpdateRequest();
+        request.setId(createResponse.getId());
+        request.setLogType("value");
+        request.setLogTitle("任务标题");
+        request.setLogNote("日志描述");
+        request.setLogState("value");
+
+        LogerrUpdateResponse response = logerrManager.update(request,token);
+
+        assertTrue(!response.hasError() && response.getResult() == 1L);
+    }
+
+    @Test
+    public void testFind() {
+        LogerrFindRequest request = new LogerrFindRequest();
+        request.setLogType("value");
+        request.setLogTitle("任务标题");
+        request.setLogState("value");
+
+        LogerrFindResponse response = logerrManager.find(request,token);
+
+        assertTrue(!response.hasError());
+    }
+}

src/main/resources/modules/SpringBoot/test/wsvr/ProfilesTest.java

@@ -1,30 +1,30 @@
-package ${domain}.wsys;
+package ${domain}.wsvr;
 
-import ${domain}.frame.auth.Token;
-import ${domain}.module.wsys.mgr.ProfilesManager;
-import ${domain}.module.wsys.req.ProfilesCreateRequest;
-import ${domain}.module.wsys.req.ProfilesDeleteRequest;
-import ${domain}.module.wsys.req.ProfilesFindRequest;
-import ${domain}.module.wsys.req.ProfilesUpdateRequest;
-import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
-import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
-import ${domain}.module.wsys.rsp.ProfilesFindResponse;
-import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
+import ${domain}.frame.auth.Token;
+import ${domain}.module.wsvr.mgr.ProfilesManager;
+import ${domain}.module.wsvr.req.ProfilesCreateRequest;
+import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
+import ${domain}.module.wsvr.req.ProfilesFindRequest;
+import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
+import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
+import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
+import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
+import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
 
 import static junit.framework.TestCase.assertTrue;
 
 /**
  * ProfilesTest -  - 系统配置测试用例
  *
- * @author author
+ * @author wangbing
  * @version 0.0.1
- * @since 2020-05-24
+ * @since 2020-07-06
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -40,9 +40,9 @@ public class ProfilesTest {
     @Test
     public void testCreate() {
         ProfilesCreateRequest request = new ProfilesCreateRequest();
-        request.setActive("环境");
+        request.setActive("value");
-        request.setKey("键");
+        request.setKey("配置键");
-        request.setValue("值");
+        request.setValue("配置值");
 
         ProfilesCreateResponse response = profilesManager.create(request,token);
 
@@ -54,9 +54,9 @@ public class ProfilesTest {
 
         //创建数据
         ProfilesCreateRequest createRequest = new ProfilesCreateRequest();
-        createRequest.setActive("环境");
+        createRequest.setActive("value");
-        createRequest.setKey("键");
+        createRequest.setKey("配置键");
-        createRequest.setValue("值");
+        createRequest.setValue("配置值");
 
         ProfilesCreateResponse createResponse = profilesManager.create(createRequest,token);
 
@@ -74,9 +74,9 @@ public class ProfilesTest {
     public void testUpdate() {
         //创建数据
         ProfilesCreateRequest createRequest = new ProfilesCreateRequest();
-        createRequest.setActive("环境");
+        createRequest.setActive("value");
-        createRequest.setKey("键");
+        createRequest.setKey("配置键");
-        createRequest.setValue("值");
+        createRequest.setValue("配置值");
 
         ProfilesCreateResponse createResponse = profilesManager.create(createRequest, token);
 
@@ -85,9 +85,9 @@ public class ProfilesTest {
         //更新数据
         ProfilesUpdateRequest request = new ProfilesUpdateRequest();
         request.setId(createResponse.getId());
-        request.setActive("环境");
+        request.setActive("value");
-        request.setKey("键");
+        request.setKey("配置键");
-        request.setValue("值");
+        request.setValue("配置值");
 
         ProfilesUpdateResponse response = profilesManager.update(request,token);
 
@@ -97,8 +97,8 @@ public class ProfilesTest {
     @Test
     public void testFind() {
         ProfilesFindRequest request = new ProfilesFindRequest();
-        request.setActive("环境");
+        request.setActive("value");
-        request.setKey("键");
+        request.setKey("配置键");
 
         ProfilesFindResponse response = profilesManager.find(request,token);
 

src/main/resources/modules/SpringBoot/test/wsys/LogErrTest.java

@@ -1,118 +0,0 @@
-package ${domain}.wsys;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
-import ${domain}.frame.auth.Token;
-import ${domain}.module.wsys.mgr.LogErrManager;
-import ${domain}.module.wsys.req.LogErrCreateRequest;
-import ${domain}.module.wsys.req.LogErrDeleteRequest;
-import ${domain}.module.wsys.req.LogErrFindRequest;
-import ${domain}.module.wsys.req.LogErrUpdateRequest;
-import ${domain}.module.wsys.rsp.LogErrCreateResponse;
-import ${domain}.module.wsys.rsp.LogErrDeleteResponse;
-import ${domain}.module.wsys.rsp.LogErrFindResponse;
-import ${domain}.module.wsys.rsp.LogErrUpdateResponse;
-
-import static junit.framework.TestCase.assertTrue;
-
-/**
- * LogErrTest -  - 错误日志测试用例
- *
- * @author wangbing
- * @version 0.0.1
- * @since 2020-06-07
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@Transactional
-public class LogErrTest {
-
-    @Autowired
-    private Token token;
-
-    @Autowired
-    private LogErrManager logErrManager;
-
-    @Test
-    public void testCreate() {
-        LogErrCreateRequest request = new LogErrCreateRequest();
-        request.setLogErrType("code");
-        request.setLogTitle("日志标题");
-        request.setLogNote("content");
-        request.setLogErrResult("code");
-        request.setLogAttr1("属性1");
-        request.setLogAttr2("属性2");
-        request.setLogAttr3("属性3");
-
-        LogErrCreateResponse response = logErrManager.create(request,token);
-
-        assertTrue(!response.hasError());
-    }
-
-    @Test
-    public void testDelete() {
-
-        //创建数据
-        LogErrCreateRequest createRequest = new LogErrCreateRequest();
-        createRequest.setLogErrType("code");
-        createRequest.setLogTitle("日志标题");
-        createRequest.setLogNote("content");
-        createRequest.setLogErrResult("code");
-        createRequest.setLogAttr1("属性1");
-        createRequest.setLogAttr2("属性2");
-        createRequest.setLogAttr3("属性3");
-
-        LogErrCreateResponse createResponse = logErrManager.create(createRequest,token);
-
-        assertTrue(!createResponse.hasError() && createResponse.getId() > 0);
-        //删除数据
-        LogErrDeleteRequest request = new LogErrDeleteRequest();
-        request.setId(createResponse.getId());
-
-        LogErrDeleteResponse response = logErrManager.delete(request,token);
-
-        assertTrue(!response.hasError() && response.getResult() == 1L);
-    }
-
-    @Test
-    public void testUpdate() {
-        //创建数据
-        LogErrCreateRequest createRequest = new LogErrCreateRequest();
-        createRequest.setLogErrType("code");
-        createRequest.setLogTitle("日志标题");
-        createRequest.setLogNote("content");
-        createRequest.setLogErrResult("code");
-        createRequest.setLogAttr1("属性1");
-        createRequest.setLogAttr2("属性2");
-        createRequest.setLogAttr3("属性3");
-
-        LogErrCreateResponse createResponse = logErrManager.create(createRequest, token);
-
-        assertTrue(!createResponse.hasError());
-
-        //更新数据
-        LogErrUpdateRequest request = new LogErrUpdateRequest();
-        request.setId(createResponse.getId());
-        request.setLogErrResult("code");
-
-        LogErrUpdateResponse response = logErrManager.update(request,token);
-
-        assertTrue(!response.hasError() && response.getResult() == 1L);
-    }
-
-    @Test
-    public void testFind() {
-        LogErrFindRequest request = new LogErrFindRequest();
-        request.setLogErrType("code");
-        request.setLogTitle("日志标题");
-        request.setLogErrResult("code");
-
-        LogErrFindResponse response = logErrManager.find(request,token);
-
-        assertTrue(!response.hasError());
-    }
-}