1、API可配置

Former-commit-id: 0e0ad49bf1937138c531c6d2452d31b83f75e29f

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

@@ -218,26 +218,26 @@ public class JavaFxApplication extends Application {
         md_right_menu.setOnAction(xEventHandler);
         table_right_menu.setOnAction(xEventHandler);
 
-        URL projectdetail = JavaFxApplication.class.getClassLoader().getResource("fxml/projectdetail.fxml");
+        URL projectdetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailProject.fxml");
         if (projectdetail == null) {
-            projectdetail = getClass().getResource("../../../fxml/projectdetail.fxml");
+            projectdetail = getClass().getResource("../../../fxml/DetailProject.fxml");
         }
         mProjectLoader = new FXMLLoader(projectdetail);
         mProjectLoader.load();
         detailProjectController = mProjectLoader.getController();
 
-        URL mddetail = JavaFxApplication.class.getClassLoader().getResource("fxml/moduledetail.fxml");
+        URL mddetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailModule.fxml");
         if (mddetail == null) {
-            mddetail = getClass().getResource("../../../fxml/moduledetail.fxml");
+            mddetail = getClass().getResource("../../../fxml/DetailModule.fxml");
         }
         mModuleLoader = new FXMLLoader(mddetail);
         mModuleLoader.load();
         mdDetailController = mModuleLoader.getController();
 
 
-        URL tabledetail = JavaFxApplication.class.getClassLoader().getResource("fxml/tabledetail.fxml");
+        URL tabledetail = JavaFxApplication.class.getClassLoader().getResource("fxml/DetailTable.fxml");
         if (tabledetail == null) {
-            tabledetail = getClass().getResource("../../../fxml/tabledetail.fxml");
+            tabledetail = getClass().getResource("../../../fxml/DetailTable.fxml");
         }
         mTableLoader = new FXMLLoader(tabledetail);
         mTableLoader.load();
@@ -503,6 +503,12 @@ public class JavaFxApplication extends Application {
                     currentProject.setNeedAsync(newValue);
                 }
             });
