初始化脚本修改，登录提示修改，form表单修改
diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java
index 28e09ae..1cd496a 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java
@@ -6,6 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.DisabledException;
import org.springframework.security.authentication.LockedException;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
@@ -36,6 +37,8 @@
errmsg = "账号被锁定";
} else if (exception instanceof ValidateCodeException) {
errmsg = exception.getMessage();
+ } else if (exception instanceof DisabledException){
+ errmsg= "该用户已被注销";
}
/* setDefaultFailureUrl("/login");*/
/* super.onAuthenticationFailure(request, response, new ValidateCodeException(errmsg));*/
diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java
index 52388f1..8708919 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java
@@ -34,7 +34,6 @@
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
Authentication authentication) throws IOException, ServletException {
- logger.info("登录成功");
//TODO:记录日志
UserDetails userDetails = (UserDetails) authentication.getPrincipal();
if (userDetails != null) {
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index f761b5c..f229650 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -88,10 +88,6 @@
INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (6, NULL, 1, NULL, 'layui-icon-set', '/operator/index', '操作员管理', 4, 3);
INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (4, NULL, 1, NULL, 'layui-icon-set', '/function/index', '功能维护', 1, 3);
INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (9, NULL, 1, NULL, '', '/operator/logs', '操作日志', 4, 3);
-INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (10, NULL, 0, NULL, 'layui-icon-util', '#', '参数管理', 3, -1);
-INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (11, NULL, 1, NULL, 'layui-icon-util', '/param/syspara', '全局参数配置', 1, 10);
-INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (12, NULL, 1, NULL, 'layui-icon-util', '/param/businesspara', '业务参数配置', 2, 10);
-INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (17, NULL, 1, NULL, 'layui-icon-util', '/param/apiclientpara', '应用参数配置', 3, 10);
INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (14, NULL, 0, NULL, 'layui-icon-app', '#', '设备管理', 8, -1);
INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (15, NULL, 1, NULL, 'layui-icon-app', '/device/index', '注册设备', 1, 14);
INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (16, NULL, 1, NULL, 'layui-icon-home', '/devicegroup/index', '设备组管理', 2, 14);
@@ -239,19 +235,6 @@
INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (21, '', 5, '删除角色', '/role/del');
INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (22, '', 6, '修改状态', '/operator/updatestate');
INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (24, '', 9, '查询', '/operator/logslist');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (26, '', 11, '修改', '/param/sysparaupdate');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (27, '', 11, '查询', '/param/syspara');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (28, '', 12, '查询', '/param/businesspara');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (29, '', 12, '删除', '/param/deletebusinesspara');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (30, '', 12, '修改', '/param/businessparaupdate');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (32, '', 12, '新增', '/param/addbusinesspara');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (33, '', 12, '新增跳转', '/param/load4addbuspara');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (34, '', 17, '查询', '/param/apiclientpara');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (35, '', 17, '新增修改跳转', '/param/load4addapiclient');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (36, '', 17, '修改状态', '/param/updateapiclientstate');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (37, '', 17, '删除', '/param/deleteapiclient');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (39, '', 17, '修改', '/param/updateapiclientpara');
-INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (40, '', 17, '新增', '/param/addapiclientpara');
INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (1, '', 13, '查询', '/area/index');
INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (2, '', 13, '添加页面', '/area/loadadd');
INSERT INTO "tb_resource" (id,code,function_id,name,uri) VALUES (3, '', 13, '添加', '/area/add');
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 09762d8..127ba66 100755
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -22,7 +22,7 @@
<div class="layui-header">
<div class="layui-logo">
<img th:src="@{/static/custom/images/logo.png}"/>
- <cite>支付中心</cite>
+ <cite>食堂应用中心</cite>
</div>
<ul class="layui-nav layui-layout-left">
<li class="layui-nav-item" lay-unselect>
diff --git a/src/main/resources/templates/restaurant/customer/form.html b/src/main/resources/templates/restaurant/customer/form.html
index d3f2230..f324fac 100644
--- a/src/main/resources/templates/restaurant/customer/form.html
+++ b/src/main/resources/templates/restaurant/customer/form.html
@@ -1,5 +1,5 @@
-<form id="customer-form" lay-filter="form" class="layui-form model-form">
+<form id="customer-form" lay-filter="customer-form" class="layui-form model-form">
<input name="custid" id="customer-custid" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">* </span>姓名</label>
diff --git a/src/main/resources/templates/restaurant/customer/index.html b/src/main/resources/templates/restaurant/customer/index.html
index fd83300..5f0040b 100644
--- a/src/main/resources/templates/restaurant/customer/index.html
+++ b/src/main/resources/templates/restaurant/customer/index.html
@@ -16,7 +16,7 @@
<button id="customer-btn-import" class="layui-btn icon-btn" ><i class="layui-icon"></i>批量导入</button>
</div>
- <table class="layui-table" id="customer-table" lay-filter="table"></table>
+ <table class="layui-table" id="customer-table" lay-filter="customer-table"></table>
</div>
</div>
@@ -86,7 +86,7 @@
// 工具条点击事件
- table.on('tool(table)', function (obj) {
+ table.on('tool(customer-table)', function (obj) {
let data = obj.data;
let layEvent = obj.event;
console.log(data);
diff --git a/src/main/resources/templates/restaurant/transdtlrev/index.html b/src/main/resources/templates/restaurant/transdtlrev/index.html
index c97111e..6a0dc4b 100644
--- a/src/main/resources/templates/restaurant/transdtlrev/index.html
+++ b/src/main/resources/templates/restaurant/transdtlrev/index.html
@@ -41,7 +41,7 @@
</div>
</div>
- <table class="layui-table" id="transdtlrev-table" lay-filter="table"></table>
+ <table class="layui-table" id="transdtlrev-table" lay-filter="transdtlrev-table"></table>
</div>
</div>
<input hidden th:value="${shopList}" id="transdtlrev-shoplist">