manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

自动配置类参数完善；日志表增加日志类型细化操作；增加预留字段比较新旧值数据存储；

Browse Source
This commit is contained in:
thinkgem
2018-01-16 22:59:46 +08:00
parent 556f283262
commit 1c5e7f5c83
19 changed files with 1164 additions and 1822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

2
web/.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@@ -2,6 +2,6 @@
<faceted-project>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.java" version="1.7"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="jst.java" version="1.8"/>
</faceted-project>

3
web/pom.xml
View File

@@ -20,6 +20,9 @@
<properties>
<start-class>com.jeesite.modules.config.Application</start-class>
<!-- environment setting -->
<java.version>1.8</java.version>
<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>

48
web/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java
View File

@@ -1,48 +0,0 @@
/**
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
*/
package com.jeesite.modules.config.web;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.alibaba.druid.support.http.StatViewServlet;
import com.alibaba.druid.support.http.WebStatFilter;
/**
* Servlet 配置
* @author ThinkGem
* @version 2017年11月30日
*/
@Configuration
public class DruidStatConfig {
/**
* 注册DruidFilter拦截
*/
@Bean
public FilterRegistrationBean duridFilter() {
FilterRegistrationBean bean = new FilterRegistrationBean();
bean.setFilter(new WebStatFilter());
bean.addInitParameter("exclusions", "*.css,*.js,*.png,"
+ "*.jpg,*.gif,*.jpeg,*.bmp,*.ico,*.swf,*.psd,*.htc,*.htm,*.html,"
+ "*.crx,*.xpi,*.exe,*.ipa,*.apk,*.otf,*.eot,*.svg,*.ttf,*.woff,"
+ "/druid/*");
bean.addUrlPatterns("/*");
return bean;
}
/**
* 注册DruidServlet
*/
@Bean
public ServletRegistrationBean druidServlet() {
ServletRegistrationBean bean = new ServletRegistrationBean();
bean.setServlet(new StatViewServlet());
bean.addUrlMappings("/druid/*");
return bean;
}
}

40
web/src/main/java/com/jeesite/modules/config/web/interceptor/LogInterceptorConfig.java
View File

@@ -1,40 +0,0 @@
/**
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
*/
package com.jeesite.modules.config.web.interceptor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import com.jeesite.common.config.Global;
import com.jeesite.modules.sys.interceptor.LogInterceptor;
/**
* 后台管理日志记录拦截器
* @author ThinkGem
* @version 2018年1月10日
*/
@Configuration
@EnableWebMvc
@ConditionalOnProperty(name="web.interceptor.log.enabled", havingValue="true", matchIfMissing=true)
public class LogInterceptorConfig extends WebMvcConfigurerAdapter {
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new LogInterceptor())
.addPathPatterns(Global.getAdminPath() + "/**")
.excludePathPatterns(Global.getAdminPath() + "/index")
.excludePathPatterns(Global.getAdminPath() + "/login")
.excludePathPatterns(Global.getAdminPath() + "/**/listData")
.excludePathPatterns(Global.getAdminPath() + "/**/treeData")
.excludePathPatterns(Global.getAdminPath() + "/file/**")
.excludePathPatterns(Global.getAdminPath() + "/tags/**")
.excludePathPatterns(Global.getAdminPath() + "/sys/log/**")
.excludePathPatterns(Global.getAdminPath() + "/sys/online/count")
;
}
}

32
web/src/main/java/com/jeesite/modules/config/web/interceptor/MobileViewInterceptorConfig.java
View File

@@ -1,32 +0,0 @@
/**
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
*/
package com.jeesite.modules.config.web.interceptor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import com.jeesite.common.config.Global;
import com.jeesite.modules.sys.interceptor.LogInterceptor;
/**
* 前台自动切换到手机视图拦截器
* @author ThinkGem
* @version 2018年1月10日
*/
@Configuration
@EnableWebMvc
@ConditionalOnProperty(name="web.interceptor.mobile.enabled", havingValue="true")
public class MobileViewInterceptorConfig extends WebMvcConfigurerAdapter {
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new LogInterceptor())
.addPathPatterns(Global.getFrontPath() + "/**")
;
}
}

14
web/src/test/java/com/jeesite/test/InitCoreData.java
View File

@@ -24,14 +24,14 @@ public class InitCoreData extends com.jeesite.modules.db.InitCoreData {
initConfig();
initModule();
initDict();
initRole();
initMenu();
initUser();
// initRole();
// initMenu();
// initUser();
// initArea();
initOffice();
initCompany();
initPost();
initEmpUser();
// initOffice();
// initCompany();
// initPost();
// initEmpUser();
}
}