Merge branch 'master' of https://git.tonyandmoney.cn/tuonq/ConfigServer

build.gradle

@@ -31,7 +31,7 @@ buildscript {
 
 allprojects {
     group = "cn.gygxzc.cloud.tina"
-    version = "1.0.0"
+    version = "1.0.1"
 }
 
 subprojects {

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

@@ -2,6 +2,7 @@ package cn.gygxzc.cloud.config.controller
 
 import cn.gygxzc.cloud.config.model.ConfigProperty
 import cn.gygxzc.cloud.config.service.IConfigPropService
+import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
@@ -53,11 +54,9 @@ class PropertyMgrController {
 
     @GetMapping
     @ApiOperation("条件查询系统配置信息")
-    fun query(cond: ConfigProperty,
-              @RequestParam("current") page: Long,
-              @RequestParam("pageSize") pageSize: Long): Mono<IPage<ConfigProperty>> {
+    fun query(cond: ConfigProperty, pageReq: PageReq): Mono<IPage<ConfigProperty>> {
         return Mono.create {
-            it.success(propService.query(cond, page, pageSize))
+            it.success(propService.query(cond, pageReq))
         }
     }
 }

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

@@ -1,6 +1,7 @@
 package cn.gygxzc.cloud.config.service
 
 import cn.gygxzc.cloud.config.model.ConfigProperty
+import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 
 /**
@@ -18,6 +19,6 @@ interface IConfigPropService {
 
     fun updateById(prop: ConfigProperty)
 
-    fun query(prop: ConfigProperty, page: Long, pageSize: Long): IPage<ConfigProperty>
+    fun query(prop: ConfigProperty, pageReq: PageReq): IPage<ConfigProperty>
 
 }

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

@@ -4,9 +4,9 @@ import cn.gygxzc.cloud.config.dao.IPropertyDao
 import cn.gygxzc.cloud.config.model.ConfigProperty
 import cn.gygxzc.cloud.config.service.IConfigPropService
 import cn.tonyandmoney.tuonq.core.SessionUtils
+import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
 import com.baomidou.mybatisplus.core.metadata.IPage
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import java.util.*
@@ -38,23 +38,22 @@ class ConfigPropService : IConfigPropService {
         propDao.updateById(prop)
     }
 
-    override fun query(prop: ConfigProperty,
-                       page: Long, pageSize: Long): IPage<ConfigProperty> {
+    override fun query(prop: ConfigProperty, pageReq: PageReq): IPage<ConfigProperty> {
         val queryWrapper = QueryWrapper<ConfigProperty>()
-        queryWrapper.orderByDesc("application","profile","`key`")
-        if (!prop.application.isNullOrBlank()){
-            queryWrapper.eq("application",prop.application)
+        queryWrapper.orderByDesc("application", "profile", "`key`")
+        if (!prop.application.isNullOrBlank()) {
+            queryWrapper.eq("application", prop.application)
         }
-        if (!prop.profile.isNullOrBlank()){
-            queryWrapper.eq("profile",prop.profile)
+        if (!prop.profile.isNullOrBlank()) {
+            queryWrapper.eq("profile", prop.profile)
         }
-        if (!prop.label.isNullOrBlank()){
-            queryWrapper.eq("label",prop.label)
+        if (!prop.label.isNullOrBlank()) {
+            queryWrapper.eq("label", prop.label)
         }
-        if (!prop.key.isNullOrBlank()){
-            queryWrapper.like("`key`",prop.key)
+        if (!prop.key.isNullOrBlank()) {
+            queryWrapper.like("`key`", prop.key)
         }
-        return propDao.selectPage(Page(page, pageSize), queryWrapper)
+        return propDao.selectPage(pageReq.page(), queryWrapper)
     }
 
 

eureka-web/build.gradle

@@ -73,4 +73,5 @@ task innerDockerBuilder(type: Docker){
     push = true
 }
 
-dockerBuilder.dependsOn(bootJar)
+dockerBuilder.dependsOn(bootJar)
+innerDockerBuilder.dependsOn(bootJar)

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

@@ -2,7 +2,7 @@ spring:
   datasource:
     username: root
     password: tuonq520
-    url: jdbc:mysql://tuonq_mysql:3306/tuonq_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://192.168.42.1:5201/tuonq_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
 
 # 用docker swarm部署，注意一下数据库的连接名称