From 413638238b5957875fc8dee3304d79faba8f2584 Mon Sep 17 00:00:00 2001
From: "wangbingit@outlook.com" <Wb295490665>
Date: Sun, 22 Nov 2020 10:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BB=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/screen/module/mgr.ftl |  2 +-
 .../templates/screen/module/wsys/dept.ftl     |  2 +-
 .../templates/screen/module/wsys/dict.ftl     |  2 +-
 .../templates/screen/module/wsys/dictItem.ftl |  2 +-
 .../templates/screen/module/wsys/file.ftl     |  2 +-
 .../templates/screen/module/wsys/logerr.ftl   |  2 +-
 .../templates/screen/module/wsys/logtask.ftl  |  2 +-
 .../templates/screen/module/wsys/profiles.ftl |  2 +-
 .../templates/screen/module/wsys/res.ftl      |  2 +-
 .../templates/screen/module/wsys/role.ftl     |  2 +-
 .../templates/screen/module/wsys/taskSql.ftl  |  2 +-
 .../templates/screen/module/wsys/tokens.ftl   |  2 +-
 .../templates/screen/module/wsys/user.ftl     |  2 +-
 .../templates/screen/module/wsys/visitor.ftl  |  2 +-
 .../modules/SpringBoot/test/DataInit.java     | 54 +++++++++----------
 15 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
index 21b0ffb2..49b61c6b 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
@@ -92,7 +92,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <#if table.isPageAdd()>
             ${print('<#if token.hasRes("/ajax/${module.name}/${table.getFName()}/create")>')}
             <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
index 03c6370b..f5e8cd35 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
@@ -38,7 +38,7 @@
 
         <el-divider><i class="el-icon-search"></i></el-divider>
 
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/dept/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
index 9550e30f..41f53dec 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl
@@ -28,7 +28,7 @@
     </el-card>
 
     <el-card class="box-card data">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/dict/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
index c061bd97..7424fe3c 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl
@@ -31,7 +31,7 @@
     </el-card>
 
     <el-card class="box-card data">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/dictItem/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
index 4b125d5c..fa8a092c 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl
@@ -31,7 +31,7 @@
     </el-card>
 
     <el-card class="box-card data">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/file/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
index a92237da..3d1b7125 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
@@ -32,7 +32,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <el-button type="success" size="mini" icon="el-icon-shopping-cart-full" @click="onBatchStart">开始处理</el-button>
 
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
index 7595ea5e..71d7539e 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
@@ -48,7 +48,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/logtask/delete")>
                 <el-button type="danger" size="mini" icon="el-icon-delete" @click="onBitchDelete">删除</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
index f7f85951..5cfa04c9 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
@@ -24,7 +24,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/profiles/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
index cd2b8ff1..cbe94536 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
@@ -44,7 +44,7 @@
         </el-form>
     </el-card>
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/res/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
index ac4fe3c5..5981d844 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
@@ -24,7 +24,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/role/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
index abcaa000..53c6edfa 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
@@ -34,7 +34,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/taskSql/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
index 203b9424..cea1033d 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
@@ -50,7 +50,7 @@
     </el-card>
 
     <el-card class="box-card data">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/dept/exports")>
                 <el-button type="warning" size="mini" icon="el-icon-download" @click="onExport">导出</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
index ea1ba29c..c35b0be2 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
@@ -35,7 +35,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/user/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
index f77cc961..d1b455f8 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl
@@ -32,7 +32,7 @@
     </el-card>
 
     <el-card class="box-card">
