|
|
@@ -24,7 +24,6 @@ import com.dragoninfo.dcuc.auth.token.vo.TokenDetailRespVo;
|
|
|
import com.dragoninfo.dcuc.auth.token.vo.TokenReceiveVO;
|
|
|
import com.dragoninfo.dcuc.auth.token.vo.UserTokenInfoRespVO;
|
|
|
import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.*;
|
|
|
-import com.dragoninfo.dcuc.authweb.util.HeadTokenUtils;
|
|
|
import com.dragoninfo.dcuc.common.utils.LangUtil;
|
|
|
import com.dragoninfo.dcuc.common.utils.ResponseUtil;
|
|
|
import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
|
|
|
@@ -99,13 +98,13 @@ public class AuthV4Controller {
|
|
|
UserTokenInfoRespVO userToken = tokenInfo.getUserToken();
|
|
|
int expiredTime = (int) ((userToken.getExpireAt().getTime() - System.currentTimeMillis()) / 1000);
|
|
|
|
|
|
- authTokenFacade.cacheStandardUserToken(userInfo.getIdcard(), userToken.getId(), expiredTime);
|
|
|
+ authTokenFacade.cacheStandardUserToken(userInfo.getIdcard(), userToken.getUserTokenId(), expiredTime);
|
|
|
|
|
|
ApiAppAuthVo authVo = ApiAppAuthVo.builder()
|
|
|
.requestAppCode(tokenInfo.getAppToken().getAppId())
|
|
|
.userInfo(userInfo)
|
|
|
.appToken(appTokenId)
|
|
|
- .userToken(userToken.getId())
|
|
|
+ .userToken(userToken.getUserTokenId())
|
|
|
.terminalIp(IpUtils.getIp())
|
|
|
.build();
|
|
|
List<AppDataSensitiveLevelDTO> appList = staffAssignAuthInfoFacade.apiAppAuth(authVo);
|
|
|
@@ -223,7 +222,7 @@ public class AuthV4Controller {
|
|
|
v2ReqDTO.setIdcard(userInfo.getIdcard());
|
|
|
v2ReqDTO.setResourceId(resourceId);
|
|
|
v2ReqDTO.setAppToken(appTokenId);
|
|
|
- v2ReqDTO.setUserToken(tokenInfo.getUserToken().getId());
|
|
|
+ v2ReqDTO.setUserToken(tokenInfo.getUserToken().getUserTokenId());
|
|
|
v2ReqDTO.setRequestAppCode(tokenInfo.getAppToken().getAppId());
|
|
|
|
|
|
ResponseDTO<DataAuthV2RespDTO> dto = apiDataAuthFacade.dataItemsCheckV2(v2ReqDTO);
|
mazq