tuonina 5 years ago
parent
commit
44e8b56132

+ 16 - 21
build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
-        kotlin_version = '1.3.10'
-        springBootVersion = '2.1.4.RELEASE'
+        kotlin_version = '1.3.21'
+        springBootVersion = '2.1.7.RELEASE'
         junit_version = '4.12'
         commons_io_version = '2.5'
         commons_lang3_version = '3.5'
@@ -10,15 +10,16 @@ buildscript {
         mysql_connector_version = '5.1.45'
         mybatisPlusVersion = '3.0.3'
         slf4j_api_version = '1.7.25'
-        rxJavaVersion='2.2.3'
+        rxJavaVersion = '2.2.3'
         jwtVersion = '1.4.0'
-        authVersion='1.2'
+        authVersion = '1.2'
         shiro_version = '1.4.0'
         swagger_version = '2.7.0'
     }
     repositories {
-        mavenCentral()
+        maven { url 'https://maven.aliyun.com/repository/central' }
         maven { url = 'http://repo.spring.io/plugins-release' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -49,22 +50,15 @@ subprojects {
     compileJava.dependsOn(processResources)
 
 
-    ext{
-        set('springCloudVersion','Greenwich.SR1')
+    ext {
+        set('springCloudVersion', 'Greenwich.SR2')
         set('springBootAdminVersion', '2.1.4')
     }
 
     repositories {
         maven { url 'https://maven.aliyun.com/repository/public' }
-        mavenCentral()
-        jcenter()
-        maven {
-            url("https://repo.rdc.aliyun.com/repository/37165-release-a3lssL")
-            credentials {
-                username 'Dz38pq'
-                password 'U1oB2RJOJa'
-            }
-        }
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
     }
 
     dependencyManagement {
@@ -74,7 +68,7 @@ subprojects {
         }
     }
 
-    configurations{
+    configurations {
         all*.exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
     }
 
@@ -88,6 +82,7 @@ subprojects {
         // SpringBoot Starter
         compile 'org.springframework.cloud:spring-cloud-starter-bus-amqp'
         compile('org.springframework.boot:spring-boot-starter-web')
+        compile('org.springframework.boot:spring-boot-starter-thymeleaf')
 
         compile('org.springframework.cloud:spring-cloud-config-server')
         compile('org.springframework.cloud:spring-cloud-config-monitor')
@@ -100,7 +95,7 @@ subprojects {
 
         compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-server')
         compile('org.springframework.cloud:spring-cloud-starter-openfeign')
-        
+
 //
         // commons
         compile("commons-io:commons-io:$commons_io_version")
@@ -116,7 +111,7 @@ subprojects {
         compile("org.slf4j:slf4j-api:$slf4j_api_version")
         compile("javax.servlet:javax.servlet-api:3.1.0")
         compile("javax.servlet:servlet-api:2.5")
-        
+
         compile("mysql:mysql-connector-java:$mysql_connector_version")
         compile("com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion")
 
@@ -127,8 +122,8 @@ subprojects {
         compile 'io.jsonwebtoken:jjwt-api:0.10.5'
         runtime 'io.jsonwebtoken:jjwt-impl:0.10.5',
                 'io.jsonwebtoken:jjwt-jackson:0.10.5'
-        
-        
+
+
         ext.jarTree = fileTree(dir: 'libs', include: '**/*.jar')
         compile jarTree
     }

+ 16 - 0
envir-config/src/main/resources/html/config.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>配置管理</title>
+    <!-- 引入样式 -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vant@2.0/lib/index.css">
+
+    <!-- 引入组件 -->
+    <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vant@2.0/lib/vant.min.js"></script>
+</head>
+<body>
+
+</body>
+</html>

+ 1 - 1
eureka-web/src/main/resources/application.yml

@@ -42,7 +42,7 @@ eureka:
     prefer-ip-address: true
     lease-renewal-interval-in-seconds: 15
     lease-expiration-duration-in-seconds: 32
-    ip-address: 192.168.1.148
+    ip-address: 192.168.42.12
     metadata-map:
       startup: ${random.int}
       tags: config

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip