diff --git a/checkstyle.xml b/checkstyle.xml index d08229d..8a941e9 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,10 +1,13 @@ + "https://checkstyle.org/dtds/configuration_1_3.dtd"> - + + + + @@ -42,7 +45,7 @@ - + @@ -67,7 +70,7 @@ - + @@ -97,8 +100,8 @@ - - + + @@ -111,7 +114,7 @@ - + @@ -140,4 +143,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index fe367d4..eab44a8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,22 +10,30 @@ war ${project.artifactId} https://www.chinaweal.com.cn - - - org.springframework.boot - spring-boot-starter-parent - 2.3.5.RELEASE - - + boot基础的后台模板 1.8 - 42.2.8 true UTF-8 1.8 1.8 1.8 + false + 2.3.5.RELEASE + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + @@ -37,7 +45,7 @@ org.postgresql postgresql - ${postgresql.version} + 42.2.8 org.projectlombok @@ -58,6 +66,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/src/main/java/com/chinaweal/youfool/prj/YoufoolApplication.java b/src/main/java/com/chinaweal/youfool/prj/YoufoolApplication.java index 058cdb1..1fc2ce4 100644 --- a/src/main/java/com/chinaweal/youfool/prj/YoufoolApplication.java +++ b/src/main/java/com/chinaweal/youfool/prj/YoufoolApplication.java @@ -1,46 +1,31 @@ package com.chinaweal.youfool.prj; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; @SpringBootApplication(scanBasePackages = {"com.chinaweal"}) @EnableCaching @Slf4j -public class YoufoolApplication extends SpringBootServletInitializer implements ApplicationListener { - @Value("${applicationName}") - private String applicationName; - @Value("${version}") - private String version; - @Value("${description}") - private String description; - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) { - return applicationBuilder.sources(YoufoolApplication.class); - } - - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - if (event.getApplicationContext().getParent() == null) { - log.info("========================== 程序启动成功！ =========================="); - log.info("====== 程 序：{} ！", applicationName); - log.info("====== 版本号：{} ", version); - log.info("====== 描 述：{} ", description); - log.info("====== CMS 基础框架后台管理系统路径：/cms，账号：admin、密码：123456"); - log.info("====== 接口文档路径：/doc.html，账号：admin、密码：123456。注：如果乱码请指定VM -Dfile.encoding=UTF-8"); - log.info("====== Druid Monitor路径：/druid，账号：admin、密码：123456"); - log.info("===================================================================="); - } - } +public class YoufoolApplication extends SpringBootServletInitializer { public static void main(String[] args) { + SpringApplication.run(YoufoolApplication.class, args); + log.info("========================== 程序启动成功！ =========================="); + log.info("====== 程 序：youfool-prj-springboot-template！"); + log.info("====== 描 述：boot基础的后台模板！"); + log.info("====== CMS 基础框架后台管理系统路径：/cms，账号：admin、密码：123456"); + log.info("====== 接口文档路径：/doc.html，账号：admin、密码：123456。注：如果乱码请指定VM -Dfile.encoding=UTF-8"); + log.info("====== Druid Monitor路径：/druid，账号：admin、密码：123456"); + log.info("===================================================================="); + } + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(this.getClass()); } } 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 a2d6bba..fad9119 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java @@ -17,6 +17,7 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import javax.annotation.Resource; import javax.sql.DataSource; /** @@ -27,6 +28,8 @@ import javax.sql.DataSource; @MapperScan(basePackages = {"com.chinaweal.youfool.framework.springboot.cms.**.mapper", "com.chinaweal.youfool.prj.**.mapper"}, sqlSessionTemplateRef = "prjSqlSessionTemplate") public class PrjDataSource { + @Resource + private CommonMetaObjectHandler commonMetaObjectHandler; @Bean(name = "prjDS", initMethod = "init", destroyMethod = "close") @ConfigurationProperties(prefix = "spring.datasource.prj") @@ -41,7 +44,7 @@ public class PrjDataSource { MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); bean.setDataSource(dataSource); GlobalConfig globalConfig = new GlobalConfig(); - globalConfig.setMetaObjectHandler(new CommonMetaObjectHandler()); + globalConfig.setMetaObjectHandler(commonMetaObjectHandler); bean.setGlobalConfig(globalConfig); bean.setConfigLocation(new ClassPathResource("mybatis/mybatis-config.xml")); bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mybatis/mapper/**/*.xml")); @@ -51,9 +54,7 @@ public class PrjDataSource { @Bean(name = "prjTransactionManager") @Primary public DataSourceTransactionManager transactionManager(@Qualifier("prjDS") DataSource dataSource) { - DataSourceTransactionManager dataSourceTransactionManager = new DataSourceTransactionManager(dataSource); - dataSourceTransactionManager.setEnforceReadOnly(true); - return dataSourceTransactionManager; + return new DataSourceTransactionManager(dataSource); } @Bean(name = "prjSqlSessionTemplate") 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 e22de33..aab74c8 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/ShiroConfig.java @@ -11,7 +11,6 @@ import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import javax.annotation.PostConstruct; import javax.servlet.Filter; 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 4d58f81..cf88741 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java @@ -18,12 +18,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; public class SwaggerKnife4j { @Value("${applicationName}") private String applicationName; - @Value("${version}") - private String version; @Value("${description}") private String description; - @Value("${license}") - private String license; @Bean("cms") public Docket cmsApi() { @@ -43,9 +39,8 @@ public class SwaggerKnife4j { .title(applicationName) .description(description) .termsOfServiceUrl("https://www.chinaweal.com.cn") - .version(version) .contact(new Contact("chinaweal", "https://www.chinaweal.com.cn", "")) - .license(license) + .license("众望通科技") .licenseUrl("https://www.chinaweal.com.cn") .build(); } diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGenerator.java b/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGen.java similarity index 74% rename from src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGenerator.java rename to src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGen.java index 3ba43eb..c4cca33 100644 --- a/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGenerator.java +++ b/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGen.java @@ -6,13 +6,12 @@ import com.chinaweal.youfool.framework.springboot.cms.dev.GenerateDictConstant; /** * 常量代码生成器 */ -public class ConstantCodeGenerator { - private ConstantCodeGenerator() { - - } +public class ConstantCodeGen { public static void main(String[] args) { - GenerateDictConstant generator = new GenerateDictConstant("properties/codeCenerator"); + GenerateDictConstant generator = new GenerateDictConstant("properties/codeGenerator"); generator.generateConstant(); } + private ConstantCodeGen(){ + } } diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/MybatisPlusCodeGenerator.java b/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java similarity index 70% rename from src/main/java/com/chinaweal/youfool/prj/dev/MybatisPlusCodeGenerator.java rename to src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java index 0a67595..d362c0b 100644 --- a/src/main/java/com/chinaweal/youfool/prj/dev/MybatisPlusCodeGenerator.java +++ b/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java @@ -4,15 +4,15 @@ package com.chinaweal.youfool.prj.dev; import com.chinaweal.youfool.framework.springboot.mybatis.plus.CodeGenerator; /** - * 代码生成器 + * 根据库表结构生成代码层 */ -public class MybatisPlusCodeGenerator { - private MybatisPlusCodeGenerator() { - - } +public class TableCodeGen { public static void main(String[] args) { - CodeGenerator codeGenerator = new CodeGenerator("properties/codeCenerator"); + CodeGenerator codeGenerator = new CodeGenerator("properties/codeGenerator"); codeGenerator.generateCode(); } + private TableCodeGen(){ + } + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 07bf422..dcb2f15 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,4 +9,4 @@ spring: prj: url: jdbc:postgresql://172.22.80.157:5432/prj_template username: postgres - password: 123456 \ No newline at end of file + password: 123456 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a0e4fa4..94e0bfb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -37,7 +37,7 @@ restLog: # ignoreSuffix: .css,.jpg,.png,.icon,.html,.js jwt: - id: pms + id: prj secret: 64faa93ed3454feeab946cc3a526eea0 ttlMillis: 7500000 #后台125分钟，多出5分钟，前端cookie只记录120分钟 diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml index e96e43f..6fb0146 100644 --- a/src/main/resources/mybatis/mybatis-config.xml +++ b/src/main/resources/mybatis/mybatis-config.xml @@ -42,9 +42,11 @@ + - + + diff --git a/src/main/resources/properties/codeGenerator.properties b/src/main/resources/properties/codeGenerator.properties index f9d299d..405de0a 100644 --- a/src/main/resources/properties/codeGenerator.properties +++ b/src/main/resources/properties/codeGenerator.properties @@ -9,4 +9,15 @@ password=123456 parentPackageName=com.chinaweal.youfool.prj #mapper文件存放路径 mapperFilePath=/src/main/resources/mybatis/mapper/ -author=chinaweal \ No newline at end of file +author=chinaweal +#mybatis-plus 代码生成器参数-------配置文件模板 +#module=rl-biz-med +#实体目录 +#entityPackagePath=/rl-rpc-service/src/main/java/com/chinaweal/fsrl/med/entity +#servicePackagePath=/rl-rpc-service/src/main/java/com/chinaweal/fsrl/med/service +#mapperPackagePath=/module +#serviceImplPackagePath=/module +#controllerPackagePath=/module +#mapper文件存放路径 +#字典常量生成路径 +constantPackagePath=/rl-common/src/main/java/com/chinaweal/fsrl diff --git a/src/main/resources/properties/youfool-prj.properties b/src/main/resources/properties/youfool-prj.properties index efc1293..8c50da2 100644 --- a/src/main/resources/properties/youfool-prj.properties +++ b/src/main/resources/properties/youfool-prj.properties @@ -1,7 +1,3 @@ -applicationName=prj +applicationName=youfool-prj-springboot-template #描述 -description=web应用后台模板 -#许可 -license=众望通科技 -#版本号 -version=1.0 +description=boot基础的后台模板