From 6467aada6143928c382617995c5d740dea204700 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 17:40:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E5=88=86=E6=9E=90=E4=B8=8B?= =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E8=80=97=E6=97=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 32dbd62d --- .../java/com/epmet/controller/ThirdLoginController.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 469385222d..00770d82bb 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -6,7 +6,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.StaffOrgsResultDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.ThirdLoginService; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -20,7 +19,6 @@ import java.util.List; * @Description 第三方-居民端、政府端登陆服务 * @author sun */ -@Slf4j @RestController @RequestMapping("thirdlogin") public class ThirdLoginController { @@ -36,11 +34,8 @@ public class ThirdLoginController { **/ @PostMapping("resilogin") public Result resiLogin(@RequestBody LoginFormDTO formDTO) { - long start = System.currentTimeMillis(); ValidatorUtils.validateEntity(formDTO); - UserTokenResultDTO resultDTO = thirdLoginService.resiLogin(formDTO); - log.error("resilogin total cost:{}",System.currentTimeMillis()-start); - return new Result().ok(resultDTO); + return new Result().ok(thirdLoginService.resiLogin(formDTO)); } /** From 6c44ba2e45bb0b029a0902b83690b6fab62313fa Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 17:41:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E5=88=86=E6=9E=90=E4=B8=8B?= =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E8=80=97=E6=97=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e0161568 --- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 7b22870b05..d1cc70552e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -65,15 +65,12 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { **/ @Override public UserTokenResultDTO resiLogin(LoginFormDTO formDTO) { - long start = System.currentTimeMillis(); //1.调用epmet_third服务，校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息 WxLoginFormDTO resiLoginFormDTO = new WxLoginFormDTO(); resiLoginFormDTO.setAppId(formDTO.getAppId()); resiLoginFormDTO.setWxCode(formDTO.getWxCode()); UserWechatDTO userWechatDTO = this.getUserWeChat(resiLoginFormDTO); - logger.error("resiLogin getUserWeChat cost time:{}",System.currentTimeMillis()-start); - start = System.currentTimeMillis(); //2.调用epmet-user服务，新增用户信息(先判断用户是否存在，不存在则新增存在则更新) WxUserFormDTO wxUserFormDTO = new WxUserFormDTO(); wxUserFormDTO.setWechatDTO(userWechatDTO); @@ -82,8 +79,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { if (!userResult.success()) { throw new RenException(userResult.getCode()); } - logger.error("resiLogin saveWxUser cost time:{}",System.currentTimeMillis()-start); - start = System.currentTimeMillis(); UserDTO userDTO = userResult.getData(); //3.生成业务token @@ -96,7 +91,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { //5.接口返参 UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); - logger.error("resiLogin generateToken cost time:{}",System.currentTimeMillis()-start); + return userTokenResultDTO; }