diff --git a/.gitignore b/.gitignore index c2065bc..da30c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ out/ ### VS Code ### .vscode/ +logs diff --git a/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/AuthorizeController.kt b/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/AuthorizeController.kt index 465f166..0fb6ac5 100644 --- a/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/AuthorizeController.kt +++ b/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/AuthorizeController.kt @@ -5,18 +5,18 @@ import cn.dev33.satoken.stp.StpUtil import cn.edu.hfut.auto.knowledge.entity.vo.LoginVO import cn.edu.hfut.auto.knowledge.exception.BusinessError import cn.edu.hfut.auto.knowledge.exception.ErrorCode -import cn.edu.hfut.auto.knowledge.service.UserService +import cn.edu.hfut.auto.knowledge.repository.UserRepository import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RestController @RestController class AuthorizeController( - private val userService: UserService + private val userRepository: UserRepository ) { @PostMapping("/login") fun login(@RequestBody vo: LoginVO) { - val user = userService.findByUsername(vo.username) + val user = userRepository.findByUsername(vo.username) ?.takeIf { BCrypt.checkpw(vo.password, it.password) } ?: throw BusinessError(ErrorCode.INVALID_USERNAME_OR_PASSWORD) StpUtil.login(user.id) diff --git a/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/DevOnlyController.kt b/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/DevOnlyController.kt index 41e1d17..1ea7836 100644 --- a/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/DevOnlyController.kt +++ b/src/main/kotlin/cn/edu/hfut/auto/knowledge/controller/DevOnlyController.kt @@ -4,7 +4,7 @@ import cn.dev33.satoken.secure.BCrypt import cn.edu.hfut.auto.knowledge.entity.User import cn.edu.hfut.auto.knowledge.entity.by import cn.edu.hfut.auto.knowledge.entity.vo.LoginVO -import cn.edu.hfut.auto.knowledge.service.UserService +import cn.edu.hfut.auto.knowledge.repository.UserRepository import org.babyfish.jimmer.kt.new import org.springframework.context.annotation.Profile import org.springframework.web.bind.annotation.PostMapping @@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.RestController @Profile("dev") @RestController class DevOnlyController( - private val userService: UserService + private val userRepository: UserRepository ) { @PostMapping("/register") fun register(@RequestBody vo: LoginVO) { - userService.insert(new(User::class).by { + userRepository.insert(new(User::class).by { username = vo.username password = BCrypt.hashpw(vo.password) level = 2 diff --git a/src/main/kotlin/cn/edu/hfut/auto/knowledge/service/UserService.kt b/src/main/kotlin/cn/edu/hfut/auto/knowledge/repository/UserRepository.kt similarity index 69% rename from src/main/kotlin/cn/edu/hfut/auto/knowledge/service/UserService.kt rename to src/main/kotlin/cn/edu/hfut/auto/knowledge/repository/UserRepository.kt index 40d48dd..14f27ed 100644 --- a/src/main/kotlin/cn/edu/hfut/auto/knowledge/service/UserService.kt +++ b/src/main/kotlin/cn/edu/hfut/auto/knowledge/repository/UserRepository.kt @@ -1,9 +1,9 @@ -package cn.edu.hfut.auto.knowledge.service +package cn.edu.hfut.auto.knowledge.repository import cn.edu.hfut.auto.knowledge.entity.User import org.babyfish.jimmer.spring.repository.KRepository import org.babyfish.jimmer.sql.fetcher.Fetcher -interface UserService : KRepository { +interface UserRepository : KRepository { fun findByUsername(username: String, fetcher: Fetcher? = null): User? } \ No newline at end of file