添加公共数据源Shared,优化数据源结构,优化登陆速度

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

@@ -14,11 +14,12 @@ import com.gxzc.zen.common.properties.PlatformProperties
 import com.gxzc.zen.common.util.PlatformUtil
 import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
+import com.gxzc.zen.umps.util.MD5Salt
+import org.apache.commons.lang3.RandomStringUtils
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.CommandLineRunner
 import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -75,6 +76,17 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
     @ZenTransactional
     override fun insertCacheable(entity: SysUser) {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
+            // 处理一下密码
+            if (entity.password.isNullOrEmpty()) {
+                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
+            } else if (entity.password!!.length < 6) {
+                throw ZenException(ZenExceptionEnum.REG_PASSWORD_ERROR)
+            }
+
+            val salt = RandomStringUtils.random(9)!!
+            entity.salt = salt
+            entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
+
             if (baseMapper.insert(entity) == 0) {
                 throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
             }
@@ -114,6 +126,13 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
                 userRoleService.insertBatch(entity.id!!, addRoleIdList)
             }
 
+            // 密码搞一下
+            if (!entity.password.isNullOrEmpty() && entity.password!!.length >= 6) {
+                val salt = RandomStringUtils.random(9)!!
+                entity.salt = salt
+                entity.password = MD5Salt.md5SaltEncode(salt, entity.password!!)
+            }
+
             baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
 //            throw ZenException(ZenExceptionEnum.SERVER_ERROR)
             // 更新缓存

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

