diff --git a/increpack.xml b/increpack.xml new file mode 100644 index 0000000..cf9ea75 --- /dev/null +++ b/increpack.xml @@ -0,0 +1,26 @@ + + + http://172.22.80.91:8086/incre/control/upgradeRecord/getUpgradeByAppIdAndCodeId + + 7c37692da73159e45f4e0bb79171d2ed + + 0eb9da6c4f4491f5196186e3b64c31af + + + git + http://47.107.61.133:3000/youfool-project/youfool-prj-springboot-template.git + + 200edf923d9b74f023a1da1d4a6c196664fc639c + 8a19e1ae5ef47fea450a742788f6428750ea9afa + + + + src\main\resources\properties + src\main\resources\application.yml + + + + rl-common-1.0-SNAPSHOT.jar + rl-rpc-service-1.0-SNAPSHOT.jar + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 71aa570..11b5cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ 1.8 false 2.3.5.RELEASE + true @@ -39,7 +40,7 @@ com.chinaweal.youfool youfool-framework-springboot - 3.0.0-SNAPSHOT + 3.0.2-SNAPSHOT @@ -59,29 +60,20 @@ 4.12 test + + + com.chinaweal.youfool + youfool-increpack-common + 1.0.5 + + + + com.chinaweal.youfool + youfool-increpack-maven-plugin + 2.1.0 + - - - - dev - - dev - - - - true - - - - - prod - - prod - - - - @@ -116,6 +108,58 @@ + + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + ${project.artifactId} + + target/assembly.xml + + + + + make-assembly + package + + single + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + compile + + java + + + com.chinaweal.youfool.increpack.maven.IncrePackMain + + ${project.artifactId} + ${project.version} + + false + + + + authMac + package + + java + + + com.chinaweal.youfool.increpack.common.AuthPackMain + + + + diff --git a/src/main/java/com/chinaweal/youfool/prj/config/AuthorityCheck.java b/src/main/java/com/chinaweal/youfool/prj/config/AuthorityCheck.java new file mode 100644 index 0000000..ac67d34 --- /dev/null +++ b/src/main/java/com/chinaweal/youfool/prj/config/AuthorityCheck.java @@ -0,0 +1,48 @@ +package com.chinaweal.youfool.prj.config; + +import com.chinaweal.youfool.increpack.common.interceptor.PrjFileCheck; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.io.File; +import java.util.List; + +/** + * Created with IDEA 15.0.2 + * 应用启动的文件授权检验 + * + * @author Lain + * @date 2020-10-11 + * @time 16:47 + */ +@Component +public class AuthorityCheck { + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Value("${spring.profiles.active}") + private String env; + + @PostConstruct + public void doAuthorityCheck() throws Exception { + + if ("prod".equalsIgnoreCase(this.env)) { + //当前系统部署路径 + ClassLoader classLoader = this.getClass().getClassLoader(); + String path = classLoader.getResource("").getPath(); + String prjPath = new File(path).getParentFile().getParent(); + List resultList = new PrjFileCheck().doPrjFileCheck(prjPath); + if (resultList.size() > 0) { + for (int i = 0; i < resultList.size(); i++) { + String s = resultList.get(i); + log.error("{}.篡改文件：{}", i + 1, s); + } + log.error("因为部分文件的auth不正确，应用启动失败，请修正授权！"); + //检验文件不通过，停止程序 + Thread.sleep(3600000); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/prj/config/PropertySourceConfig.java b/src/main/java/com/chinaweal/youfool/prj/config/PropertySourceConfig.java deleted file mode 100644 index 72cbd09..0000000 --- a/src/main/java/com/chinaweal/youfool/prj/config/PropertySourceConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chinaweal.youfool.prj.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; -import org.springframework.stereotype.Component; - -/** - * 引入properties常用值 - */ -@Component -@Configuration -@PropertySource(value = {"classpath:properties/youfool-prj.properties"}, encoding = "UTF-8") -public class PropertySourceConfig { - @Bean - public PropertySourcesPlaceholderConfigurer propertySources() { - return new PropertySourcesPlaceholderConfigurer(); - } -} \ No newline at end of file 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 cf88741..7f0cfdc 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java @@ -1,6 +1,5 @@ package com.chinaweal.youfool.prj.config; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; @@ -16,10 +15,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; @Configuration @EnableSwagger2WebMvc public class SwaggerKnife4j { - @Value("${applicationName}") - private String applicationName; - @Value("${description}") - private String description; + private final String applicationName = "youfool-prj-springboot-template"; + private final String description = "boot基础的后台模板"; @Bean("cms") public Docket cmsApi() { diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/EnumsCodeGen.java b/src/main/java/com/chinaweal/youfool/prj/dev/EnumsCodeGen.java new file mode 100644 index 0000000..4f311c6 --- /dev/null +++ b/src/main/java/com/chinaweal/youfool/prj/dev/EnumsCodeGen.java @@ -0,0 +1,17 @@ +package com.chinaweal.youfool.prj.dev; + + +import com.chinaweal.youfool.framework.springboot.cms.dev.GenerateDictEnums; + +/** + * 常量代码生成器 + */ +public class EnumsCodeGen { + + public static void main(String[] args) { + GenerateDictEnums generator = new GenerateDictEnums("properties/codeGenerator"); + generator.generateEnums(); + } + private EnumsCodeGen(){ + } +} diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java b/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java index d362c0b..c0083da 100644 --- a/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java +++ b/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java @@ -1,7 +1,7 @@ package com.chinaweal.youfool.prj.dev; -import com.chinaweal.youfool.framework.springboot.mybatis.plus.CodeGenerator; +import com.chinaweal.youfool.framework.springboot.mybatis.plus.FastCodeGenerator; /** * 根据库表结构生成代码层 @@ -9,10 +9,11 @@ import com.chinaweal.youfool.framework.springboot.mybatis.plus.CodeGenerator; public class TableCodeGen { public static void main(String[] args) { - CodeGenerator codeGenerator = new CodeGenerator("properties/codeGenerator"); - codeGenerator.generateCode(); + FastCodeGenerator fastCodeGenerator = new FastCodeGenerator("properties/codeGenerator"); + fastCodeGenerator.generate(); } - private TableCodeGen(){ + + private TableCodeGen() { } } diff --git a/src/main/resources/properties/codeGenerator.properties b/src/main/resources/properties/codeGenerator.properties index 405de0a..75c5823 100644 --- a/src/main/resources/properties/codeGenerator.properties +++ b/src/main/resources/properties/codeGenerator.properties @@ -20,4 +20,5 @@ author=chinaweal #controllerPackagePath=/module #mapper文件存放路径 #字典常量生成路径 -constantPackagePath=/rl-common/src/main/java/com/chinaweal/fsrl +constantPackagePath=/src/main/java/com/chinaweal/common +enumsPackagePath=/src/main/java/com/chinaweal/common \ No newline at end of file