Browse Source

解决Spring Boot 1.4.7.RELEASE Gradle插件与Gradle 4.x不兼容问题

huxz 8 years ago
parent
commit
e7b632107a

+ 5 - 0
.gitignore

@@ -2,6 +2,7 @@
 # idea
 .idea/
 *.iml
+out/
 
 # --------------------
 # eclipse
@@ -46,5 +47,9 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 
+# --------------------
+# Gradle
+build/
+
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar

+ 5 - 6
build.gradle

@@ -9,15 +9,14 @@ allprojects {
 subprojects {
     apply plugin: 'java'
     sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-    tasks.withType(JavaCompile) {
-        options.encoding = 'UTF-8'
-    }
 
     repositories {
         mavenLocal()
 
-        maven { url "http://10.10.101.21:8081/artifactory/libs-release" }
-        maven { url "http://10.10.101.21:8081/artifactory/libs-snapshot" }
+        jcenter()
+        maven { url "http://113.105.74.141:8081/artifactory/libs-release" }
+        maven { url "http://113.105.74.141:8081/artifactory/libs-snapshot" }
     }
+
+    [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 }

+ 3 - 3
settings.gradle

@@ -1,4 +1,4 @@
 rootProject.name = 'sso-parent'
-include ':sso-common'
-include ':sso-server'
-include ':sso-manage-console'
+include 'sso-common'
+include 'sso-server'
+include 'sso-manage-console'

+ 2 - 10
sso-manage-console/build.gradle

@@ -1,13 +1,5 @@
-buildscript {
-	ext {
-		springBootVersion = '1.4.7.RELEASE'
-	}
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-	}
+plugins {
+	id "org.springframework.boot" version "1.4.7.RELEASE"
 }
 
 apply plugin: 'java'

+ 0 - 5
sso-manage-console/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

+ 16 - 4
sso-server/build.gradle

@@ -1,6 +1,14 @@
 plugins {
-    id "war"
-    id "org.springframework.boot" version '1.4.7.RELEASE'
+    id "java"
+    id "org.springframework.boot" version '1.5.9.RELEASE'
+}
+
+group = 'com.uas.sso'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = 1.8
+
+configurations {
+    all*.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
 }
 
 dependencies {
@@ -10,13 +18,13 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-web")
     compile("org.springframework.boot:spring-boot-starter-security")
     compile("org.springframework.boot:spring-boot-starter-data-jpa")
-    compile("org.springframework.boot:spring-boot-starter-redis")
+    compile("org.springframework.boot:spring-boot-starter-data-redis")
 
     compile("org.springframework:spring-tx:4.3.3.RELEASE")
     compile("org.springframework.session:spring-session:1.2.2.RELEASE")
 
     compile("mysql:mysql-connector-java:5.1.41")
-    compile("com.alibaba:druid:1.0.24")
+    compile("com.alibaba:druid:1.1.6")
     compile("com.alibaba:fastjson:1.2.15")
     compile("com.alibaba:dubbo:2.8.4") {
         exclude(module: 'javax.servlet-api')
@@ -33,3 +41,7 @@ dependencies {
 
     testCompile("org.springframework.boot:spring-boot-starter-test")
 }
+
+bootRun {
+    addResources true
+}

+ 3 - 3
sso-server/src/main/java/com/uas/sso/entity/UserLog.java

@@ -13,7 +13,7 @@ import java.sql.Timestamp;
  * @date 2018/1/2
  */
 @Entity
-@Table(name = "sso$user$log")
+@Table(name = "sso$log$user")
 public class UserLog extends BaseLog implements Serializable {
 
     /**
@@ -59,13 +59,13 @@ public class UserLog extends BaseLog implements Serializable {
     /**
      * 修改后用户信息
      */
-    @Column(name = "userMsg", nullable = false)
+    @Column(name = "userMsg", nullable = false, length = 2000)
     private String userMsg;
 
     /**
      * 其他信息
      */
-    @Column(name = "otherMsg")
+    @Column(name = "otherMsg", length = 2000)
     private String otherMsg;
 
     public UserLog() {

+ 2 - 0
sso-server/src/main/java/com/uas/sso/service/impl/TokenServiceImpl.java

@@ -20,6 +20,7 @@ public class TokenServiceImpl implements TokenService {
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @SuppressWarnings("unchecked")
     @Override
     public void save(Token token) {
         redisTemplate.opsForValue().set(token.getId(), token, token.getExpires_in(), TimeUnit.SECONDS);
@@ -31,6 +32,7 @@ public class TokenServiceImpl implements TokenService {
         return token;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void delete(String tokenId) {
         redisTemplate.delete(tokenId);

+ 32 - 27
sso-server/src/main/resources/application.yml

@@ -1,31 +1,36 @@
+server:
+  port: 8090
+
 spring:
- application:
-  name: sso-server
- profiles:
-   active: dev
- jpa:
-  database: MYSQL
-  show-sql: false
-  properties:
-   hibernate:
-    dialect: org.hibernate.dialect.MySQL5Dialect
-    hbm2ddl:
-     auto: update
+  main:
+    banner-mode: "off"
+  application:
+    name: sso-server
+  profiles:
+    active: dev
+  jpa:
+    database: MYSQL
+    show-sql: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL5Dialect
+        hbm2ddl:
+          auto: update
 
- http:
-  encoding:
-   force: true
-  multipart:
-   enabled: true
-   max-file-size: 512MB
-   max-request-size: 512MB
+  http:
+    encoding:
+      force: true
+    multipart:
+      enabled: true
+      max-file-size: 512MB
+      max-request-size: 512MB
 
 security:
- basic:
-  enabled: true
-  path: /console
- user:
-  name: admin
-  password: select111***
-  role: ADMIN
- ignored: false
+  basic:
+    enabled: true
+    path: /console
+  user:
+    name: admin
+    password: select111***
+    role: ADMIN
+  ignored: false