From 6558080e3e75dcc54195fae6c685d2d2a218f43a Mon Sep 17 00:00:00 2001 From: huangx Date: Tue, 23 Mar 2021 16:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B4=E5=90=88=EF=BC=88?= =?UTF-8?q?=E6=B2=A1=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youfool/prj/config/CmsDataSource.java | 56 ------------------- .../youfool/prj/config/FilterConfig.java | 39 +++++++++++++ .../youfool/prj/config/PrjDataSource.java | 2 +- .../prj/dev/ConstantCodeGenerator.java | 18 ++++++ src/main/resources/application-dev.yml | 6 +- src/main/resources/application-prod.yml | 4 -- src/main/resources/application.yml | 10 +--- ...or.properties => codeGenerator.properties} | 4 +- 8 files changed, 62 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/com/chinaweal/youfool/prj/config/CmsDataSource.java create mode 100644 src/main/java/com/chinaweal/youfool/prj/config/FilterConfig.java create mode 100644 src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGenerator.java rename src/main/resources/properties/{codeCenerator.properties => codeGenerator.properties} (67%) diff --git a/src/main/java/com/chinaweal/youfool/prj/config/CmsDataSource.java b/src/main/java/com/chinaweal/youfool/prj/config/CmsDataSource.java deleted file mode 100644 index c26f57f..0000000 --- a/src/main/java/com/chinaweal/youfool/prj/config/CmsDataSource.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.chinaweal.youfool.prj.config; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; -import com.baomidou.mybatisplus.core.config.GlobalConfig; -import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import com.chinaweal.youfool.framework.springboot.mybatis.plus.CommonMetaObjectHandler; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; - -import javax.sql.DataSource; - -/** - * cms基础的数据源 - */ - -@Configuration -@MapperScan(basePackages = "com.chinaweal.youfool.framework.springboot.**.mapper", sqlSessionTemplateRef = "cmsSqlSessionTemplate") -public class CmsDataSource { - - @Bean(name = "cmsDS", initMethod = "init", destroyMethod = "close") - @ConfigurationProperties(prefix = "spring.datasource.cms") - public DruidDataSource dataSource() { - return DruidDataSourceBuilder.create().build(); - } - - @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("cms/mybatis/mybatis-config.xml")); - bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:cms/mybatis/mapper/**/*.xml")); - return bean; - } - - @Bean(name = "cmsTransactionManager") - public DataSourceTransactionManager transactionManager(@Qualifier("cmsDS") DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } - - @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 new file mode 100644 index 0000000..262a7aa --- /dev/null +++ b/src/main/java/com/chinaweal/youfool/prj/config/FilterConfig.java @@ -0,0 +1,39 @@ +package com.chinaweal.youfool.prj.config; + +import com.chinaweal.youfool.framework.springboot.filter.RepeatlyReadFilter; +import com.chinaweal.youfool.framework.springboot.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 a8a75fe..a2d6bba 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java @@ -24,7 +24,7 @@ import javax.sql.DataSource; */ @Configuration -@MapperScan(basePackages = {"com.chinaweal.youfool.prj.**.mapper"}, sqlSessionTemplateRef = "prjSqlSessionTemplate") +@MapperScan(basePackages = {"com.chinaweal.youfool.framework.springboot.cms.**.mapper", "com.chinaweal.youfool.prj.**.mapper"}, sqlSessionTemplateRef = "prjSqlSessionTemplate") public class PrjDataSource { diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGenerator.java b/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGenerator.java new file mode 100644 index 0000000..3ba43eb --- /dev/null +++ b/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGenerator.java @@ -0,0 +1,18 @@ +package com.chinaweal.youfool.prj.dev; + + +import com.chinaweal.youfool.framework.springboot.cms.dev.GenerateDictConstant; + +/** + * 常量代码生成器 + */ +public class ConstantCodeGenerator { + private ConstantCodeGenerator() { + + } + + public static void main(String[] args) { + GenerateDictConstant generator = new GenerateDictConstant("properties/codeCenerator"); + generator.generateConstant(); + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 531801b..07bf422 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,15 +2,11 @@ logging: level: dao: debug youfool.dao: info - com.chinaweal.youfool.framework.springboot.log: debug + com.chinaweal.youfool.framework.springboot.cms: debug com.chinaweal.youfool.prj: debug spring: datasource: prj: url: jdbc:postgresql://172.22.80.157:5432/prj_template username: postgres - password: 123456 - 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-prod.yml b/src/main/resources/application-prod.yml index f46ba6d..d108e0d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -10,8 +10,4 @@ spring: prj: url: jdbc:postgresql://127.0.0.1:5432/pms username: postgres - password: 123456 - youfool: - url: jdbc:postgresql://127.0.0.1:5432/pms?currentSchema=youfool - 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 151dcbc..a0e4fa4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,15 +18,6 @@ spring: time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 validation-query: select version() - cms: - filters: stat - initial-size: 2 - min-idle: 1 - max-active: 20 - max-wait: 30000 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - validation-query: select version() druid: web-stat-filter: enabled: true @@ -42,6 +33,7 @@ spring: restLog: ignoreServletPath: /druid,/swagger-resources,/v2/api-docs,/webjars + isSaveDb: false # ignoreSuffix: .css,.jpg,.png,.icon,.html,.js jwt: diff --git a/src/main/resources/properties/codeCenerator.properties b/src/main/resources/properties/codeGenerator.properties similarity index 67% rename from src/main/resources/properties/codeCenerator.properties rename to src/main/resources/properties/codeGenerator.properties index 1e83848..f9d299d 100644 --- a/src/main/resources/properties/codeCenerator.properties +++ b/src/main/resources/properties/codeGenerator.properties @@ -1,12 +1,12 @@ #mybatis-plus 代码生成器参数 -url=jdbc:postgresql://172.22.80.157:5432/pms_dev +url=jdbc:postgresql://172.22.80.157:5432/prj_template driverName=org.postgresql.Driver #PostgreSQL schemaName schemaName=public username=postgres password=123456 #父包名 -parentPackageName=com.chinaweal.youfool.pms +parentPackageName=com.chinaweal.youfool.prj #mapper文件存放路径 mapperFilePath=/src/main/resources/mybatis/mapper/ author=chinaweal \ No newline at end of file