架构调整

Former-commit-id: e135424037f04f0c1b17128917a1cfdfd7cdf649

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

@@ -112,10 +112,10 @@
             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>
 

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

@@ -47,6 +47,9 @@
                     <i class="el-icon-stopwatch"></i>
                     <span slot="title">监控运行</span>
                 </template>
+                ${print('<#if token.hasRes("MNT_TOKENS")>')}
+                <el-menu-item index="${uuid()}" @click="addTab({title: '登录管理', name: 'tokens', url: '${r'${context}'}/wsys/tokens.htm'})">登录管理</el-menu-item>
+                ${print('</#if>')}
                 ${print('<#if token.hasRes("MNT_SCHEDULE")>')}
                 <el-menu-item index="${uuid()}" @click="addTab({title: '调度监控', name: 'schedule', url: '${r'${context}'}/wsys/schedule.htm'})">调度监控</el-menu-item>
                 ${print('</#if>')}
@@ -66,7 +69,6 @@
                 <el-menu-item index="${uuid()}" @click="addTab({title: '部门管理', name: 'dept', url: '${r'${context}'}/wsys/dept.htm'})">部门管理</el-menu-item>
                 <el-menu-item index="${uuid()}" @click="addTab({title: '用户管理', name: 'user', url: '${r'${context}'}/wsys/user.htm'})">用户管理</el-menu-item>
                 <el-menu-item index="${uuid()}" @click="addTab({title: '文件管理', name: 'file', url: '${r'${context}'}/wsys/file.htm'})">文件管理</el-menu-item>
-                <el-menu-item index="${uuid()}" @click="addTab({title: '登录管理', name: 'tokens', url: '${r'${context}'}/wsys/tokens.htm'})">登录管理</el-menu-item>
             </el-submenu>
             ${print('</#if>')}
 <#list project.modules as module>
@@ -532,35 +534,31 @@
                 nav.setCookie("tab.title", tab.title);
                 nav.setCookie("tab.name", tab.name);
                 nav.setCookie("tab.url", tab.url);
-            },
-            onRecoveryState: function () {
-                this.prop.menu = nav.getCookie("prop.menu");
-
-                this.prop.full = nav.getCookie("prop.full");
-                if (this.prop.full) {
-                    nav.screenFull();
-                } else {
-                    nav.screenNotFull();
-                }
-
-                var tabTitle = nav.getCookie("tab.title");
-                var tabName = nav.getCookie("tab.name");
-                var tabUrl = nav.getCookie("tab.url");
-                if (tabTitle && tabName && tabUrl) {
-                    this.addTab({
-                        title: tabTitle,
-                        name: tabName,
-                        url: tabUrl
-                    })
-                } else {
-                    this.onHome();//页面初始好后打开首页
-                }
             }
         },
         created: function () {
         },
         mounted: function () {
-            this.onRecoveryState();
+            this.prop.menu = nav.getCookie("prop.menu");
+
+            this.prop.full = nav.getCookie("prop.full") === 'true';
+            if (this.prop.full) {
+                nav.screenFull();
+            } else {
+                nav.screenNotFull();
+            }
+
+            var tabTitle = nav.getCookie("tab.title");
+            var tabName = nav.getCookie("tab.name");
+            var tabUrl = nav.getCookie("tab.url");
+            this.onHome();
+            if (tabTitle && tabName && tabUrl) {
+                this.addTab({
+                    title: tabTitle,
+                    name: tabName,
+                    url: tabUrl
+                })
+            }
         },
         watch: {}
     })

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

@@ -111,8 +111,8 @@
                     prop="userStatus"
                     label="用户状态">
                 <template slot-scope="scope">
-                    <el-tag size="mini" effect="dark" type="success" v-if="scope.row.userStatus == '0'">无效</el-tag>
+                    <el-tag size="mini" effect="dark" type="danger" v-if="scope.row.userStatus == '0'">无效</el-tag>
-                    <el-tag size="mini" effect="dark" type="danger" v-if="scope.row.userStatus == '1'">有效</el-tag>
+                    <el-tag size="mini" effect="dark" type="success" v-if="scope.row.userStatus == '1'">有效</el-tag>
                     <el-tag size="mini" effect="dark" type="warning" v-if="scope.row.userStatus == '2'">初始密码</el-tag>
                 </template>
             </el-table-column>

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