+            detailProjectController.getApi().selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    currentProject.setNeedApi(newValue);
+                }
+            });
             detailProjectController.getDatabase().selectedToggleProperty().addListener(new ChangeListener<Toggle>() {
                 @Override
                 public void changed(ObservableValue<? extends Toggle> observable, Toggle oldValue, Toggle newValue) {
@@ -677,6 +683,7 @@ public class JavaFxApplication extends Application {
         }
         detailProjectController.getCloud().setSelected(currentProject.isNeedCloud());
         detailProjectController.getAsync().setSelected(currentProject.isNeedAsync());
+        detailProjectController.getApi().setSelected(currentProject.isNeedApi());
 
         if (gridPane != null) {
             mDetail.getChildren().clear();

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

@@ -23,6 +23,8 @@ public class DetailProjectController {
     private CheckBox cloud;
     @FXML
     private CheckBox async;
+    @FXML
+    private CheckBox api;
 
     public CheckBox getSysMD() {
         return sysMD;
@@ -87,4 +89,12 @@ public class DetailProjectController {
     public void setAsync(CheckBox async) {
         this.async = async;
     }
+
+    public CheckBox getApi() {
+        return api;
+    }
+
+    public void setApi(CheckBox api) {
+        this.api = api;
+    }
 }

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

@@ -212,7 +212,7 @@ public class SpringBootCallable implements Callable {
             }
         }
 
-        {
+        if (project.isNeedApi()){
             File api = Tool.createPath(root.getAbsolutePath(), "api");
 
             for (Module module : project.getModules()) {
@@ -426,10 +426,6 @@ public class SpringBootCallable implements Callable {
         ctx.put("author", md.getProjectAuthor());
         ctx.put("date", new Date());
 
-        if (md.getModuleName().equals("api")) {
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ApiExampleResponse" + ".java"), "SpringBoot/java/module/rsp/ApiExampleResponse.java", ctx);
-        }
-
         for (Table table : md.getTables()) {
             ctx.put("table", table);
 

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

@@ -40,6 +40,8 @@ public class Project extends TreeItem {
     private boolean needCloud;
     @Property("needAsync")
     private boolean needAsync;
+    @Property("api")
+    private boolean api;
     @Property(value = "database")
     private DataBase database;
 
@@ -134,4 +136,12 @@ public class Project extends TreeItem {
     public void setNeedAsync(boolean needAsync) {
         this.needAsync = needAsync;
     }
+
+    public boolean isNeedApi() {
+        return api;
+    }
+
+    public void setNeedApi(boolean api) {
+        this.api = api;
+    }
 }

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

@@ -89,8 +89,9 @@ public class EntityReader {
                     continue;
                 }
                 if (className != null) {
-                    if (line.contains("@ColumnName") ||
+                    if (line.contains("@ColumnName")
-                            line.contains("@ColumnDescription")
+                            || line.contains("@ColumnDescription")
+                            || line.contains("@ColumnList")
                             ) {
                         continue;
                     }

src/main/resources/fxml/DetailProject.fxml

@@ -78,6 +78,7 @@
                 <CheckBox fx:id="multiDB" text="多数据库"/>
                 <CheckBox fx:id="cloud" selected="false" text="添加Cloud"/>
                 <CheckBox fx:id="async" selected="false" text="异步编程"/>
+                <CheckBox fx:id="api" selected="false" text="Api接口"/>
             </children>
         </HBox>
     </children>

src/main/resources/modules/SpringBoot/java/action/GlobalController.java

@@ -24,16 +24,20 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
 import ${basePackage}.config.ActionConfig;
 import ${basePackage}.frame.auth.LocalData;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.base.BaseRequest;
 import ${basePackage}.frame.base.BaseResponse;
 import ${basePackage}.frame.base.ErrorType;
 import ${basePackage}.frame.base.Screen;
-import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.AESUtil;
 import ${basePackage}.frame.utils.LogUtil;
 import ${basePackage}.frame.utils.MD5Util;
 import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.RequestUtil;
+import ${basePackage}.frame.utils.StringUtil;
+import ${basePackage}.module.system.mgr.TokensManager;
+import ${basePackage}.module.system.req.TokensBuildRequest;
+import ${basePackage}.module.system.rsp.TokensBuildResponse;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -305,7 +309,6 @@ public class GlobalController implements ErrorController {
         }
     }
 
-
     @RequestMapping(path = "/api/{module}/{target}/{method}", method = RequestMethod.POST)
     @ResponseBody
     public String api(
@@ -356,9 +359,22 @@ public class GlobalController implements ErrorController {
         }
 
         // 权限验证
-        if (!LocalData.getToken().hasRes(httpServletRequest.getServletPath())) {
+        if (StringUtil.isNotEmpty(token)) {
-            response.addError(ErrorType.BUSINESS_ERROR, "[" + httpServletRequest.getServletPath() + "]未授权的资源!");
+            TokensManager tokensManager = LocalData.getBean(TokensManager.class);
-            return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+            TokensBuildRequest tokensBuildRequest = new TokensBuildRequest();
+            tokensBuildRequest.setToken(token);
+            TokensBuildResponse tokensBuildResponse = tokensManager.build(tokensBuildRequest, LocalData.getSysToken());
+            LocalData.setToken(tokensBuildResponse.getToken());
+            if (!LocalData.getToken().hasRes(httpServletRequest.getServletPath())) {
+                response.addError(ErrorType.BUSINESS_ERROR, "[" + httpServletRequest.getServletPath() + "]未授权的资源!");
+                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+            }
+        } else {
+            String excluded = LocalData.getEnvironment().getProperty("web.url.auth.excluded", "") + ",/api/system/User/login";
+            if (!excluded.contains(excluded)) {
+                response.addError(ErrorType.BUSINESS_ERROR, "请通过登录接口获取Token!");
+                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+            }
         }
 
         // 开始处理业务

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml

@@ -68,6 +68,9 @@
         <include refid="table"/>
         WHERE
         "IS_DELETED" = 0
+        <if test="request.userId == null and request.roleId == null">
+            AND "FREE" = '1'
+        </if>
         <if test="request.userId != null">
             AND "ID" IN (
             SELECT t2.RES_ID

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml

@@ -30,31 +30,42 @@
 
     <select id="find" resultMap="user">
         SELECT
-        <include refid="entityColumnList"/>
+        t1.*,t2.ROLE_NAMES, t2.ROLE_CODES
         FROM
-        <include refid="table"/>
+        "sys_user" t1,
+        (
+        SELECT
+        t2.user_id, GROUP_CONCAT(t3.NAME) ROLE_NAMES, GROUP_CONCAT(t3.CODE) ROLE_CODES
+        FROM
+        "sys_user_role" t2,
+        "sys_role" t3
         WHERE
-        "IS_DELETED" = 0
+        t2.ROLE_ID = t3.ID
+        AND t2."IS_DELETED" = 0
+        AND t3."IS_DELETED" = 0
+        GROUP BY t2.USER_ID
+        ) t2
+        WHERE t1."IS_DELETED" = 0 and t1.ID = t2.user_id
         <if test="request.userName != null and request.userName != ''">
-            AND USER_NAME = ${r"#"}{request.userName}
+            AND t1."USER_NAME" = ${r'#'}{request.userName}
         </if>
         <if test="request.userCode != null and request.userCode != ''">
-            AND USER_CODE = ${r"#"}{request.userCode}
+            AND t1."USER_CODE" = ${r'#'}{request.userCode}
         </if>
         <if test="request.userAlias != null and request.userAlias != ''">
-            AND USER_ALIAS = ${r"#"}{request.userAlias}
+            AND t1."USER_ALIAS" = ${r'#'}{request.userAlias}
         </if>
         <if test="request.userStatus != null and request.userStatus != ''">
-            AND USER_STATUS = ${r"#"}{request.userStatus}
+            AND t1."USER_STATUS" = ${r'#'}{request.userStatus}
         </if>
         <if test="request.deptId != null and request.deptId != 0">
-            AND DEPT_ID = ${r"#"}{request.deptId}
+            AND t1."DEPT_ID" = ${r'#'}{request.deptId}
         </if>
         <if test="request.deptCode != null and request.deptCode != ''">
-            AND DEPT_CODE = ${r"#"}{request.deptCode}
+            AND t1."DEPT_CODE" = ${r'#'}{request.deptCode}
         </if>
         <if test="request.deptName != null and request.deptName != ''">
-            AND DEPT_NAME = ${r"#"}{request.deptName}
+            AND t1."DEPT_NAME" = ${r'#'}{request.deptName}
         </if>
     </select>
 

src/main/resources/modules/SpringBoot/java/module/system/req/UserUpdateRequest.java

@@ -51,6 +51,11 @@ public class UserUpdateRequest extends BaseUpdateRequest {
      */
     private String deptCode;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
     public Long getId() {
         return this.id;
     }
@@ -98,4 +103,12 @@ public class UserUpdateRequest extends BaseUpdateRequest {
     public void setDeptCode(String deptCode) {
         this.deptCode = deptCode;
     }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 }

src/main/resources/modules/SpringBoot/resources/application-dev.ftl

@@ -126,7 +126,7 @@ web.url.index=/index.htm
 # 登录页
 web.url.login=/login.htm
 # 拦截验证
-web.url.auth.included=/,/**/*.htm,/ajax/**,/api/**
+web.url.auth.included=/,/**/*.htm,/ajax/**
 # 直接放行
 web.url.auth.excluded=/login.htm,/ajax/system/User/login,/ajax/system/User/logout
 # 超级管理员

src/main/resources/modules/SpringBoot/resources/application-prod.ftl

@@ -126,7 +126,7 @@ web.url.index=/index.htm
 # 登录页
 web.url.login=/login.htm
 # 拦截验证
-web.url.auth.included=/,/**/*.htm,/ajax/**,/api/**
+web.url.auth.included=/,/**/*.htm,/ajax/**
 # 直接放行
 web.url.auth.excluded=/login.htm,/ajax/system/User/login,/ajax/system/User/logout
 # 超级管理员

src/main/resources/modules/SpringBoot/test/DataInit.java

@@ -293,6 +293,30 @@ public class DataInit {
 
     </#list>
 </#list>
+<#if project.isNeedAsync()>
+<#list project.modules as module>
+    <#list module.tables as table>
+        <#if table.create>
+                forMgr.add(createRes("API_${module.moduleName?upper_case}_${table.tableName?upper_case}_CREATE", "${table.tableComment}新增", "请求", "/api/${module.moduleName}/${table.getFName()}/create"));
+        </#if>
+        <#if table.delete>
+                forMgr.add(createRes("API_${module.moduleName?upper_case}_${table.tableName?upper_case}_DELETE", "${table.tableComment}删除", "请求", "/api/${module.moduleName}/${table.getFName()}/delete"));
+        </#if>
+        <#if table.update>
+                forMgr.add(createRes("API_${module.moduleName?upper_case}_${table.tableName?upper_case}_UPDATE", "${table.tableComment}更新", "请求", "/api/${module.moduleName}/${table.getFName()}/update"));
+        </#if>
+        <#if table.find>
+                forMgr.add(createRes("API_${module.moduleName?upper_case}_${table.tableName?upper_case}_FIND", "${table.tableComment}查询", "请求", "/api/${module.moduleName}/${table.getFName()}/find"));
+        </#if>
+        <#if table.get>
+                forMgr.add(createRes("API_${module.moduleName?upper_case}_${table.tableName?upper_case}_GET", "${table.tableComment}获取", "请求", "/api/${module.moduleName}/${table.getFName()}/get"));
+        </#if>
+        <#if table.search>
+                forMgr.add(createRes("API_${module.moduleName?upper_case}_${table.tableName?upper_case}_SEARCH", "${table.tableComment}搜索", "请求", "/api/${module.moduleName}/${table.getFName()}/search"));
+        </#if>
+    </#list>
+</#list>
+</#if>
             }
 
             {//初始化开发角色