Skip to content

C
cms_sys
Commit 7fca56b0 authored by wangtp's avatar wangtp
Browse files
Options

Merge remote-tracking branch 'origin/4.7.1'

parents a038b14c cfa5e1fd
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 17 deletions
src/main/java/net/mingsoft/config/WebConfig.java
View file @ 7fca56b0
......@@ -3,6 +3,7 @@ package net.mingsoft.config;
import java.io.File;
import org.springframework.aop.Advisor;
import net.mingsoft.basic.filter.XSSEscapeFilter;
import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.aop.support.JdkRegexpMethodPointcut;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
......@@ -131,18 +132,16 @@ public class WebConfig implements WebMvcConfigurer {
return new DefaultPointcutAdvisor(druidStatPointcut(), druidStatInterceptor());
}
// /**
// * xssFilter注册
// */
// @Bean
// public FilterRegistrationBean xssFilterRegistration() {
// XssFilter xssFilter = new XssFilter();
// xssFilter.setUrlExclusion(Arrays.asList("/static/"));
// FilterRegistrationBean registration = new
// FilterRegistrationBean(xssFilter);
// registration.addUrlPatterns("/*");
// return registration;
// }
/**
* xssFilter注册
*/
@Bean
public FilterRegistrationBean xssFilterRegistration() {
XSSEscapeFilter xssFilter = new XSSEscapeFilter();
FilterRegistrationBean registration = new FilterRegistrationBean(xssFilter);
registration.addUrlPatterns("/*");
return registration;
}
/**
* RequestContextListener注册
......
src/main/resources/application.yml
View file @ 7fca56b0
......@@ -13,7 +13,7 @@ ms:
upload:
path: /upload
denied: exe
denied: .exe,.jsp
allowed: jpg
max-size: 1
memory-size: 4096
......
src/main/webapp/templets/1/default/about.htm
View file @ 7fca56b0
......@@ -6,7 +6,7 @@
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}images/about_us.jpg) no-repeat center;">
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/about_us.jpg) no-repeat center;">
<p class="banner_tit_about animated fadeInLeft">关于我们</p>
<p class="banner_tit_about_des animated fadeInRight">About us</p>
</div>
......
src/main/webapp/templets/1/default/advice.htm
View file @ 7fca56b0
......@@ -5,7 +5,7 @@
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}images/talk_online.jpeg) no-repeat center;">
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/talk_online.jpeg) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">在线留言</p>
<p class="banner_tit_other_des animated fadeInRight">Talk online</p>
</div>
......
src/main/webapp/templets/1/default/case-list.htm
View file @ 7fca56b0
......@@ -6,7 +6,7 @@
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}images/00.png) no-repeat center;">
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/00.png) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">案&nbsp;&nbsp;&nbsp;例</p>
<p class="banner_tit_other_des animated fadeInRight">Case list</p>
</div>
......
src/main/webapp/templets/1/default/news-show.htm
View file @ 7fca56b0
......@@ -8,7 +8,7 @@
<body>
<#include "head.htm">
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}images/news2.png) no-repeat center;">
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/news2.png) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">公司动态</p>
<p class="banner_tit_other_des animated fadeInRight">Our company</p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment