sys-dapp.git - Gitblit

parent: acd9357e | patch | commit | ignore whitespace

20221021

xiaoyong931011

2022-11-11 952b26d869da3d3228cec922359b5380cabdc6fa

20221021

8 files modified

	src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/403.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/404.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/500.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/dapp/money-change-flow.html	38 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/layout.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/login.html	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/index.html	2 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java

@@ -44,7 +44,7 @@
            log.error("| |_   / /\\  | | | |");
            log.error("|_|   /_/--\\ |_| |_|__");
            log.error("                        ");
            log.error("WEM启动失败，{}", e.getMessage());
            log.error("DMD启动失败，{}", e.getMessage());
            log.error("Redis连接异常，请检查Redis连接配置并确保Redis服务已启动");
            // 关闭 FEBS
            context.close();
@@ -63,7 +63,7 @@
            log.info("/ /`  / / \\ | |\\/| | |_) | |   | |_   | |  | |_  ");
            log.info("\\_\\_, \\_\\_/ |_|  | |_|   |_|__ |_|__  |_|  |_|__ ");
            log.info("                                                      ");
            log.info("WEM 权限系统启动完毕，地址：{}", url);
            log.info("DMD 权限系统启动完毕，地址：{}", url);

            boolean auto = febsProperties.isAutoOpenBrowser();
            if (auto && StringUtils.equalsIgnoreCase(active, FebsConstant.DEVELOP)) {

 src/main/resources/templates/error/403.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>WEM 权限系统</title>
    <title>DMD 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/error/404.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>WEM 权限系统</title>
    <title>DMD 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/error/500.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>WEM 权限系统</title>
    <title>DMD 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/febs/views/dapp/money-change-flow.html

@@ -67,13 +67,31 @@
        height: auto !important;
    }
</style>
<script type="text/html" id="type-format">
<script type="text/html" id="flow-status">
    {{#
    var status = {
    2: {title: '成功'},
    1: {title: '进行中'},
    3: {title: '取消'}
    }[d.status];
    }}
    <span>{{ status.title }}</span>
</script>
<script type="text/html" id="flow-type">
    {{#
    var type = {
    1: {title: '兑换'},
    2: {title: '提现'},
    3: {title: '采矿'},
    4: {title: '代理返利'}
    1: {title: '买入'},
    2: {title: '矩阵收益'},
    3: {title: '直推收益'},
    4: {title: '保险池'},
    5: {title: '提现'},
    6: {title: '手续费充值'},
    7: {title: '手续费扣除'},
    8: {title: '结算'},
    9: {title: '冻结'},
    10: {title: '冻结释放'},
    11: {title: '产矿'},
    12: {title: '手续费返利'},
    }[d.type];
    }}
    <span>{{ type.title }}</span>
@@ -127,14 +145,14 @@
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'moneyChangeTable',
                url: ctx + 'flow/accountMoneyChangeFlow',
                url: ctx + 'flow/fundFlow',
                cols: [[
                    {field: 'address', title: '地址', minWidth: 150},
                    {field: 'preAmount', title: '变化前金额', minWidth: 100},
                    {field: 'amount', title: '变化金额', minWidth: 100},
                    {field: 'afterAmount', title: '变化后金额', minWidth: 100},
                    {field: 'content', title: '描述', minWidth: 130},
                    {title: '类型', templet: '#type-format'},
                    {field: 'amount', title: '金额', minWidth: 100},
                    {title: '类型', templet: '#flow-type'},
                    {title: '提现状态', templet: '#flow-status'},
                    {field: 'fee', title: '手续费', minWidth: 130},
                    {field: 'createTime', title: '创建时间', minWidth: 180}
                ]]
            });

 src/main/resources/templates/febs/views/layout.html

@@ -63,7 +63,7 @@
        <div class="layui-side-scroll">
            <div class="layui-logo" style="cursor: pointer">
                <img data-th-src="@{febs/images/logo.png}">
                <span>WEM 权限系统</span>
                <span>DMD 权限系统</span>
            </div>
            <script
                    type="text/html"

 src/main/resources/templates/febs/views/login.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>WEM 权限系统</title>
    <title>DMD 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -19,7 +19,7 @@
        <div class="layui-container">
            <div class="layui-row">
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-tc">
                    <div class="layui-logo"><span><b>WEM</b> 权限系统</span></div>
                    <div class="layui-logo"><span><b>DMD</b> 权限系统</span></div>
                </div>
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4" id="login-div">
                    <div class="layui-form" lay-filter="login-form">

 src/main/resources/templates/index.html

