完善数据库保存配置信息

build.gradle

@@ -1,8 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.3.10'
-        springBootVersion = '2.0.1.RELEASE'
-        springCloudVersion = 'Finchley.SR1'
+        springBootVersion = '2.1.4.RELEASE'
         junit_version = '4.12'
         commons_io_version = '2.5'
         commons_lang3_version = '3.5'
@@ -16,7 +15,6 @@ buildscript {
         authVersion='1.2'
         shiro_version = '1.4.0'
         swagger_version = '2.7.0'
-        springBootAdminVersion='2.0.1'
     }
     repositories {
         mavenCentral()
@@ -50,6 +48,12 @@ subprojects {
     [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
     compileJava.dependsOn(processResources)
 
+
+    ext{
+        set('springCloudVersion','Greenwich.SR1')
+        set('springBootAdminVersion', '2.1.4')
+    }
+
     repositories {
         mavenCentral()
         jcenter()
@@ -64,7 +68,8 @@ subprojects {
 
     dependencyManagement {
         imports {
-            mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Finchley.SR1'
+            mavenBom "de.codecentric:spring-boot-admin-dependencies:${springBootAdminVersion}"
+            mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
         }
     }
 
@@ -84,6 +89,7 @@ subprojects {
         compile('org.springframework.boot:spring-boot-starter-web')
 
         compile('org.springframework.cloud:spring-cloud-config-server')
+        compile('org.springframework.cloud:spring-cloud-config-monitor')
         compile('org.springframework.boot:spring-boot-starter-jetty')
         compile('org.springframework.boot:spring-boot-starter-jdbc')
         compile('org.springframework.boot:spring-boot-starter-cache')

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/controller/RefreshConfigController.kt

@@ -0,0 +1,36 @@
+package cn.gygxzc.cloud.config.controller
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent
+import org.springframework.context.ApplicationEventPublisher
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/16
+ * 通过前端接口刷新服务的配置
+ */
+@RestController
+@RequestMapping("/v1/refresh/config")
+class RefreshConfigController {
+
+    @Autowired
+    private var applicationEventPublisher: ApplicationEventPublisher? = null
+
+    @Value("\${spring.application.name}")
+    private lateinit var busId: String
+
+
+    @PostMapping("/{application}")
+    fun refresh(@PathVariable("application") application: String) {
+        if (this.applicationEventPublisher == null) {
+            throw RuntimeException("无法发送消息！")
+        }
+        applicationEventPublisher!!.publishEvent(RefreshRemoteApplicationEvent(this, busId, application))
+    }
+
+}

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/impl/ConfigPropService.kt

@@ -41,7 +41,7 @@ class ConfigPropService : IConfigPropService {
     override fun query(prop: ConfigProperty,
                        page: Long, pageSize: Long): IPage<ConfigProperty> {
         val queryWrapper = QueryWrapper<ConfigProperty>()
-        queryWrapper.orderByDesc("`key`","application","profile")
+        queryWrapper.orderByDesc("application","profile","`key`")
         if (!prop.application.isNullOrBlank()){
             queryWrapper.eq("application",prop.application)
         }
@@ -52,7 +52,7 @@ class ConfigPropService : IConfigPropService {
             queryWrapper.eq("label",prop.label)
         }
         if (!prop.key.isNullOrBlank()){
-            queryWrapper.like("key",prop.key)
+            queryWrapper.like("`key`",prop.key)
         }
         return propDao.selectPage(Page(page, pageSize), queryWrapper)
     }

eureka-web/build.gradle

@@ -17,8 +17,8 @@ dependencies{
     compile project(':envir-config')
     //监控
     compile('org.springframework.boot:spring-boot-starter-actuator')
-    compile("de.codecentric:spring-boot-admin-starter-server:${springBootAdminVersion}")
-    compile("de.codecentric:spring-boot-admin-starter-client:${springBootAdminVersion}")
+    compile("de.codecentric:spring-boot-admin-starter-server")
+    compile("de.codecentric:spring-boot-admin-starter-client")
     compile('org.jolokia:jolokia-core')
     compile('io.projectreactor.addons:reactor-extra')
 }

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

@@ -3,7 +3,7 @@ spring:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.jdbc.Driver
     hikari:
-      minimum-idle: 0
+      minimum-idle: 1
       maximum-pool-size: 6
       auto-commit: true
       idle-timeout: 60000
@@ -14,6 +14,8 @@ spring:
   boot:
     admin:
       context-path: /admin
+  main:
+    allow-bean-definition-overriding: true
 
 
 mybatis-plus:
@@ -22,8 +24,6 @@ mybatis-plus:
     db-config:
       id-type: auto
       table-underline: true
-      logic-delete-value: 0
-      logic-not-delete-value: 1
       column-like: true
     refresh: true
 
@@ -43,7 +43,7 @@ eureka:
     prefer-ip-address: true
     lease-renewal-interval-in-seconds: 15
     lease-expiration-duration-in-seconds: 32
-    ip-address: 127.0.0.1
+    ip-address: 192.168.1.133
     metadata-map:
       startup: ${random.int}
       tags: config
@@ -71,3 +71,4 @@ management:
 
 logging:
   path: ./.logs
+

eureka-web/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
         bootstrap: false
         prefix: /config
         jdbc:
-          sql: SELECT `key`, `value` from properties where (application=? or ISNULL(application)) and profile=? and label=?
+          sql: SELECT `key`, `value` from properties where application=? and profile=? and label=?
       label: master
     bus:
       trace: