Ver Fonte

解决冲突

PC há 3 anos atrás
pai
commit
bdf6cde927

+ 4 - 5
sckw-auth/src/main/java/com/sckw/auth/controller/AuthController.java

@@ -1,6 +1,5 @@
 package com.sckw.auth.controller;
 package com.sckw.auth.controller;
 
 
-import com.sckw.auth.model.vo.req.EntAuthenticationReqVo;
 import com.sckw.auth.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.auth.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.auth.model.vo.req.LoginReqVo;
 import com.sckw.auth.model.vo.req.LoginReqVo;
 import com.sckw.auth.model.vo.req.RegisterReqVo;
 import com.sckw.auth.model.vo.req.RegisterReqVo;
@@ -20,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 public class AuthController {
 public class AuthController {
 
 
     @Autowired
     @Autowired
-    private IAuthService indexService;
+    private IAuthService authService;
 
 
     /**
     /**
      * @param reqVo 登录入参
      * @param reqVo 登录入参
@@ -31,7 +30,7 @@ public class AuthController {
      */
      */
     @PostMapping("/login")
     @PostMapping("/login")
     public HttpResult login(@RequestBody LoginReqVo reqVo) throws SystemException {
     public HttpResult login(@RequestBody LoginReqVo reqVo) throws SystemException {
-        return HttpResult.ok(indexService.login(reqVo));
+        return HttpResult.ok(authService.login(reqVo));
     }
     }
 
 
     /**
     /**
@@ -43,7 +42,7 @@ public class AuthController {
      */
      */
     @PostMapping("/register")
     @PostMapping("/register")
     public HttpResult register(@RequestBody RegisterReqVo reqDto) throws SystemException {
     public HttpResult register(@RequestBody RegisterReqVo reqDto) throws SystemException {
-        indexService.register(reqDto);
+        authService.register(reqDto);
         return HttpResult.ok();
         return HttpResult.ok();
     }
     }
 
 
@@ -56,7 +55,7 @@ public class AuthController {
      */
      */
     @PostMapping("/forgetPassword")
     @PostMapping("/forgetPassword")
     public HttpResult forgetPassword(@RequestBody ForgetPasswordReqVo reqDto) throws SystemException {
     public HttpResult forgetPassword(@RequestBody ForgetPasswordReqVo reqDto) throws SystemException {
-        indexService.forgetPassword(reqDto);
+        authService.forgetPassword(reqDto);
         return HttpResult.ok();
         return HttpResult.ok();
     }
     }