更新但未完成

zen-api/src/main/resources/mapping/sys/SysDicMapper.xml

@@ -19,19 +19,19 @@
 
     <sql id="dynamicSqlWhere">
         WHERE 1=1
-        <if test="enable != null">
-            <choose>
-                <when test="enable == true">
-                    AND enable = 1
-                </when>
-                <otherwise>
-                    AND enable = 0
-                </otherwise>
-            </choose>
-        </if>
-        <if test="key != null and key != ''">
-            AND `key` = #{key}
-        </if>
+        <!--<if test="enable != null">-->
+            <!--<choose>-->
+                <!--<when test="enable == true">-->
+                    <!--AND enable = 1-->
+                <!--</when>-->
+                <!--<otherwise>-->
+                    <!--AND enable = 0-->
+                <!--</otherwise>-->
+            <!--</choose>-->
+        <!--</if>-->
+        <!--<if test="key != null and key != ''">-->
+            <!--AND `key` = #{key}-->
+        <!--</if>-->
     </sql>
 
     <select id="selectList" resultType="com.gxzc.zen.api.sys.model.SysDic">

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

@@ -1,6 +1,7 @@
 package com.gxzc.zen.common.base
 
 import com.gxzc.zen.common.util.HttpUtil
+import org.springframework.beans.factory.annotation.Autowired
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 
@@ -11,6 +12,9 @@ import javax.servlet.http.HttpServletResponse
  */
 open class BaseController {
 
+    @Autowired
+    private lateinit var request: HttpServletRequest
+
     fun getRequest(): HttpServletRequest {
         return HttpUtil.getRequest()
     }

zen-core/src/main/kotlin/com/gxzc/zen/common/config/json/ZenJsonConfigurer.kt

@@ -19,6 +19,7 @@ class ZenJsonConfigurer : WebMvcConfigurerAdapter() {
     }
 
     override fun configureMessageConverters(converters: MutableList<HttpMessageConverter<*>>) {
+        super.configureMessageConverters(converters)
         converters.add(getConverter())
     }
 
@@ -26,5 +27,4 @@ class ZenJsonConfigurer : WebMvcConfigurerAdapter() {
     fun getConverter(): MappingJackson2HttpMessageConverter {
         return MappingJackson2HttpMessageConverter()
     }
-
 }

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/ZenArgumentResolver.kt

@@ -0,0 +1,50 @@
+package com.gxzc.zen.common.config.request
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.gxzc.zen.common.config.request.annotation.ZenRequestBody
+import org.apache.commons.io.IOUtils
+import org.springframework.core.MethodParameter
+import org.springframework.web.bind.support.WebDataBinderFactory
+import org.springframework.web.context.request.NativeWebRequest
+import org.springframework.web.method.support.HandlerMethodArgumentResolver
+import org.springframework.web.method.support.ModelAndViewContainer
+import java.io.IOException
+import java.nio.charset.Charset
+import javax.servlet.http.HttpServletRequest
+
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/3/16
+ * @url https://noahlan.com
+ */
+
+class ZenArgumentResolver : HandlerMethodArgumentResolver {
+    init {
+        println("init zenar")
+    }
+
+    override fun supportsParameter(parameter: MethodParameter): Boolean {
+        return parameter.hasParameterAnnotation(ZenRequestBody::class.java)
+    }
+
+    override fun resolveArgument(parameter: MethodParameter, mavContainer: ModelAndViewContainer, webRequest: NativeWebRequest, binderFactory: WebDataBinderFactory): Any {
+        val body = getRequestBody(webRequest)
+        val annotation = parameter.getMethodAnnotation(ZenRequestBody::class.java)
+
+        val js = ObjectMapper().readTree(body)
+        val da = js[annotation.value[0].key]
+
+        return body
+    }
+
+    private fun getRequestBody(webRequest: NativeWebRequest): String {
+        val servletRequest = webRequest.getNativeRequest(HttpServletRequest::class.java)
+        return try {
+            IOUtils.toString(servletRequest.inputStream, Charset.forName("UTF-8"))
+        } catch (e: IOException) {
+            ""
+        }
+    }
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/ZenRequestBodyAdvice.kt

@@ -0,0 +1,44 @@
+package com.gxzc.zen.common.config.request
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.gxzc.zen.common.config.request.annotation.ZenRequestBody
+import com.gxzc.zen.common.dto.RequestDto
+import org.springframework.beans.BeanUtils
+import org.springframework.core.MethodParameter
+import org.springframework.http.HttpInputMessage
+import org.springframework.http.converter.HttpMessageConverter
+import org.springframework.web.bind.annotation.ControllerAdvice
+import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter
+import java.lang.reflect.Type
+import kotlin.reflect.full.createInstance
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/3/16
+ * @url https://noahlan.com
+ */
+@ControllerAdvice
+class ZenRequestBodyAdvice : RequestBodyAdviceAdapter() {
+    override fun supports(methodParameter: MethodParameter, targetType: Type, converterType: Class<out HttpMessageConverter<*>>): Boolean {
+        return methodParameter.hasParameterAnnotation(ZenRequestBody::class.java)
+    }
+
+    override fun beforeBodyRead(inputMessage: HttpInputMessage, parameter: MethodParameter, targetType: Type, converterType: Class<out HttpMessageConverter<*>>): HttpInputMessage {
+        return super.beforeBodyRead(inputMessage, parameter, targetType, converterType)
+    }
+
+    override fun afterBodyRead(body: Any, inputMessage: HttpInputMessage, parameter: MethodParameter, targetType: Type, converterType: Class<out HttpMessageConverter<*>>): Any {
+        val b = body as RequestDto
+        val d = b["data"]
+
+        val typ = parameter.getParameterAnnotation(ZenRequestBody::class.java).value[0].value
+//        val c = typ.createInstance()
+
+        val a = ObjectMapper().readValue(ObjectMapper().writeValueAsString(d), typ::class.java)
+
+
+        return super.afterBodyRead(body, inputMessage, parameter, targetType, converterType)
+    }
+
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/ZenRequestConfigurer.kt

@@ -0,0 +1,15 @@
+package com.gxzc.zen.common.config.request
+
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.method.support.HandlerMethodArgumentResolver
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/3/16
+ * @url https://noahlan.com
+ */
+@Configuration
+class ZenRequestConfigurer : WebMvcConfigurerAdapter() {
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/annotation/KVType.kt

@@ -0,0 +1,15 @@
+package com.gxzc.zen.common.config.request.annotation
+
+import kotlin.reflect.KClass
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/3/16
+ * @url https://noahlan.com
+ */
+@Target(AnnotationTarget.ANNOTATION_CLASS)
+annotation class KVType(
+        public val key: String,
+        public val value: KClass<out Any>) {
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/annotation/ZenRequestBody.kt

@@ -0,0 +1,13 @@
+package com.gxzc.zen.common.config.request.annotation
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/3/16
+ * @url https://noahlan.com
+ */
+@Target(AnnotationTarget.VALUE_PARAMETER)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class ZenRequestBody(val value: Array<KVType> = []) {
+}

zen-core/src/main/kotlin/com/gxzc/zen/common/dto/RequestDto.kt

@@ -1,11 +1,10 @@
 package com.gxzc.zen.common.dto
 
 /**
- * 请求 数据传输对象
+ * 请求 数据传输对象(直接使用LinkedHashMap是比较好的方式)
  * @author NorthLan
  * @date 2018/2/28
  * @url https://noahlan.com
  */
-class RequestDto {
-    var data = mutableMapOf<String, Any>()
+class RequestDto : LinkedHashMap<String, Any>() {
 }

zen-web/src/main/kotlin/com/gxzc/zen/web/sys/controller/AuthController.kt

@@ -1,19 +1,12 @@
 package com.gxzc.zen.web.sys.controller
 
-import com.baomidou.kisso.SSOConfig
 import com.baomidou.kisso.SSOHelper
-import com.baomidou.kisso.SSOToken
 import com.baomidou.kisso.annotation.Action
 import com.baomidou.kisso.annotation.Login
-import com.baomidou.kisso.annotation.Permission
 import com.gxzc.zen.api.sys.service.ISysUserService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.dto.RequestDto
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.umps.util.MD5Salt
 import io.swagger.annotations.ApiOperation
-import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
@@ -34,36 +27,36 @@ class AuthController : BaseController() {
     @ApiOperation(value = "登录")
     @PostMapping("/login")
     fun login(@RequestBody data: RequestDto): ResponseEntity<*> {
-        // 验证输入合法性
-        val account = data.data["account"]?.toString()?.trim()
-        val password = data.data["password"]?.toString()
-        val rememberMe = data.data["rememberMe"]?.let { it as Boolean }
-
-        if (account.isNullOrEmpty() || password.isNullOrEmpty()) {
-            throw ZenException(ZenExceptionEnum.REQUEST_NULL)
-        }
-        // 验证账号密码
-        val user = userService.getUserByAccountCacheable(account!!)
-                ?: throw ZenException(ZenExceptionEnum.AUTH_ACCOUNT_NOT_EXISTS)
-        // 对密码进行盐值处理比对
-        if (user.password != MD5Salt.md5SaltEncode(user.salt!!, password!!)) {
-            throw ZenException(ZenExceptionEnum.AUTH_PASSWORD_ERROR)
-        }
-
-        // 生成登陆 token->cookie
-        if (rememberMe != null && rememberMe) {
-            SSOConfig.getInstance().cookieMaxage = 604800
-        } else {
-            val attrMaxAge = getRequest().getAttribute(SSOConfig.SSO_COOKIE_MAXAGE)?.let {
-                it as Int
-            }
-            if (attrMaxAge != null) {
-                getRequest().removeAttribute(SSOConfig.SSO_COOKIE_MAXAGE)
-            }
-        }
-        SSOHelper.setSSOCookie(getRequest(), getResponse(), SSOToken().also {
-            it.uid = user.id.toString()
-        }, true)
+//        // 验证输入合法性
+//        val account = data.data["account"]?.toString()?.trim()
+//        val password = data.data["password"]?.toString()
+//        val rememberMe = data.data["rememberMe"]?.let { it as Boolean }
+//
+//        if (account.isNullOrEmpty() || password.isNullOrEmpty()) {
+//            throw ZenException(ZenExceptionEnum.REQUEST_NULL)
+//        }
+//        // 验证账号密码
+//        val user = userService.getUserByAccountCacheable(account!!)
+//                ?: throw ZenException(ZenExceptionEnum.AUTH_ACCOUNT_NOT_EXISTS)
+//        // 对密码进行盐值处理比对
+//        if (user.password != MD5Salt.md5SaltEncode(user.salt!!, password!!)) {
+//            throw ZenException(ZenExceptionEnum.AUTH_PASSWORD_ERROR)
+//        }
+//
+//        // 生成登陆 token->cookie
+//        if (rememberMe != null && rememberMe) {
+//            SSOConfig.getInstance().cookieMaxage = 604800
+//        } else {
+//            val attrMaxAge = getRequest().getAttribute(SSOConfig.SSO_COOKIE_MAXAGE)?.let {
+//                it as Int
+//            }
+//            if (attrMaxAge != null) {
+//                getRequest().removeAttribute(SSOConfig.SSO_COOKIE_MAXAGE)
+//            }
+//        }
+//        SSOHelper.setSSOCookie(getRequest(), getResponse(), SSOToken().also {
+//            it.uid = user.id.toString()
+//        }, true)
         return ResponseEntity.ok(null)
     }
 

zen-web/src/main/kotlin/com/gxzc/zen/web/sys/controller/TestController.kt

@@ -4,12 +4,13 @@ import com.baomidou.kisso.annotation.Action
 import com.baomidou.kisso.annotation.Login
 import com.gxzc.zen.api.sys.model.SysDic
 import com.gxzc.zen.api.sys.service.ISysDicService
+import com.gxzc.zen.api.sys.service.ISysParamService
 import com.gxzc.zen.common.base.BaseController
+import com.gxzc.zen.common.config.request.annotation.KVType
+import com.gxzc.zen.common.config.request.annotation.ZenRequestBody
+import com.gxzc.zen.common.dto.RequestDto
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 /**
  *
@@ -24,6 +25,9 @@ class TestController : BaseController() {
     @Autowired
     private lateinit var sysDicService: ISysDicService
 
+    @Autowired
+    private lateinit var sysParamService: ISysParamService
+
     @GetMapping("logicDel")
     @Login(action = Action.Skip)
     fun testLogicDelete() {
@@ -38,4 +42,18 @@ class TestController : BaseController() {
             key = "2333"
         })
     }
+
+    @GetMapping("logicSelect")
+    @Login(action = Action.Skip)
+    fun testLogicSelect() {
+        sysDicService.selectList(null)
+    }
+
+    @PostMapping("testInput")
+    @Login(action = Action.Skip)
+    fun testInput(@RequestBody
+                  data: SysDic) {
+        var a = 2
+        a = 3
+    }
 }

zen-web/src/main/kotlin/com/gxzc/zen/web/sys/controller/UploadController.kt

@@ -6,7 +6,6 @@ import com.gxzc.zen.common.base.BaseController
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.multipart.MultipartFile
 import java.io.File
@@ -21,10 +20,8 @@ class UploadController : BaseController() {
 
     @PostMapping("tmp")
     @Login(action = Action.Skip)
-    fun uploadTempFile(@RequestParam("file") file: MultipartFile?): ResponseEntity<*> {
-        if (file == null) {
-            // 文件没传上来
-        }
+    fun uploadTempFile(file: MultipartFile, haha: MultipartFile): ResponseEntity<*> {
+
 
         val tmp = File.createTempFile("", "")
         if (tmp == null) {