From 0fa5cac2cc3a5873d9b6bc94e4c2bde6a0fffd49 Mon Sep 17 00:00:00 2001 From: wanghb <17803890193@163.com> Date: Wed, 23 Aug 2023 17:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E4=B8=80=E4=B8=AA=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 14 ++ .../course/config/MyWebMvcConfig.java | 4 + .../course/controller/CourseController.java | 5 - .../zhiyun03/filter/LoginCheckFilter.java | 2 +- .../user/controller/UserController.java | 26 +-- .../zhiyun03/user/service/UserService.java | 1 + .../user/service/impl/UserServiceImpl.java | 4 +- .../templates/layui-v2.6.8/academicList.html | 1 + .../layui-v2.6.8/applicationList.html | 1 + .../templates/layui-v2.6.8/courseList.html | 204 +++++++++++++++++- .../templates/layui-v2.6.8/gameList.html | 1 + .../templates/layui-v2.6.8/index.html | 42 +++- .../templates/layui-v2.6.8/login.html | 17 +- 13 files changed, 279 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index 42172eb..1bfb37a 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,20 @@ commons-fileupload 1.4 + + + + + + + + + + com.auth0 + java-jwt + 3.19.2 + + diff --git a/src/main/java/com/zhiyun/zhiyun03/course/config/MyWebMvcConfig.java b/src/main/java/com/zhiyun/zhiyun03/course/config/MyWebMvcConfig.java index ebf4cd7..40ec2db 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/config/MyWebMvcConfig.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/config/MyWebMvcConfig.java @@ -2,6 +2,7 @@ package com.zhiyun.zhiyun03.course.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @Configuration public class MyWebMvcConfig extends WebMvcConfigurationSupport { @@ -22,4 +23,7 @@ public class MyWebMvcConfig extends WebMvcConfigurationSupport { super.addResourceHandlers(registry); } + + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java index 85ea672..8e162fb 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java @@ -9,17 +9,12 @@ import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.utils.common.JsonResult; -import com.zhiyun.zhiyun03.utils.oss.AliyunOssUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.io.File; -import java.io.FileOutputStream; -import java.nio.file.DirectoryStream; import java.util.List; diff --git a/src/main/java/com/zhiyun/zhiyun03/filter/LoginCheckFilter.java b/src/main/java/com/zhiyun/zhiyun03/filter/LoginCheckFilter.java index 9d0a391..79e60ec 100644 --- a/src/main/java/com/zhiyun/zhiyun03/filter/LoginCheckFilter.java +++ b/src/main/java/com/zhiyun/zhiyun03/filter/LoginCheckFilter.java @@ -56,7 +56,7 @@ public class LoginCheckFilter implements Filter { //三元运算 token = token==null?"":token; //4、判断登录状态，如果已登录，则直接放行 - if (token!= null) { + if (token!= null && token!="") { // log.info("用户已登录，用户id为：{}", request.getSession().getAttribute("USER")); filterChain.doFilter(request, response); return; diff --git a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java index 6b4a467..145fc70 100644 --- a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java +++ b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java @@ -2,29 +2,14 @@ package com.zhiyun.zhiyun03.user.controller; import com.zhiyun.zhiyun03.user.entity.User; import com.zhiyun.zhiyun03.user.service.UserService; -import com.zhiyun.zhiyun03.user.vo.UserVo; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; -import com.zhiyun.zhiyun03.utils.exception.ServiceException; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpRequest; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.util.UUID; +@Api("用户") @RestController @RequestMapping("/user") public class UserController { @@ -38,13 +23,20 @@ public class UserController { } User login = userService.login(username, password); if (login != null) { - String token = UUID.randomUUID()+""; +// String token = UUID.randomUUID()+""; request.getSession().setAttribute("USER", login.getUserName()); + return JsonResult.success(login); } return JsonResult.error(ResultCode.USER_ACCOUNT_ERROR, "账号或密码错误"); } + @GetMapping("/getUsername") + public JsonResult getUsername(HttpServletRequest request){ + Object user = request.getSession().getAttribute("USER"); + return JsonResult.success(user); + } + @PostMapping("/logout") public JsonResult loginOut(HttpServletRequest request){ // 去除session diff --git a/src/main/java/com/zhiyun/zhiyun03/user/service/UserService.java b/src/main/java/com/zhiyun/zhiyun03/user/service/UserService.java index 97690a8..10c56f4 100644 --- a/src/main/java/com/zhiyun/zhiyun03/user/service/UserService.java +++ b/src/main/java/com/zhiyun/zhiyun03/user/service/UserService.java @@ -6,4 +6,5 @@ import org.springframework.http.HttpRequest; public interface UserService extends IService { User login(String userName, String password); + } diff --git a/src/main/java/com/zhiyun/zhiyun03/user/service/impl/UserServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/user/service/impl/UserServiceImpl.java index 9adc848..eed754f 100644 --- a/src/main/java/com/zhiyun/zhiyun03/user/service/impl/UserServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/user/service/impl/UserServiceImpl.java @@ -1,11 +1,11 @@ package com.zhiyun.zhiyun03.user.service.impl; +import com.auth0.jwt.JWT; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhiyun.zhiyun03.user.entity.User; import com.zhiyun.zhiyun03.user.mapper.UserMapper; import com.zhiyun.zhiyun03.user.service.UserService; -import org.springframework.http.HttpRequest; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -20,8 +20,6 @@ public class UserServiceImpl extends ServiceImpl implements Us QueryWrapper qwu=new QueryWrapper<>(); qwu.lambda().eq(User::getUserName,userName).eq(User::getPassword,password); User login = userMapper.selectOne(qwu); - - return login; } } diff --git a/src/main/resources/templates/layui-v2.6.8/academicList.html b/src/main/resources/templates/layui-v2.6.8/academicList.html index 9c4f24f..b4be222 100644 --- a/src/main/resources/templates/layui-v2.6.8/academicList.html +++ b/src/main/resources/templates/layui-v2.6.8/academicList.html @@ -33,6 +33,7 @@ + diff --git a/src/main/resources/templates/layui-v2.6.8/applicationList.html b/src/main/resources/templates/layui-v2.6.8/applicationList.html index d239409..baf70e5 100644 --- a/src/main/resources/templates/layui-v2.6.8/applicationList.html +++ b/src/main/resources/templates/layui-v2.6.8/applicationList.html @@ -34,6 +34,7 @@ + - - + + diff --git a/src/main/resources/templates/layui-v2.6.8/index.html b/src/main/resources/templates/layui-v2.6.8/index.html index af9d64f..e4f4280 100644 --- a/src/main/resources/templates/layui-v2.6.8/index.html +++ b/src/main/resources/templates/layui-v2.6.8/index.html @@ -6,10 +6,31 @@ 天择后台管业系统 +
+
@@ -45,7 +66,6 @@ ,layer = layui.layer ,util = layui.util ,$ = layui.$; - //头部事件 util.event('lay-header-event', { //左侧菜单事件 @@ -63,11 +83,7 @@ }); } }); - }); - - - @@ -77,8 +93,24 @@ // alert(url); //通过标签的id属性的属性值，获取当前标签对象，加载对应页面 $("#center").load(url); + } openUrl('courseList.html') + \ No newline at end of file diff --git a/src/main/resources/templates/layui-v2.6.8/login.html b/src/main/resources/templates/layui-v2.6.8/login.html index b986f5b..5679dc3 100644 --- a/src/main/resources/templates/layui-v2.6.8/login.html +++ b/src/main/resources/templates/layui-v2.6.8/login.html @@ -52,15 +52,24 @@ }, type:"post", success:function(result){ + debugger console.log(result); - if (result.data!=null && result.data!= ''){ + if (result.data!=null){ layer.msg(result.tip,{icon:1,time:100},function () { - localStorage.token=result.data; + // localStorage.token=result.data.token; + // localStorage.setItem("token",result.data) + // console.log( localStorage.setItem("token",result.data)) + // const token = localStorage.getItem('token') + // console.log(token) + debugger + console.log(result.data,"asdshasadh ") + sessionStorage.setItem('username', result.data.userName) + console.log(sessionStorage.getItem('username')) location.href="http://localhost:63342/zhiyun/src/main/resources/templates/layui-v2.6.8/index.html" }) - }else { + }else if (result.msg!="success"){ layer.msg(result.msg) - location.href="http://localhost:63342/zhiyun/src/main/resources/templates/layui-v2.6.8/login.html" + // location.href="http://localhost:63342/zhiyun/src/main/resources/templates/layui-v2.6.8/login.html" } },