From 812126c4dea792a08003e0dc617e3c31f4a11c49 Mon Sep 17 00:00:00 2001 From: zhangmeng <1334717033@qq.com> Date: Tue, 9 Nov 2021 15:15:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=202021?= =?UTF-8?q?=E5=B9=B411=E6=9C=889=E6=97=A515:14:58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/FeignOauth2RequestInterceptor.java | 37 +++++++++++++++++++ .../config/security/ResourceServerConfig.java | 3 ++ .../controller/UrlRequestController.java | 10 +++-- .../admin/manager/feign/ArticleFeign.java | 5 ++- .../system/component/pear/module/admin.js | 2 +- .../system/component/pear/module/menu.js | 2 +- .../system/component/pear/module/tab.js | 9 ++--- .../static/system/config/pear.config.yml | 2 +- .../resources/templates/admin/home/home.ftl | 8 ++-- .../main/resources/templates/admin/index.ftl | 4 +- .../main/resources/templates/admin/login.ftl | 2 +- .../blog/controller/ArticleController.java | 8 ++-- .../src/main/resources/application.yml | 12 ++---- 13 files changed, 71 insertions(+), 33 deletions(-) create mode 100644 mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/feign/FeignOauth2RequestInterceptor.java diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/feign/FeignOauth2RequestInterceptor.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/feign/FeignOauth2RequestInterceptor.java new file mode 100644 index 0000000..748860b --- /dev/null +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/feign/FeignOauth2RequestInterceptor.java @@ -0,0 +1,37 @@ +package com.zhangmeng.admin.manager.config.feign; + +import feign.RequestInterceptor; +import feign.RequestTemplate; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; + +/** + * 请求拦截器 + */ +@Configuration +public class FeignOauth2RequestInterceptor implements RequestInterceptor { + @Override + public void apply(RequestTemplate requestTemplate) { + // 获取的全部请求信息 + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes != null){ + HttpServletRequest request = attributes.getRequest(); + // 获取所有的请求头信息 + Enumeration headerNames = request.getHeaderNames(); + if (headerNames != null){ + while (headerNames.hasMoreElements()){ + // 获取请求头的key + String element = headerNames.nextElement(); + // 获取请求头的value + String value = request.getHeader(element); + // 将请求头信息放入到请求头 + requestTemplate.header(element,value); + } + } + } + } +} diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/security/ResourceServerConfig.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/security/ResourceServerConfig.java index e6b4b68..16c53e6 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/security/ResourceServerConfig.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/security/ResourceServerConfig.java @@ -79,6 +79,9 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter { */ @Override public void configure(HttpSecurity http) throws Exception { + + http.headers().frameOptions().disable(); + // 所有请求必须认证通过 http.authorizeRequests() // 跨域预检请求 diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java index 491c3fc..d9abccd 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java @@ -33,7 +33,6 @@ import java.util.*; * @date 2021年11月9日09:06:23 * @version 1.0 */ -@ApiIgnore @Controller public class UrlRequestController extends BaseController { @@ -63,7 +62,12 @@ public class UrlRequestController extends BaseController { public ModelAndView admin_index(Model model){ String uuid = UUID.randomUUID().toString(); model.addAttribute("uuid",uuid); - model.addAttribute("loginUser",this.userUtil.currentUser()); + User user = this.userUtil.currentUser(); + String photo = "/mystyle-cloud-admin-manager/system/admin/images/avatar.jpg"; + if (user.getAvatar() == null ){ + user.setAvatar(photo); + } + model.addAttribute("loginUser",user); return this.jumpPage("admin/index"); } @@ -112,7 +116,7 @@ public class UrlRequestController extends BaseController { for (SysLog sysLog : sysLogs) { Map map = new HashMap<>(); User user = this.userService.findById(sysLog.getUser_id()); - map.put("avatar",user.getAvatar() == null ? "/system/admin/images/avatar.jpg":user.getAvatar()); + map.put("avatar",user.getAvatar() == null ? "/mystyle-cloud-admin-manager/system/admin/images/avatar.jpg":user.getAvatar()); map.put("username",user.getUsername()); map.put("addTime",sysLog.getAddTime()); map.put("description",sysLog.getDescription()); diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java index b21328b..cc839a5 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java @@ -5,6 +5,7 @@ import com.zhangmeng.model.dto.query.QueryParams; import com.zhangmeng.model.entity.Article; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -13,10 +14,10 @@ import java.util.List; public interface ArticleFeign { @GetMapping("/article/selectCountByDayOfPass") - List selectCountByDayOfPass(@RequestParam(value = "x_date", defaultValue = "forezp",required = false) List x_date); + List selectCountByDayOfPass(@RequestBody @RequestParam(value = "x_date", required = false) List x_date); @GetMapping("/article/selectCountEq") - Integer selectCountEq(@RequestParam(value = "deleteStatus", defaultValue = "forezp",required = false)boolean deleteStatus); + Integer selectCountEq(@RequestParam(value = "deleteStatus", defaultValue = "forezp", required = false) boolean deleteStatus); @GetMapping("/article/findByCondition") List
findByCondition(); diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/admin.js b/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/admin.js index b0ac73f..98d711a 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/admin.js +++ b/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/admin.js @@ -326,7 +326,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm bodyTab.addTabOnly({ id: $(this).attr("user-menu-id"), title: $(this).attr("user-menu-title"), - url: $(this).attr("user-menu-url") + "?token=" + localStorage.getItem("token"), + url: $(this).attr("user-menu-url") + "?access_token=" + localStorage.getItem("access_token"), icon: "", close: true }, 300); diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/menu.js b/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/menu.js index 2181652..efc9350 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/menu.js +++ b/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/menu.js @@ -59,7 +59,7 @@ layui.define(['table', 'jquery', 'element'], function(exports) { menuTitle: dom.attr("menu-title"), menuPath: dom.attr("menu-title"), menuIcon: dom.attr("menu-icon"), - menuUrl: dom.attr("menu-url") + "?token=" + localStorage.getItem("token"), + menuUrl: dom.attr("menu-url") + "?access_token=" + localStorage.getItem("access_token"), openType: dom.attr("open-type") }; var doms = hash(dom); diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/tab.js b/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/tab.js index 733352b..2bad2d5 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/tab.js +++ b/mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/tab.js @@ -470,18 +470,17 @@ layui.define(['jquery', 'element'], function(exports) { TitleItem += 'ဆ'; title += TitleItem; - var token = localStorage.getItem("token"); + var access_token = localStorage.getItem("access_token"); if (option.index == index) { - // 处 理 显 示 内 容 - content += '
' + '?access_token='+access_token+'" frameborder="no" border="0" marginwidth="0" marginheight="0" style="width: 100%;height: 100%;">' } else { // 处 理 显 示 内 容 content += '
' + '?access_token='+access_token+'" frameborder="no" border="0" marginwidth="0" marginheight="0" style="width: 100%;height: 100%;">' } index++; }); diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/system/config/pear.config.yml b/mystyle-cloud-admin-manager/src/main/resources/static/system/config/pear.config.yml index a5e6300..1cf9f88 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/static/system/config/pear.config.yml +++ b/mystyle-cloud-admin-manager/src/main/resources/static/system/config/pear.config.yml @@ -34,7 +34,7 @@ tab: ## 首页 index: id: "0" ## 标识 ID , 建议与菜单项中的 ID 一致 - href: "/admin/home" ## 页面地址 + href: "/mystyle-cloud-admin-manager/admin/home" ## 页面地址 title: "首页" ## 标题 ## 主题配置 theme: diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/home/home.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/home/home.ftl index ea448e2..4eecc2f 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/home/home.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/home/home.ftl @@ -6,8 +6,8 @@ - - + + @@ -199,8 +199,8 @@ - - + +