@@ -104,16 +104,16 @@ class MD5Salt {
      * @return
      */
     private fun mergeRawTextAndSalt(rawText: String?): String {
-        var rawText = rawText
-        if (rawText == null) {
-            rawText = ""
+        var tmp = rawText
+        if (tmp == null) {
+            tmp = ""
         }
 
         return if (this.salt == null || "" == this.salt) {
-            rawText
+            tmp
         } else {
             val mt = StringBuffer()
-            mt.append(rawText)
+            mt.append(tmp)
             mt.append(SSOConfig.CUT_SYMBOL)
             mt.append(this.salt)
             mt.toString()

zen-core/src/main/kotlin/com/gxzc/zen/common/exception/ZenExceptionEnum.kt

@@ -14,6 +14,11 @@ enum class ZenExceptionEnum(val code: Int, val msg: String) {
     AUTH_PASSWORD_ERROR(101, "密码错误"),
     AUTH_NO_LOGIN(102, "未登录"),
 
+    /**
+     * Register
+     */
+    REG_PASSWORD_ERROR(200,"密码格式错误"),
+
     /**
      * 文件上传
      */

zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt

@@ -17,7 +17,7 @@ import java.io.File
  * @url https://noahlan.me
  */
 fun main(args: Array<String>) {
-    generate(true, "NorthLan", "bus", DataSourceConfig().also {
+    generate(true, "NorthLan", "shared", DataSourceConfig().also {
         it.dbType = DbType.MYSQL
         it.typeConvert = object : MySqlTypeConvert() {
             override fun processTypeConvert(fieldType: String?): DbColumnType {

zen-orm/src/main/kotlin/com/gxzc/zen/orm/config/MultipleDataSourceConfig.kt

@@ -51,6 +51,13 @@ class MultipleDataSourceConfig {
         return DruidXADataSource()
     }
 
+    @Bean(DSKey.DSKEY_SHARED + "druid")
+    @ConfigurationProperties(prefix = "datasource.shared")
+    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
+    fun dataSourceSharedDruid(): XADataSource {
+        return DruidXADataSource()
+    }
+
     @Bean(DSKey.DSKEY_SYS)
     @DependsOn(DSKey.DSKEY_SYS + "druid")
     @Primary
@@ -69,14 +76,25 @@ class MultipleDataSourceConfig {
         }
     }
 
+    @Bean(DSKey.DSKEY_SHARED)
+    @DependsOn(DSKey.DSKEY_SHARED + "druid")
+    @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
+    fun dataSourceShared(): DataSource {
+        return AtomikosDataSourceBean().also {
+            it.xaDataSource = dataSourceSharedDruid()
+        }
+    }
+
     @Bean
     @ConditionalOnProperty(prefix = "orm", name = ["multi-datasource-enable"], havingValue = "true", matchIfMissing = true)
     fun multipleDataSource(@Qualifier(DSKey.DSKEY_SYS) dataSourceSys: DataSource,
-                           @Qualifier(DSKey.DSKEY_BUSINESS) dataSourceBus: DataSource): DynamicMultipleDataSource {
+                           @Qualifier(DSKey.DSKEY_BUSINESS) dataSourceBus: DataSource,
+                           @Qualifier(DSKey.DSKEY_SHARED) dataSourceShared: DataSource): DynamicMultipleDataSource {
         return DynamicMultipleDataSource().apply {
             setTargetDataSources(mapOf(
                     DSKey.DSKEY_SYS to dataSourceSys,
-                    DSKey.DSKEY_BUSINESS to dataSourceBus))
+                    DSKey.DSKEY_BUSINESS to dataSourceBus,
+                    DSKey.DSKEY_SHARED to dataSourceShared))
             setDefaultTargetDataSource(dataSourceSys)
         }
     }

zen-orm/src/main/kotlin/com/gxzc/zen/orm/contants/DSKey.kt

@@ -6,10 +6,12 @@ package com.gxzc.zen.orm.contants
  */
 enum class DSKey(val dsKey: String, val pkgName: String) {
     DS_SYS("sysDataSource", "com.gxzc.zen.api.sys"),
-    DS_BUSINESS("busDataSource", "com.gxzc.zen.api.bus");
+    DS_BUSINESS("busDataSource", "com.gxzc.zen.api.bus"),
+    DS_SHARED("sharedDataSource", "com.gxzc.zen.api.shared");
 
     companion object {
         const val DSKEY_SYS = "sysDataSource"
         const val DSKEY_BUSINESS = "busDataSource"
+        const val DSKEY_SHARED = "sharedDataSource"
     }
 }

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

@@ -44,14 +44,15 @@ class AuthController : BaseController() {
         // 验证账号密码
         val user = userService.getUserByAccountCacheable(account!!)
                 ?: throw ZenException(ZenExceptionEnum.AUTH_ACCOUNT_NOT_EXISTS)
+
         // 对密码进行盐值处理比对
-        if (user.password != MD5Salt.md5SaltEncode(user.salt!!, password!!)) {
+        if (!MD5Salt.md5SaltValid(user.salt!!, user.password!!, password!!)) {
             throw ZenException(ZenExceptionEnum.AUTH_PASSWORD_ERROR)
         }
 
         // 生成登陆 token->cookie
         if (rememberMe != null && rememberMe) {
-            SSOConfig.getInstance().cookieMaxage = 604800
+            SSOConfig.getInstance().cookieMaxage = 604800 // 7天
         } else {
             val attrMaxAge = getRequest().getAttribute(SSOConfig.SSO_COOKIE_MAXAGE)?.let {
                 it as Int

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

@@ -59,11 +59,29 @@ datasource:
     max-active: 20
     time-between-eviction-runs-millis: 60000
     min-evictable-idle-time-millis: 30000
+  shared:
+    name: shared
+    url: jdbc:mysql://192.168.1.124:3307/archives_shared?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.jdbc.Driver
+    username: archives
+    password: archives
+    test-on-borrow: false
+    test-on-return: false
+    test-while-idle: true
+    validation-query: SELECT 1
+    async-init: false
+    filters: log4j,wall,mergeStat
+    keep-alive: false
+    initial-size: 5
+    min-idle: 5
+    max-active: 20
+    time-between-eviction-runs-millis: 60000
+    min-evictable-idle-time-millis: 30000
 
 ###################  mybatis-plus配置  ###################
 mybatis-plus:
   mapper-locations: classpath*:mapping/**/*.xml
-  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper
+  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper,com.gxzc.zen.api.shared.mapper
   global-config:
     id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
     db-column-underline: true

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

@@ -31,7 +31,7 @@ spring:
 logging:
   level:
     root: info
-    com.gxzc.zen: info
+    com.gxzc.zen: debug
     com.atomikos: warn
   path: logs/
   file: zen.log