refactor

Itsusinn · Nov 17, 2020 · 701e41a · 701e41a
1 parent 1ca4fa6
commit 701e41a
Showing 283 changed files with 2,016 additions and 11 deletions.
diff --git a/reproduce/golang/.gitignore → mychat-backend-golang/.gitignore b/reproduce/golang/.gitignore → mychat-backend-golang/.gitignore
diff --git a/reproduce/golang/config/config.go → mychat-backend-golang/config/config.go b/reproduce/golang/config/config.go → mychat-backend-golang/config/config.go
diff --git a/reproduce/golang/db/database.go → mychat-backend-golang/db/database.go b/reproduce/golang/db/database.go → mychat-backend-golang/db/database.go
diff --git a/reproduce/golang/db/db_data.go → mychat-backend-golang/db/db_data.go b/reproduce/golang/db/db_data.go → mychat-backend-golang/db/db_data.go
diff --git a/reproduce/golang/db/redis.go → mychat-backend-golang/db/redis.go b/reproduce/golang/db/redis.go → mychat-backend-golang/db/redis.go
diff --git a/reproduce/golang/go.mod → mychat-backend-golang/go.mod b/reproduce/golang/go.mod → mychat-backend-golang/go.mod
diff --git a/reproduce/golang/jwt/jwt.go → mychat-backend-golang/jwt/jwt.go b/reproduce/golang/jwt/jwt.go → mychat-backend-golang/jwt/jwt.go
diff --git a/reproduce/golang/jwt/jwt_middleware.go → mychat-backend-golang/jwt/jwt_middleware.go b/reproduce/golang/jwt/jwt_middleware.go → mychat-backend-golang/jwt/jwt_middleware.go
diff --git a/reproduce/golang/main.go → mychat-backend-golang/main.go b/reproduce/golang/main.go → mychat-backend-golang/main.go
diff --git a/reproduce/golang/routes/auth_route.go → mychat-backend-golang/routes/auth_route.go b/reproduce/golang/routes/auth_route.go → mychat-backend-golang/routes/auth_route.go
diff --git a/reproduce/golang/routes/basic_route.go → mychat-backend-golang/routes/basic_route.go b/reproduce/golang/routes/basic_route.go → mychat-backend-golang/routes/basic_route.go
diff --git a/reproduce/golang/routes/comment_route.go → ...at-backend-golang/routes/comment_route.go b/reproduce/golang/routes/comment_route.go → ...at-backend-golang/routes/comment_route.go
diff --git a/reproduce/golang/routes/post_route.go → mychat-backend-golang/routes/post_route.go b/reproduce/golang/routes/post_route.go → mychat-backend-golang/routes/post_route.go
diff --git a/reproduce/golang/routes/requests.go → mychat-backend-golang/routes/requests.go b/reproduce/golang/routes/requests.go → mychat-backend-golang/routes/requests.go
diff --git a/reproduce/golang/routes/user_route.go → mychat-backend-golang/routes/user_route.go b/reproduce/golang/routes/user_route.go → mychat-backend-golang/routes/user_route.go
diff --git a/reproduce/golang/service/auth_service.go → ...at-backend-golang/service/auth_service.go b/reproduce/golang/service/auth_service.go → ...at-backend-golang/service/auth_service.go
diff --git a/reproduce/golang/service/comment_service.go → ...backend-golang/service/comment_service.go b/reproduce/golang/service/comment_service.go → ...backend-golang/service/comment_service.go
diff --git a/reproduce/golang/service/post_service.go → ...at-backend-golang/service/post_service.go b/reproduce/golang/service/post_service.go → ...at-backend-golang/service/post_service.go
diff --git a/reproduce/golang/service/user_service.go → ...at-backend-golang/service/user_service.go b/reproduce/golang/service/user_service.go → ...at-backend-golang/service/user_service.go
diff --git a/reproduce/golang/tables.sql → mychat-backend-golang/tables.sql b/reproduce/golang/tables.sql → mychat-backend-golang/tables.sql
diff --git a/reproduce/golang/util/contains.go → mychat-backend-golang/util/contains.go b/reproduce/golang/util/contains.go → mychat-backend-golang/util/contains.go
diff --git a/reproduce/ktor/.gitignore → mychat-backend-ktor/.gitignore b/reproduce/ktor/.gitignore → mychat-backend-ktor/.gitignore
diff --git a/LICENSE → mychat-backend-ktor/LICENSE b/LICENSE → mychat-backend-ktor/LICENSE
diff --git a/README.md → mychat-backend-ktor/README.md b/README.md → mychat-backend-ktor/README.md
diff --git a/reproduce/ktor/build.gradle → mychat-backend-ktor/build.gradle b/reproduce/ktor/build.gradle → mychat-backend-ktor/build.gradle
diff --git a/reproduce/ktor/gradle.properties → mychat-backend-ktor/gradle.properties b/reproduce/ktor/gradle.properties → mychat-backend-ktor/gradle.properties
diff --git a/...ce/ktor/gradle/wrapper/gradle-wrapper.jar → ...nd-ktor/gradle/wrapper/gradle-wrapper.jar b/...ce/ktor/gradle/wrapper/gradle-wrapper.jar → ...nd-ktor/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/reproduce/ktor/gradlew → mychat-backend-ktor/gradlew b/reproduce/ktor/gradlew → mychat-backend-ktor/gradlew
diff --git a/reproduce/ktor/gradlew.bat → mychat-backend-ktor/gradlew.bat b/reproduce/ktor/gradlew.bat → mychat-backend-ktor/gradlew.bat
diff --git a/reproduce/ktor/resources/application.conf → ...t-backend-ktor/resources/application.conf b/reproduce/ktor/resources/application.conf → ...t-backend-ktor/resources/application.conf
diff --git a/reproduce/ktor/resources/tables.sql → mychat-backend-ktor/resources/tables.sql b/reproduce/ktor/resources/tables.sql → mychat-backend-ktor/resources/tables.sql
diff --git a/reproduce/ktor/settings.gradle → mychat-backend-ktor/settings.gradle b/reproduce/ktor/settings.gradle → mychat-backend-ktor/settings.gradle
diff --git a/...or/src/moe/itsusinn/mychat/Application.kt → ...or/src/moe/itsusinn/mychat/Application.kt b/...or/src/moe/itsusinn/mychat/Application.kt → ...or/src/moe/itsusinn/mychat/Application.kt
diff --git a/...uce/ktor/src/moe/itsusinn/mychat/Const.kt → ...end-ktor/src/moe/itsusinn/mychat/Const.kt b/...uce/ktor/src/moe/itsusinn/mychat/Const.kt → ...end-ktor/src/moe/itsusinn/mychat/Const.kt
diff --git a/...uce/ktor/src/moe/itsusinn/mychat/Event.kt → ...end-ktor/src/moe/itsusinn/mychat/Event.kt b/...uce/ktor/src/moe/itsusinn/mychat/Event.kt → ...end-ktor/src/moe/itsusinn/mychat/Event.kt
diff --git a/...ktor/src/moe/itsusinn/mychat/Extension.kt → ...ktor/src/moe/itsusinn/mychat/Extension.kt b/...ktor/src/moe/itsusinn/mychat/Extension.kt → ...ktor/src/moe/itsusinn/mychat/Extension.kt
diff --git a/...moe/itsusinn/mychat/route/AccountRoute.kt → ...moe/itsusinn/mychat/route/AccountRoute.kt b/...moe/itsusinn/mychat/route/AccountRoute.kt → ...moe/itsusinn/mychat/route/AccountRoute.kt
diff --git a/...rc/moe/itsusinn/mychat/route/AuthRoute.kt → ...rc/moe/itsusinn/mychat/route/AuthRoute.kt b/...rc/moe/itsusinn/mychat/route/AuthRoute.kt → ...rc/moe/itsusinn/mychat/route/AuthRoute.kt
diff --git a/...moe/itsusinn/mychat/route/CommentRoute.kt → ...moe/itsusinn/mychat/route/CommentRoute.kt b/...moe/itsusinn/mychat/route/CommentRoute.kt → ...moe/itsusinn/mychat/route/CommentRoute.kt
diff --git a/...rc/moe/itsusinn/mychat/route/PostRoute.kt → ...rc/moe/itsusinn/mychat/route/PostRoute.kt b/...rc/moe/itsusinn/mychat/route/PostRoute.kt → ...rc/moe/itsusinn/mychat/route/PostRoute.kt
diff --git a/...oe/itsusinn/mychat/route/ResultFactory.kt → ...oe/itsusinn/mychat/route/ResultFactory.kt b/...oe/itsusinn/mychat/route/ResultFactory.kt → ...oe/itsusinn/mychat/route/ResultFactory.kt
diff --git a/...or/src/moe/itsusinn/mychat/route/Route.kt → ...or/src/moe/itsusinn/mychat/route/Route.kt b/...or/src/moe/itsusinn/mychat/route/Route.kt → ...or/src/moe/itsusinn/mychat/route/Route.kt
diff --git a/...ychat/route/jwt/CredentialAndPrincipal.kt → ...ychat/route/jwt/CredentialAndPrincipal.kt b/...ychat/route/jwt/CredentialAndPrincipal.kt → ...ychat/route/jwt/CredentialAndPrincipal.kt
diff --git a/...oe/itsusinn/mychat/route/jwt/JwtConfig.kt → ...oe/itsusinn/mychat/route/jwt/JwtConfig.kt b/...oe/itsusinn/mychat/route/jwt/JwtConfig.kt → ...oe/itsusinn/mychat/route/jwt/JwtConfig.kt
diff --git a/...oe/itsusinn/mychat/service/PostService.kt → ...oe/itsusinn/mychat/service/PostService.kt b/...oe/itsusinn/mychat/service/PostService.kt → ...oe/itsusinn/mychat/service/PostService.kt
diff --git a/...e/itsusinn/mychat/service/RedisService.kt → ...e/itsusinn/mychat/service/RedisService.kt b/...e/itsusinn/mychat/service/RedisService.kt → ...e/itsusinn/mychat/service/RedisService.kt
diff --git a/...oe/itsusinn/mychat/service/UserService.kt → ...oe/itsusinn/mychat/service/UserService.kt b/...oe/itsusinn/mychat/service/UserService.kt → ...oe/itsusinn/mychat/service/UserService.kt
diff --git a/...r/src/moe/itsusinn/mychat/sql/Database.kt → ...r/src/moe/itsusinn/mychat/sql/Database.kt b/...r/src/moe/itsusinn/mychat/sql/Database.kt → ...r/src/moe/itsusinn/mychat/sql/Database.kt
diff --git a/...c/moe/itsusinn/mychat/sql/data/Comment.kt → ...c/moe/itsusinn/mychat/sql/data/Comment.kt b/...c/moe/itsusinn/mychat/sql/data/Comment.kt → ...c/moe/itsusinn/mychat/sql/data/Comment.kt
diff --git a/.../src/moe/itsusinn/mychat/sql/data/Post.kt → .../src/moe/itsusinn/mychat/sql/data/Post.kt b/.../src/moe/itsusinn/mychat/sql/data/Post.kt → .../src/moe/itsusinn/mychat/sql/data/Post.kt
diff --git a/.../src/moe/itsusinn/mychat/sql/data/User.kt → .../src/moe/itsusinn/mychat/sql/data/User.kt b/.../src/moe/itsusinn/mychat/sql/data/User.kt → .../src/moe/itsusinn/mychat/sql/data/User.kt
diff --git a/.gitignore → mychat-backend-spring/.gitignore b/.gitignore → mychat-backend-spring/.gitignore
diff --git a/reproduce/ktor/LICENSE → mychat-backend-spring/LICENSE b/reproduce/ktor/LICENSE → mychat-backend-spring/LICENSE
diff --git a/reproduce/ktor/README.md → mychat-backend-spring/README.md b/reproduce/ktor/README.md → mychat-backend-spring/README.md
diff --git a/build.gradle.kts → mychat-backend-spring/build.gradle.kts b/build.gradle.kts → mychat-backend-spring/build.gradle.kts
diff --git a/mychat-backend-spring/depoly.sh b/mychat-backend-spring/depoly.sh
@@ -0,0 +1,4 @@
+gradle clean bootJar
+echo Build Successfully
+scp -r ./build/libs/mychat.jar itsusinn@atri:/home/itsusinn/
+echo Copy Successfully
diff --git a/gradle/wrapper/gradle-wrapper.jar → ...-spring/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar → ...-spring/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew → mychat-backend-spring/gradlew b/gradlew → mychat-backend-spring/gradlew
diff --git a/gradlew.bat → mychat-backend-spring/gradlew.bat b/gradlew.bat → mychat-backend-spring/gradlew.bat
diff --git a/settings.gradle.kts → mychat-backend-spring/settings.gradle.kts b/settings.gradle.kts → mychat-backend-spring/settings.gradle.kts
diff --git a/...main/kotlin/moe/itsusinn/mychat/Logger.kt → ...n/kotlin/moe/itsusinn/mychat/Extension.kt b/...main/kotlin/moe/itsusinn/mychat/Logger.kt → ...n/kotlin/moe/itsusinn/mychat/Extension.kt
@@ -4,9 +4,14 @@ import moe.itsusinn.mychat.security.atri.AtriAuthenticationToken
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.security.core.context.SecurityContextHolder
+import org.springframework.security.crypto.bcrypt.BCrypt
 
 fun Any.logger(): Logger = LoggerFactory.getLogger(javaClass)
 
 val Any.credential
     get() =
