新增常用工具类,BaseController 获取request等

build.gradle

@@ -28,8 +28,8 @@ buildscript {
 //        rabbitmq_version = '5.1.2'
         xxljob_version = '1.9.0'
         swagger_version = '2.7.0'
-
         fastjson_version = '1.2.44'
+        pinyin4j_version = '2.5.1'
 
         kisso_version = '3.7.0'
         // caffeine_version = 'a'
@@ -114,6 +114,7 @@ subprojects {
 //        compile("com.google.guava:guava:23.6-jre")
         compile("com.github.penggle:kaptcha:2.3.2")
         compile("com.alibaba:fastjson:$fastjson_version")
+        compile("com.belerweb:pinyin4j:$pinyin4j_version")
 
         // sso
         compile("com.baomidou:kisso:$kisso_version")

zen-core/src/main/kotlin/com/gxzc/zen/common/base/BaseController.kt

@@ -0,0 +1,34 @@
+package com.gxzc.zen.common.base
+
+import com.baomidou.kisso.SSOHelper
+import com.baomidou.kisso.security.token.SSOToken
+import com.gxzc.zen.common.util.HttpUtil
+import org.slf4j.LoggerFactory
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+/**
+ * 控制器基类
+ * 支持kisso
+ * @author NorthLan at 2018/2/9
+ */
+open class BaseController {
+    protected val logger = LoggerFactory.getLogger(this::class.java)
+
+    protected fun getRequest(): HttpServletRequest {
+        return HttpUtil.getRequest()
+    }
+
+    protected fun getResponse(): HttpServletResponse {
+        return HttpUtil.getResponse()
+    }
+
+    protected fun getCurUserId(): Long {
+        return getSSOToken().id.toLong()
+    }
+
+    protected fun getSSOToken(): SSOToken {
+        return SSOHelper.attrToken(getRequest())
+                ?: throw RuntimeException("The user does not exist, please re-login.")
+    }
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/util/CacheUtil.kt

@@ -0,0 +1,11 @@
+package com.gxzc.zen.common.util
+
+import org.springframework.cache.CacheManager
+
+/**
+ * 缓存工具类
+ * @author NorthLan at 2018/2/8
+ */
+object CacheUtil {
+    val cacheManager = SpringContextHolder.getBean(CacheManager::class.java)
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/util/HttpUtil.kt

@@ -0,0 +1,27 @@
+package com.gxzc.zen.common.util
+
+import org.slf4j.LoggerFactory
+import org.springframework.web.context.request.RequestContextHolder
+import org.springframework.web.context.request.ServletRequestAttributes
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+/**
+ * http工具类
+ * @author NorthLan at 2018/2/8
+ */
+object HttpUtil {
+    private val logger = LoggerFactory.getLogger(HttpUtil::class.java)
+
+    fun getRequest(): HttpServletRequest {
+        return (RequestContextHolder.getRequestAttributes() as ServletRequestAttributes).request
+    }
+
+    fun getResponse(): HttpServletResponse {
+        return (RequestContextHolder.getRequestAttributes() as ServletRequestAttributes).response
+    }
+
+    fun getIp(): String {
+        return getRequest().remoteHost
+    }
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/util/PinyinUtil.kt

@@ -0,0 +1,79 @@
+package com.gxzc.zen.common.util
+
+import net.sourceforge.pinyin4j.PinyinHelper
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType
+import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType
+import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination
+import org.slf4j.LoggerFactory
+
+/**
+ * 拼音工具类
+ * @author NorthLan at 2018/2/8
+ */
+object PinyinUtil {
+    private val logger = LoggerFactory.getLogger(PinyinUtil::class.java)
+
+    /**
+     * 将中文转换为 全拼
+     * 非汉字字符原样拼接
+     * @param src 中文字符串
+     * @param camel 是否输出驼峰格式化
+     */
+    fun convertToPinyin(src: String?, camel: Boolean = false): String {
+        if (src.isNullOrEmpty()) {
+            return ""
+        }
+        // 设置汉字拼音输出的格式
+        val format = HanyuPinyinOutputFormat().apply {
+            caseType = HanyuPinyinCaseType.LOWERCASE // 全小写
+            toneType = HanyuPinyinToneType.WITHOUT_TONE // 无音标
+            vCharType = HanyuPinyinVCharType.WITH_V // u->v
+        }
+        return try {
+            var result = ""
+            var temp: String
+            for (ch in src!!) {
+                var isChinese = false
+                temp = if (ch.toString().matches(Regex("[\\u4E00-\\u9FA5]+"))) {
+                    isChinese = true
+                    val py = PinyinHelper.toHanyuPinyinStringArray(ch, format)
+                    py[0] // 只取出第一种读音
+                } else {
+                    ch.toString()
+                }
+                if (camel && isChinese) {
+                    temp = temp.substring(0, 1).toUpperCase() + temp.substring(1)
+                }
+                result += temp
+            }
+            result
+        } catch (e: BadHanyuPinyinOutputFormatCombination) {
+            logger.error("拼音转换错误", e)
+            ""
+        }
+    }
+
+    /**
+     * 获取中文拼音首字母(小写)
+     * @param src 中文字符串
+     */
+    fun getPinYinHead(src: String?): String {
+        if (src.isNullOrEmpty()) {
+            return ""
+        }
+        var result = ""
+        for (ch in src!!) {
+            if (ch.toString().matches(Regex("[\\u4E00-\\u9FA5]+"))) {
+                val py = PinyinHelper.toHanyuPinyinStringArray(ch)
+                result += if (py != null) {
+                    py[0][0]
+                } else {
+                    ch.toString()
+                }
+            }
+        }
+        return result
+    }
+}

zen-umps/src/main/kotlin/com/gxzc/zen/umps/KissoAuthorization.kt → zen-umps/src/main/kotlin/com/gxzc/zen/umps/config/KissoAuthorization.kt

@@ -1,6 +1,7 @@
-package com.gxzc.zen.umps
+package com.gxzc.zen.umps.config
 
 import com.baomidou.kisso.SSOAuthorization
+import com.baomidou.kisso.SSOHelper
 import com.baomidou.kisso.security.token.SSOToken
 import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.common.util.PlatformUtil
@@ -19,6 +20,7 @@ class KissoAuthorization : SSOAuthorization {
         if (token == null) {
             return false
         }
+
         if (!StringUtils.isNumeric(token.id)) {
             return false
         }

zen-umps/src/main/kotlin/com/gxzc/zen/umps/KissoWebAppConfigurer.kt → zen-umps/src/main/kotlin/com/gxzc/zen/umps/config/KissoWebAppConfigurer.kt

@@ -1,23 +1,21 @@
-package com.gxzc.zen.umps
+package com.gxzc.zen.umps.config
 
 import com.baomidou.kisso.web.interceptor.SSOPermissionInterceptor
 import com.baomidou.kisso.web.interceptor.SSOSpringInterceptor
 import org.springframework.context.annotation.Configuration
+import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
+@ControllerAdvice
 @Configuration
 class KissoWebAppConfigurer : WebMvcConfigurerAdapter() {
 
-    /*@Bean("KissoInit")
-    fun initKisso(){
-        return com.baomidou.kisso.web.WebKissoConfigurer()
-    }*/
-
     override fun addInterceptors(registry: InterceptorRegistry) {
         //登录拦截
         registry.addInterceptor(SSOSpringInterceptor())
                 .addPathPatterns("/**")
+                .excludePathPatterns("/login")
         //权限拦截
         registry.addInterceptor(SSOPermissionInterceptor().also { it.authorization = KissoAuthorization() })
                 .addPathPatterns("/**")