From d6139a1c6bd470d6d765fcc8241ccdb7be0f8484 Mon Sep 17 00:00:00 2001 From: huangx Date: Fri, 4 Dec 2020 17:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E5=AE=8C=E6=88=90=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 17 +++----- ...foolDataSource.java => CmsDataSource.java} | 27 +++++++------ .../youfool/prj/config/FilterConfig.java | 39 ------------------- .../youfool/prj/config/PrjDataSource.java | 2 +- .../youfool/prj/config/ShiroConfig.java | 2 +- .../youfool/prj/config/SwaggerKnife4j.java | 17 +++----- src/main/resources/application-dev.yml | 6 +-- src/main/resources/application.yml | 7 ++-- 8 files changed, 32 insertions(+), 85 deletions(-) rename src/main/java/com/chinaweal/youfool/prj/config/{YoufoolDataSource.java => CmsDataSource.java} (69%) delete mode 100644 src/main/java/com/chinaweal/youfool/prj/config/FilterConfig.java diff --git a/pom.xml b/pom.xml index 4e189a0..fe367d4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,22 +5,21 @@ 4.0.0 com.chinaweal.youfool - prj-springboot-template + youfool-prj-springboot-template 1.0.0-SNAPSHOT war - - prj-springboot-template + ${project.artifactId} https://www.chinaweal.com.cn + org.springframework.boot spring-boot-starter-parent - 2.2.6.RELEASE + 2.3.5.RELEASE 1.8 42.2.8 - 2.2.2 true UTF-8 1.8 @@ -32,7 +31,7 @@ com.chinaweal.youfool youfool-framework-springboot - 1.1.0-SNAPSHOT + 2.0.0-SNAPSHOT @@ -40,12 +39,6 @@ postgresql ${postgresql.version} - - - com.alibaba - druid-spring-boot-starter - 1.1.21 - org.projectlombok lombok diff --git a/src/main/java/com/chinaweal/youfool/prj/config/YoufoolDataSource.java b/src/main/java/com/chinaweal/youfool/prj/config/CmsDataSource.java similarity index 69% rename from src/main/java/com/chinaweal/youfool/prj/config/YoufoolDataSource.java rename to src/main/java/com/chinaweal/youfool/prj/config/CmsDataSource.java index fb78a68..c26f57f 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/YoufoolDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/CmsDataSource.java @@ -19,39 +19,38 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import javax.sql.DataSource; /** - * youfool基础的数据源 + * cms基础的数据源 */ @Configuration -@MapperScan(basePackages = "com.chinaweal.youfool.framework.springboot.**.mapper", sqlSessionTemplateRef = "youfoolSqlSessionTemplate") -public class YoufoolDataSource { +@MapperScan(basePackages = "com.chinaweal.youfool.framework.springboot.**.mapper", sqlSessionTemplateRef = "cmsSqlSessionTemplate") +public class CmsDataSource { - - @Bean(name = "youfoolDS", initMethod = "init", destroyMethod = "close") - @ConfigurationProperties(prefix = "spring.datasource.youfool") + @Bean(name = "cmsDS", initMethod = "init", destroyMethod = "close") + @ConfigurationProperties(prefix = "spring.datasource.cms") public DruidDataSource dataSource() { return DruidDataSourceBuilder.create().build(); } - @Bean(name = "youfoolSqlSessionFactory") - public MybatisSqlSessionFactoryBean sqlSessionFactory(@Qualifier("youfoolDS") DataSource dataSource) throws Exception { + @Bean(name = "cmsSqlSessionFactory") + public MybatisSqlSessionFactoryBean sqlSessionFactory(@Qualifier("cmsDS") DataSource dataSource) throws Exception { MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); bean.setDataSource(dataSource); GlobalConfig globalConfig = new GlobalConfig(); globalConfig.setMetaObjectHandler(new CommonMetaObjectHandler()); bean.setGlobalConfig(globalConfig); - bean.setConfigLocation(new ClassPathResource("youfool/mybatis/mybatis-config.xml")); - bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:youfool/mybatis/mapper/**/*.xml")); + bean.setConfigLocation(new ClassPathResource("cms/mybatis/mybatis-config.xml")); + bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:cms/mybatis/mapper/**/*.xml")); return bean; } - @Bean(name = "youfoolTransactionManager") - public DataSourceTransactionManager transactionManager(@Qualifier("youfoolDS") DataSource dataSource) { + @Bean(name = "cmsTransactionManager") + public DataSourceTransactionManager transactionManager(@Qualifier("cmsDS") DataSource dataSource) { return new DataSourceTransactionManager(dataSource); } - @Bean(name = "youfoolSqlSessionTemplate") - public SqlSessionTemplate sqlSessionTemplate(@Qualifier("youfoolSqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + @Bean(name = "cmsSqlSessionTemplate") + public SqlSessionTemplate sqlSessionTemplate(@Qualifier("cmsSqlSessionFactory") SqlSessionFactory sqlSessionFactory) { return new SqlSessionTemplate(sqlSessionFactory); } } diff --git a/src/main/java/com/chinaweal/youfool/prj/config/FilterConfig.java b/src/main/java/com/chinaweal/youfool/prj/config/FilterConfig.java deleted file mode 100644 index 0599eba..0000000 --- a/src/main/java/com/chinaweal/youfool/prj/config/FilterConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.chinaweal.youfool.prj.config; - -import com.chinaweal.youfool.framework.springboot.filter.RepeatlyReadFilter; -import com.chinaweal.youfool.framework.springboot.log.filter.RestLogFilter; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @author itluck - */ -@Configuration -public class FilterConfig { - /** - * 日志记录过滤器 - */ - @Bean - public FilterRegistrationBean restLogFilter() { - FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - registrationBean.setFilter(new RestLogFilter()); - registrationBean.addUrlPatterns("/*"); - registrationBean.setName("restLogFilter"); - registrationBean.setOrder(-99); - return registrationBean; - } - - /** - * 开启重复读取request流，用于日志 - */ - @Bean - public FilterRegistrationBean repeatlyReadFilter() { - FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - registrationBean.setFilter(new RepeatlyReadFilter()); - registrationBean.addUrlPatterns("/*"); - registrationBean.setName("repeatlyReadFilter"); - registrationBean.setOrder(-100); - return registrationBean; - } -} diff --git a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java index 13e5f1c..a8a75fe 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java @@ -20,7 +20,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import javax.sql.DataSource; /** - * 系统的数据源 + * 项目的数据源 */ @Configuration diff --git a/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java b/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java index 19489c7..e22de33 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java @@ -21,7 +21,7 @@ import java.util.Map; /** * shiro配置 */ -@Configuration +//@Configuration public class ShiroConfig { @Bean diff --git a/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java b/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java index 13b3af0..4d58f81 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java @@ -1,27 +1,20 @@ package com.chinaweal.youfool.prj.config; -import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.ParameterBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.schema.ModelRef; import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Contact; -import springfox.documentation.service.Parameter; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; -import java.util.ArrayList; -import java.util.List; @Configuration -@EnableSwagger2 -@EnableKnife4j +@EnableSwagger2WebMvc public class SwaggerKnife4j { @Value("${applicationName}") private String applicationName; @@ -32,8 +25,8 @@ public class SwaggerKnife4j { @Value("${license}") private String license; - @Bean("youfool") - public Docket youfoolApi() { + @Bean("cms") + public Docket cmsApi() { //添加head参数start return new Docket(DocumentationType.SWAGGER_2) .enable(true) @@ -45,7 +38,6 @@ public class SwaggerKnife4j { .build(); } - private ApiInfo apiInfo() { return new ApiInfoBuilder() .title(applicationName) @@ -57,4 +49,5 @@ public class SwaggerKnife4j { .licenseUrl("https://www.chinaweal.com.cn") .build(); } + } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 3a68fbf..531801b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,10 +7,10 @@ logging: spring: datasource: prj: - url: jdbc:postgresql://172.22.80.157:5432/pms_dev + url: jdbc:postgresql://172.22.80.157:5432/prj_template username: postgres password: 123456 - youfool: - url: jdbc:postgresql://172.22.80.157:5432/pms_dev?currentSchema=youfool + cms: + url: jdbc:postgresql://172.22.80.157:5432/prj_template?currentSchema=cms username: postgres password: 123456 \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0ee2fea..151dcbc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: profiles: active: dev application: - name: prj-springboot-template + name: youfool-prj-springboot-template datasource: #https://gitee.com/wenshao/druid/tree/master/druid-spring-boot-starter #https://github.com/alibaba/druid/wiki/DruidDataSource%E9%85%8D%E7%BD%AE @@ -18,7 +18,7 @@ spring: time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 validation-query: select version() - youfool: + cms: filters: stat initial-size: 2 min-idle: 1 @@ -53,7 +53,8 @@ jwt: sm3: secret: 82b0832fdaac473b83225ab92e7e3c3d -#knife4j: +knife4j: + enable: true # production: false # basic: # enable: true