添加rpc模块(dubbo,zookeeper),完善字典值工具类. SysDictUtil

build.gradle

@@ -28,6 +28,7 @@ buildscript {
 //        kisso_version = '3.6.13'
         caffeine_version = '2.6.1'
         shiro_version = '1.4.0'
+        dubbo_starter_version = '2.0.0'
     }
     repositories {
         mavenCentral()
@@ -113,14 +114,14 @@ subprojects {
         // utils
         compile("org.projectlombok:lombok:1.16.18")
 //        compile("com.google.guava:guava:23.6-jre")
-        compile("com.github.penggle:kaptcha:2.3.2")
+//        compile("com.github.penggle:kaptcha:2.3.2")
         compile("com.alibaba:fastjson:$fastjson_version")
         compile("com.belerweb:pinyin4j:$pinyin4j_version")
         compile('com.github.hotchemi:khronos:0.9.0')
         compile('com.github.shihyuho:jackson-dynamic-filter:1.0')
 
-        // sso
-//        compile("com.baomidou:kisso:$kisso_version")
+        // rpc
+        compile('com.alibaba.spring.boot:dubbo-spring-boot-starter:$dubbo_starter_version')
 
         // activiti
 //        compile("org.activiti:activiti-spring-boot-starter-basic:$activiti_starter_version")

settings.gradle

@@ -5,4 +5,5 @@ include 'zen-api'
 include 'zen-web'
 include 'zen-mq'
 include 'zen-job'
+include 'zen-rpc'
 

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysDictValueService.kt

@@ -56,4 +56,9 @@ interface ISysDictValueService : BaseService<SysDictValue> {
      * 根据code值与value获取指定字典值
      */
     fun getDictValueByCodeAndValue(code: String, value: String): SysDictValue?
+
+    /**
+     * 根据code前缀与value获取指定字典值
+     */
+    fun getDictValueByPrefixAndValue(prefix: String, value: String): SysDictValue?
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDictValueServiceImpl.kt

@@ -95,6 +95,13 @@ class SysDictValueServiceImpl : ServiceImpl<SysDictValueMapper, SysDictValue>(),
         }
     }
 
+    override fun getDictValueByPrefixAndValue(prefix: String, value: String): SysDictValue? {
+        val cachedList = getListCacheable()
+        return cachedList.find {
+            it.code!!.startsWith("${prefix}_") && it.value == value
+        }
+    }
+
     private fun evictCache() {
         RedisCacheUtil.evict(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY)
     }

zen-api/src/main/kotlin/com/gxzc/zen/api/util/SysDicUtil.kt

@@ -1,28 +0,0 @@
-//package com.gxzc.zen.api.util
-//
-//import com.gxzc.zen.api.sys.model.SysDic
-//import com.gxzc.zen.api.sys.service.ISysDicService
-//import com.gxzc.zen.common.util.SpringContextHolder
-//
-///**
-// * 系统字典工具类
-// * 缓存中获取
-// * @author NorthLan
-// * @date 2018/3/17
-// * @url https://noahlan.com
-// */
-//object SysDicUtil {
-//    private val sysDicService: ISysDicService = SpringContextHolder.getBean(ISysDicService::class.java)
-//
-//    fun getAllList(): MutableList<SysDic> {
-//        return sysDicService.getListCacheable()
-//    }
-//
-//    fun getListByKey(key: String): MutableList<SysDic> {
-//        return sysDicService.getListByKey(key)
-//    }
-//
-//    fun getOne(key: String, value: String?, sort: Int?): SysDic? {
-//        return sysDicService.getOneByKey(key, value, sort)
-//    }
-//}

zen-api/src/main/kotlin/com/gxzc/zen/api/util/SysDictUtil.kt

@@ -0,0 +1,49 @@
+package com.gxzc.zen.api.util
+
+import com.gxzc.zen.api.sys.model.SysDictValue
+import com.gxzc.zen.api.sys.service.ISysDictValueService
+import com.gxzc.zen.common.util.SpringContextHolder
+
+/**
+ * 字典工具类
+ * @author NorthLan
+ * @date 2018/5/7
+ * @url https://noahlan.com
+ */
+object SysDictUtil {
+    private var dictValueService = SpringContextHolder.getBean(ISysDictValueService::class.java)
+        get() {
+            if (field == null) {
+                field = SpringContextHolder.getBean(ISysDictValueService::class.java)
+            }
+            return field
+        }
+
+    /**
+     * 获取所有字典值列表
+     */
+    fun getAll(): MutableList<SysDictValue> {
+        return dictValueService!!.getListCacheable()
+    }
+
+    /**
+     * 根据code前缀获取字典值列表
+     */
+    fun getListByPrefix(prefix: String): MutableList<SysDictValue> {
+        return dictValueService!!.getDictValueListByTypeCode(prefix)
+    }
+
+    /**
+     * 根据code和value直接获取字典值
+     */
+    fun getValueByCV(code: String, value: String): SysDictValue? {
+        return dictValueService!!.getDictValueByCodeAndValue(code, value)
+    }
+
+    /**
+     * 根据prefix和value直接获取字典值
+     */
+    fun getValueByPV(prefix: String, value: String): SysDictValue? {
+        return dictValueService!!.getDictValueByPrefixAndValue(prefix, value)
+    }
+}

zen-rpc/build.gradle

@@ -0,0 +1,19 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_version"
+    }
+}
+
+dependencies {
+    compile project(":zen-core")
+    compile project(":zen-api")
+}
+
+bootRepackage {
+    enabled = false
+}