1、错误日志

Former-commit-id: 18e319a951b3f1fd7df7e54e8d1c8b8de730d1f1

src/main/resources/modules/SpringBoot/java/task/TokenTask.java

@@ -27,6 +27,10 @@ public class TokenTask extends RunDelayRepeatTask {
     @Override
     public void run() {
         TokensManager tokensManager = LocalData.getBean(TokensManager.class);
+        if (tokensManager == null) {
+            return;
+        }
+
         TokensFindRequest tokensFindRequest = new TokensFindRequest();
         tokensFindRequest.setPageSize(0);
         tokensFindRequest.setValid(true);

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

@@ -14,7 +14,7 @@
 <#if sysMD>
             <el-submenu index="${tool.uuid()}" >
                 <template slot="title">
-                    <i class="el-icon-monitor"></i>
+                    <i class="el-icon-setting"></i>
                     <span slot="title">系统设置</span>
                 </template>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '字典管理', name: 'dict', url: '${r'${context}'}/system/dict.htm'})">字典管理</el-menu-item>
@@ -25,7 +25,7 @@
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '角色管理', name: 'role', url: '${r'${context}'}/system/role.htm'})">角色管理</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '登录管理', name: 'tokens', url: '${r'${context}'}/system/tokens.htm'})">登录管理</el-menu-item>
             </el-submenu>
-            <el-submenu index="${tool.uuid()}" >
+            <el-submenu index="${tool.uuid()}">
                 <template slot="title">
                     <i class="el-icon-time"></i>
                     <span slot="title">计划任务</span>
@@ -34,7 +34,7 @@
             </el-submenu>
             <el-submenu index="${tool.uuid()}" >
                 <template slot="title">
-                    <i class="el-icon-warning-outline"></i>
+                    <i class="el-icon-data-analysis"></i>
                     <span slot="title">系统日志</span>
                 </template>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '错误日志', name: 'LOG_ERR', url: '${r'${context}'}/system/logErr.htm'})">错误日志</el-menu-item>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl

@@ -210,6 +210,7 @@
             onCreate: function () {
                 this.form.title = '新增字典项';
                 this.form.dialog = true;
+                this.form.id = '';
                 this.form.dictName = location.getParam("dictName");
                 this.form.key = '';
                 this.form.value = '';

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl

@@ -299,6 +299,7 @@
             onCreate: function () {
                 this.form.title = "资源新增";
                 this.form.dialog = true;
+                this.form.id = "";
                 this.form.resCode = "";
                 this.form.resName = "";
                 this.form.resType = "";