升级springboot1.x到2.x

dongxl123 · Jul 23, 2020 · 917abac · 917abac
1 parent f7d12e6
commit 917abac
Show file tree

Hide file tree

Showing 19 changed files with 65 additions and 70 deletions.
diff --git 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,24 +26,18 @@ subprojects {
         mavenCentral()
     }
     group = 'com.winbaoxian.module'
-    version = '3.0.0-SNAPSHOT'
+    version = '1.2.0-SNAPSHOT'
     sourceCompatibility = '1.8'
     configurations {
         compileOnly {
             extendsFrom annotationProcessor
         }
     }
     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
@@ -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/...spring/src/main/java/com/winbaoxian/module/example/component/cas/WinCasConfiguration.java b/...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/.../main/java/com/winbaoxian/module/example/component/security/WinSecurityConfiguration.java b/.../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
@@ -9,9 +9,10 @@
     <!--JNDI DataSource for J2EE environments -->
     <bean id="dataSource"
           class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>
         <property name="url" value="jdbc:mysql://testwinbx.mysql.rds.aliyuncs.com:3306/citymanager?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true"/>
         <property name="username" value="winbx_test"/>
-        <property name="password" value="vault:v1:ctU8FDyl3icK6cvI6CbAPyXn6Ioklyfmyj/lBttnjGBkuK/VSOaNQw=="/>
+        <property name="password" value="funcitypt001"/>
         <!-- 配置初始化大小、最小、最大 -->
         <property name="initialSize" value="5"/>
         <property name="minIdle" value="1"/>
@@ -29,19 +30,18 @@
         <property name="testWhileIdle" value="true"/>
         <property name="testOnBorrow" value="false"/>
         <property name="testOnReturn" value="false"/>
-        <property name="filters" value="vault"/>
-        <property name="connectionProperties" value="config.decrypt=true"/>
+<!--        <property name="filters" value="vault"/>-->
+<!--        <property name="connectionProperties" value="config.decrypt=true"/>-->
     </bean>
 
     <!-- Hibernate SessionFactory -->
-    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean"
-          destroy-method="destroy">
+    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean" >
         <property name="dataSource" ref="dataSource"/>
         <property name="hibernateProperties">
             <props>
                 <prop key="hibernate.dialect">${hibernate.dialect}</prop>
                 <prop key="hibernate.query.substitutions">true 'Y', false 'N'</prop>
-                <prop key="hibernate.cache.use_second_level_cache">true</prop>
+                <prop key="hibernate.cache.use_second_level_cache">false</prop>
                 <!--<prop key="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</prop>-->
                 <prop key="hibernate.jdbc.batch_size">50</prop>
                 <prop key="hibernate.show_sql">${hibernate.show_sql}</prop>

diff --git a/example-spring/src/main/resources/logback.xml b/example-spring/src/main/resources/logback.xml
@@ -50,7 +50,7 @@
         <level value="DEBUG"/>
     </logger>
     <root>
-        <level value="info"/>
+        <level value="DEBUG"/>
         <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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')
 }
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
@@ -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/...rity/src/main/java/com/winbaoxian/module/security/model/mapper/WinSecurityRoleMapper.java b/...rity/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/...rc/main/java/com/winbaoxian/module/security/repository/WinSecurityResourceRepository.java b/...rc/main/java/com/winbaoxian/module/security/repository/WinSecurityResourceRepository.java
@@ -9,6 +9,8 @@
 
 public interface WinSecurityResourceRepository extends JpaRepository<WinSecurityResourceEntity, Long>, JpaSpecificationExecutor<WinSecurityResourceEntity> {
 
+    WinSecurityResourceEntity findOneById(Long id);
+
     List<WinSecurityResourceEntity> findAllByDeletedFalse();
 
     List<WinSecurityResourceEntity> findAllByStatusAndDeletedFalseOrderBySeqAsc(Integer status);

diff --git a/...ty/src/main/java/com/winbaoxian/module/security/repository/WinSecurityRoleRepository.java b/...ty/src/main/java/com/winbaoxian/module/security/repository/WinSecurityRoleRepository.java
@@ -11,6 +11,8 @@
 
 public interface WinSecurityRoleRepository<E extends WinSecurityBaseRoleEntity> extends JpaRepository<E, Long>, JpaSpecificationExecutor<E> {
 
+    E findOneById(Long id);
+
     List<E> findAllByDeletedFalseOrderBySeqAsc();
 
     Page<E> findAllByDeletedFalseOrderBySeqAsc(Pageable pageable);

diff --git a/...ty/src/main/java/com/winbaoxian/module/security/repository/WinSecurityUserRepository.java b/...ty/src/main/java/com/winbaoxian/module/security/repository/WinSecurityUserRepository.java
@@ -10,6 +10,8 @@
 
 public interface WinSecurityUserRepository<E extends WinSecurityBaseUserEntity> extends JpaRepository<E, Long>, JpaSpecificationExecutor<E> {
 
+    E findOneById(Long id);
+
     boolean existsByUserNameAndDeletedFalse(String userName);
 
     boolean existsByUserNameAndIdNotAndDeletedFalse(String userName, Long id);

diff --git a/...rity/src/main/java/com/winbaoxian/module/security/service/WinSecurityResourceService.java b/...rity/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<WinSecurityResourceDTO> 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/...security/src/main/java/com/winbaoxian/module/security/service/WinSecurityRoleService.java b/...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/...security/src/main/java/com/winbaoxian/module/security/service/WinSecurityUserService.java b/...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;
         }