-        SecurityContextHolder.getContext().authentication as AtriAuthenticationToken
+        SecurityContextHolder.getContext().authentication as AtriAuthenticationToken
+
+fun checkDbPassword(plaintext:String, hashed:String):Boolean{
+    return BCrypt.checkpw(plaintext, hashed)
+}
diff --git a/.../moe/itsusinn/mychat/MychatApplication.kt → .../moe/itsusinn/mychat/MychatApplication.kt b/.../moe/itsusinn/mychat/MychatApplication.kt → .../moe/itsusinn/mychat/MychatApplication.kt
diff --git a/...ychat/configuration/DruidConfiguration.kt → ...ychat/configuration/DruidConfiguration.kt b/...ychat/configuration/DruidConfiguration.kt → ...ychat/configuration/DruidConfiguration.kt
diff --git a/...ychat/configuration/KtormConfiguration.kt → ...ychat/configuration/KtormConfiguration.kt b/...ychat/configuration/KtormConfiguration.kt → ...ychat/configuration/KtormConfiguration.kt
diff --git a/...at/configuration/SecurityConfiguration.kt → ...at/configuration/SecurityConfiguration.kt b/...at/configuration/SecurityConfiguration.kt → ...at/configuration/SecurityConfiguration.kt
diff --git a/...usinn/mychat/controller/UserController.kt → ...usinn/mychat/controller/UserController.kt b/...usinn/mychat/controller/UserController.kt → ...usinn/mychat/controller/UserController.kt
@@ -52,8 +52,8 @@ class UserController {
 
             val user = userService.checkPassword(
                 username,
-                bCryptPasswordEncoder.encode(password)
-            ) ?: return UserLoginRespond(Status.Failed, "")
+                password
+            ) ?: return UserLoginRespond(Status.Failed, "Wrong Password")
 
             val roles = userRoleService.findRolesByUid(user.userID)
             val token = generateToken(

diff --git a/...moe/itsusinn/mychat/models/CommentData.kt → ...moe/itsusinn/mychat/models/CommentData.kt b/...moe/itsusinn/mychat/models/CommentData.kt → ...moe/itsusinn/mychat/models/CommentData.kt
diff --git a/...in/moe/itsusinn/mychat/models/PostData.kt → ...in/moe/itsusinn/mychat/models/PostData.kt b/...in/moe/itsusinn/mychat/models/PostData.kt → ...in/moe/itsusinn/mychat/models/PostData.kt
diff --git a/...in/moe/itsusinn/mychat/models/UserData.kt → ...in/moe/itsusinn/mychat/models/UserData.kt b/...in/moe/itsusinn/mychat/models/UserData.kt → ...in/moe/itsusinn/mychat/models/UserData.kt
diff --git a/...mychat/models/request/UserLoginRequest.kt → ...mychat/models/request/UserLoginRequest.kt b/...mychat/models/request/UserLoginRequest.kt → ...mychat/models/request/UserLoginRequest.kt
diff --git a/...hat/models/request/UserRegisterRequest.kt → ...hat/models/request/UserRegisterRequest.kt b/...hat/models/request/UserRegisterRequest.kt → ...hat/models/request/UserRegisterRequest.kt
diff --git a/.../itsusinn/mychat/models/respond/Status.kt → .../itsusinn/mychat/models/respond/Status.kt b/.../itsusinn/mychat/models/respond/Status.kt → .../itsusinn/mychat/models/respond/Status.kt
diff --git a/...mychat/models/respond/UserLoginRespond.kt → ...mychat/models/respond/UserLoginRespond.kt b/...mychat/models/respond/UserLoginRespond.kt → ...mychat/models/respond/UserLoginRespond.kt
diff --git a/...hat/models/respond/UserRegisterRespond.kt → ...hat/models/respond/UserRegisterRespond.kt b/...hat/models/respond/UserRegisterRespond.kt → ...hat/models/respond/UserRegisterRespond.kt
diff --git a/...nn/mychat/repository/CommentRepository.kt → ...nn/mychat/repository/CommentRepository.kt b/...nn/mychat/repository/CommentRepository.kt → ...nn/mychat/repository/CommentRepository.kt
diff --git a/...at/repository/RolePermissionRepository.kt → ...at/repository/RolePermissionRepository.kt b/...at/repository/RolePermissionRepository.kt → ...at/repository/RolePermissionRepository.kt
diff --git a/...usinn/mychat/repository/UserRepository.kt → ...usinn/mychat/repository/UserRepository.kt b/...usinn/mychat/repository/UserRepository.kt → ...usinn/mychat/repository/UserRepository.kt
@@ -6,6 +6,7 @@ import org.ktorm.database.Database
 import org.ktorm.dsl.eq
 import org.ktorm.entity.add
 import org.ktorm.entity.find
+import org.springframework.security.crypto.bcrypt.BCrypt
 import org.springframework.stereotype.Repository
 
 @Repository
@@ -27,4 +28,5 @@ class UserRepository(
      */
     fun findUserByUid(uid: Long): UserEntity? = database.users.find { it.userID eq uid }
 
-}
+}
+
diff --git a/...n/mychat/repository/UserRoleRepository.kt → ...n/mychat/repository/UserRoleRepository.kt b/...n/mychat/repository/UserRoleRepository.kt → ...n/mychat/repository/UserRoleRepository.kt
diff --git a/...mychat/repository/entity/CommentEntity.kt → ...mychat/repository/entity/CommentEntity.kt b/...mychat/repository/entity/CommentEntity.kt → ...mychat/repository/entity/CommentEntity.kt
diff --git a/...hat/repository/entity/PermissionEntity.kt → ...hat/repository/entity/PermissionEntity.kt b/...hat/repository/entity/PermissionEntity.kt → ...hat/repository/entity/PermissionEntity.kt
diff --git a/...nn/mychat/repository/entity/PostEntity.kt → ...nn/mychat/repository/entity/PostEntity.kt b/...nn/mychat/repository/entity/PostEntity.kt → ...nn/mychat/repository/entity/PostEntity.kt
diff --git a/...nn/mychat/repository/entity/RoleEntity.kt → ...nn/mychat/repository/entity/RoleEntity.kt b/...nn/mychat/repository/entity/RoleEntity.kt → ...nn/mychat/repository/entity/RoleEntity.kt
diff --git a/...repository/entity/RolePermissionEntity.kt → ...repository/entity/RolePermissionEntity.kt b/...repository/entity/RolePermissionEntity.kt → ...repository/entity/RolePermissionEntity.kt
diff --git a/...nn/mychat/repository/entity/UserEntity.kt → ...nn/mychat/repository/entity/UserEntity.kt b/...nn/mychat/repository/entity/UserEntity.kt → ...nn/mychat/repository/entity/UserEntity.kt
diff --git a/...ychat/repository/entity/UserRoleEntity.kt → ...ychat/repository/entity/UserRoleEntity.kt b/...ychat/repository/entity/UserRoleEntity.kt → ...ychat/repository/entity/UserRoleEntity.kt
diff --git a/...ychat/security/MyAccessDecisionManager.kt → ...ychat/security/MyAccessDecisionManager.kt b/...ychat/security/MyAccessDecisionManager.kt → ...ychat/security/MyAccessDecisionManager.kt
diff --git a/...t/security/MyFilterSecurityInterceptor.kt → ...t/security/MyFilterSecurityInterceptor.kt b/...t/security/MyFilterSecurityInterceptor.kt → ...t/security/MyFilterSecurityInterceptor.kt
diff --git a/...nvocationSecurityMetadataSourceService.kt → ...nvocationSecurityMetadataSourceService.kt b/...nvocationSecurityMetadataSourceService.kt → ...nvocationSecurityMetadataSourceService.kt
diff --git a/...moe/itsusinn/mychat/security/TypeAlias.kt → ...moe/itsusinn/mychat/security/TypeAlias.kt b/...moe/itsusinn/mychat/security/TypeAlias.kt → ...moe/itsusinn/mychat/security/TypeAlias.kt
diff --git a/...ty/atri/AtriAuthenticationInjectFilter.kt → ...ty/atri/AtriAuthenticationInjectFilter.kt b/...ty/atri/AtriAuthenticationInjectFilter.kt → ...ty/atri/AtriAuthenticationInjectFilter.kt
diff --git a/...curity/atri/AtriAuthenticationProvider.kt → ...curity/atri/AtriAuthenticationProvider.kt b/...curity/atri/AtriAuthenticationProvider.kt → ...curity/atri/AtriAuthenticationProvider.kt
diff --git a/.../security/atri/AtriAuthenticationToken.kt → .../security/atri/AtriAuthenticationToken.kt b/.../security/atri/AtriAuthenticationToken.kt → .../security/atri/AtriAuthenticationToken.kt
diff --git a/...inn/mychat/security/atri/AtriValidator.kt → ...inn/mychat/security/atri/AtriValidator.kt b/...inn/mychat/security/atri/AtriValidator.kt → ...inn/mychat/security/atri/AtriValidator.kt
diff --git a/...chat/security/permission/MyUserDetails.kt → ...chat/security/permission/MyUserDetails.kt b/...chat/security/permission/MyUserDetails.kt → ...chat/security/permission/MyUserDetails.kt
diff --git a/.../mychat/security/permission/Permission.kt → .../mychat/security/permission/Permission.kt b/.../mychat/security/permission/Permission.kt → .../mychat/security/permission/Permission.kt
diff --git a/...susinn/mychat/security/permission/Role.kt → ...susinn/mychat/security/permission/Role.kt b/...susinn/mychat/security/permission/Role.kt → ...susinn/mychat/security/permission/Role.kt
diff --git a/...hat/security/permission/RolePermission.kt → ...hat/security/permission/RolePermission.kt b/...hat/security/permission/RolePermission.kt → ...hat/security/permission/RolePermission.kt
diff --git a/...e/itsusinn/mychat/security/tool/Base64.kt → ...e/itsusinn/mychat/security/tool/Base64.kt b/...e/itsusinn/mychat/security/tool/Base64.kt → ...e/itsusinn/mychat/security/tool/Base64.kt
diff --git a/.../itsusinn/mychat/security/tool/JwtUtil.kt → .../itsusinn/mychat/security/tool/JwtUtil.kt b/.../itsusinn/mychat/security/tool/JwtUtil.kt → .../itsusinn/mychat/security/tool/JwtUtil.kt
diff --git a/...e/itsusinn/mychat/services/MyValidator.kt → ...e/itsusinn/mychat/services/MyValidator.kt b/...e/itsusinn/mychat/services/MyValidator.kt → ...e/itsusinn/mychat/services/MyValidator.kt
diff --git a/...e/itsusinn/mychat/services/PostService.kt → ...e/itsusinn/mychat/services/PostService.kt b/...e/itsusinn/mychat/services/PostService.kt → ...e/itsusinn/mychat/services/PostService.kt
diff --git a/...susinn/mychat/services/UserRoleService.kt → ...susinn/mychat/services/UserRoleService.kt b/...susinn/mychat/services/UserRoleService.kt → ...susinn/mychat/services/UserRoleService.kt
diff --git a/...e/itsusinn/mychat/services/UserService.kt → ...e/itsusinn/mychat/services/UserService.kt b/...e/itsusinn/mychat/services/UserService.kt → ...e/itsusinn/mychat/services/UserService.kt
@@ -1,5 +1,6 @@
 package moe.itsusinn.mychat.services
 
