open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

架构升级

Browse Source 
Former-commit-id: 4b17397c2af3df78808f8f2c9b262f1e5c97d6bc
master
wangbing 5 years ago
parent 3ba50c0534
commit 46b1efc274
9 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File

8
src/main/resources/modules/SpringBoot/java/action/GlobalErrorController.java
Unescape View File

@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import ${domain}.frame.auth.LocalData; import ${domain}.frame.auth.LocalData;
import ${domain}.frame.utils.RequestUtil; import ${domain}.frame.utils.RequestUtil;
import ${domain}.module.wsys.mgr.LogerrManager;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -62,6 +63,13 @@ public class GlobalErrorController extends BasicErrorController {
break; break;
case INTERNAL_SERVER_ERROR://500 case INTERNAL_SERVER_ERROR://500
default: default:
try {
LogerrManager logerrManager = LocalData.getBean(LogerrManager.class);
logerrManager.addErr("系统错误", (String) model.get("message"), (String) model.get("trace"));
modelAndView.setViewName("500");
} catch (Exception ignored) {
}
modelAndView.setViewName("500"); modelAndView.setViewName("500");
break; break;
} }

2
src/main/resources/modules/SpringBoot/resources/templates/500.ftl
Unescape View File

@ -78,7 +78,7 @@
<div class="info"> <div class="info">
<p style="font-size: 18px;font-weight: bold">服务器内部错误，错误信息如下：</p> <p style="font-size: 18px;font-weight: bold">服务器内部错误，错误信息如下：</p>
<p style="color: red">${msg}</p> <p style="color: red">${trace}</p>
</div> </div>
<div class="control"> <div class="control">
<a onclick="history.back()">返回上页</a> <a href="/">返回首页</a> <a onclick="history.back()">返回上页</a> <a href="/">返回首页</a>

4
src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
Unescape View File

@ -593,6 +593,8 @@
}, },
// 全屏 // 全屏
screenFull: function () { screenFull: function () {
if (window.isFull)return;
window.isFull = true;
var docElm = document.documentElement; var docElm = document.documentElement;
if (docElm.requestFullscreen) {//W3C if (docElm.requestFullscreen) {//W3C
docElm.requestFullscreen(); docElm.requestFullscreen();
@ -612,6 +614,8 @@
}, },
// 取消全屏 // 取消全屏
screenNotFull: function () { screenNotFull: function () {
if (!window.isFull)return;
window.isFull = false;
if (document.exitFullscreen) {//W3C if (document.exitFullscreen) {//W3C
document.exitFullscreen(); document.exitFullscreen();
} else if (document.mozCancelFullScreen) {//FireFox } else if (document.mozCancelFullScreen) {//FireFox

2
src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl
Unescape View File

@ -28,7 +28,7 @@
padding: 0; padding: 0;
margin: 0; margin: 0;
display: flex; display: flex;
background: #001d3a; background: url(data:image/gif;base64,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)
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }

2
src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
Unescape View File

@ -227,7 +227,7 @@
label="${item.fieldComment?default("")}"> label="${item.fieldComment?default("")}">
<template slot-scope="scope"> <template slot-scope="scope">
<#list item.selectItems as st> <#list item.selectItems as st>
<el-tag size="mini" effect="dark" v-if="scope.row.${item.getFName()} == '${st.value}'">${st.label}</el-tag> <el-tag size="mini" v-if="scope.row.${item.getFName()} == '${st.value}'">${st.label}</el-tag>
</#list> </#list>
</template> </template>
</el-table-column> </el-table-column>

30
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logerr.ftl
Unescape View File

@ -74,15 +74,26 @@
prop="id" prop="id"
label="主键"> label="主键">
</el-table-column> </el-table-column>
<el-table-column
align="center"
min-width="100"
prop="logState"
label="日志状态">
<template slot-scope="scope">
<el-tag size="mini" type="danger" effect="dark" v-if="scope.row.logState == '0'">待处理</el-tag>
<el-tag size="mini" type="warning" effect="dark" v-if="scope.row.logState == '1'">处理中</el-tag>
<el-tag size="mini" type="info" effect="dark" v-if="scope.row.logState == '2'">已处理</el-tag>
</template>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="100" min-width="100"
prop="logType" prop="logType"
label="日志类型"> label="日志类型">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="mini" effect="dark" v-if="scope.row.logType == '系统错误'">系统错误</el-tag> <el-tag size="mini" v-if="scope.row.logType == '系统错误'">系统错误</el-tag>
<el-tag size="mini" effect="dark" v-if="scope.row.logType == '任务错误'">任务错误</el-tag> <el-tag size="mini" v-if="scope.row.logType == '任务错误'">任务错误</el-tag>
<el-tag size="mini" effect="dark" v-if="scope.row.logType == '业务错误'">业务错误</el-tag> <el-tag size="mini" v-if="scope.row.logType == '业务错误'">业务错误</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -97,17 +108,6 @@
prop="logNote" prop="logNote"
label="日志描述"> label="日志描述">
</el-table-column> </el-table-column>
<el-table-column
align="center"
min-width="100"
prop="logState"
label="日志状态">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" v-if="scope.row.logState == '0'">待处理</el-tag>
<el-tag size="mini" effect="dark" v-if="scope.row.logState == '1'">处理中</el-tag>
<el-tag size="mini" effect="dark" v-if="scope.row.logState == '2'">已处理</el-tag>
</template>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="140" min-width="140"
@ -234,7 +234,7 @@
} }
next(); next();
}.bind(this)) }.bind(this))
}, function () { }.bind(this), function () {
nav.tipClose(); nav.tipClose();
nav.s("批量处理完成.") nav.s("批量处理完成.")
this.onFind(); this.onFind();

6
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl
Unescape View File

@ -108,9 +108,9 @@
prop="taskType" prop="taskType"
label="任务类型"> label="任务类型">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="mini" effect="dark" v-if="scope.row.taskType == 'Cron'">Cron表达式</el-tag> <el-tag size="mini" v-if="scope.row.taskType == 'Cron'">Cron表达式</el-tag>
<el-tag size="mini" effect="dark" v-if="scope.row.taskType == 'DelayRepeat'">间隔重复(秒)</el-tag> <el-tag size="mini" v-if="scope.row.taskType == 'DelayRepeat'">间隔重复(秒)</el-tag>
<el-tag size="mini" effect="dark" v-if="scope.row.taskType == 'FixRepeat'">绝对重复(秒)</el-tag> <el-tag size="mini" v-if="scope.row.taskType == 'FixRepeat'">绝对重复(秒)</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

4
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl
Unescape View File

@ -137,8 +137,8 @@
prop="terminal" prop="terminal"
label="终端类型"> label="终端类型">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="mini" effect="dark" v-if="scope.row.terminal == 'WEB'">网页</el-tag> <el-tag size="mini" v-if="scope.row.terminal == 'WEB'">网页</el-tag>
<el-tag size="mini" effect="dark" v-if="scope.row.terminal == 'API'">终端</el-tag> <el-tag size="mini" v-if="scope.row.terminal == 'API'">终端</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

6
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
Unescape View File

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

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.