diff --git a/README.md b/README.md index 8995858..7cc310e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ -**公司项目管理系统筹建群（CW）** -**相关文档** +boot 基础模板 diff --git a/increpack.xml b/increpack.xml deleted file mode 100644 index e3813f1..0000000 --- a/increpack.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - http://47.107.61.133:3000/chinaweal/youfool-increpack.git - D:\chinaweal\gitea-code\youfool-pms - 8c7ff00218565019ad898b25158ef397170b6432 - 054e33b95fa75511dc2efb26ddc781e8ffd21356 - - - - src\main\resources\application.yml - src\main\resources\application-dev.yml - src\main\resources\application-prod.yml - src\main\resources\logback-spring.xml - src\main\resources\properties\codeCenerator.properties - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1e68052..4e189a0 100644 --- a/pom.xml +++ b/pom.xml @@ -46,33 +46,18 @@ druid-spring-boot-starter 1.1.21 - - - - com.alibaba - easyexcel - ${easyexcel.version} - - org.projectlombok lombok 1.18.12 provided - junit junit 4.12 test - - - com.chinaweal.youfool - youfool-increpack-maven-plugin-git - 1.0.1-SNAPSHOT - @@ -81,46 +66,6 @@ org.springframework.boot spring-boot-maven-plugin - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - package - - java - - - com.chinaweal.youfool.increpack.maven.IncrePackMain - - ${project.version} - - false - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.1 - - - target/assembly.xml - - - - - make-assembly - package - - single - - - - org.apache.maven.plugins diff --git a/src/main/java/com/chinaweal/youfool/prj/config/PmsDataSource.java b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java similarity index 74% rename from src/main/java/com/chinaweal/youfool/prj/config/PmsDataSource.java rename to src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java index a98f882..13e5f1c 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PmsDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java @@ -20,28 +20,24 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import javax.sql.DataSource; /** - * pms系统的数据源 - * - * @author itluck + * 系统的数据源 */ -//@Configuration -//@MapperScan(basePackages = {"com.chinaweal.youfool.pms.base.**.mapper", -// "com.chinaweal.youfool.pms.org.**.mapper", "com.chinaweal.youfool.pms.resource.**.mapper", -// "com.chinaweal.youfool.pms.project.**.mapper"}, sqlSessionTemplateRef = "pmsSqlSessionTemplate") -public class PmsDataSource { +@Configuration +@MapperScan(basePackages = {"com.chinaweal.youfool.prj.**.mapper"}, sqlSessionTemplateRef = "prjSqlSessionTemplate") +public class PrjDataSource { - @Bean(name = "pmsDS", initMethod = "init", destroyMethod = "close") - @ConfigurationProperties(prefix = "spring.datasource.pms") + @Bean(name = "prjDS", initMethod = "init", destroyMethod = "close") + @ConfigurationProperties(prefix = "spring.datasource.prj") @Primary public DruidDataSource dataSource() { return DruidDataSourceBuilder.create().build(); } - @Bean(name = "pmsSqlSessionFactory") + @Bean(name = "prjSqlSessionFactory") @Primary - public MybatisSqlSessionFactoryBean sqlSessionFactory(@Qualifier("pmsDS") DataSource dataSource) throws Exception { + public MybatisSqlSessionFactoryBean sqlSessionFactory(@Qualifier("prjDS") DataSource dataSource) throws Exception { MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); bean.setDataSource(dataSource); GlobalConfig globalConfig = new GlobalConfig(); @@ -52,17 +48,17 @@ public class PmsDataSource { return bean; } - @Bean(name = "pmsTransactionManager") + @Bean(name = "prjTransactionManager") @Primary - public DataSourceTransactionManager transactionManager(@Qualifier("pmsDS") DataSource dataSource) { + public DataSourceTransactionManager transactionManager(@Qualifier("prjDS") DataSource dataSource) { DataSourceTransactionManager dataSourceTransactionManager = new DataSourceTransactionManager(dataSource); dataSourceTransactionManager.setEnforceReadOnly(true); return dataSourceTransactionManager; } - @Bean(name = "pmsSqlSessionTemplate") + @Bean(name = "prjSqlSessionTemplate") @Primary - public SqlSessionTemplate sqlSessionTemplate(@Qualifier("pmsSqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + public SqlSessionTemplate sqlSessionTemplate(@Qualifier("prjSqlSessionFactory") SqlSessionFactory sqlSessionFactory) { return new SqlSessionTemplate(sqlSessionFactory); } } diff --git a/src/main/java/com/chinaweal/youfool/prj/config/PropertySourceConfig.java b/src/main/java/com/chinaweal/youfool/prj/config/PropertySourceConfig.java index bd1b290..72cbd09 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PropertySourceConfig.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/PropertySourceConfig.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; */ @Component @Configuration -@PropertySource(value = {"classpath:properties/youfool-pms.properties"}, encoding = "UTF-8") +@PropertySource(value = {"classpath:properties/youfool-prj.properties"}, encoding = "UTF-8") public class PropertySourceConfig { @Bean public PropertySourcesPlaceholderConfigurer propertySources() { 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 b109d74..19489c7 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java @@ -34,6 +34,8 @@ public class ShiroConfig { filterMap.put("jwtRestful", new JWTRestfulFilter()); factoryBean.setFilters(filterMap); Map filterChainDefinitionMap = new LinkedHashMap<>(); + filterChainDefinitionMap.put("/xxx==GET", "jwtRestful[org:dept:list]"); + filterChainDefinitionMap.put("/**", "jwtRestful"); factoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); return factoryBean; } 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 2723170..13b3af0 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java @@ -19,9 +19,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; import java.util.ArrayList; import java.util.List; -/** - * @author itluck - */ @Configuration @EnableSwagger2 @EnableKnife4j @@ -35,24 +32,6 @@ public class SwaggerKnife4j { @Value("${license}") private String license; - @Bean("orgApi") - public Docket orgApi() { - //添加head参数start - ParameterBuilder tokenPar = new ParameterBuilder(); - List headers = new ArrayList<>(); - tokenPar.name("token").description("令牌").modelRef(new ModelRef("string")).parameterType("header").required(false).build(); - headers.add(tokenPar.build()); - return new Docket(DocumentationType.SWAGGER_2) - .enable(true) - .apiInfo(apiInfo()) - .groupName("组织架构") - .select() - .apis(RequestHandlerSelectors.basePackage("com.chinaweal.youfool.pms.org")) - .paths(PathSelectors.any()) - .build() - .globalOperationParameters(headers); - } - @Bean("youfool") public Docket youfoolApi() { //添加head参数start @@ -66,41 +45,6 @@ public class SwaggerKnife4j { .build(); } - @Bean("projectApi") - public Docket projectApi() { - ParameterBuilder tokenPar = new ParameterBuilder(); - List headers = new ArrayList<>(); - tokenPar.name("token").description("令牌").modelRef(new ModelRef("string")).parameterType("header").required(false).build(); - headers.add(tokenPar.build()); - return new Docket(DocumentationType.SWAGGER_2) - .enable(true) - .apiInfo(apiInfo()) - .groupName("项目管理") - .select() - .apis(RequestHandlerSelectors.basePackage("com.chinaweal.youfool.pms.project")) - .paths(PathSelectors.any()) - .build() - .globalOperationParameters(headers); - } - - @Bean("resourceApi") - public Docket resourceApi() { - //添加head参数start - ParameterBuilder tokenPar = new ParameterBuilder(); - List headers = new ArrayList<>(); - tokenPar.name("token").description("令牌").modelRef(new ModelRef("string")).parameterType("header").required(false).build(); - headers.add(tokenPar.build()); - return new Docket(DocumentationType.SWAGGER_2) - .enable(true) - .apiInfo(apiInfo()) - .groupName("资源管理") - .select() - .apis(RequestHandlerSelectors.basePackage("com.chinaweal.youfool.pms.resource")) - .paths(PathSelectors.any()) - .build() - .globalOperationParameters(headers); - } - private ApiInfo apiInfo() { return new ApiInfoBuilder() diff --git a/src/main/java/com/chinaweal/youfool/prj/config/YoufoolDataSource.java b/src/main/java/com/chinaweal/youfool/prj/config/YoufoolDataSource.java index 58e0e39..fb78a68 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/YoufoolDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/YoufoolDataSource.java @@ -20,8 +20,6 @@ import javax.sql.DataSource; /** * youfool基础的数据源 - * - * @author itluck */ @Configuration diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 371dfee..3a68fbf 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ logging: com.chinaweal.youfool.prj: debug spring: datasource: - pms: + prj: url: jdbc:postgresql://172.22.80.157:5432/pms_dev username: postgres password: 123456 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 11a180a..f46ba6d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -7,7 +7,7 @@ logging: filePath: D:\project\pms\logs spring: datasource: - pms: + prj: url: jdbc:postgresql://127.0.0.1:5432/pms username: postgres password: 123456 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 69dba58..0ee2fea 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: 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 - pms: + prj: filters: stat initial-size: 2 min-idle: 1 diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 844b4ac..0b466a1 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ - + diff --git a/src/main/resources/processes/MyProcesses.bpmn b/src/main/resources/processes/MyProcesses.bpmn deleted file mode 100644 index cb7bc52..0000000 --- a/src/main/resources/processes/MyProcesses.bpmn +++ /dev/null @@ -1,38 +0,0 @@ - - - - - SequenceFlow_0t0thg0 - - - SequenceFlow_0t0thg0 - SequenceFlow_09qk1yb - - - - SequenceFlow_09qk1yb - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/properties/youfool-pms.properties b/src/main/resources/properties/youfool-prj.properties similarity index 52% rename from src/main/resources/properties/youfool-pms.properties rename to src/main/resources/properties/youfool-prj.properties index 9d5f3cf..efc1293 100644 --- a/src/main/resources/properties/youfool-pms.properties +++ b/src/main/resources/properties/youfool-prj.properties @@ -1,6 +1,6 @@ -applicationName=pms +applicationName=prj #描述 -description=建设工地管理系统 +description=web应用后台模板 #许可 license=众望通科技 #版本号