Browse Source

20220315

master
zy_Java 3 years ago
parent
commit
f314e960ae
  1. 2
      cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java
  2. 6
      cloudutil/src/main/java/com/ccsens/cloudutil/feign/PtosTallFeignClient.java
  3. 2
      ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java

2
cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java

@ -120,7 +120,7 @@ public class MustLoginAspect {
Object result = pjp.proceed(); Object result = pjp.proceed();
if(result instanceof JsonResponse && authHeader == null){ if(result instanceof JsonResponse && authHeader == null){
JsonResponse result1 = (JsonResponse) result; JsonResponse result1 = (JsonResponse) result;
if(result1.getCode() == 200 && result1.getData() != null){ if(result1.getCode() == 200){
result1.setTokenObj(token,refreshToken); result1.setTokenObj(token,refreshToken);
return result1; return result1;
} }

6
cloudutil/src/main/java/com/ccsens/cloudutil/feign/PtosTallFeignClient.java

@ -12,6 +12,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List; import java.util.List;
@ -24,13 +26,13 @@ public interface PtosTallFeignClient {
/** /**
* 根据token获取userId * 根据token获取userId
*/ */
@GetMapping("users/token") @PostMapping("users/token")
JsonResponse<FeignUserVo.TokenToUserId> getUserIdByToken(FeignUserDto.UserInfoByToken params); JsonResponse<FeignUserVo.TokenToUserId> getUserIdByToken(FeignUserDto.UserInfoByToken params);
/** /**
* 根据手机号获取用户在本域的业务项目列表 * 根据手机号获取用户在本域的业务项目列表
*/ */
@GetMapping("project/byPhone") @PostMapping("project/byPhone")
JsonResponse<List<FeignProjectVo.ProjectInfo>> queryProjectByPhone(FeignProjectDto.QueryProjectByPhone params); JsonResponse<List<FeignProjectVo.ProjectInfo>> queryProjectByPhone(FeignProjectDto.QueryProjectByPhone params);
} }

2
ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java

@ -169,7 +169,7 @@ public class WxUserService implements IWxUserService {
List<WxOfficialUser> wxOfficialUsers = wxOfficialUserMapper.selectByExample(wxOfficialUserExample); List<WxOfficialUser> wxOfficialUsers = wxOfficialUserMapper.selectByExample(wxOfficialUserExample);
if(CollectionUtil.isNotEmpty(wxOfficialUsers)){ if(CollectionUtil.isNotEmpty(wxOfficialUsers)){
userOfficial.setUserId(wxOfficialUsers.get(0).getUserId()); userOfficial.setUserId(wxOfficialUsers.get(0).getUserId());
userOfficial.setStatus(wxOfficialUsers.get(0).getRecStatus()); userOfficial.setStatus(wxOfficialUsers.get(0).getAttentionStatus());
} }
return userOfficial; return userOfficial;
} }

Loading…
Cancel
Save