升级springboot1.x到2.x

dongxl123 · Jul 22, 2020 · f7d12e6 · f7d12e6
1 parent ac27eac
commit f7d12e6
Show file tree

Hide file tree

Showing 17 changed files with 100 additions and 114 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,52 +1,60 @@
-allprojects {
-    apply plugin: 'maven'
-    group = 'com.winbaoxian.module'
-    version = '1.0.0'
+plugins {
+    id 'org.springframework.boot' version '2.2.5.RELEASE' apply false
+    id 'net.ltgt.apt' version '0.21'
+}
+
+repositories {
+    mavenCentral()
 }
 
 subprojects {
-    buildscript {
-        ext {
-            springBootVersion = '1.5.17.RELEASE'
-            springVersion = '4.3.20.RELEASE'
-            casVersion = '3.4.1'
-        }
-        repositories {
-            mavenCentral()
-        }
-        dependencies {
-            classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-        }
-    }
+    apply plugin: 'maven'
     apply plugin: 'java'
     apply plugin: 'idea'
-    sourceCompatibility = 1.8
-
+    apply plugin: 'io.spring.dependency-management'
+    dependencyManagement {
+        imports {
+            mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
+        }
+    }
     repositories {
         mavenLocal()
         maven { url "http://192.168.180.191:8081/nexus/content/repositories/public" }
         maven { url "http://192.168.180.191:8081/nexus/content/repositories/snapshots/" }
+        maven { url 'https://maven.aliyun.com/repository/public' }
         mavenCentral()
     }
-
-    dependencies {
-        compile('org.apache.commons:commons-lang3:3.7')
-        compile('commons-beanutils:commons-beanutils:1.9.3')
-        compile('com.alibaba:fastjson:1.2.58')
-        compile('org.mapstruct:mapstruct-jdk8:1.2.0.Final')
-        compile('org.mapstruct:mapstruct-processor:1.2.0.Final')
-        compileOnly('org.projectlombok:lombok:1.16.22')
+    group = 'com.winbaoxian.module'
+    version = '3.0.0-SNAPSHOT'
+    sourceCompatibility = '1.8'
+    configurations {
+        compileOnly {
+            extendsFrom annotationProcessor
+        }
     }
-
-    task "create-dirs" << {
-        sourceSets*.java.srcDirs*.each { it.mkdirs() }
-        sourceSets*.resources.srcDirs*.each { it.mkdirs() }
+    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 'commons-beanutils:commons-beanutils:1.9.3'
+        implementation 'com.alibaba:fastjson:1.2.58'
+        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'
+        compileOnly 'org.projectlombok:lombok'
+        annotationProcessor 'org.projectlombok:lombok'
     }
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
     }
 }
 
+
 def isWindows() {
     return org.gradle.internal.os.OperatingSystem.current().isWindows()
 }
@@ -65,10 +73,5 @@ task servicedocs(type: Exec, description: '执行生成servicedoc文档操作')
     commandLine serviceCommand
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.4'
-    distributionType = 'all'
-}
-
 
 
diff --git a/example-springboot/build.gradle b/example-springboot/build.gradle
@@ -1,7 +1,7 @@
 description = 'module example for springboot'
 
 apply plugin: 'war'