@@ -3,7 +3,7 @@
      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
    <meta charset="utf-8">
    <title>WEM 权限系统</title>
    <title>DMD 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

			@@ -44,7 +44,7 @@
			log.error("\| \|_ / /\\ \| \| \| \|");
			log.error("\|_\| /_/--\\ \|_\| \|_\|__");
			log.error(" ");
			log.error("WEM启动失败，{}", e.getMessage());
			log.error("DMD启动失败，{}", e.getMessage());
			log.error("Redis连接异常，请检查Redis连接配置并确保Redis服务已启动");
			// 关闭 FEBS
			context.close();
			@@ -63,7 +63,7 @@
			log.info("/ /` / / \\ \| \|\\/\| \| \|_) \| \| \| \|_ \| \| \| \|_ ");
			log.info("\\_\\_, \\_\\_/ \|_\| \| \|_\| \|_\|__ \|_\|__ \|_\| \|_\|__ ");
			log.info(" ");
			log.info("WEM 权限系统启动完毕，地址：{}", url);
			log.info("DMD 权限系统启动完毕，地址：{}", url);

			boolean auto = febsProperties.isAutoOpenBrowser();
			if (auto && StringUtils.equalsIgnoreCase(active, FebsConstant.DEVELOP)) {

			@@ -2,7 +2,7 @@
			<html xmlns:th="http://www.thymeleaf.org">
			<head>
			<meta charset="utf-8">
			<title>WEM 权限系统</title>
			<title>DMD 权限系统</title>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

			@@ -67,13 +67,31 @@
			height: auto !important;
			}
			</style>
			<script type="text/html" id="type-format">
			<script type="text/html" id="flow-status">
			{{#
			var status = {
			2: {title: '成功'},
			1: {title: '进行中'},
			3: {title: '取消'}
			}[d.status];
			}}
			<span>{{ status.title }}</span>
			</script>
			<script type="text/html" id="flow-type">
			{{#
			var type = {
			1: {title: '兑换'},
			2: {title: '提现'},
			3: {title: '采矿'},
			4: {title: '代理返利'}
			1: {title: '买入'},
			2: {title: '矩阵收益'},
			3: {title: '直推收益'},
			4: {title: '保险池'},
			5: {title: '提现'},
			6: {title: '手续费充值'},
			7: {title: '手续费扣除'},
			8: {title: '结算'},
			9: {title: '冻结'},
			10: {title: '冻结释放'},
			11: {title: '产矿'},
			12: {title: '手续费返利'},
			}[d.type];
			}}
			<span>{{ type.title }}</span>
			@@ -127,14 +145,14 @@
			tableIns = febs.table.init({
			elem: $view.find('table'),
			id: 'moneyChangeTable',
			url: ctx + 'flow/accountMoneyChangeFlow',
			url: ctx + 'flow/fundFlow',
			cols: [[
			{field: 'address', title: '地址', minWidth: 150},
			{field: 'preAmount', title: '变化前金额', minWidth: 100},
			{field: 'amount', title: '变化金额', minWidth: 100},
			{field: 'afterAmount', title: '变化后金额', minWidth: 100},
			{field: 'content', title: '描述', minWidth: 130},
			{title: '类型', templet: '#type-format'},
			{field: 'amount', title: '金额', minWidth: 100},
			{title: '类型', templet: '#flow-type'},
			{title: '提现状态', templet: '#flow-status'},
			{field: 'fee', title: '手续费', minWidth: 130},
			{field: 'createTime', title: '创建时间', minWidth: 180}
			]]
			});

			@@ -63,7 +63,7 @@
			<div class="layui-side-scroll">
			<div class="layui-logo" style="cursor: pointer">
			<img data-th-src="@{febs/images/logo.png}">
			<span>WEM 权限系统</span>
			<span>DMD 权限系统</span>
			</div>
			<script
			type="text/html"

			@@ -3,7 +3,7 @@
			xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			<head>
			<meta charset="utf-8">
			<title>WEM 权限系统</title>
			<title>DMD 权限系统</title>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">