+import moe.itsusinn.mychat.checkDbPassword
 import moe.itsusinn.mychat.repository.UserRepository
 import moe.itsusinn.mychat.repository.UserRoleRepository
 import moe.itsusinn.mychat.repository.entity.UserEntity
@@ -18,9 +19,13 @@ class UserService {
      * 校检密码是否正确
      */
     fun checkPassword(username: String, password: String): UserEntity? {
-        val user = userRepository.findUserByUsername(username)
-        return if (user == null || user.password != password) null
-        else user
+        val userEntity = userRepository.findUserByUsername(username)
+        return if (
+            userEntity == null
+            ||
+            !checkDbPassword(password, userEntity.password)
+        ) null
+        else userEntity
     }
 
     /**

diff --git a/src/main/resources/application.properties → ...src/main/resources/application.properties b/src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/src/main/resources/application.yml → ...spring/src/main/resources/application.yml b/src/main/resources/application.yml → ...spring/src/main/resources/application.yml
@@ -3,5 +3,6 @@ spring:
   datasource:
     driverClassName: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:3306/mychat?useUnicode=true&characterEncoding=utf-8&sessionVariables=sql_mode='NO_ENGINE_SUBSTITUTION'&jdbcCompliantTruncation=false
-    username: root
-    type: com.alibaba.druid.pool.DruidDataSource
+    username: itsusinn
+    password: X*2Jzh.m;Mrj
+    type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/tables.sql → ...kend-spring/src/main/resources/tables.sql b/src/main/resources/tables.sql → ...kend-spring/src/main/resources/tables.sql
diff --git a/src/test/Post.http → mychat-backend-spring/src/test/Post.http b/src/test/Post.http → mychat-backend-spring/src/test/Post.http
diff --git a/src/test/User.http → mychat-backend-spring/src/test/User.http b/src/test/User.http → mychat-backend-spring/src/test/User.http
@@ -8,7 +8,7 @@ POST http://{{address}}/user/register
 Content-Type: application/json
 
 {
-  "username": "abc",
+  "username": "abcd",
   "password": "123"
 }
 
@@ -17,7 +17,7 @@ POST http://{{address}}/user/login
 Content-Type: application/json
 
 {
-  "username": "abc",
+  "username": "abcd",
   "password": "123"
 }
 > {% client.global.set("token", response.body.token); %}

diff --git a/src/test/http-client.env.json → ...kend-spring/src/test/http-client.env.json b/src/test/http-client.env.json → ...kend-spring/src/test/http-client.env.json
diff --git a/...itsusinn/mychat/MychatApplicationTests.kt → ...itsusinn/mychat/MychatApplicationTests.kt b/...itsusinn/mychat/MychatApplicationTests.kt → ...itsusinn/mychat/MychatApplicationTests.kt
diff --git a/mychat-backend-vertx/.editorconfig b/mychat-backend-vertx/.editorconfig
@@ -0,0 +1,11 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
diff --git a/mychat-backend-vertx/.gitignore b/mychat-backend-vertx/.gitignore
@@ -0,0 +1,185 @@
+### Vert.x ###
+.vertx/
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+### Intellij+iml ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-buildTool-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-buildTool.properties
+fabric.properties
+
+### Intellij+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
+
+### Gradle ###
+.gradle
+/buildTool/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### NetBeans ###
+nbproject/private/
+buildTool/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
diff --git a/mychat-backend-vertx/.idea/.gitignore b/mychat-backend-vertx/.idea/.gitignore
diff --git a/mychat-backend-vertx/.idea/compiler.xml b/mychat-backend-vertx/.idea/compiler.xml
diff --git a/mychat-backend-vertx/.idea/jarRepositories.xml b/mychat-backend-vertx/.idea/jarRepositories.xml
diff --git a/mychat-backend-vertx/README.adoc b/mychat-backend-vertx/README.adoc
@@ -0,0 +1,31 @@
+= Mychat-backend-vertx
+
+image:https://img.shields.io/badge/vert.x-3.9.4-purple.svg[link="https://vertx.io"]
+
+This application was generated using http://start.vertx.io
+
+== Building
+
+To launch your tests:
+```
+./gradlew clean test
+```
+
+To package your application:
+```
+./gradlew clean assemble
+```
+
+To run your application:
+```
+./gradlew clean run
+```
+
+== Help
+
+* https://vertx.io/docs/[Vert.x Documentation]
+* https://stackoverflow.com/questions/tagged/vert.x?sort=newest&pageSize=15[Vert.x Stack Overflow]
+* https://groups.google.com/forum/?fromgroups#!forum/vertx[Vert.x User Group]
+* https://gitter.im/eclipse-vertx/vertx-users[Vert.x Gitter]
+
+