Skip to content

G
guns-vip
Commit 2df97931 by fsn
Options

整理项目结构,删掉所有旧配置

parent 6bb4c433
Showing with 59 additions and 397 deletions
src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java
...@@ -3,11 +3,12 @@ package com.stylefeng.guns.config; ...@@ -3,11 +3,12 @@ package com.stylefeng.guns.config;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.enums.DBType; import com.baomidou.mybatisplus.enums.DBType;
import com.baomidou.mybatisplus.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
import com.stylefeng.guns.config.properties.DataSourceConfigTemplate;
import com.stylefeng.guns.config.properties.DatabaseProperties;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import project.config.datasource.DataSourceConfigTemplate;
/** /**
* MybatisPlus配置 * MybatisPlus配置
...@@ -16,13 +17,11 @@ import project.config.datasource.DataSourceConfigTemplate; ...@@ -16,13 +17,11 @@ import project.config.datasource.DataSourceConfigTemplate;
* @Date 2017/5/20 21:58 * @Date 2017/5/20 21:58
*/ */
@Configuration @Configuration
@MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao","com.stylefeng.guns.persistence.dao"}) @MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao", "com.stylefeng.guns.persistence.dao"})
@ConfigurationProperties(prefix = "spring.datasource")
public class MybatisPlusConfig { public class MybatisPlusConfig {
private String url; @Autowired
private String username; DatabaseProperties databaseProperties;
private String password;
/** /**
* mybatis-plus分页插件 * mybatis-plus分页插件
...@@ -40,22 +39,10 @@ public class MybatisPlusConfig { ...@@ -40,22 +39,10 @@ public class MybatisPlusConfig {
@Bean(initMethod = "init") @Bean(initMethod = "init")
public DruidDataSource dataSource() { public DruidDataSource dataSource() {
DruidDataSource dataSource = new DruidDataSource(); DruidDataSource dataSource = new DruidDataSource();
dataSource.setUrl(this.url.trim()); dataSource.setUrl(databaseProperties.getUrl().trim());
dataSource.setUsername(this.username.trim()); dataSource.setUsername(databaseProperties.getUsername().trim());
dataSource.setPassword(this.password); dataSource.setPassword(databaseProperties.getPassword().trim());
DataSourceConfigTemplate.config(dataSource); DataSourceConfigTemplate.config(dataSource);
return dataSource; return dataSource;
} }
public void setUrl(String url) {
this.url = url;
}
public void setUsername(String username) {
this.username = username;
}
public void setPassword(String password) {
this.password = password;
}
} }
src/main/java/project/config/datasource/DataSourceConfigTemplate.java → src/main/java/com/stylefeng/guns/config/properties/DataSourceConfigTemplate.java
package project.config.datasource; package com.stylefeng.guns.config.properties;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
......
src/main/java/com/stylefeng/guns/config/properties/DatabaseProperties.java 0 → 100644
package com.stylefeng.guns.config.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
/**
* 数据库数据源配置
*
* @author fengshuonan
* @date 2017-05-21 11:18
*/
@Configuration
@ConfigurationProperties(prefix = "spring.datasource")
public class DatabaseProperties {
private String url;
private String username;
private String password;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
}
src/main/java/project/generator/MpGenerator.java → src/main/java/generator/MpGenerator.java
package project.generator; package generator;
import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.InjectionConfig; import com.baomidou.mybatisplus.generator.InjectionConfig;
......
src/main/java/project/config/datasource/DataSourceConfig.java deleted 100644 → 0
//package project.config.datasource;
//
//import com.alibaba.druid.pool.DruidDataSource;
//import com.baomidou.mybatisplus.entity.GlobalConfiguration;
//import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
//import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
//import com.stylefeng.guns.core.util.ResKit;
//import org.apache.ibatis.plugin.Interceptor;
//import org.mybatis.spring.mapper.MapperScannerConfigurer;
//import org.springframework.context.EnvironmentAware;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.context.annotation.PropertySource;
//import org.springframework.core.env.Environment;
//import org.springframework.core.io.ClassPathResource;
//import org.springframework.core.io.Resource;
//import org.springframework.jdbc.datasource.DataSourceTransactionManager;
//import org.springframework.transaction.annotation.EnableTransactionManagement;
//
//import javax.sql.DataSource;
//
///**
// * 数据源配置
// *
// * @author fengshuonan
// * @date 2016年11月12日 下午4:55:09
// */
//@Configuration
//@EnableTransactionManagement
//@PropertySource("classpath:jdbc.properties")
//public class DataSourceConfig implements EnvironmentAware {
//
// private Environment em;
//
// /**
// * 扫描所有mybatis的接口
// *
// * @author fengshuonan
// */
// @Bean
// public MapperScannerConfigurer mappers() {
// MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
// mapperScannerConfigurer.setBasePackage("com.stylefeng.guns.modular.*.dao;com.stylefeng.guns.persistence.dao");
// mapperScannerConfigurer.setSqlSessionFactoryBeanName("sqlSessionFactory");
// return mapperScannerConfigurer;
// }
//
// /**
// * spring和MyBatis整合
// *
// * @author fengshuonan
// */
// @Bean
// public MybatisSqlSessionFactoryBean sqlSessionFactory(DataSource dataSource, GlobalConfiguration globalConfig) {
// MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
// sqlSessionFactory.setDataSource(dataSource);
// sqlSessionFactory.setConfigLocation(new ClassPathResource("mybatis-config.xml"));
// Resource[] classPathResources = ResKit.getClassPathResources("classpath*:com/stylefeng/guns/**/mapping/*.xml");
// sqlSessionFactory.setMapperLocations(classPathResources);
//
// //以下为mybatis-plus配置
// PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
// paginationInterceptor.setDialectType("mysql");
// sqlSessionFactory.setPlugins(new Interceptor[]{paginationInterceptor});
// sqlSessionFactory.setGlobalConfig(globalConfig);
// return sqlSessionFactory;
// }
//
// /**
// * mybatis-plus的配置
// *
// * @author fengshuonan
// * @date 2017年2月22日 下午3:39:28
// */
// @Bean
// public GlobalConfiguration globalConfig() {
// GlobalConfiguration globalConfig = new GlobalConfiguration();
// /**
// * AUTO->`0`("数据库ID自增")
// * INPUT->`1`(用户输入ID")
// * ID_WORKER->`2`("全局唯一ID")
// * UUID->`3`("全局唯一ID")
// */
// globalConfig.setIdType(1);
// globalConfig.setDbType("mysql");
//
// /**
// * 全局表为下划线命名设置
// */
// globalConfig.setDbColumnUnderline(false);
//
// return globalConfig;
// }
//
// /**
// * 事务管理, 声明式事务的开启
// *
// * @author fengshuonan
// */
// @Bean
// public DataSourceTransactionManager transactionManager(DataSource dataSource) {
// DataSourceTransactionManager manager = new DataSourceTransactionManager();
// manager.setDataSource(dataSource);
// return manager;
// }
//
// /**
// * 第三方数据库连接池的配置
// *
// * @author fengshuonan
// * @Date 2017/4/27 17:24
// */
// @Bean(initMethod = "init")
// public DruidDataSource dataSource() {
// DruidDataSource dataSource = new DruidDataSource();
// dataSource.setUrl(em.getProperty("jdbc.url").trim());
// dataSource.setUsername(em.getProperty("jdbc.username").trim());
// dataSource.setPassword(em.getProperty("jdbc.password").trim());
//
// DataSourceConfigTemplate.config(dataSource);
// return dataSource;
// }
//
// @Override
// public void setEnvironment(Environment environment) {
// this.em = environment;
// }
//
//}
src/main/java/project/config/root/RootSpringConfig.java deleted 100644 → 0
//package project.config.root;
//
//import org.springframework.context.annotation.*;
//import org.springframework.context.annotation.ComponentScan.Filter;
//import org.springframework.web.servlet.config.annotation.EnableWebMvc;
//import project.config.EhcacheConfig;
//import project.config.KaptchaConfig;
//import com.stylefeng.guns.config.MybatisPlusConfig;
//import project.config.ShiroConfig;
//import project.config.web.monitor.DruidMonitorConfig;
//
///**
// * spring的根配置
// *
// * @author fengshuonan
// * @date 2016年11月12日 下午5:00:06
// */
//@Configuration
//@ComponentScan(basePackages = {"com.stylefeng"}, excludeFilters = {
// @Filter(type = FilterType.ANNOTATION, value = EnableWebMvc.class)// 这个是为了不让扫描到springmvc的控制器
//})
//@EnableAspectJAutoProxy
//@Import(value = {MybatisPlusConfig.class, ShiroConfig.class, DruidMonitorConfig.class, EhcacheConfig.class, KaptchaConfig.class})
//public class RootSpringConfig {
//
//}
src/main/java/project/config/web/SpringMvcConfig.java deleted 100644 → 0
//package project.config.web;
//
//import org.beetl.ext.spring.BeetlSpringViewResolver;
//import org.hibernate.validator.HibernateValidator;
//import org.springframework.context.annotation.*;
//import org.springframework.context.support.ReloadableResourceBundleMessageSource;
//import org.springframework.core.io.ClassPathResource;
//import org.springframework.http.MediaType;
//import org.springframework.http.converter.ByteArrayHttpMessageConverter;
//import org.springframework.http.converter.StringHttpMessageConverter;
//import org.springframework.validation.Validator;
//import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
//import org.springframework.web.multipart.MultipartResolver;
//import org.springframework.web.multipart.support.StandardServletMultipartResolver;
//import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
//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 project.config.web.beetl.BeetlConfiguration;
//
//import java.nio.charset.Charset;
//import java.util.ArrayList;
//import java.util.List;
//
///**
// * spring mvc配置类
// *
// * @author fengshuonan
// * @date 2016年11月12日 下午5:03:32
// */
//@Configuration
//@EnableWebMvc
//@ComponentScan(basePackages = {"com.stylefeng.guns.**.controller", "com.stylefeng.guns.common.controller"})
//@EnableAspectJAutoProxy
//@Import({ControllerAopConfig.class})
//public class SpringMvcConfig extends WebMvcConfigurerAdapter {
//
// // beetl的配置
// @Bean(initMethod = "init")
// public BeetlConfiguration beetlConfiguration() {
// BeetlConfiguration beetlConfiguration = new BeetlConfiguration();
// beetlConfiguration.setConfigFileResource(new ClassPathResource("beetl.properties"));
// return beetlConfiguration;
// }
//
// // beetl的视图解析器
// @Bean
// public BeetlSpringViewResolver beetlViewResolver() {
// BeetlSpringViewResolver beetlSpringViewResolver = new BeetlSpringViewResolver();
// beetlSpringViewResolver.setConfig(beetlConfiguration());
// beetlSpringViewResolver.setContentType("text/html;charset=UTF-8");
// beetlSpringViewResolver.setOrder(0);
// return beetlSpringViewResolver;
// }
//
// // 配置静态资源的处理,对静态资源的请求转发到servlet容器中默认的servlet上(对静态资源的请求不做处理)
// @Override
// public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
// configurer.enable();
// }
//
// // 文件上传用的resolver
// @Bean
// public MultipartResolver multipartResolver() {
// return new StandardServletMultipartResolver();
// }
//
// // 校验器的配置
// @Bean
// public LocalValidatorFactoryBean validator(ReloadableResourceBundleMessageSource messageSource) {
// LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
// localValidatorFactoryBean.setProviderClass(HibernateValidator.class);
// localValidatorFactoryBean.setValidationMessageSource(messageSource);
// return localValidatorFactoryBean;
// }
//
// // 国际化消息资源文件配置(本系统中主要用于显示/错误消息定制)
// @Bean
// public ReloadableResourceBundleMessageSource messageSource() {
// ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
// messageSource.setBasenames("classpath:org/hibernate/validator/ValidationMessages");
// messageSource.setUseCodeAsDefaultMessage(false);
// messageSource.setDefaultEncoding("UTF-8");
// messageSource.setCacheSeconds(60);
// return messageSource;
// }
//
// // 配置全局的验证器实例
// @Override
// public Validator getValidator() {
// return this.validator(messageSource());
// }
//
// // 配置spring mvc的拦截器
// @Override
// public void addInterceptors(InterceptorRegistry registry) {
//
// }
//
//
//
// @Bean
// public ByteArrayHttpMessageConverter byteMsgConverter() {
// return new ByteArrayHttpMessageConverter();
// }
//
// @Bean
// public StringHttpMessageConverter stringHttpMessageConverter() {
// StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter(
// Charset.forName("UTF-8"));
// List<MediaType> list = new ArrayList<MediaType>();
// list.add(MediaType.TEXT_PLAIN);
// stringHttpMessageConverter.setSupportedMediaTypes(list);
// return stringHttpMessageConverter;
// }
//
//
//
//}
src/main/java/project/config/web/WebAppInitializer.java deleted 100644 → 0
//package project.config.web;
//
//import com.alibaba.druid.support.http.StatViewServlet;
//import com.stylefeng.guns.config.web.SpringMvcConfig;
//import com.stylefeng.guns.core.listener.ConfigListener;
//import com.stylefeng.guns.core.util.xss.XssFilter;
//import org.springframework.web.context.request.RequestContextListener;
//import org.springframework.web.filter.CharacterEncodingFilter;
//import org.springframework.web.filter.DelegatingFilterProxy;
//import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
//import project.config.root.RootSpringConfig;
//
//import javax.servlet.*;
//import javax.servlet.ServletRegistration.Dynamic;
//import java.util.EnumSet;
//
///**
// * tomcat启动初始化整个应用的类（代替了web.xml）
// *
// * @author fengshuonan
// * @date 2016年11月12日 下午5:00:31
// */
//public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
//
// // spring应用上下文
// @Override
// protected Class<?>[] getRootConfigClasses() {
// return new Class[]{RootSpringConfig.class};
// }
//
// // springmvc 上下文
// @Override
// protected Class<?>[] getServletConfigClasses() {
// return new Class[]{SpringMvcConfig.class};
// }
//
// // 将DispatcherServlet映射到"/"
// @Override
// protected String[] getServletMappings() {
// return new String[]{"/"};
// }
//
// // 通过重载这个方法可以对DispatcherServlt进行额外的配置
// @Override
// protected void customizeRegistration(Dynamic registration) {
// // 上传文件临时路径的配置
// String folder = System.getProperty("java.io.tmpdir");
// registration.setMultipartConfig(new MultipartConfigElement(folder));
// }
//
// // 这里注册的Filter只能过滤DispatherServlet
// @Override
// protected Filter[] getServletFilters() {
// return new Filter[]{};
// }
//
// @Override
// public void onStartup(ServletContext servletContext) throws ServletException {
//
// //Apache Shiro
// FilterRegistration.Dynamic shiroFilter = servletContext.addFilter("shiroFilter", new DelegatingFilterProxy());
// shiroFilter.setInitParameter("targetFilterLifecycle", "true");
// shiroFilter.addMappingForUrlPatterns(null, false, "/*");
//
// //Encoding Filter
// FilterRegistration.Dynamic encodingFilter = servletContext.addFilter("encodingFilter",
// new CharacterEncodingFilter());
// encodingFilter.setInitParameter("encoding", "UTF-8");
// encodingFilter.setInitParameter("forceEncoding", "true");
// encodingFilter.addMappingForUrlPatterns(null, false, "/*");
//
// //用来非Controller层获取HttpServletRequest
// servletContext.addListener(RequestContextListener.class);
// servletContext.addListener(ConfigListener.class);
//
// //防止xss攻击的filter
// FilterRegistration.Dynamic xssFilter = servletContext.addFilter("xssSqlFilter",
// new XssFilter());
// xssFilter.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
//
// super.onStartup(servletContext);
// }
//
// /**
// * 添加其他servlet
// *
// * @param servletContext
// */
// @Override
// protected void registerDispatcherServlet(ServletContext servletContext) {
// super.registerDispatcherServlet(servletContext);
// try {
// ServletRegistration.Dynamic dynamic = servletContext.addServlet("DruidStatView", StatViewServlet.class);
// dynamic.addMapping("/druid/*");
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//}
src/main/resources/application.yml
...@@ -14,6 +14,10 @@ spring: ...@@ -14,6 +14,10 @@ spring:
username: root username: root
password: root password: root
#web
mutipart:
location:
#mybatis #mybatis
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:com/stylefeng/guns/**/mapping/*.xml mapper-locations: classpath*:com/stylefeng/guns/**/mapping/*.xml
...@@ -31,3 +35,4 @@ mybatis-plus: ...@@ -31,3 +35,4 @@ mybatis-plus:
#logging #logging
logging: logging:
level: debug level: debug
file: logs/guns.log
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