root
/
mystyle-cloud-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改首页 2021年11月9日15:14:58

master
zhangmeng 2021-11-09 15:15:18 +08:00
parent 9ecc43107f
commit 812126c4de
13 changed files with 71 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/feign/FeignOauth2RequestInterceptor.java Normal file
View File

@ -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<String> headerNames = request.getHeaderNames();
if (headerNames != null){
while (headerNames.hasMoreElements()){
// 获取请求头的key
String element = headerNames.nextElement();
// 获取请求头的value
String value = request.getHeader(element);
// 将请求头信息放入到请求头
requestTemplate.header(element,value);
}
}
}
}
}

3
mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/config/security/ResourceServerConfig.java
View File

@ -79,6 +79,9 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
*/
@Override
public void configure(HttpSecurity http) throws Exception {
http.headers().frameOptions().disable();
// 所有请求必须认证通过
http.authorizeRequests()
// 跨域预检请求

10
mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java
View File

@ -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<String,Object> 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());

5
mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java
View File

@ -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<Integer> selectCountByDayOfPass(@RequestParam(value = "x_date", defaultValue = "forezp",required = false) List<String> x_date);
List<Integer> selectCountByDayOfPass(@RequestBody @RequestParam(value = "x_date", required = false) List<String> 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<Article> findByCondition();

2
mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/admin.js
View File

@ -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);

2
mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/menu.js
View File

@ -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);

9
mystyle-cloud-admin-manager/src/main/resources/static/system/component/pear/module/tab.js
View File

@ -470,18 +470,17 @@ layui.define(['jquery', 'element'], function(exports) {
TitleItem += '<i class="layui-icon layui-unselect layui-tab-close">ဆ</i></li>';
title += TitleItem;
var token = localStorage.getItem("token");
var access_token = localStorage.getItem("access_token");
if (option.index == index) {
// 处 理 显 示 内 容
content += '<div class="layui-show layui-tab-item"><iframe id="' + item.id + '" data-frameid="' + item.id +
content += '<div class="layui-show layui-tab-item"><iframe id="' + item.id + '" data-frameid="' + item.id +
'" src="' + item.url +
'?token='+token+'" frameborder="no" border="0" marginwidth="0" marginheight="0" style="width: 100%;height: 100%;"></iframe></div>'
'?access_token='+access_token+'" frameborder="no" border="0" marginwidth="0" marginheight="0" style="width: 100%;height: 100%;"></iframe></div>'
} else {
// 处 理 显 示 内 容
content += '<div class="layui-tab-item"><iframe id="' + item.id + '" data-frameid="' + item.id + '" src="' +
item.url +
'?token='+token+'" frameborder="no" border="0" marginwidth="0" marginheight="0" style="width: 100%;height: 100%;"></iframe></div>'
'?access_token='+access_token+'" frameborder="no" border="0" marginwidth="0" marginheight="0" style="width: 100%;height: 100%;"></iframe></div>'
}
index++;
});

2
mystyle-cloud-admin-manager/src/main/resources/static/system/config/pear.config.yml
View File

@ -34,7 +34,7 @@ tab:
## 首页
index:
id: "0" ## 标识 ID , 建议与菜单项中的 ID 一致
href: "/admin/home" ## 页面地址
href: "/mystyle-cloud-admin-manager/admin/home" ## 页面地址
title: "首页" ## 标题
## 主题配置
theme:

8
mystyle-cloud-admin-manager/src/main/resources/templates/admin/home/home.ftl
View File

@ -6,8 +6,8 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/component/pear/css/pear.css" />
<link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/admin/css/other/console1.css" />
<link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/css/pear.css" />
<link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/admin/css/other/console1.css" />
<!-- 主 题 更 换 -->
<style id="pearadmin-bg-color"></style>
</head>
@ -199,8 +199,8 @@
</div>
</div>
<!--</div>-->
<script src="${springMacroRequestContext.contextPath}/system/component/layui/layui.js"></script>
<script src="${springMacroRequestContext.contextPath}/system/component/pear/pear.js"></script>
<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/layui/layui.js"></script>
<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/pear.js"></script>
<script>
layui.use(['layer', 'echarts', 'element', 'count'], function() {
var $ = layui.jquery,

4
mystyle-cloud-admin-manager/src/main/resources/templates/admin/index.ftl
View File

@ -32,7 +32,7 @@
<!-- 头 像 -->
<a href="javascript:;">
<#if loginUser.avatar??>
<img src="${springMacroRequestContext.contextPath}/system/admin/images/avatar.jpg" class="layui-nav-img">
<img src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/admin/images/avatar.jpg" class="layui-nav-img">
<#else >
<img src="${loginUser.avatar!}" class="layui-nav-img">
</#if>
@ -40,7 +40,7 @@
</a>
<!-- 功 能 菜 单 -->
<dl class="layui-nav-child">
<dd><a user-menu-url="/user/person" user-menu-id="${uuid!}" user-menu-title="基本资料">基本资料</a></dd>
<dd><a user-menu-url="/mystyle-cloud-admin-manager/user/person" user-menu-id="${uuid!}" user-menu-title="基本资料">基本资料</a></dd>
<dd><a href="javascript:void(0);" class="logout">注销登录</a></dd>
</dl>
</li>

2
mystyle-cloud-admin-manager/src/main/resources/templates/admin/login.ftl
View File

@ -86,7 +86,7 @@
btn.stop(function () {
if (result.flag) {
popup.success(result.message, function () {
localStorage.setItem("access_token", result.data.token);
localStorage.setItem("access_token", result.data.accessToken);
postToPage(admin_manager_index_url, result.data.token);
})
} else {

8
mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/controller/ArticleController.java
View File

@ -158,13 +158,13 @@ public class ArticleController extends BaseController {
return new Result(true,StatusCode.OK,"删除成功");
}
@GetMapping("/selectCountByDayOfPass")
public List<Integer> selectCountByDayOfPass(List<String> x_date){
return this.articleService.selectCountByDayOfPass(x_date);
@GetMapping("/selectCountEq")
public Integer selectCountEq(boolean deleteStatus){
return this.articleService.selectCountEq("deleteStatus",deleteStatus);
}
@GetMapping("/selectCountByDayOfPass")
public List<Integer> selectCountByDayOfPass(List<String> x_date){
public List<Integer> selectCountByDayOfPass(@RequestBody @RequestParam(value = "x_date") List<String> x_date){
return this.articleService.selectCountByDayOfPass(x_date);
}

12
mystyle-cloud-gateway/src/main/resources/application.yml
View File

@ -39,18 +39,12 @@ spring:
- id: mystyle-cloud-oauth
uri: lb://mystyle-cloud-oauth
predicates:
- Path=/oauth/**
- Path=/mystyle-cloud-oauth/**
filters:
- StripPrefix=1
- id: mystyle-cloud-admin-manager
uri: lb://mystyle-cloud-admin-manager
predicates:
- Path=/manager/**
- Path=/mystyle-cloud-admin-manager/**
filters:
- StripPrefix=1
- id: mystyle-cloud-blog
uri: lb://mystyle-cloud-blog
predicates:
- Path=/blog/**
filters:
- StripPrefix=1
- StripPrefix=1