From 917abacf36964d8975b05088a2e8871bb710ca14 Mon Sep 17 00:00:00 2001 From: dongxuanliang252 Date: Thu, 23 Jul 2020 19:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot1.x=E5=88=B02.x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 13 +++------ example-spring/build.gradle | 29 +++++++++++-------- .../component/cas/WinCasConfiguration.java | 3 +- .../security/WinSecurityConfiguration.java | 2 +- .../src/main/resources/applicationContext.xml | 12 ++++---- example-spring/src/main/resources/logback.xml | 2 +- example-springboot/build.gradle | 17 ++++++----- .../module/example/Application.java | 2 +- settings.gradle | 4 +-- win-cas/build.gradle | 3 +- win-security/build.gradle | 6 +--- .../annotation/EnableWinSecurity.java | 2 +- .../model/mapper/WinSecurityRoleMapper.java | 4 --- .../WinSecurityResourceRepository.java | 2 ++ .../repository/WinSecurityRoleRepository.java | 2 ++ .../repository/WinSecurityUserRepository.java | 2 ++ .../service/WinSecurityResourceService.java | 18 ++++++------ .../service/WinSecurityRoleService.java | 6 ++-- .../service/WinSecurityUserService.java | 6 ++-- 19 files changed, 65 insertions(+), 70 deletions(-) diff --git a/build.gradle b/build.gradle index ce76cdf..03f9b4a 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ subprojects { apply plugin: 'maven' apply plugin: 'java' apply plugin: 'idea' + apply plugin: 'net.ltgt.apt' apply plugin: 'io.spring.dependency-management' dependencyManagement { imports { @@ -25,7 +26,7 @@ subprojects { mavenCentral() } group = 'com.winbaoxian.module' - version = '3.0.0-SNAPSHOT' + version = '1.2.0-SNAPSHOT' sourceCompatibility = '1.8' configurations { compileOnly { @@ -33,16 +34,10 @@ subprojects { } } dependencies { - implementation "org.springframework.boot:spring-boot-starter-data-jpa" - implementation "org.springframework:spring-web" - implementation "org.jasig.cas.client:cas-client-core:3.5.1" - implementation 'org.apache.shiro:shiro-spring:1.4.2' - compileOnly 'javax.servlet:javax.servlet-api:3.1.0' - implementation 'org.aspectj:aspectjrt:1.8.13' - implementation 'org.aspectj:aspectjweaver:1.8.13' - implementation 'org.apache.commons:commons-lang3:3.7' + implementation 'org.apache.commons:commons-lang3' implementation 'commons-beanutils:commons-beanutils:1.9.3' implementation 'com.alibaba:fastjson:1.2.58' + compileOnly 'javax.servlet:javax.servlet-api' compileOnly 'org.mapstruct:mapstruct-jdk8:1.3.1.Final' annotationProcessor 'org.mapstruct:mapstruct-processor:1.3.1.Final' testAnnotationProcessor 'org.mapstruct:mapstruct-processor:1.3.1.Final' diff --git a/example-spring/build.gradle b/example-spring/build.gradle index de7597e..62f2007 100644 --- a/example-spring/build.gradle +++ b/example-spring/build.gradle @@ -15,22 +15,27 @@ apply plugin: 'war' apply plugin: "com.bmuschko.tomcat" dependencies { - compile project(":win-security") - compile project(":win-cas") - runtime('mysql:mysql-connector-java:5.1.47') - compile('com.winbaoxian.module:win-security:1.0.0-SNAPSHOT') - compile('com.winbaoxian:vault-lib:1.1.0') - compile("org.springframework:spring-webmvc:${springVersion}") - compile("org.springframework:spring-web:${springVersion}") - compile('com.winbaoxian:druid:1.1.11') - compileOnly('javax.servlet:javax.servlet-api:3.1.0') + implementation('com.winbaoxian.module:win-security:1.2.0-SNAPSHOT') + implementation('com.winbaoxian.module:win-cas:1.2.0-SNAPSHOT') + runtimeOnly('mysql:mysql-connector-java') + implementation("org.springframework:spring-webmvc") + implementation("org.springframework:spring-web") + implementation('org.springframework.boot:spring-boot-starter-data-jpa') + implementation('org.hibernate:hibernate-core') + implementation('org.aspectj:aspectjrt') + implementation('org.aspectj:aspectjweaver') + implementation('org.slf4j:slf4j-api') + implementation('com.winbaoxian:vault-lib:1.1.0') + implementation('com.winbaoxian:druid:1.1.11') + implementation('org.mapstruct:mapstruct:1.3.1.Final') + def tomcatVersion = '8.0.42' tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}", "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}", "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}" } -tomcat{ +tomcat { httpPort = 9999 - contextPath = 'example' -} + contextPath = '/' + } diff --git a/example-spring/src/main/java/com/winbaoxian/module/example/component/cas/WinCasConfiguration.java b/example-spring/src/main/java/com/winbaoxian/module/example/component/cas/WinCasConfiguration.java index 703edcb..3c5e9bd 100644 --- a/example-spring/src/main/java/com/winbaoxian/module/example/component/cas/WinCasConfiguration.java +++ b/example-spring/src/main/java/com/winbaoxian/module/example/component/cas/WinCasConfiguration.java @@ -1,6 +1,5 @@ package com.winbaoxian.module.example.component.cas; -import com.winbaoxian.module.cas.annotation.EnableWinCasClient; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.context.annotation.Configuration; @@ -9,6 +8,6 @@ * @date 2019-04-12 17:12 */ //@Configuration -@EnableWinCasClient +//@EnableWinCasClient public class WinCasConfiguration { } diff --git a/example-spring/src/main/java/com/winbaoxian/module/example/component/security/WinSecurityConfiguration.java b/example-spring/src/main/java/com/winbaoxian/module/example/component/security/WinSecurityConfiguration.java index d65bbcd..9f34b4a 100644 --- a/example-spring/src/main/java/com/winbaoxian/module/example/component/security/WinSecurityConfiguration.java +++ b/example-spring/src/main/java/com/winbaoxian/module/example/component/security/WinSecurityConfiguration.java @@ -31,7 +31,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactoryWinSecurity() factoryBean.setDataSource(dataSource); factoryBean.setPackagesToScan(new String[]{}); factoryBean.setPersistenceUnitName("winSecurity"); - factoryBean.setJpaProperties(sessionFactory.getProperties()); + factoryBean.setJpaPropertyMap(sessionFactory.getProperties()); factoryBean.setPersistenceProviderClass(HibernatePersistenceProvider.class); return factoryBean; } diff --git a/example-spring/src/main/resources/applicationContext.xml b/example-spring/src/main/resources/applicationContext.xml index 17109e7..e72c9b3 100644 --- a/example-spring/src/main/resources/applicationContext.xml +++ b/example-spring/src/main/resources/applicationContext.xml @@ -9,9 +9,10 @@ + - + @@ -29,19 +30,18 @@ - - + + - + ${hibernate.dialect} true 'Y', false 'N' - true + false 50 ${hibernate.show_sql} diff --git a/example-spring/src/main/resources/logback.xml b/example-spring/src/main/resources/logback.xml index 8222074..a360de0 100644 --- a/example-spring/src/main/resources/logback.xml +++ b/example-spring/src/main/resources/logback.xml @@ -50,7 +50,7 @@ - + diff --git a/example-springboot/build.gradle b/example-springboot/build.gradle index 7ad5b42..184a5c5 100644 --- a/example-springboot/build.gradle +++ b/example-springboot/build.gradle @@ -4,13 +4,14 @@ apply plugin: 'war' //apply plugin: 'org.springframework.boot' dependencies { - compile project(":win-security") - compile project(":win-cas") - compile('org.springframework.boot:spring-boot-starter-data-jpa') - compile('org.springframework.boot:spring-boot-starter-web') - runtime('mysql:mysql-connector-java') - compile('com.winbaoxian.module:win-security:1.0.0-SNAPSHOT') - compile('com.winbaoxian:vault-lib:1.1.0') - testCompile('org.springframework.boot:spring-boot-starter-test') + implementation('com.winbaoxian.module:win-security:1.2.0-SNAPSHOT') + implementation('com.winbaoxian.module:win-cas:1.2.0-SNAPSHOT') + implementation('org.springframework.boot:spring-boot-starter-data-jpa') + implementation('org.springframework.boot:spring-boot-starter-web') + runtimeOnly('mysql:mysql-connector-java') + implementation('org.apache.shiro:shiro-spring:1.4.2') + implementation('org.mapstruct:mapstruct:1.3.1.Final') + implementation('com.winbaoxian:vault-lib:1.1.0') + testImplementation('org.springframework.boot:spring-boot-starter-test') } diff --git a/example-springboot/src/main/java/com/winbaoxian/module/example/Application.java b/example-springboot/src/main/java/com/winbaoxian/module/example/Application.java index b5ba89f..cd4a6e7 100644 --- a/example-springboot/src/main/java/com/winbaoxian/module/example/Application.java +++ b/example-springboot/src/main/java/com/winbaoxian/module/example/Application.java @@ -28,7 +28,7 @@ extensionServiceProcessors = {RoleAddProcessorImpl.class, RoleUpdateProcessorImpl.class, UserAddProcessorImpl.class, UserUpdateProcessorImpl.class, UserPageProcessorImpl.class}, extensionServiceFillers = {UserFillerImpl.class}, sysLog = true) -//@EnableWinCasClient +@EnableWinCasClient public class Application extends SpringBootServletInitializer { @Override diff --git a/settings.gradle b/settings.gradle index a433d1d..bd13244 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,4 @@ rootProject.name = 'spring-biz-module' include 'win-security' include 'win-cas' include 'example-springboot' -//include 'example-spring' -// - +include 'example-spring' diff --git a/win-cas/build.gradle b/win-cas/build.gradle index 3a2ec36..090052a 100644 --- a/win-cas/build.gradle +++ b/win-cas/build.gradle @@ -3,8 +3,7 @@ description = 'win-cas' dependencies { implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework:spring-web") - implementation("org.jasig.cas.client:cas-client-core") - compileOnly('javax.servlet:javax.servlet-api:3.1.0') + implementation("org.jasig.cas.client:cas-client-core:3.5.1") } //支持上传到maven nexus库 diff --git a/win-security/build.gradle b/win-security/build.gradle index f382174..c0566cc 100644 --- a/win-security/build.gradle +++ b/win-security/build.gradle @@ -3,10 +3,6 @@ description = 'win-security' dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework:spring-web") - implementation("org.jasig.cas.client:cas-client-core") + implementation("org.jasig.cas.client:cas-client-core:3.5.1") implementation('org.apache.shiro:shiro-spring:1.4.2') - compileOnly('javax.servlet:javax.servlet-api:3.1.0') - implementation('org.hibernate:hibernate-core:5.0.12.Final') - implementation('org.aspectj:aspectjrt:1.8.13') - implementation('org.aspectj:aspectjweaver:1.8.13') } \ No newline at end of file diff --git a/win-security/src/main/java/com/winbaoxian/module/security/annotation/EnableWinSecurity.java b/win-security/src/main/java/com/winbaoxian/module/security/annotation/EnableWinSecurity.java index 0b16a8b..b46cbf2 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/annotation/EnableWinSecurity.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/annotation/EnableWinSecurity.java @@ -38,7 +38,6 @@ WinSecurityExceptionHandler.class, ShiroConfiguration.class, ShiroFilterConfiguration.class, - WinSecurityErrorController.class, WinSecurityAccessService.class, WinSecurityUserService.class, WinSecurityRoleService.class, @@ -49,6 +48,7 @@ @Import({ExtensionClassRegistrar.class, SysLogSelector.class, ControllerEffectiveScopeSelector.class, + WinSecurityErrorController.class, AnnotationAttributesRegistrar.class, EntityManagerFactoryAttributesPostProcessor.class}) @EnableJpaRepositories(basePackages = "com.winbaoxian.module.security.repository") diff --git a/win-security/src/main/java/com/winbaoxian/module/security/model/mapper/WinSecurityRoleMapper.java b/win-security/src/main/java/com/winbaoxian/module/security/model/mapper/WinSecurityRoleMapper.java index 5933a10..ba71978 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/model/mapper/WinSecurityRoleMapper.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/model/mapper/WinSecurityRoleMapper.java @@ -2,11 +2,7 @@ import com.alibaba.fastjson.JSON; import com.winbaoxian.module.security.model.dto.WinSecurityBaseRoleDTO; -import com.winbaoxian.module.security.model.dto.WinSecurityBaseUserDTO; import com.winbaoxian.module.security.model.entity.WinSecurityBaseRoleEntity; -import com.winbaoxian.module.security.model.entity.WinSecurityBaseUserEntity; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; import java.util.ArrayList; import java.util.List; diff --git a/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityResourceRepository.java b/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityResourceRepository.java index 9e98839..1884598 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityResourceRepository.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityResourceRepository.java @@ -9,6 +9,8 @@ public interface WinSecurityResourceRepository extends JpaRepository, JpaSpecificationExecutor { + WinSecurityResourceEntity findOneById(Long id); + List findAllByDeletedFalse(); List findAllByStatusAndDeletedFalseOrderBySeqAsc(Integer status); diff --git a/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityRoleRepository.java b/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityRoleRepository.java index 5a5468b..1015b98 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityRoleRepository.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityRoleRepository.java @@ -11,6 +11,8 @@ public interface WinSecurityRoleRepository extends JpaRepository, JpaSpecificationExecutor { + E findOneById(Long id); + List findAllByDeletedFalseOrderBySeqAsc(); Page findAllByDeletedFalseOrderBySeqAsc(Pageable pageable); diff --git a/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityUserRepository.java b/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityUserRepository.java index c1d8f5f..692a592 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityUserRepository.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/repository/WinSecurityUserRepository.java @@ -10,6 +10,8 @@ public interface WinSecurityUserRepository extends JpaRepository, JpaSpecificationExecutor { + E findOneById(Long id); + boolean existsByUserNameAndDeletedFalse(String userName); boolean existsByUserNameAndIdNotAndDeletedFalse(String userName, Long id); diff --git a/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityResourceService.java b/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityResourceService.java index fa70f0b..5ab88d4 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityResourceService.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityResourceService.java @@ -60,7 +60,7 @@ private String getGlobalCode(String thisCode, Long pid) { String globalCode = thisCode; Long thisPid = pid; while (thisPid != null && thisPid > 0) { - WinSecurityResourceEntity pEntity = winSecurityResourceRepository.getOne(thisPid); + WinSecurityResourceEntity pEntity = winSecurityResourceRepository.findOneById(thisPid); if (pEntity != null) { if (StringUtils.isNotBlank(pEntity.getCode())) { globalCode = String.format("%s.%s", pEntity.getCode(), globalCode); @@ -76,7 +76,7 @@ private String getGlobalCode(String thisCode, Long pid) { } public void deleteResource(Long id) { - WinSecurityResourceEntity entity = winSecurityResourceRepository.getOne(id); + WinSecurityResourceEntity entity = winSecurityResourceRepository.findOneById(id); if (entity == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_RESOURCE_NOT_EXISTS); } @@ -102,7 +102,7 @@ public WinSecurityResourceDTO updateResource(WinSecurityResourceDTO dto) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_PARAM_NOT_EXISTS); } Long id = dto.getId(); - WinSecurityResourceEntity persistent = winSecurityResourceRepository.getOne(id); + WinSecurityResourceEntity persistent = winSecurityResourceRepository.findOneById(id); if (persistent == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_RESOURCE_NOT_EXISTS); } @@ -134,7 +134,7 @@ private void updateGlobalCodeByPid(Long thisId) { } public WinSecurityResourceDTO getResource(Long id) { - return WinSecurityResourceMapper.INSTANCE.toResourceDTO(winSecurityResourceRepository.getOne(id)); + return WinSecurityResourceMapper.INSTANCE.toResourceDTO(winSecurityResourceRepository.findOneById(id)); } public List getResourceList(WinSecurityResourceDTO params) { @@ -242,7 +242,7 @@ public WinSecurityResourceDTO dragAndDropResource(DragAndDropParamDTO params) { params.setTargetParentId(0L); } Long id = params.getId(); - WinSecurityResourceEntity persistent = winSecurityResourceRepository.getOne(id); + WinSecurityResourceEntity persistent = winSecurityResourceRepository.findOneById(id); if (persistent == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_RESOURCE_NOT_EXISTS); } @@ -264,11 +264,11 @@ public WinSecurityResourceDTO dragAndDropResource(DragAndDropParamDTO params) { } private Long reCalculateSequence(Long id, Long targetParentId, Long targetUpId, Long targetDownId) { - WinSecurityResourceEntity thisResource = winSecurityResourceRepository.getOne(id); + WinSecurityResourceEntity thisResource = winSecurityResourceRepository.findOneById(id); WinSecurityResourceEntity upResource = null; WinSecurityResourceEntity downResource = null; if (targetUpId != null) { - upResource = winSecurityResourceRepository.getOne(targetUpId); + upResource = winSecurityResourceRepository.findOneById(targetUpId); if (upResource == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_RESOURCE_NOT_EXISTS); } @@ -277,7 +277,7 @@ private Long reCalculateSequence(Long id, Long targetParentId, Long targetUpId, } } if (targetDownId != null) { - downResource = winSecurityResourceRepository.getOne(targetDownId); + downResource = winSecurityResourceRepository.findOneById(targetDownId); if (downResource == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_RESOURCE_NOT_EXISTS); } @@ -399,7 +399,7 @@ public boolean updateResourceBatch(BatchUpdateParamDTO params) { params.setTargetParentId(0L); } for (Long thisId : params.getIdList()) { - WinSecurityResourceEntity persistent = winSecurityResourceRepository.getOne(thisId); + WinSecurityResourceEntity persistent = winSecurityResourceRepository.findOneById(thisId); if (persistent == null) { continue; } diff --git a/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityRoleService.java b/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityRoleService.java index 0dd6ccd..2e62985 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityRoleService.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityRoleService.java @@ -72,7 +72,7 @@ public D addRole(D dto) { } public void deleteRole(Long id) { - E entity = winSecurityRoleRepository.getOne(id); + E entity = winSecurityRoleRepository.findOneById(id); if (entity == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_ROLE_NOT_EXISTS); } @@ -88,7 +88,7 @@ public D updateRole(D dto) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_PARAM_NOT_EXISTS); } Long id = dto.getId(); - E persistent = winSecurityRoleRepository.getOne(id); + E persistent = winSecurityRoleRepository.findOneById(id); if (persistent == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_ROLE_NOT_EXISTS); } @@ -123,7 +123,7 @@ public D updateRole(D dto) { } public D getRole(Long id) { - D roleDTO = (D) WinSecurityRoleMapper.INSTANCE.toRoleDTO(winSecurityRoleRepository.getOne(id), winSecurityClassLoaderConfiguration.getRoleDTOClass()); + D roleDTO = (D) WinSecurityRoleMapper.INSTANCE.toRoleDTO(winSecurityRoleRepository.findOneById(id), winSecurityClassLoaderConfiguration.getRoleDTOClass()); if (roleDTO == null) { return null; } diff --git a/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityUserService.java b/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityUserService.java index 0d313aa..abe26c9 100644 --- a/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityUserService.java +++ b/win-security/src/main/java/com/winbaoxian/module/security/service/WinSecurityUserService.java @@ -84,7 +84,7 @@ public D addUser(D dto) { } public void deleteUser(Long id) { - E entity = winSecurityUserRepository.getOne(id); + E entity = winSecurityUserRepository.findOneById(id); if (entity == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_USER_NOT_EXISTS); } @@ -100,7 +100,7 @@ public D updateUser(D dto) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_PARAM_NOT_EXISTS); } Long id = dto.getId(); - E persistent = winSecurityUserRepository.getOne(id); + E persistent = winSecurityUserRepository.findOneById(id); if (persistent == null) { throw new WinSecurityException(WinSecurityErrorEnum.COMMON_USER_NOT_EXISTS); } @@ -135,7 +135,7 @@ public D updateUser(D dto) { } public D getUser(Long id) { - D userDTO = (D) WinSecurityUserMapper.INSTANCE.toUserDTO(winSecurityUserRepository.getOne(id), winSecurityClassLoaderConfiguration.getUserDTOClass()); + D userDTO = (D) WinSecurityUserMapper.INSTANCE.toUserDTO(winSecurityUserRepository.findOneById(id), winSecurityClassLoaderConfiguration.getUserDTOClass()); if (userDTO == null) { return null; }