ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.7.1'

This commit is contained in:
wangtp 2019-08-14 18:34:27 +08:00
parent a038b14c81 cfa5e1fdea
commit 7fca56b031
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/net/mingsoft/config/WebConfig.java
View File

@ -3,6 +3,7 @@ package net.mingsoft.config;
import java.io.File; import java.io.File;
import org.springframework.aop.Advisor; import org.springframework.aop.Advisor;
import net.mingsoft.basic.filter.XSSEscapeFilter;
import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.aop.support.JdkRegexpMethodPointcut; import org.springframework.aop.support.JdkRegexpMethodPointcut;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
@ -131,18 +132,16 @@ public class WebConfig implements WebMvcConfigurer {
return new DefaultPointcutAdvisor(druidStatPointcut(), druidStatInterceptor()); return new DefaultPointcutAdvisor(druidStatPointcut(), druidStatInterceptor());
} }
// /** /**
// * xssFilter注册 * xssFilter注册
// */ */
// @Bean @Bean
// public FilterRegistrationBean xssFilterRegistration() { public FilterRegistrationBean xssFilterRegistration() {
// XssFilter xssFilter = new XssFilter(); XSSEscapeFilter xssFilter = new XSSEscapeFilter();
// xssFilter.setUrlExclusion(Arrays.asList("/static/")); FilterRegistrationBean registration = new FilterRegistrationBean(xssFilter);
// FilterRegistrationBean registration = new registration.addUrlPatterns("/*");
// FilterRegistrationBean(xssFilter); return registration;
// registration.addUrlPatterns("/*"); }
// return registration;
// }
/** /**
* RequestContextListener注册 * RequestContextListener注册

2
src/main/resources/application.yml
View File

@ -13,7 +13,7 @@ ms:
upload: upload:
path: /upload path: /upload
denied: exe denied: .exe,.jsp
allowed: jpg allowed: jpg
max-size: 1 max-size: 1
memory-size: 4096 memory-size: 4096

2
src/main/webapp/templets/1/default/about.htm
View File

@ -6,7 +6,7 @@
<body> <body>
<#include "head.htm"/> <#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 animated fadeInLeft">关于我们</p>
<p class="banner_tit_about_des animated fadeInRight">About us</p> <p class="banner_tit_about_des animated fadeInRight">About us</p>
</div> </div>

2
src/main/webapp/templets/1/default/advice.htm
View File

@ -5,7 +5,7 @@
</head> </head>
<body> <body>
<#include "head.htm"/> <#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 animated fadeInLeft">在线留言</p>
<p class="banner_tit_other_des animated fadeInRight">Talk online</p> <p class="banner_tit_other_des animated fadeInRight">Talk online</p>
</div> </div>

2
src/main/webapp/templets/1/default/case-list.htm
View File

@ -6,7 +6,7 @@
<body> <body>
<#include "head.htm"/> <#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 animated fadeInLeft">案&nbsp;&nbsp;&nbsp;例</p>
<p class="banner_tit_other_des animated fadeInRight">Case list</p> <p class="banner_tit_other_des animated fadeInRight">Case list</p>
</div> </div>

2
src/main/webapp/templets/1/default/news-show.htm
View File

@ -8,7 +8,7 @@
<body> <body>
<#include "head.htm"> <#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 animated fadeInLeft">公司动态</p>
<p class="banner_tit_other_des animated fadeInRight">Our company</p> <p class="banner_tit_other_des animated fadeInRight">Our company</p>