Dialog优化，DELETE id，

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

@@ -84,9 +84,8 @@ public class ApiCallable implements Callable {
             System.out.println("生成模块:Pom");
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("domain", String.join(".", domainList));
-            ctx.put("projectName", apiFile.getName());
+            ctx.put("name", apiFile.getName());
-            File file = new File(apiFile, "pom.xml");
+            freeMarkerManager.outputTemp(Tool.createFile(apiFile,"pom.xml"), "Java_api/pom.xml", ctx);
-            freeMarkerManager.outputTemp(file, "Java_api/pom.xml", ctx);
         }
 
         {
@@ -123,7 +122,6 @@ public class ApiCallable implements Callable {
         return true;
     }
 
-
     private void generateTest() {
         Set<String> modules = new HashSet<>();
         for (Api api : apiList) {

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

@@ -168,13 +168,14 @@ public class SpringBootCallable implements Callable {
                 if (!module.getNeedGenerate()) {
                     continue;
                 }
+                HashMap<String, Object> ctxss = new HashMap<String, Object>();
+                ctxss.put("project",project);
+                ctxss.put("domain",project.getDomain());
+                ctxss.put("author", project.getAuthor());
+                ctxss.put("module", module.getModuleName());
                 File m = Tool.createPath(api, module.getModuleName());
                 for (Table table : module.getTables()) {
                     if (table.getApi()) {
-                        HashMap<String, Object> ctxss = new HashMap<String, Object>();
-                        ctxss.put("domain", project.getDomain());
-                        ctxss.put("module", module.getModuleName());
-                        ctxss.put("author", project.getAuthor());
                         ctxss.put("table", table);
                         freeMarkerManager.outputTemp(Tool.createFile(m, table.getCName() + "Api.java"), "SpringBoot/java/action/api/Api.java", ctxss);
                     }

src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java

@@ -358,6 +358,7 @@ public class Dialog {
     public static void showApi() {
         Stage stage = new Stage();
         stage.initModality(Modality.APPLICATION_MODAL);
+        stage.setAlwaysOnTop(false);
 
         FXMLLoader dbdetailloader = new FXMLLoader(Application.class.getResource("../../../fxml/OptionApi.fxml"));
         try {
@@ -460,36 +461,20 @@ public class Dialog {
             modulePath.textProperty().addListener(new ChangeListener<String>() {
                 @Override
                 public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                    Dialog.showWait("初始化面板");
+                    if (newValue != null && !"".equals(newValue)){
-                    Callable<Object> callable = Executors.callable(new Runnable() {
+                        Dialog.showWait("加载中...");
-                        @Override
+                        Callable<Object> callable = Executors.callable(new Runnable() {
-                        public void run() {
+                            @Override
-                            controller.load();
+                            public void run() {
-                            Dialog.stopWait();
+                                controller.load();
-                        }
+                                Dialog.stopWait();
-                    });
+                            }
-                    Executors.newSingleThreadExecutor().submit(callable);
+                        });
+                        Executors.newSingleThreadExecutor().submit(callable);
+                    }
                 }
             });
 
-            ProjectManager dBmanger = ManagerFactory.getProjectManager();
-
-            File file = dBmanger.getPath();
-            File[] files = file.listFiles();
-            s:
-            for (File f : files) {
-                if (!f.getName().contains(".")) {
-                    File modul = findAction(f);
-                    if (modul == null) {
-                        modulePath.setText("");
-                        apiPath.setText("");
-                    } else {
-                        modulePath.setText(f.getAbsolutePath());
-                        apiPath.setText(new File(ProjectManager.getPath(), f.getName() + "-api").getAbsolutePath());
-                        break s;
-                    }
-                }
-            }
 
             Button start = controller.getStart();
             start.setOnAction(new EventHandler<ActionEvent>() {
@@ -500,6 +485,7 @@ public class Dialog {
 
                     if (new File(module).exists()) {
                         Dialog.showWait("生成中...");
+                        ProjectManager dBmanger = ManagerFactory.getProjectManager();
                         dBmanger.generateApi(new File(module), new File(api), controller.getDomainList(), controller.getData());
                         Dialog.stopWait();
                         Platform.runLater(new Runnable() {
@@ -523,6 +509,25 @@ public class Dialog {
             });
 
             stage.show();
+
+            // 自动查找目录下的项目
+            ProjectManager dBmanger = ManagerFactory.getProjectManager();
+            File file = dBmanger.getPath();
+            File[] files = file.listFiles();
+            s:
+            for (File f : files) {
+                if (!f.getName().contains(".")) {
+                    File modul = findAction(f);
+                    if (modul == null) {
+                        modulePath.setText("");
+                        apiPath.setText("");
+                    } else {
+                        modulePath.setText(f.getAbsolutePath());
+                        apiPath.setText(new File(ProjectManager.getPath(), f.getName() + "-api").getAbsolutePath());
+                        break s;
+                    }
+                }
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -614,7 +619,7 @@ public class Dialog {
             modulePath.textProperty().addListener(new ChangeListener<String>() {
                 @Override
                 public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                    Dialog.showWait("初始化面板");
+                    Dialog.showWait("加载中...");
                     Callable<Object> callable = Executors.callable(new Runnable() {
                         @Override
                         public void run() {
@@ -626,25 +631,6 @@ public class Dialog {
                 }
             });
 
-            ProjectManager dBmanger = ManagerFactory.getProjectManager();
-
-            File file = dBmanger.getPath();
-            File[] files = file.listFiles();
-            s:
-            for (File f : files) {
-                if (!f.getName().contains(".")) {
-                    File modul = findAction(f);
-                    if (modul == null) {
-                        modulePath.setText("");
-                        docPath.setText("");
-                    } else {
-                        modulePath.setText(f.getAbsolutePath());
-                        docPath.setText(new File(ProjectManager.getPath(), f.getName() + "-doc").getAbsolutePath());
-                        break s;
-                    }
-                }
-            }
-
             Button start = controller.getStart();
             start.setOnAction(new EventHandler<ActionEvent>() {
                 @Override
@@ -654,6 +640,7 @@ public class Dialog {
 
                     if (new File(module).exists()) {
                         Dialog.showWait("生成中...");
+                        ProjectManager dBmanger = ManagerFactory.getProjectManager();
                         dBmanger.generateDoc(new File(module), new File(api), controller.getData());
                         Dialog.stopWait();
                         Platform.runLater(new Runnable() {
@@ -677,6 +664,25 @@ public class Dialog {
             });
 
             stage.show();
+
+            // 自动查找目录下的项目
+            ProjectManager dBmanger = ManagerFactory.getProjectManager();
+            File file = dBmanger.getPath();
+            File[] files = file.listFiles();
+            s:
+            for (File f : files) {
+                if (!f.getName().contains(".")) {
+                    File modul = findAction(f);
+                    if (modul == null) {
+                        modulePath.setText("");
+                        docPath.setText("");
+                    } else {
+                        modulePath.setText(f.getAbsolutePath());
+                        docPath.setText(new File(ProjectManager.getPath(), f.getName() + "-doc").getAbsolutePath());
+                        break s;
+                    }
+                }
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/xyz/wbsite/dbtool/javafx/tool/EntityReader.java

@@ -69,6 +69,8 @@ public class EntityReader {
 
                     } else if (line.contains("org.hibernate.validator")) {
 
+                    } else if (line.contains(".excel.")) {
+
                     } else {
                         importList.add(line);
                     }
@@ -89,10 +91,7 @@ public class EntityReader {
                     continue;
                 }
                 if (className != null) {
-                    if (line.contains("@ColumnName")
+                    if (line.contains("@Excel")) {
-                            || line.contains("@ColumnDescription")
-                            || line.contains("@ColumnList")
-                            ) {
                         continue;
                     }
 

src/main/java/xyz/wbsite/dbtool/web/frame/ssh/SshClient.java

@@ -52,9 +52,9 @@ public class SshClient {
         return connection;
     }
 
-    private boolean exeCmd(Connection connection, String cmd) {
+    private boolean exeCmd(String cmd) {
         try {
-            Session session = connection.openSession();// 打开一个会话
+            Session session = getConnect().openSession();
             session.execCommand(cmd);// 执行命令
             String result = processStdout(session.getStdout(), CHAR_SET);
             System.out.println(result);
@@ -175,7 +175,7 @@ public class SshClient {
         String cmd = "uname -a";
 
         SshClient sshClient = new SshClient(ip, 8084, username, password);
-        sshClient.put("E:\\2.jpg", "/root");
+        sshClient.put("E:\\2.jpg", "/root/ss");
         sshClient.close();
     }
 }

src/main/resources/modules/Java_api/ApiTest.java

@@ -12,8 +12,8 @@ import ${domain}.module.${module}.req.${item.request};
 <#list apiList as item>
 import ${domain}.module.${module}.rsp.${item.response};
 </#list>
-import ${domain}.module.system.req.UserLoginRequest;
+import ${domain}.module.wsys.req.UserLoginRequest;
-import ${domain}.module.system.rsp.UserLoginResponse;
+import ${domain}.module.wsys.rsp.UserLoginResponse;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/resources/modules/Java_api/pom.xml

@@ -3,16 +3,46 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>${domain}</groupId>
-    <artifactId>${projectName}</artifactId>
+    <artifactId>${name}</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
+    <repositories>
+        <!-- 常用公共仓库 阿里云镜像 -->
+        <repository>
+            <id>public</id>
+            <name>central仓和jcenter仓的聚合仓</name>
+            <layout>default</layout>
+            <url>https://maven.aliyun.com/nexus/content/groups/public</url>
+        </repository>
+        <repository>
+            <id>google</id>
+            <name>google仓</name>
+            <layout>default</layout>
+            <url>https://maven.aliyun.com/repository/google</url>
+        </repository>
+        <repository>
+            <id>spring</id>
+            <name>spring仓</name>
+            <layout>default</layout>
+            <url>https://maven.aliyun.com/repository/spring</url>
+        </repository>
+        <repository>
+            <id>spring-plugin</id>
+            <name>spring-plugin仓</name>
+            <layout>default</layout>
+            <url>https://maven.aliyun.com/repository/spring-plugin</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java

@@ -1,8 +1,5 @@
 package ${domain}.action.ajax.wsys;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.multipart.MultipartFile;
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.auth.Token;
 import ${domain}.frame.base.BaseResponse;
@@ -11,15 +8,12 @@ import ${domain}.frame.excel.WExcel;
 import ${domain}.frame.excel.exception.TemplateNotMatchException;
 import ${domain}.frame.utils.CookieUtil;
 import ${domain}.frame.utils.LogUtil;
-import ${domain}.frame.utils.MD5Util;
 import ${domain}.frame.utils.MapperUtil;
-import ${domain}.frame.utils.RequestUtil;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
 import ${domain}.module.wsys.ent.User;
 import ${domain}.module.wsys.mgr.TokensManager;
 import ${domain}.module.wsys.mgr.UserManager;
-import ${domain}.module.wsys.req.TokensCreateRequest;
 import ${domain}.module.wsys.req.TokensLogoutRequest;
 import ${domain}.module.wsys.req.UserChangePwdRequest;
 import ${domain}.module.wsys.req.UserCreateRequest;
@@ -28,7 +22,6 @@ import ${domain}.module.wsys.req.UserFindRequest;
 import ${domain}.module.wsys.req.UserLoginRequest;
 import ${domain}.module.wsys.req.UserLogoutRequest;
 import ${domain}.module.wsys.req.UserUpdateRequest;
-import ${domain}.module.wsys.rsp.TokensCreateResponse;
 import ${domain}.module.wsys.rsp.TokensLogoutResponse;
 import ${domain}.module.wsys.rsp.UserChangePwdResponse;
 import ${domain}.module.wsys.rsp.UserCreateResponse;
@@ -37,22 +30,16 @@ import ${domain}.module.wsys.rsp.UserFindResponse;
 import ${domain}.module.wsys.rsp.UserLoginResponse;
 import ${domain}.module.wsys.rsp.UserLogoutResponse;
 import ${domain}.module.wsys.rsp.UserUpdateResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 public class UserAjax {
 
-    @Value("${r'${web.url.auth.admin}'}")
-    private String admin;
-    @Value("${r'${web.url.auth.pwd}'}")
-    private String pwd;
     @Autowired
     private TokensManager tokensManager;
     @Autowired
@@ -71,6 +58,7 @@ public class UserAjax {
     }
 
     public UserChangePwdResponse changePwd(UserChangePwdRequest request) {
+        String admin = LocalData.getEnvironment().getProperty("web.url.auth.admin", "admin");
         if (admin.equals(LocalData.getToken().getUserName())) {
             UserChangePwdResponse response = new UserChangePwdResponse();
             response.addError(ErrorType.BUSINESS_ERROR, "超级管理员无法通过网页变更登录密码!");
@@ -83,101 +71,13 @@ public class UserAjax {
         return userManager.find(request, LocalData.getToken());
     }
 
-    public UserLoginResponse login(UserLoginRequest request, Token token, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+    public UserLoginResponse login(UserLoginRequest request, HttpServletResponse httpServletResponse) {
-        UserLoginResponse response = new UserLoginResponse();
+        UserLoginResponse response = userManager.login(request, LocalData.getToken());
-
+        if (!response.hasError()) {
-        ValidationUtil.validate(request, response);
+            Cookie cookie = CookieUtil.newCookie("token", response.getToken());
-        if (response.hasError()) {
+            cookie.setPath("/");
-            return response;
-        }
-
-        if (request.getUsername().equals(admin)) {//超级管理员登录
-            String generatePwd = MD5Util.generatePwd(request.getPassword());
-            if (!generatePwd.equals(pwd)) {
-                response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
-            } else {
-                Date current = new Date();
-                Calendar instance = Calendar.getInstance();
-                instance.setTime(current);
-                instance.add(Calendar.HOUR_OF_DAY, 3);//默认一个小时内有效
-
-                TokensCreateRequest tokensCreateRequest = new TokensCreateRequest();
-                tokensCreateRequest.setToken(UUID.randomUUID().toString());
-                tokensCreateRequest.setUserId(0L);
-                tokensCreateRequest.setUserName(admin);
-                tokensCreateRequest.setLoginTime(current);
-                tokensCreateRequest.setValidTime(instance.getTime());
-                tokensCreateRequest.setValid(true);
-                tokensCreateRequest.setDeptId(null);
-                tokensCreateRequest.setDeptCode(null);
-                tokensCreateRequest.setDeptName(null);
-                tokensCreateRequest.setTerminal("WEB");
-                tokensCreateRequest.setTerminalIp(RequestUtil.getIp(httpServletRequest));
-                tokensCreateRequest.setTerminalInfo(RequestUtil.getUserAgent(httpServletRequest));
-                TokensCreateResponse tokensCreateResponse = tokensManager.create(tokensCreateRequest, LocalData.getSysToken());
-
-                if (tokensCreateResponse.hasError()) {
-                    response.addErrors(tokensCreateResponse.getErrors());
-                    return response;
-                }
-                Cookie cookie = CookieUtil.newCookie("token", tokensCreateRequest.getToken());
-                cookie.setPath("/");
-                httpServletResponse.addCookie(cookie);
-                response.setToken(tokensCreateRequest.getToken());
-            }
-        } else {//管理员登录
-            UserFindRequest userFindRequest = new UserFindRequest();
-            userFindRequest.setUserName(request.getUsername());
-            UserFindResponse userFindResponse = userManager.find(userFindRequest, LocalData.getSysToken());
-
-            if (userFindResponse.hasError()) {
-                response.addErrors(userFindResponse.getErrors());
-                return response;
-            } else if (userFindResponse.getResult().size() == 0) {
-                response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
-                return response;
-            } else if (userFindResponse.getResult().size() > 1) {
-                response.addError(ErrorType.BUSINESS_ERROR, "用户信息异常!");
-                return response;
-            }
-
-            User user = userFindResponse.getResult().get(0);
-
-            String generatePwd = MD5Util.generatePwd(request.getPassword());
-            if (!generatePwd.equals(user.getUserPwd())) {
-                response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
-                return response;
-            }
-
-            Date current = new Date();
-            Calendar instance = Calendar.getInstance();
-            instance.setTime(current);
-            instance.add(Calendar.HOUR_OF_DAY, 3);//默认一个小时内有效
-
-            TokensCreateRequest tokensCreateRequest = new TokensCreateRequest();
-            tokensCreateRequest.setToken(UUID.randomUUID().toString());
-            tokensCreateRequest.setUserId(user.getId());
-            tokensCreateRequest.setUserName(user.getUserName());
-            tokensCreateRequest.setLoginTime(current);
-            tokensCreateRequest.setValidTime(instance.getTime());
-            tokensCreateRequest.setValid(true);
-            tokensCreateRequest.setDeptId(user.getDeptId());
-            tokensCreateRequest.setDeptCode(user.getDeptCode());
-            tokensCreateRequest.setDeptName(user.getDeptName());
-            tokensCreateRequest.setTerminal("WEB");
-            tokensCreateRequest.setTerminalIp(RequestUtil.getIp(httpServletRequest));
-            tokensCreateRequest.setTerminalInfo(RequestUtil.getUserAgent(httpServletRequest));
-            TokensCreateResponse tokensCreateResponse = tokensManager.create(tokensCreateRequest, LocalData.getSysToken());
-
-            if (tokensCreateResponse.hasError()) {
-                response.addErrors(tokensCreateResponse.getErrors());
-                return response;
-            }
-            Cookie cookie = CookieUtil.newCookie("token", tokensCreateRequest.getToken());
             httpServletResponse.addCookie(cookie);
-            response.setToken(tokensCreateRequest.getToken());
         }
-
         return response;
     }
 

src/main/resources/modules/SpringBoot/java/action/api/Api.java

@@ -3,45 +3,45 @@ package ${domain}.action.api.${module};
 import ${domain}.frame.auth.LocalData;
 import ${domain}.module.${module}.mgr.${table.getCName()}Manager;
 <#if table.getCreate()>
-import ${domain}.module.${moduleName}.req.${table.getCName()}CreateRequest;
+import ${domain}.module.${module}.req.${table.getCName()}CreateRequest;
 </#if>
 <#if table.getDelete()>
-import ${domain}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
+import ${domain}.module.${module}.req.${table.getCName()}DeleteRequest;
 </#if>
 <#if table.getFind()>
-import ${domain}.module.${moduleName}.req.${table.getCName()}FindRequest;
+import ${domain}.module.${module}.req.${table.getCName()}FindRequest;
 </#if>
 <#if table.getGet()>
-import ${domain}.module.${moduleName}.req.${table.getCName()}GetRequest;
+import ${domain}.module.${module}.req.${table.getCName()}GetRequest;
 </#if>
 <#if table.getSearch()>
-import ${domain}.module.${moduleName}.req.${table.getCName()}SearchRequest;
+import ${domain}.module.${module}.req.${table.getCName()}SearchRequest;
 </#if>
 <#if table.getUpdate()>
-import ${domain}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
+import ${domain}.module.${module}.req.${table.getCName()}UpdateRequest;
 </#if>
 <#if table.getCreate()>
-import ${domain}.module.${moduleName}.rsp.${table.getCName()}CreateResponse;
+import ${domain}.module.${module}.rsp.${table.getCName()}CreateResponse;
 </#if>
 <#if table.getDelete()>
-import ${domain}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse;
+import ${domain}.module.${module}.rsp.${table.getCName()}DeleteResponse;
 </#if>
 <#if table.getFind()>
-import ${domain}.module.${moduleName}.rsp.${table.getCName()}FindResponse;
+import ${domain}.module.${module}.rsp.${table.getCName()}FindResponse;
 </#if>
 <#if table.getGet()>
-import ${domain}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
+import ${domain}.module.${module}.rsp.${table.getCName()}GetResponse;
 </#if>
 <#if table.getSearch()>
-import ${domain}.module.${moduleName}.rsp.${table.getCName()}SearchResponse;
+import ${domain}.module.${module}.rsp.${table.getCName()}SearchResponse;
 </#if>
 <#if table.getUpdate()>
-import ${domain}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
+import ${domain}.module.${module}.rsp.${table.getCName()}UpdateResponse;
 </#if>
 <#list table.methods as item>
 <#if item.selected>
-import ${domain}.module.${moduleName}.req.${table.getCName()}${item.getAbbName()?default("")}Request;
+import ${domain}.module.${module}.req.${table.getCName()}${item.getAbbName()?default("")}Request;
-import ${domain}.module.${moduleName}.rsp.${table.getCName()}${item.getAbbName()?default("")}Response;
+import ${domain}.module.${module}.rsp.${table.getCName()}${item.getAbbName()?default("")}Response;
 </#if>
 </#list>
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/modules/SpringBoot/java/action/api/wsys/FileApi.java

@@ -1,6 +1,5 @@
 package ${domain}.action.api.wsys;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.utils.Base64Util;
@@ -12,6 +11,7 @@ import ${domain}.module.wsys.req.FileUploadRequest;
 import ${domain}.module.wsys.rsp.FileDownloadResponse;
 import ${domain}.module.wsys.rsp.FileGetResponse;
 import ${domain}.module.wsys.rsp.FileUploadResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 
 public class FileApi {
 

src/main/resources/modules/SpringBoot/java/action/api/wsys/UserApi.java

@@ -1,35 +1,15 @@
 package ${domain}.action.api.wsys;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.auth.LocalData;
-import ${domain}.frame.base.ErrorType;
-import ${domain}.frame.utils.MD5Util;
-import ${domain}.frame.utils.RequestUtil;
-import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.wsys.ent.User;
 import ${domain}.module.wsys.mgr.TokensManager;
 import ${domain}.module.wsys.mgr.UserManager;
-import ${domain}.module.wsys.req.TokensCreateRequest;
-import ${domain}.module.wsys.req.UserCreateRequest;
-import ${domain}.module.wsys.req.UserDeleteRequest;
-import ${domain}.module.wsys.req.UserFindRequest;
-import ${domain}.module.wsys.req.UserGetRequest;
 import ${domain}.module.wsys.req.UserLoginRequest;
-import ${domain}.module.wsys.req.UserUpdateRequest;
-import ${domain}.module.wsys.rsp.TokensCreateResponse;
-import ${domain}.module.wsys.rsp.UserCreateResponse;
-import ${domain}.module.wsys.rsp.UserDeleteResponse;
-import ${domain}.module.wsys.rsp.UserFindResponse;
-import ${domain}.module.wsys.rsp.UserGetResponse;
 import ${domain}.module.wsys.rsp.UserLoginResponse;
-import ${domain}.module.wsys.rsp.UserUpdateResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
 
-public class UserApi{
+public class UserApi {
 
     @Autowired
     private TokensManager tokensManager;
@@ -37,61 +17,6 @@ public class UserApi{
     private UserManager userManager;
 
     public UserLoginResponse login(UserLoginRequest request, HttpServletRequest httpServletRequest) {
-        UserLoginResponse response = new UserLoginResponse();
+        return userManager.login(request, LocalData.getToken());
-
-        ValidationUtil.validate(request, response);
-        if (response.hasError()) {
-            return response;
-        }
-
-        UserFindRequest userFindRequest = new UserFindRequest();
-        userFindRequest.setUserName(request.getUsername());
-        UserFindResponse userFindResponse = userManager.find(userFindRequest, LocalData.getSysToken());
-
-        if (userFindResponse.hasError()) {
-            response.addErrors(userFindResponse.getErrors());
-            return response;
-        } else if (userFindResponse.getResult().size() == 0) {
-            response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
-            return response;
-        } else if (userFindResponse.getResult().size() > 1) {
-            response.addError(ErrorType.BUSINESS_ERROR, "用户信息异常!");
-            return response;
-        }
-
-        User user = userFindResponse.getResult().get(0);
-
-        String generatePwd = MD5Util.generatePwd(request.getPassword());
-        if (!generatePwd.equals(user.getUserPwd())) {
-            response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
-            return response;
-        }
-
-        Date current = new Date();
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(current);
-        instance.add(Calendar.HOUR_OF_DAY, 1);//默认一个小时内有效
-
-        TokensCreateRequest tokensCreateRequest = new TokensCreateRequest();
-        tokensCreateRequest.setToken(UUID.randomUUID().toString());
-        tokensCreateRequest.setUserId(user.getId());
-        tokensCreateRequest.setUserName(user.getUserName());
-        tokensCreateRequest.setLoginTime(current);
-        tokensCreateRequest.setValidTime(instance.getTime());
-        tokensCreateRequest.setValid(true);
-        tokensCreateRequest.setDeptId(user.getDeptId());
-        tokensCreateRequest.setDeptCode(user.getDeptCode());
-        tokensCreateRequest.setDeptName(user.getDeptName());
-        tokensCreateRequest.setTerminal("WEB");
-        tokensCreateRequest.setTerminalIp(RequestUtil.getIp(httpServletRequest));
-        tokensCreateRequest.setTerminalInfo(RequestUtil.getUserAgent(httpServletRequest));
-        TokensCreateResponse tokensCreateResponse = tokensManager.create(tokensCreateRequest, LocalData.getSysToken());
-
-        if (tokensCreateResponse.hasError()) {
-            response.addErrors(tokensCreateResponse.getErrors());
-            return response;
-        }
-        response.setToken(tokensCreateRequest.getToken());
-        return response;
     }
 }

src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl

@@ -17,13 +17,13 @@ public class ${table.getCName()}DeleteRequest extends BaseRequest {
      * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 <#else>

src/main/resources/modules/SpringBoot/java/module/req/getRequestClass.ftl

@@ -16,13 +16,13 @@ public class ${table.getCName()}GetRequest extends BaseRequest {
      * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -4,9 +4,11 @@ import ${domain}.frame.auth.Token;
 import ${domain}.module.wsys.req.FileCreateRequest;
 import ${domain}.module.wsys.req.FileDeleteRequest;
 import ${domain}.module.wsys.req.FileFindRequest;
+import ${domain}.module.wsys.req.FileGetRequest;
 import ${domain}.module.wsys.rsp.FileCreateResponse;
 import ${domain}.module.wsys.rsp.FileDeleteResponse;
 import ${domain}.module.wsys.rsp.FileFindResponse;
+import ${domain}.module.wsys.rsp.FileGetResponse;
 
 /**
  * 文件
@@ -43,4 +45,13 @@ public interface FileManager {
      * @return
      */
     FileFindResponse find(FileFindRequest request, Token token);
+
+    /**
+     * 获得对象
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    FileGetResponse get(FileGetRequest request, Token token);
 }

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

@@ -17,9 +17,11 @@ import ${domain}.module.wsys.mpr.FileMapper;
 import ${domain}.module.wsys.req.FileCreateRequest;
 import ${domain}.module.wsys.req.FileDeleteRequest;
 import ${domain}.module.wsys.req.FileFindRequest;
+import ${domain}.module.wsys.req.FileGetRequest;
 import ${domain}.module.wsys.rsp.FileCreateResponse;
 import ${domain}.module.wsys.rsp.FileDeleteResponse;
 import ${domain}.module.wsys.rsp.FileFindResponse;
+import ${domain}.module.wsys.rsp.FileGetResponse;
 
 /**
  * FILE - 文件
@@ -118,4 +120,31 @@ public class FileManagerImpl implements FileManager {
 
         return response;
     }
+
+    /**
+     * 获得对象
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 响应
+     */
+    @Transactional(readOnly = true)
+    public FileGetResponse get(FileGetRequest request, Token token) {
+        FileGetResponse response = new FileGetResponse();
+
+        ValidationUtil.validate(request, response);
+        if (response.hasError()) {
+            return response;
+        }
+
+        File po = fileMapper.getById(request.getId(), token);
+
+        if (po != null) {
+            response.setFile(po);
+        } else {
+            response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
+        }
+
+        return response;
+    }
 }

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

@@ -5,11 +5,13 @@ import ${domain}.module.wsys.req.UserChangePwdRequest;
 import ${domain}.module.wsys.req.UserCreateRequest;
 import ${domain}.module.wsys.req.UserDeleteRequest;
 import ${domain}.module.wsys.req.UserFindRequest;
+import ${domain}.module.wsys.req.UserLoginRequest;
 import ${domain}.module.wsys.req.UserUpdateRequest;
 import ${domain}.module.wsys.rsp.UserChangePwdResponse;
 import ${domain}.module.wsys.rsp.UserCreateResponse;
 import ${domain}.module.wsys.rsp.UserDeleteResponse;
 import ${domain}.module.wsys.rsp.UserFindResponse;
+import ${domain}.module.wsys.rsp.UserLoginResponse;
 import ${domain}.module.wsys.rsp.UserUpdateResponse;
 
 /**
@@ -65,4 +67,13 @@ public interface UserManager {
      * @return
      */
     UserFindResponse find(UserFindRequest request, Token token);
+
+    /**
+     * 登录
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    UserLoginResponse login(UserLoginRequest request, Token token);
 }

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

@@ -1,12 +1,5 @@
 package ${domain}.module.wsys.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;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.auth.Token;
 import ${domain}.frame.base.ErrorType;
@@ -14,6 +7,7 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MD5Util;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
+import ${domain}.frame.utils.RequestUtil;
 import ${domain}.frame.utils.ValidationUtil;
 import ${domain}.module.wsys.ent.Dept;
 import ${domain}.module.wsys.ent.Role;
@@ -21,20 +15,36 @@ import ${domain}.module.wsys.ent.User;
 import ${domain}.module.wsys.mpr.UserMapper;
 import ${domain}.module.wsys.req.DeptFindRequest;
 import ${domain}.module.wsys.req.RoleFindRequest;
+import ${domain}.module.wsys.req.TokensCreateRequest;
 import ${domain}.module.wsys.req.UserChangePwdRequest;
 import ${domain}.module.wsys.req.UserCreateRequest;
 import ${domain}.module.wsys.req.UserDeleteRequest;
 import ${domain}.module.wsys.req.UserFindRequest;
+import ${domain}.module.wsys.req.UserLoginRequest;
 import ${domain}.module.wsys.req.UserRoleCreateRequest;
 import ${domain}.module.wsys.req.UserUpdateRequest;
 import ${domain}.module.wsys.rsp.DeptFindResponse;
 import ${domain}.module.wsys.rsp.RoleFindResponse;
+import ${domain}.module.wsys.rsp.TokensCreateResponse;
 import ${domain}.module.wsys.rsp.UserChangePwdResponse;
 import ${domain}.module.wsys.rsp.UserCreateResponse;
 import ${domain}.module.wsys.rsp.UserDeleteResponse;
 import ${domain}.module.wsys.rsp.UserFindResponse;
+import ${domain}.module.wsys.rsp.UserLoginResponse;
 import ${domain}.module.wsys.rsp.UserRoleCreateResponse;
 import ${domain}.module.wsys.rsp.UserUpdateResponse;
+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.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.UUID;
 
 /**
  * USER - 用户
@@ -47,9 +57,15 @@ import ${domain}.module.wsys.rsp.UserUpdateResponse;
 @Service
 public class UserManagerImpl implements UserManager {
 
+    @Value("${r'${web.url.auth.admin}'}")
+    private String admin;
+    @Value("${r'${web.url.auth.pwd}'}")
+    private String pwd;
     @Autowired
     private UserMapper userMapper;
     @Autowired
+    private TokensManager tokensManager;
+    @Autowired
     private DeptManager deptManager;
     @Autowired
     private RoleManager roleManager;
@@ -84,7 +100,7 @@ public class UserManagerImpl implements UserManager {
             }
         }
 
-        if (StringUtil.isNotEmpty(request.getDeptCode())){// 检查机构设置是否正确
+        if (StringUtil.isNotEmpty(request.getDeptCode())) {// 检查机构设置是否正确
             DeptFindRequest deptFindRequest = new DeptFindRequest();
             deptFindRequest.setDeptCode(request.getDeptCode());
             deptFindRequest.setPageSize(1);
@@ -266,4 +282,78 @@ public class UserManagerImpl implements UserManager {
 
         return response;
     }
+
+    @Override
+    public UserLoginResponse login(UserLoginRequest request, Token token) {
+        UserLoginResponse response = new UserLoginResponse();
+
+        ValidationUtil.validate(request, response);
+        if (response.hasError()) {
+            return response;
+        }
+
+        User user = null;
+        if (request.getUsername().equals(admin)) {//超级管理员登录
+            String generatePwd = MD5Util.generatePwd(request.getPassword());
+            if (!generatePwd.equals(pwd)) {
+                response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
+            }
+            user = new User();
+            user.setId(0);
+            user.setUserName(admin);
+        } else {//管理员登录
+            UserFindRequest userFindRequest = new UserFindRequest();
+            userFindRequest.setUserName(request.getUsername());
+            UserFindResponse userFindResponse = this.find(userFindRequest, LocalData.getSysToken());
+
+            if (userFindResponse.hasError()) {
+                response.addErrors(userFindResponse.getErrors());
+                return response;
+            } else if (userFindResponse.getResult().size() == 0) {
+                response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
+                return response;
+            } else if (userFindResponse.getResult().size() > 1) {
+                response.addError(ErrorType.BUSINESS_ERROR, "用户信息异常!");
+                return response;
+            }
+
+            user = userFindResponse.getResult().get(0);
+
+            String generatePwd = MD5Util.generatePwd(request.getPassword());
+            if (!generatePwd.equals(user.getUserPwd())) {
+                response.addError(ErrorType.BUSINESS_ERROR, "用户名或密码错误!");
+                return response;
+            }
+        }
+
+        if (!response.hasError()) {// 创建Token
+            Date current = new Date();
+            Calendar instance = Calendar.getInstance();
+            instance.setTime(current);
+            instance.add(Calendar.HOUR_OF_DAY, 3);//默认一个小时内有效
+
+            TokensCreateRequest tokensCreateRequest = new TokensCreateRequest();
+            tokensCreateRequest.setToken(UUID.randomUUID().toString());
+            tokensCreateRequest.setUserId(user.getId());
+            tokensCreateRequest.setUserName(user.getUserName());
+            tokensCreateRequest.setDeptId(user.getDeptId());
+            tokensCreateRequest.setDeptCode(user.getDeptCode());
+            tokensCreateRequest.setDeptName(user.getDeptName());
+            tokensCreateRequest.setLoginTime(current);
+            tokensCreateRequest.setValidTime(instance.getTime());
+            tokensCreateRequest.setValid(true);
+            tokensCreateRequest.setTerminal("WEB");
+            tokensCreateRequest.setTerminalIp(RequestUtil.getIp(LocalData.getRequest()));
+            tokensCreateRequest.setTerminalInfo(RequestUtil.getUserAgent(LocalData.getRequest()));
+            TokensCreateResponse tokensCreateResponse = tokensManager.create(tokensCreateRequest, LocalData.getSysToken());
+
+            if (tokensCreateResponse.hasError()) {
+                response.addErrors(tokensCreateResponse.getErrors());
+                return response;
+            }
+            response.setToken(tokensCreateRequest.getToken());
+        }
+
+        return response;
+    }
 }

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

@@ -17,13 +17,13 @@ public class DeptDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class DictDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class DictItemDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -16,13 +16,13 @@ public class FileDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -0,0 +1,29 @@
+package ${domain}.module.wsys.req;
+
+import ${domain}.frame.base.BaseRequest;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * FileDownloadRequest - 文件下载
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class FileGetRequest extends BaseRequest {
+
+    /**
+     * 文件ID
+     */
+    @NotNull(message = "[id]文件主键不能为空")
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

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

@@ -17,13 +17,13 @@ public class LogerrDeleteRequest extends BaseRequest {
      * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class ProfilesDeleteRequest extends BaseRequest {
      * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class ResDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class RoleDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class RoleResDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class TaskSqlDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class UserDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class UserRoleDeleteRequest extends BaseRequest {
      * 主键
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class VisitorDeleteRequest extends BaseRequest {
      * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -17,13 +17,13 @@ public class VisitorResDeleteRequest extends BaseRequest {
      * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
-    private long id;
+    private Long id;
 
-    public long getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 }

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

@@ -0,0 +1,27 @@
+package ${domain}.module.wsys.rsp;
+
+import ${domain}.module.wsys.ent.File;
+import ${domain}.frame.base.BaseResponse;
+
+/**
+ * FileGetResponse - 文件
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class FileGetResponse extends BaseResponse {
+
+    /**
+     * 文件
+     */
+    private File file;
+
+    public File getFile() {
+        return this.file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+}