diff --git a/pom.xml b/pom.xml index 944eeea..bc49c86 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ 4.0.0 com.chinaweal.youfool - youfool-prj-springboot-template + youfool-course 1.0.0-SNAPSHOT war ${project.artifactId} https://www.chinaweal.com.cn - boot基础的后台模板 + youfool课程 - 1.8 + 21 true UTF-8 - 1.8 - 1.8 - 1.8 + 21 + 21 + 21 false - 2.3.5.RELEASE + 3.4.5 true @@ -39,45 +39,21 @@ com.chinaweal.youfool - youfool-framework-springboot - 3.3.1-SNAPSHOT + youfool-framework-springboot3 + 1.0.2 org.postgresql postgresql - 42.2.8 + 42.7.8 org.projectlombok lombok - 1.18.12 + 1.18.42 provided - - junit - junit - 4.12 - test - - - - com.chinaweal.youfool - youfool-increpack-common - 1.0.5 - - - - com.chinaweal.youfool - youfool-increpack-maven-plugin - 2.1.0 - - - - mysql - mysql-connector-java - 8.0.28 - @@ -115,58 +91,6 @@ - - - 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/YoufoolApplication.java b/src/main/java/com/chinaweal/youfool/course/YoufoolApplication.java similarity index 97% rename from src/main/java/com/chinaweal/youfool/prj/YoufoolApplication.java rename to src/main/java/com/chinaweal/youfool/course/YoufoolApplication.java index 1fc2ce4..09976d8 100644 --- a/src/main/java/com/chinaweal/youfool/prj/YoufoolApplication.java +++ b/src/main/java/com/chinaweal/youfool/course/YoufoolApplication.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj; +package com.chinaweal.youfool.course; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/chinaweal/youfool/prj/common/constants/SessionConstants.java b/src/main/java/com/chinaweal/youfool/course/common/constants/SessionConstants.java similarity index 57% rename from src/main/java/com/chinaweal/youfool/prj/common/constants/SessionConstants.java rename to src/main/java/com/chinaweal/youfool/course/common/constants/SessionConstants.java index e08d603..b35d089 100644 --- a/src/main/java/com/chinaweal/youfool/prj/common/constants/SessionConstants.java +++ b/src/main/java/com/chinaweal/youfool/course/common/constants/SessionConstants.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.common.constants; +package com.chinaweal.youfool.course.common.constants; /** * session常量 @@ -7,5 +7,4 @@ package com.chinaweal.youfool.prj.common.constants; **/ public interface SessionConstants { - String USER_KEY = "user"; } diff --git a/src/main/java/com/chinaweal/youfool/prj/common/util/StringUtils.java b/src/main/java/com/chinaweal/youfool/course/common/util/StringUtils.java similarity index 98% rename from src/main/java/com/chinaweal/youfool/prj/common/util/StringUtils.java rename to src/main/java/com/chinaweal/youfool/course/common/util/StringUtils.java index d414ff2..3f57d13 100644 --- a/src/main/java/com/chinaweal/youfool/prj/common/util/StringUtils.java +++ b/src/main/java/com/chinaweal/youfool/course/common/util/StringUtils.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.common.util; +package com.chinaweal.youfool.course.common.util; import java.util.UUID; diff --git a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java b/src/main/java/com/chinaweal/youfool/course/config/PrjDataSource.java similarity index 94% rename from src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java rename to src/main/java/com/chinaweal/youfool/course/config/PrjDataSource.java index f187e5b..470a3b1 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java +++ b/src/main/java/com/chinaweal/youfool/course/config/PrjDataSource.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.config; +package com.chinaweal.youfool.course.config; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; @@ -19,7 +19,7 @@ import javax.sql.DataSource; */ @Configuration -@MapperScan(basePackages = {"com.chinaweal.youfool.framework.springboot.cms.**.mapper", "com.chinaweal.youfool.prj.**.mapper"}) +@MapperScan(basePackages = {"com.chinaweal.youfool.framework.springboot.cms.**.mapper", "com.chinaweal.youfool.lesson.**.mapper"}) public class PrjDataSource { @Resource diff --git a/src/main/java/com/chinaweal/youfool/prj/config/SpringMvcConfig.java b/src/main/java/com/chinaweal/youfool/course/config/SpringMvcConfig.java similarity index 97% rename from src/main/java/com/chinaweal/youfool/prj/config/SpringMvcConfig.java rename to src/main/java/com/chinaweal/youfool/course/config/SpringMvcConfig.java index 567e40b..8cdb1fb 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/SpringMvcConfig.java +++ b/src/main/java/com/chinaweal/youfool/course/config/SpringMvcConfig.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.config; +package com.chinaweal.youfool.course.config; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; diff --git a/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java b/src/main/java/com/chinaweal/youfool/course/config/SwaggerKnife4j.java similarity index 97% rename from src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java rename to src/main/java/com/chinaweal/youfool/course/config/SwaggerKnife4j.java index 7f0cfdc..80b6c13 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/SwaggerKnife4j.java +++ b/src/main/java/com/chinaweal/youfool/course/config/SwaggerKnife4j.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.config; +package com.chinaweal.youfool.course.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/chinaweal/youfool/prj/controller/LoginController.java b/src/main/java/com/chinaweal/youfool/course/controller/LoginController.java similarity index 96% rename from src/main/java/com/chinaweal/youfool/prj/controller/LoginController.java rename to src/main/java/com/chinaweal/youfool/course/controller/LoginController.java index c07febc..2bae687 100644 --- a/src/main/java/com/chinaweal/youfool/prj/controller/LoginController.java +++ b/src/main/java/com/chinaweal/youfool/course/controller/LoginController.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.controller; +package com.chinaweal.youfool.course.controller; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; @@ -8,7 +8,7 @@ import com.chinaweal.youfool.framework.springboot.common.util.RSAUtil; import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.rest.ResultCode; import com.chinaweal.youfool.framework.springboot.user.entity.UserBase; -import com.chinaweal.youfool.prj.common.constants.SessionConstants; +import com.chinaweal.youfool.course.common.constants.SessionConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGen.java b/src/main/java/com/chinaweal/youfool/course/dev/ConstantCodeGen.java similarity index 89% rename from src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGen.java rename to src/main/java/com/chinaweal/youfool/course/dev/ConstantCodeGen.java index c4cca33..1e68102 100644 --- a/src/main/java/com/chinaweal/youfool/prj/dev/ConstantCodeGen.java +++ b/src/main/java/com/chinaweal/youfool/course/dev/ConstantCodeGen.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.dev; +package com.chinaweal.youfool.course.dev; import com.chinaweal.youfool.framework.springboot.cms.dev.GenerateDictConstant; diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/EnumsCodeGen.java b/src/main/java/com/chinaweal/youfool/course/dev/EnumsCodeGen.java similarity index 89% rename from src/main/java/com/chinaweal/youfool/prj/dev/EnumsCodeGen.java rename to src/main/java/com/chinaweal/youfool/course/dev/EnumsCodeGen.java index 4f311c6..92dd60e 100644 --- a/src/main/java/com/chinaweal/youfool/prj/dev/EnumsCodeGen.java +++ b/src/main/java/com/chinaweal/youfool/course/dev/EnumsCodeGen.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.dev; +package com.chinaweal.youfool.course.dev; import com.chinaweal.youfool.framework.springboot.cms.dev.GenerateDictEnums; diff --git a/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java b/src/main/java/com/chinaweal/youfool/course/dev/TableCodeGen.java similarity index 90% rename from src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java rename to src/main/java/com/chinaweal/youfool/course/dev/TableCodeGen.java index c0083da..7c95223 100644 --- a/src/main/java/com/chinaweal/youfool/prj/dev/TableCodeGen.java +++ b/src/main/java/com/chinaweal/youfool/course/dev/TableCodeGen.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.dev; +package com.chinaweal.youfool.course.dev; import com.chinaweal.youfool.framework.springboot.mybatis.plus.FastCodeGenerator; diff --git a/src/main/java/com/chinaweal/youfool/prj/service/impl/StpInterfaceImpl.java b/src/main/java/com/chinaweal/youfool/course/service/impl/StpInterfaceImpl.java similarity index 94% rename from src/main/java/com/chinaweal/youfool/prj/service/impl/StpInterfaceImpl.java rename to src/main/java/com/chinaweal/youfool/course/service/impl/StpInterfaceImpl.java index fbe15e4..d33239c 100644 --- a/src/main/java/com/chinaweal/youfool/prj/service/impl/StpInterfaceImpl.java +++ b/src/main/java/com/chinaweal/youfool/course/service/impl/StpInterfaceImpl.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.service.impl; +package com.chinaweal.youfool.course.service.impl; import cn.dev33.satoken.stp.StpInterface; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/chinaweal/youfool/prj/service/impl/UserBaseServiceImpl.java b/src/main/java/com/chinaweal/youfool/course/service/impl/UserBaseServiceImpl.java similarity index 90% rename from src/main/java/com/chinaweal/youfool/prj/service/impl/UserBaseServiceImpl.java rename to src/main/java/com/chinaweal/youfool/course/service/impl/UserBaseServiceImpl.java index 7f3a671..6f2fb22 100644 --- a/src/main/java/com/chinaweal/youfool/prj/service/impl/UserBaseServiceImpl.java +++ b/src/main/java/com/chinaweal/youfool/course/service/impl/UserBaseServiceImpl.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj.service.impl; +package com.chinaweal.youfool.course.service.impl; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.session.SaSession; @@ -6,7 +6,7 @@ import cn.dev33.satoken.stp.StpUtil; import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.user.entity.UserBase; import com.chinaweal.youfool.framework.springboot.user.service.UserBaseService; -import com.chinaweal.youfool.prj.common.constants.SessionConstants; +import com.chinaweal.youfool.course.common.constants.SessionConstants; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/chinaweal/youfool/prj/config/AuthorityCheck.java b/src/main/java/com/chinaweal/youfool/prj/config/AuthorityCheck.java deleted file mode 100644 index ac67d34..0000000 --- a/src/main/java/com/chinaweal/youfool/prj/config/AuthorityCheck.java +++ /dev/null @@ -1,48 +0,0 @@ -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/resources/application.yml b/src/main/resources/application.yml index b2d0892..3a593a0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: profiles: active: dev application: - name: youfool-prj-springboot-template + name: youfool-lesson datasource: dynamic: primary: master #设置默认的数据源或者数据源组,默认值即为master diff --git a/src/test/java/com/chinaweal/youfool/prj/AppTest.java b/src/test/java/com/chinaweal/youfool/course/AppTest.java similarity index 95% rename from src/test/java/com/chinaweal/youfool/prj/AppTest.java rename to src/test/java/com/chinaweal/youfool/course/AppTest.java index 46014f3..2d2b168 100644 --- a/src/test/java/com/chinaweal/youfool/prj/AppTest.java +++ b/src/test/java/com/chinaweal/youfool/course/AppTest.java @@ -1,4 +1,4 @@ -package com.chinaweal.youfool.prj; +package com.chinaweal.youfool.course; import org.junit.Test;