From 50b31c6b6f1129ef17884d2a0a02f8dfe0cdda13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Wed, 21 Dec 2022 14:02:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/jlw/universitiesColleges/add.html | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/web/src/main/resources/templates/jlw/universitiesColleges/add.html b/web/src/main/resources/templates/jlw/universitiesColleges/add.html index b54ac3bd..e639cc8e 100644 --- a/web/src/main/resources/templates/jlw/universitiesColleges/add.html +++ b/web/src/main/resources/templates/jlw/universitiesColleges/add.html @@ -105,21 +105,15 @@
${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.code!''}
- +
-
- -
-
${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.password!''}
-
- -
+ From 937424ae44b5b03cdf22af9f867a36575a95ae49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Wed, 21 Dec 2022 19:23:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/console/web/UserConsoleController.java | 13 ------------- .../jlw/web/UniversitiesCollegesController.java | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java b/admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java index b3ed6b24..a602fe60 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java @@ -121,19 +121,6 @@ public class UserConsoleController { return view; } - /** - *@author 姚丹 - *@data 2022/11/28 - * 用户中心 - */ - @GetMapping(MODEL + "/userCenter.do") - @Function("user.query") - public ModelAndView userCenter() { - ModelAndView view = new ModelAndView("/other/userCenter.html"); - view.addObject("search", UserQuery.class.getName()); - return view; - } - /* Json */ @PostMapping(MODEL + "/delete.json") diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java index 541722ff..caa37938 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.console.web.query.UserQuery; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; @@ -256,4 +257,17 @@ public class UniversitiesCollegesController{ public JsonResult info(@SCoreUser CoreUser coreUser) { return JsonResult.success(universitiesCollegesService.info()); } + + /** + *@author 姚丹 + *@data 2022/11/28 + * 用户中心 + */ + @GetMapping(MODEL + "/userCenter.do") + @Function("user.query") + public ModelAndView userCenter() { + ModelAndView view = new ModelAndView("/other/userCenter.html"); + view.addObject("search", UserQuery.class.getName()); + return view; + } } From cf36d44474268cf2d7fa4e58d94e790c1c3ddc68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Wed, 21 Dec 2022 19:55:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/other/userCenter.html | 88 ++++++++++--------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/web/src/main/resources/templates/other/userCenter.html b/web/src/main/resources/templates/other/userCenter.html index ef356801..67d04d0a 100644 --- a/web/src/main/resources/templates/other/userCenter.html +++ b/web/src/main/resources/templates/other/userCenter.html @@ -33,12 +33,39 @@ }
+
+ + +
+