From 84560eab857f3cc1c4ee6bd4bd8608830aceecdc Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 04 七月 2022 13:57:47 +0800 Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang --- safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java index 608b319..d139e52 100644 --- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java +++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java @@ -1,7 +1,7 @@ package com.gkhy.safePlatform.accountController; import com.alibaba.fastjson.JSONObject; -import com.gkhy.safePlatform.account.rpc.apimodel.UserAccountService; +import com.gkhy.safePlatform.account.rpc.apimodel.AccountAuthService; import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.MenuRPCRespDTO; import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.UserLoginRPCRespDTO; import com.gkhy.safePlatform.commons.vo.ResultVO; @@ -20,18 +20,18 @@ public class LoginController { @DubboReference(check = false) - private UserAccountService userAccountService; + private AccountAuthService accountAuthService; @RequestMapping("/login") public ResultVO<UserLoginRPCRespDTO> authLogin(@RequestBody JSONObject loginForm){ String username = loginForm.getString("username"); String password = loginForm.getString("password"); - return userAccountService.authLogin(username, password); + return accountAuthService.authLogin(username, password); } @RequestMapping("/menu") public ResultVO<List<MenuRPCRespDTO>> getMenu(Principal principal, Long projectId){ String userId = principal.getName(); - return userAccountService.getMenu(Long.valueOf(userId), projectId); + return accountAuthService.getMenu(Long.valueOf(userId), projectId); } } -- Gitblit v1.9.2