From d7bb63f5a6961cf4f22a60e3c242e05ad95a3176 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 16 Jun 2025 18:18:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=A2=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=BC=8F=E6=B4=9E=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/controller/UserController.java | 3 ++ src/main/resources/application.properties | 39 ++++++++++--------- src/main/resources/application.properties-dev | 8 +++- src/main/resources/static/login.html | 9 ++++- .../static/pages/prepayment/proDictForm.html | 21 ++++++++-- .../static/pages/prepayment/proDictList.html | 13 +++++-- 6 files changed, 65 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java index 2430c30..4e642d7 100644 --- a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java +++ b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java @@ -12,6 +12,7 @@ import com.bonus.boot.manager.manager.service.UserService; import com.bonus.boot.manager.manager.table.PageTableHandler; import com.bonus.boot.manager.manager.table.PageTableRequest; import com.bonus.boot.manager.manager.table.PageTableResponse; +import com.bonus.boot.manager.manager.utils.AESCBCUtils; import com.bonus.boot.manager.manager.utils.AjaxRes; import com.bonus.boot.manager.manager.utils.GlobalConst; import com.bonus.boot.manager.manager.utils.UserUtil; @@ -229,6 +230,8 @@ public class UserController { @PostMapping("resetPasswordForOne") @ApiOperation(value = "用户管理-第一次重置密码") public AjaxRes resetPasswordForOne(SysUser bean) { + bean.setUsername(AESCBCUtils.decrypt(bean.getUsername())); + bean.setPassword(AESCBCUtils.decrypt(bean.getPassword())); AjaxRes ar = new AjaxRes(); int result = userService.resetPasswordForOne(bean); if(result==1){ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e5dbd82..8c7af1d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,13 +1,13 @@ -server.port=20020 -#????·?? +server.port=2002 +#?????? server.servlet.context-path=/yncw #mysql????????? -spring.datasource.url=jdbc:mysql://192.168.0.14:4418/yncw_real?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true +#spring.datasource.url=jdbc:mysql://192.168.0.14:1103/yncw1?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true +#spring.datasource.username=root +#spring.datasource.password=dszadmin@ynreal14! +spring.datasource.url=jdbc:mysql://192.168.1.23:2000/yncw_real?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true spring.datasource.username=root -spring.datasource.password=Bonus@admin123! -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/yncw_real?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true -#spring.datasource.username=mroot -#spring.datasource.password=bonus@admin123 +spring.datasource.password=Ynsbd@mysql123! spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.max-idle=10 spring.datasource.max-wait=60000 @@ -21,20 +21,19 @@ mybatis.type-aliases-package=com.bonus.boot.manager.*.entity # ????????????????????? mybatis.configuration.map-underscore-to-camel-case=true #redis config -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password= - -#spring.redis.host=192.168.0.14 -#spring.redis.port=2001 -#spring.redis.password=Dszbns@Redis123! +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password= +spring.redis.host=192.168.1.23 +spring.redis.port=2001 +spring.redis.password=Ynsbd@Redis123! # ??? logging.config=classpath:logback-boot.xml log.level.root=info log.level.my=debug log.file=logs/sys-back.log log.maxsize=30MB -#???????С +#???????? server.max-http-header-size=102400 spring.servlet.multipart.max-file-size=999MB spring.servlet.multipart.max-request-size=999MB @@ -50,7 +49,7 @@ spring.servlet.multipart.enabled=true #files.path=e:\\yncw\\files files.path=/data/yncw/files files.url=http://127.0.0.1:8080/yncw/statics -files.upload=F:\\files +files.upload=e:\\files #sql.ip=192.168.0.14 #sql.host=1103 @@ -64,6 +63,8 @@ sql.name=root sql.pwd=Ynsbd@mysql123! sql.database=yncw_real - -#????? -admin/YNsbd@12345 +server.tomcat.connection-timeout=10s +server.tomcat.max-threads=800 +server.tomcat.min-spare-threads=50 +server.tomcat.accept-count=500 +server.tomcat.max-swallow-size=2MB \ No newline at end of file diff --git a/src/main/resources/application.properties-dev b/src/main/resources/application.properties-dev index 0ddf471..87115e7 100644 --- a/src/main/resources/application.properties-dev +++ b/src/main/resources/application.properties-dev @@ -61,4 +61,10 @@ sql.ip=192.168.1.23 sql.host=2000 sql.name=root sql.pwd=Ynsbd@mysql123! -sql.database=yncw_real \ No newline at end of file +sql.database=yncw_real + +server.tomcat.connection-timeout=10s +server.tomcat.max-threads=800 +server.tomcat.min-spare-threads=50 +server.tomcat.accept-count=500 +server.tomcat.max-swallow-size=2MB \ No newline at end of file diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html index cd8e1b0..9a14db5 100644 --- a/src/main/resources/static/login.html +++ b/src/main/resources/static/login.html @@ -50,7 +50,11 @@ if (token != null && token.trim().length != 0) { $.ajax({ type : 'get', - url : ctxPath + '/users/current?token=' + token, + // url : ctxPath + '/users/current?token=' + token, + url : ctxPath + '/users/current', + headers: { + 'Authorization': 'Bearer ' + token // 通过 HTTP Header 传递 token + }, success : function(data) { location.href = ctxPath + '/index.html'; }, @@ -107,7 +111,8 @@ url: ctxPath + '/users/resetPasswordForOne',// 请求地址 contentType: "application/x-www-form-urlencoded", dataType: 'json', // 服务器返回数据类型 - data: JSON.stringify({'username': username,'password':password}), //获取提交的表单字段 + // data: JSON.stringify({'username': username,'password':password}), //获取提交的表单字段 + data: JSON.stringify({'username': encryptCBC(username),'password':encryptCBC(password)}), //获取提交的表单字段 success: function (data) { var resMsg = data.resMsg; if ("数据获取成功" == resMsg) { diff --git a/src/main/resources/static/pages/prepayment/proDictForm.html b/src/main/resources/static/pages/prepayment/proDictForm.html index 8a23c6d..21b2d85 100644 --- a/src/main/resources/static/pages/prepayment/proDictForm.html +++ b/src/main/resources/static/pages/prepayment/proDictForm.html @@ -13,9 +13,7 @@ top: 15px; right: 450px; } - .layui-icon{ - font-size: 80px!important; - } + .layui-input, .layui-textarea{ width: 100%; @@ -152,8 +150,25 @@ formdata.id = id; } formdata.type = $("#type").val(); + var typeVal = $("#type").val() + if (!typeVal) { + layer.msg('请选择类型', {icon: 2, time: 20000}); + return false; + } formdata.name = $("#name").val(); + var nameVal = $("#name").val().trim(); + if (!nameVal) { + $("#name").focus(); + layer.msg('请输入名称', {icon: 2, time: 20000}); + return false; + } formdata.remarks = $("#remarks").val(); + var remarksVal = $("#remarks").val().trim(); + if (!remarksVal) { + $("#remarks").focus(); + layer.msg('请输入备注', {icon: 2, time: 2000}); + return false; + } $.ajax({ type : 'post', url : ctxPath + '/prepayment/addOrUpdate', diff --git a/src/main/resources/static/pages/prepayment/proDictList.html b/src/main/resources/static/pages/prepayment/proDictList.html index 1d1d84e..d399c99 100644 --- a/src/main/resources/static/pages/prepayment/proDictList.html +++ b/src/main/resources/static/pages/prepayment/proDictList.html @@ -22,6 +22,10 @@ .layui-input, .layui-textarea{ width: 100%; } + .text-center { + text-align: center !important; + vertical-align: middle !important; + } @@ -176,9 +180,11 @@ var c = meta.settings._iDisplayStart + meta.row + 1; return c; }, + "class": "text-center", "orderable": false }, - { "data": "", "defaultContent": "", + { "data": "", "defaultContent": "","orderable": false, "width":100, + "class": "text-center", "render": function (data, type, row) { var type = row['type']; if(type == 1){ @@ -188,12 +194,13 @@ } }, }, - { "data": "name", "defaultContent": ""}, - { "data": "remarks", "defaultContent": ""}, + { "data": "name", "defaultContent": "","orderable": false,"class": "text-center","width":550}, + { "data": "remarks", "defaultContent": "","orderable": false,"class": "text-center","width":550}, { "data": "", "defaultContent": "", "orderable":false, + "class": "text-center", "render": function (data, type, row) { var id = row['id']; var edit = buttonupdte(id, "", pers);