1

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

@@ -126,11 +126,16 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
                 userRoleService.insertBatch(entity.id!!, addRoleIdList)
             }
 
+            val originEntity = baseMapper.selectById(entity.id!!)
+
             // 密码搞一下
             if (!entity.password.isNullOrEmpty() && entity.password!!.length >= 6) {
                 val salt = RandomStringUtils.randomAlphanumeric(9)!!
                 entity.salt = salt
                 entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
+            } else {
+                entity.password = originEntity.password
+                entity.salt = originEntity.salt
             }
 
             baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))

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

@@ -19,6 +19,7 @@ import com.gxzc.zen.common.dto.RequestDto
 import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.xxl.job.core.biz.AdminBiz
 import com.xxl.job.core.rpc.netcom.NetComClientProxy
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.InputStreamResource
 import org.springframework.core.io.Resource
@@ -28,6 +29,7 @@ import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import java.io.File
 import java.io.FileInputStream
+import javax.servlet.http.Cookie
 
 
 /**
@@ -169,4 +171,24 @@ class TestController : BaseController() {
     fun jobSelect() {
         testSharedService.select()
     }
+
+    @GetMapping("testRedirect")
+    @Login(action = Action.Skip)
+    fun testRedirect() {
+//        println(getRequest().requestURI)
+//        println(getRequest().requestURL)
+//        println(getRequest().servletPath)
+//        println(getRequest().servletContext.contextPath)
+//
+//        val path = getRequest().requestURL.replace(Regex(getRequest().requestURI), "")
+//        println(path)
+//        getResponse().sendRedirect("http://sys.zen.com/sys/#/dashboard")
+        val a = getRequest().cookies
+        println(a)
+        getResponse().addCookie(Cookie("hsdkhfjsdhfkjsdf", "Setset"))
+        getResponse().addCookie(Cookie("test", "Setset").apply {
+            this.domain = "sys.zen.com"
+        })
+        getResponse().sendRedirect("http://192.168.1.213:8082/test/testpermission1")
+    }
 }

zen-web/src/main/resources/application-cache.yml

@@ -6,8 +6,8 @@ spring:
     caffeine:
       spec:
   redis:
-    host: 192.168.1.92
-    port: 30001
+    host: 192.168.1.10
+    port: 6379
     password:
     pool:
       min-idle: 1