@@ -90,7 +90,7 @@ public class DataInit {
         {
             List<Res> forDev = new ArrayList<>();
             {// 初始化开发角色特有资源
-                forDev.add(createRes("DEV", "开发管理菜单", "WEB", "DEV"));
+                forDev.add(createRes("DEV", "核心设置菜单", "WEB", "DEV"));
 
                 forDev.add(createRes("DEV_PROFILES", "系统配置菜单", "WEB", "DEV_PROFILES"));
                 forDev.add(createRes("DEV_PROFILES_HTM", "系统配置管理页", "WEB", "/wsvr/profiles.htm"));
@@ -141,6 +141,13 @@ public class DataInit {
                 forDev.add(createRes("DEV_VISITOR_RES_FIND", "应用资源关系查询", "WEB", "/ajax/wsys/visitorRes/find"));
 
                 forDev.add(createRes("MNT", "监控运行菜单", "WEB", "MNT"));
+
+                forDev.add(createRes("MNT_TOKENS", "登录凭证管理菜单", "WEB", "MNT_TOKENS"));
+                forDev.add(createRes("MNT_TOKENS_HTM", "登录凭证管理页", "WEB", "/wsys/tokens.htm"));
+                forDev.add(createRes("MNT_TOKENS_FIND", "登录凭证查询", "WEB", "/ajax/wsys/tokens/find"));
+                forDev.add(createRes("MNT_TOKENS_EXPORT", "凭证导出", "WEB", "/ajax/wsys/tokens/exports"));
+                forDev.add(createRes("MNT_TOKENS_LOGOUT", "凭证注销", "WEB", "/ajax/wsys/tokens/logout"));
+
                 forDev.add(createRes("MNT_SCHEDULE", "调度监控菜单", "WEB", "MNT_SCHEDULE"));
                 forDev.add(createRes("MNT_SCHEDULE_HTM", "调度监控页", "WEB", "/wsys/schedule.htm"));
                 forDev.add(createRes("MNT_SCHEDULE_FIND", "调度监控查询", "WEB", "/ajax/wsys/schedule/find"));
@@ -156,7 +163,7 @@ public class DataInit {
 
             List<Res> forMgr = new ArrayList<>();
             {// 初始化管理资源
-                forMgr.add(createRes("SYS", "系统管理菜单", "WEB", "SYS"));
+                forMgr.add(createRes("SYS", "基础设置菜单", "WEB", "SYS"));
                 forMgr.add(createRes("SYS_INDEX_ROOT", "根页", "WEB", "/", true));
                 forMgr.add(createRes("SYS_INDEX", "主页", "WEB", "/index.htm", true));
                 forMgr.add(createRes("SYS_INDEX_HOME", "首页", "WEB", "/home.htm", true));
@@ -224,12 +231,6 @@ public class DataInit {
                 forMgr.add(createRes("SYS_ROLE_ROLERES", "角色资源关系查询", "WEB", "/ajax/wsys/roleRes/find"));
                 forMgr.add(createRes("SYS_ROLE_RES_TREE", "资源树查询", "WEB", "/ajax/wsys/res/tree"));
 
-                forMgr.add(createRes("SYS_TOKENS", "登录凭证管理菜单", "WEB", "SYS_TOKENS"));
-                forMgr.add(createRes("SYS_TOKENS_HTM", "登录凭证管理页", "WEB", "/wsys/tokens.htm"));
-                forMgr.add(createRes("SYS_TOKENS_FIND", "登录凭证查询", "WEB", "/ajax/wsys/tokens/find"));
-                forMgr.add(createRes("SYS_TOKENS_EXPORT", "凭证导出", "WEB", "/ajax/wsys/tokens/exports"));
-                forMgr.add(createRes("SYS_TOKENS_LOGOUT", "凭证注销", "WEB", "/ajax/wsys/tokens/logout"));
-
 <#list project.modules as module>
 <#if module.getNeedGenerate()>
                 forMgr.add(createRes("${module.moduleName?upper_case}", "${module.moduleComment}菜单", "WEB", "WEB_${module.moduleName?upper_case}"));