Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp

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<UserTokenResultDTO> resiLogin(@RequestBody LoginFormDTO formDTO) {
-        long start = System.currentTimeMillis();
         ValidatorUtils.validateEntity(formDTO);
-        UserTokenResultDTO resultDTO = thirdLoginService.resiLogin(formDTO);
+        return new Result<UserTokenResultDTO>().ok(thirdLoginService.resiLogin(formDTO));
-        log.error("resilogin total cost:{}",System.currentTimeMillis()-start);
-        return new Result<UserTokenResultDTO>().ok(resultDTO);
     }
 
     /**

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;
     }