-        <el-row>
+        <el-row type="flex" justify="space-between">
             <el-col :span="12">
                 <#if token.hasRes("/ajax/wsys/visitor/create")>
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java
index e40f34fb..23d90f3e 100644
--- a/src/main/resources/modules/SpringBoot/test/DataInit.java
+++ b/src/main/resources/modules/SpringBoot/test/DataInit.java
@@ -244,32 +244,32 @@ public class DataInit {
 <#assign index = "0"+index/>
 </#if>
 <#if module.getNeedGenerate()>
-                forMgr.add(createRes("${index}", "${module.note}菜单", "WEB", "${module.name?upper_case}"));
+                forMgr.add(createRes("00${index}", "${module.note}菜单", "WEB", "${module.name?upper_case}"));
     <#list module.tables as table>
         <#if table.isPage()>
-                forMgr.add(createRes("${index}01", "${table.tableComment}管理菜单", "WEB", "${module.name?upper_case}_${table.tableName?upper_case}"));
-                forMgr.add(createRes("${index}0101", "${table.tableComment}管理页", "WEB", "/${module.name}/${table.getFName()}.htm"));
-                forMgr.add(createRes("${index}010101", "${table.tableComment}模板", "WEB", "/ajax/${module.name}/${table.getFName()}/template"));
-                forMgr.add(createRes("${index}010102", "${table.tableComment}导入", "WEB", "/ajax/${module.name}/${table.getFName()}/imports"));
-                forMgr.add(createRes("${index}010103", "${table.tableComment}导出", "WEB", "/ajax/${module.name}/${table.getFName()}/exports"));
+                forMgr.add(createRes("00${index}01", "${table.tableComment}管理菜单", "WEB", "${module.name?upper_case}_${table.tableName?upper_case}"));
+                forMgr.add(createRes("00${index}0101", "${table.tableComment}管理页", "WEB", "/${module.name}/${table.getFName()}.htm"));
+                forMgr.add(createRes("00${index}010101", "${table.tableComment}模板", "WEB", "/ajax/${module.name}/${table.getFName()}/template"));
+                forMgr.add(createRes("00${index}010102", "${table.tableComment}导入", "WEB", "/ajax/${module.name}/${table.getFName()}/imports"));
+                forMgr.add(createRes("00${index}010103", "${table.tableComment}导出", "WEB", "/ajax/${module.name}/${table.getFName()}/exports"));
         </#if>
         <#if table.create>
-                forMgr.add(createRes("${index}010104", "${table.tableComment}新增", "WEB", "/ajax/${module.name}/${table.getFName()}/create"));
+                forMgr.add(createRes("00${index}010104", "${table.tableComment}新增", "WEB", "/ajax/${module.name}/${table.getFName()}/create"));
         </#if>
         <#if table.delete>
-                forMgr.add(createRes("${index}010105", "${table.tableComment}删除", "WEB", "/ajax/${module.name}/${table.getFName()}/delete"));
+                forMgr.add(createRes("00${index}010105", "${table.tableComment}删除", "WEB", "/ajax/${module.name}/${table.getFName()}/delete"));
         </#if>
         <#if table.update>
-                forMgr.add(createRes("${index}010106", "${table.tableComment}更新", "WEB", "/ajax/${module.name}/${table.getFName()}/update"));
+                forMgr.add(createRes("00${index}010106", "${table.tableComment}更新", "WEB", "/ajax/${module.name}/${table.getFName()}/update"));
         </#if>
         <#if table.find>
-                forMgr.add(createRes("${index}010107", "${table.tableComment}查询", "WEB", "/ajax/${module.name}/${table.getFName()}/find"));
+                forMgr.add(createRes("00${index}010107", "${table.tableComment}查询", "WEB", "/ajax/${module.name}/${table.getFName()}/find"));
         </#if>
         <#if table.get>
-                forMgr.add(createRes("${index}010108", "${table.tableComment}获取", "WEB", "/ajax/${module.name}/${table.getFName()}/get"));
+                forMgr.add(createRes("00${index}010108", "${table.tableComment}获取", "WEB", "/ajax/${module.name}/${table.getFName()}/get"));
         </#if>
         <#if table.search>
-                forMgr.add(createRes("${index}010109", "${table.tableComment}搜索", "WEB", "/ajax/${module.name}/${table.getFName()}/search"));
+                forMgr.add(createRes("00${index}010109", "${table.tableComment}搜索", "WEB", "/ajax/${module.name}/${table.getFName()}/search"));
         </#if>
     </#list>
 </#if>
@@ -278,38 +278,38 @@ public class DataInit {
 <#if project.isNeedApi()>
 
             {// API资源
-                forMgr.add(createRes("A", "接口资源", "API", "A"));
-                forMgr.add(createRes("A01", "基础资源", "API", "A01"));
-                forMgr.add(createRes("A0101", "用户登录", "API", "/api/wsys/User/login"));
-                forMgr.add(createRes("A0102", "字典查询", "API", "/api/wsys/Dict/find"));
-                forMgr.add(createRes("A0103", "加载字典", "API", "/api/wsys/Dict/load"));
-                forMgr.add(createRes("A0104", "文件上传", "API", "/api/wsys/File/upload"));
-                forMgr.add(createRes("A0105", "文件下载", "API", "/api/wsys/File/download"));
+                forMgr.add(createRes("01", "接口资源", "API", "A"));
+                forMgr.add(createRes("0101", "基础资源", "API", "A01"));
+                forMgr.add(createRes("010101", "用户登录", "API", "/api/wsys/User/login"));
+                forMgr.add(createRes("010102", "字典查询", "API", "/api/wsys/Dict/find"));
+                forMgr.add(createRes("010103", "加载字典", "API", "/api/wsys/Dict/load"));
+                forMgr.add(createRes("010104", "文件上传", "API", "/api/wsys/File/upload"));
+                forMgr.add(createRes("010105", "文件下载", "API", "/api/wsys/File/download"));
 <#list project.modules as module>
 <#assign index = module_index + 2/>
 <#if index<10>
 <#assign index = "0"+index/>
 </#if>
-                forMgr.add(createRes("A${index}", "${module.note}", "API", "A${module.name?upper_case}"));
+                forMgr.add(createRes("01${index}", "${module.note}", "API", "A${module.name?upper_case}"));
     <#list module.tables as table>
-                forMgr.add(createRes("A${index}01", "${table.tableComment}", "API", "A${module.name?upper_case}_${table.tableName?upper_case}"));
+                forMgr.add(createRes("01${index}01", "${table.tableComment}", "API", "A${module.name?upper_case}_${table.tableName?upper_case}"));
         <#if table.create>
-                forMgr.add(createRes("A${index}0101", "${table.tableComment}新增", "API", "/api/${module.name}/${table.getFName()}/create"));
+                forMgr.add(createRes("01${index}0101", "${table.tableComment}新增", "API", "/api/${module.name}/${table.getFName()}/create"));
         </#if>
         <#if table.delete>
-                forMgr.add(createRes("A${index}0102", "${table.tableComment}删除", "API", "/api/${module.name}/${table.getFName()}/delete"));
+                forMgr.add(createRes("01${index}0102", "${table.tableComment}删除", "API", "/api/${module.name}/${table.getFName()}/delete"));
         </#if>
         <#if table.update>
-                forMgr.add(createRes("A${index}0103", "${table.tableComment}更新", "API", "/api/${module.name}/${table.getFName()}/update"));
+                forMgr.add(createRes("01${index}0103", "${table.tableComment}更新", "API", "/api/${module.name}/${table.getFName()}/update"));
         </#if>
         <#if table.find>
-                forMgr.add(createRes("A${index}0104", "${table.tableComment}查询", "API", "/api/${module.name}/${table.getFName()}/find"));
+                forMgr.add(createRes("01${index}0104", "${table.tableComment}查询", "API", "/api/${module.name}/${table.getFName()}/find"));
         </#if>
         <#if table.get>
-                forMgr.add(createRes("A${index}0105", "${table.tableComment}获取", "API", "/api/${module.name}/${table.getFName()}/get"));
+                forMgr.add(createRes("01${index}0105", "${table.tableComment}获取", "API", "/api/${module.name}/${table.getFName()}/get"));
         </#if>
         <#if table.search>
-                forMgr.add(createRes("A${index}0107", "${table.tableComment}搜索", "API", "/api/${module.name}/${table.getFName()}/search"));
+                forMgr.add(createRes("01${index}0107", "${table.tableComment}搜索", "API", "/api/${module.name}/${table.getFName()}/search"));
         </#if>
     </#list>
 </#list>