-apply plugin: 'org.springframework.boot'
+//apply plugin: 'org.springframework.boot'
 
 dependencies {
     compile project(":win-security")

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
@@ -10,7 +10,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 /**
  * @ServletComponentScan 开启listner和filter
@@ -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/...a/com/winbaoxian/module/example/component/multids/CityManagerDataSourceConfiguration.java b/...a/com/winbaoxian/module/example/component/multids/CityManagerDataSourceConfiguration.java
@@ -1,9 +1,9 @@
 package com.winbaoxian.module.example.component.multids;
 
 import com.winbaoxian.vault.VaultTools;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,7 +33,7 @@ public class CityManagerDataSourceConfiguration {
     private VaultTools vaultTools;
 
     @Bean
-    @ConfigurationProperties(prefix = "spring.datasource.citymanager", ignoreNestedProperties = true)
+    @ConfigurationProperties(prefix = "spring.datasource.citymanager")
     public DataSource dataSourceCitymanager() {
         return DataSourceBuilder.create().build();
     }
@@ -43,7 +43,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactoryCitymanager(En
         return builder
                 .dataSource(dataSourceCitymanager())
                 .packages(new String[]{"com.winbaoxian.module.example.model.entity.citymanagerddd"})
-                .properties(jpaProperties.getHibernateProperties(dataSourceCitymanager()))
+                .properties(jpaProperties.getProperties())
                 .persistenceUnit("citymanager")
                 .build();
     }

diff --git a/...main/java/com/winbaoxian/module/example/component/multids/TobDataSourceConfiguration.java b/...main/java/com/winbaoxian/module/example/component/multids/TobDataSourceConfiguration.java
@@ -1,9 +1,9 @@
 package com.winbaoxian.module.example.component.multids;
 
 import com.winbaoxian.vault.VaultTools;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -46,7 +46,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactoryTob(EntityMana
         return builder
                 .dataSource(dataSourceTob())
                 .packages(new String[]{"com.winbaoxian.module.example.model.entity.tob"})
-                .properties(jpaProperties.getHibernateProperties(dataSourceTob()))
+                .properties(jpaProperties.getProperties())
                 .persistenceUnit("tob")
                 .build();
     }

diff --git a/example-springboot/src/main/resources/application.yml b/example-springboot/src/main/resources/application.yml
@@ -10,8 +10,9 @@ spring:
       ddl-auto: none
   datasource:
     citymanager:
-      driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://testwinbx.mysql.rds.aliyuncs.com:3306/citymanager?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      type: com.zaxxer.hikari.HikariDataSource
+      jdbcUrl: jdbc:mysql://testwinbx.mysql.rds.aliyuncs.com:3306/citymanager?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
       username: winbx_test
       password: funcitypt001
       initialSize: 1
@@ -27,8 +28,9 @@ spring:
       poolPreparedStatements: false
       cipherText: vault:v1:Zd7xYEU7kLiUG0THKcFnSjszkEzL67r7MNXYpho1Tu1sEcZZ0nyxOw==
     tob:
-      driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://testwinbx.mysql.rds.aliyuncs.com:3306/baoxian2b?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      type: com.zaxxer.hikari.HikariDataSource
+      jdbcUrl: jdbc:mysql://testwinbx.mysql.rds.aliyuncs.com:3306/baoxian2b?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
       username: winbx_test
       password: funcitypt001
       initialSize: 1

diff --git a/settings.gradle b/settings.gradle
@@ -2,6 +2,6 @@ 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
@@ -1,10 +1,9 @@
 description = 'win-cas'
-version = '1.0.0-SNAPSHOT'
 
 dependencies {
-    compile("org.springframework.boot:spring-boot-starter:${springBootVersion}")
-    compile("org.springframework:spring-web:${springVersion}")
-    compile("org.jasig.cas.client:cas-client-core:${casVersion}")
+    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')
 }
 

diff --git a/win-cas/src/main/java/com/winbaoxian/module/cas/initializer/WinCasSpringWebInitializer.java b/win-cas/src/main/java/com/winbaoxian/module/cas/initializer/WinCasSpringWebInitializer.java
@@ -15,7 +15,7 @@
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
 import org.springframework.context.annotation.Configuration;

diff --git a/win-security/build.gradle b/win-security/build.gradle
@@ -1,30 +1,12 @@
 description = 'win-security'
-version = '1.0.0-SNAPSHOT'
-
 
 dependencies {
-    compile("org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}")
-    compile("org.springframework:spring-web:${springVersion}")
-    compile("org.jasig.cas.client:cas-client-core:${casVersion}")
-    compile('org.apache.shiro:shiro-spring:1.4.2')
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework:spring-web")
+    implementation("org.jasig.cas.client:cas-client-core")
+    implementation('org.apache.shiro:shiro-spring:1.4.2')
     compileOnly('javax.servlet:javax.servlet-api:3.1.0')
-    compile('org.hibernate:hibernate-core:5.0.12.Final')
-    compile('org.aspectj:aspectjrt:1.8.13')
-    compile('org.aspectj:aspectjweaver:1.8.13')
-}
-
-//支持上传到maven nexus库
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository(url: "http://192.168.180.191:8081/nexus/content/repositories/snapshots/") {
-                authentication(userName: "admin", password: "admin123")
-            }
-            pom.project {
-                name = project.name
-                packaging = 'jar'
-                description = 'win security'
-            }
-        }
-    }
+    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/...src/main/java/com/winbaoxian/module/security/config/shiro/WinSecurityErrorController.java b/...src/main/java/com/winbaoxian/module/security/config/shiro/WinSecurityErrorController.java
@@ -17,7 +17,7 @@
 package com.winbaoxian.module.security.config.shiro;
 
 import com.winbaoxian.module.security.model.common.JsonResult;
-import org.springframework.boot.autoconfigure.web.ErrorController;
+import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

diff --git a/...main/java/com/winbaoxian/module/security/initializer/WinSecuritySpringWebInitializer.java b/...main/java/com/winbaoxian/module/security/initializer/WinSecuritySpringWebInitializer.java
@@ -6,7 +6,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.OrderComparator;

diff --git a/win-security/src/main/java/com/winbaoxian/module/security/model/common/Pagination.java b/win-security/src/main/java/com/winbaoxian/module/security/model/common/Pagination.java
@@ -87,12 +87,12 @@ public void setOrderDirection(String orderDirection) {
     public static Pageable createPageable(Pagination pagination, String defaultOrderProperty, String defaultOrderDirection) {
         String orderProperty = StringUtils.defaultIfBlank(pagination.getOrderProperty(), defaultOrderProperty);
         String orderDirection = StringUtils.defaultIfBlank(pagination.getOrderDirection(), defaultOrderDirection);
-        Sort sort = new Sort(Sort.Direction.fromStringOrNull(orderDirection), orderProperty);
-        return new PageRequest(pagination.getPageNum() - 1, pagination.getPageSize(), sort);
+        Sort sort = Sort.by(Sort.Direction.fromString(orderDirection), orderProperty);
+        return PageRequest.of(pagination.getPageNum() - 1, pagination.getPageSize(), sort);
     }
 
     public static Pageable createPageable(Pagination pagination) {
-        return new PageRequest(pagination.getPageNum() - 1, pagination.getPageSize());
+        return PageRequest.of(pagination.getPageNum() - 1, pagination.getPageSize());
     }
 
 }