feat: 增加日志

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/zerotrust/ZeroTrustAppAuthBusiness.java

@@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.dragoninfo.dcuc.auth.api.enums.securitypolicy.AuthTypeEnum;
-import com.dragoninfo.dcuc.auth.api.vo.zerotrust.AppAuthReqVO;
 import com.dragoninfo.dcuc.auth.api.enums.zerotrust.ZeroTrustBusinessRespEnum;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.AppAuthReqVO;
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustDataRespVO;
 import com.dragoninfo.dcuc.auth.async.BusiEventPublisher;
 import com.dragoninfo.dcuc.auth.audit.enums.AuthResultEnum;
@@ -90,17 +90,17 @@ public class ZeroTrustAppAuthBusiness implements IZeroTrustAppAuthBusiness {
         String userTokenId = appAuthReqVO.getUserTokenId();
         UserTokenInfoRespVO userToken = authTokenBusiness.getUserTokenInfo(userTokenId);
         if (null == userToken) {
-            log.error("查询不到用户令牌信息");
+            log.error("查询不到用户令牌信息:{}", userTokenId);
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.TOKEN_FAIL);
         }
         String pId = userToken.getPid();
-        log.info("传入的用户令牌为:{}, 应用鉴权查寻到的令牌结果:{}, pid:{}", userTokenId, JSON.toJSONString(userToken), pId);
+        log.info("传入的用户令牌为:{}, 令牌信息:{}, pid:{}", userTokenId, JSON.toJSONString(userToken), pId);
         // 构建sysLogVo
         SecurityPolicyAuthenticationLogReqVO logReqVO = getSysLogVo(appAuthReqVO);
 
         AuthUserInfo userInfo = authUserInfoService.findByIdcard(pId);
         if (userInfo == null) {
-            log.error("查询不到用户信息");
+            log.error("查询不到用户信息：{}", pId);
             ApiAppAuthVo appAuthVo = ApiAppAuthVo.builder()
                     .terminalIp(IpUtils.getRealIpAdrress(RequestUtils.getRequest()))
                     .userToken(userTokenId)
@@ -136,6 +136,7 @@ public class ZeroTrustAppAuthBusiness implements IZeroTrustAppAuthBusiness {
 
     /**
      * 过滤安全策略冻结的应用级权限
+     *
      * @param appList
      * @param userVo
      * @return

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/zerotrust/ZeroTrustDataAuthBusiness.java

@@ -1,9 +1,9 @@
 package com.dragoninfo.dcuc.auth.auth.business.impl.zerotrust;
 
 import cn.hutool.core.util.StrUtil;
+import com.dragoninfo.dcuc.auth.api.enums.zerotrust.ZeroTrustBusinessRespEnum;
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.DataAuthReqVO;
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.DataAuthRespVO;
-import com.dragoninfo.dcuc.auth.api.enums.zerotrust.ZeroTrustBusinessRespEnum;
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustDataRespVO;
 import com.dragoninfo.dcuc.auth.audit.enums.AuthResultEnum;
 import com.dragoninfo.dcuc.auth.audit.service.log.LogInfoFillService;
@@ -22,7 +22,6 @@ import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.ObjectUtils;
 import com.dragonsoft.duceap.commons.util.ip.IpUtils;
-import com.dragonsoft.duceap.web.utils.RequestUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -74,7 +73,7 @@ public class ZeroTrustDataAuthBusiness implements IZeroTrustDataAuthBusiness {
         String appTokenId = dataAuthReqVO.getAppTokenId();
         TokenDetailRespVo tokenInfo = authTokenBusiness.getByAppTokenId(appTokenId, true, false);
         if (null == tokenInfo) {
-            log.error("令牌查询结果为空");
+            log.error("查询不到应用令牌信息:{}", appTokenId);
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.TOKEN_FAIL);
         }
         DataItemsCheckDto dto = new DataItemsCheckDto();
@@ -87,7 +86,7 @@ public class ZeroTrustDataAuthBusiness implements IZeroTrustDataAuthBusiness {
         String taskId = dataAuthReqVO.getTaskId();
         ZeroTrustDataRespVO<String> checkTaskIdMessage = apiCommonBusiness.taskIdCheck(appTokenId, taskId);
         if (!checkTaskIdMessage.isRespSuccess()) {
-            log.info("==============任务信息校验失败===========");
+            log.error("==============任务信息校验失败：{}===========", taskId);
 
             // 发送鉴权失败日志
             logInfoFillService.sendDataAuthenticationLog(AuthResultEnum.FAIL, dto, IpUtils.getIp(), appTokenId, tokenInfo.getUserToken().getUserTokenId());
@@ -97,13 +96,13 @@ public class ZeroTrustDataAuthBusiness implements IZeroTrustDataAuthBusiness {
 
         ApplyInfoVo applyInfo = tokenInfo.getApplyInfo();
         if (ObjectUtils.isEmpty(applyInfo)) {
-            log.error("应用不存在");
+            log.error("应用不存在:{}", tokenInfo.getAppToken().getAppId());
             // 发送鉴权失败日志
             logInfoFillService.sendDataAuthenticationLog(AuthResultEnum.FAIL, dto, IpUtils.getIp(), appTokenId, tokenInfo.getUserToken().getUserTokenId());
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
         if (BooleanEnum.TRUE.getValue().equals(applyInfo.getApplyStatus())) {
-            log.error("应用已停用");
+            log.error("应用已停用:{},状态：{}", applyInfo.getApplyCode(), applyInfo.getApplyStatus());
             // 发送鉴权失败日志
             logInfoFillService.sendDataAuthenticationLog(AuthResultEnum.FAIL, dto, IpUtils.getIp(), appTokenId, tokenInfo.getUserToken().getUserTokenId());
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
@@ -111,7 +110,7 @@ public class ZeroTrustDataAuthBusiness implements IZeroTrustDataAuthBusiness {
 
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (null == userInfo) {
-            log.error("查询不到用户信息");
+            log.error("查询不到用户信息:{}", tokenInfo.getUserToken().getPid());
 
             // 发送鉴权失败日志
             logInfoFillService.sendDataAuthenticationLog(AuthResultEnum.FAIL, dto, IpUtils.getIp(), appTokenId, tokenInfo.getUserToken().getUserTokenId());

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/zerotrust/ZeroTrustServiceAuthBusiness.java

@@ -1,8 +1,8 @@
 package com.dragoninfo.dcuc.auth.auth.business.impl.zerotrust;
 
 import cn.hutool.core.util.StrUtil;
-import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ServiceAuthReqVO;
 import com.dragoninfo.dcuc.auth.api.enums.zerotrust.ZeroTrustBusinessRespEnum;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ServiceAuthReqVO;
 import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustDataRespVO;
 import com.dragoninfo.dcuc.auth.audit.enums.AuthResultEnum;
 import com.dragoninfo.dcuc.auth.audit.service.log.LogInfoFillService;
@@ -68,7 +68,7 @@ public class ZeroTrustServiceAuthBusiness implements IZeroTrustServiceAuthBusine
         String appTokenId = serviceAuthReqVO.getAppTokenId();
         TokenDetailRespVo tokenInfo = authTokenBusiness.getByAppTokenId(appTokenId, true, false);
         if (null == tokenInfo) {
-            log.error("查询不到令牌信息");
+            log.error("查询不到应用令牌信息:{}", appTokenId);
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.TOKEN_FAIL);
         }
 
@@ -76,7 +76,7 @@ public class ZeroTrustServiceAuthBusiness implements IZeroTrustServiceAuthBusine
         String taskId = serviceAuthReqVO.getTaskId();
         ZeroTrustDataRespVO<String> checkTaskIdMessage = apiCommonBusiness.taskIdCheck(appTokenId, taskId);
         if (!checkTaskIdMessage.isRespSuccess()) {
-            log.error("==============任务信息校验失败===========");
+            log.error("==============任务信息校验失败：{}===========", taskId);
 
             // 发送鉴权失败日志
             logInfoFillService.sendServiceAuthenticationLog(AuthResultEnum.FAIL, null, tokenInfo.getAppToken().getAppId(),
@@ -88,7 +88,7 @@ public class ZeroTrustServiceAuthBusiness implements IZeroTrustServiceAuthBusine
 
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
-            log.error("查询不到用户信息");
+            log.error("查询不到用户信息:{}", tokenInfo.getUserToken().getPid());
 
             //发送鉴权失败日志
             logInfoFillService.sendServiceAuthenticationLog(AuthResultEnum.FAIL, null, tokenInfo.getAppToken().getAppId(),
@@ -100,7 +100,7 @@ public class ZeroTrustServiceAuthBusiness implements IZeroTrustServiceAuthBusine
 
         ApplyInfoVo applyInfo = tokenInfo.getApplyInfo();
         if (ObjectUtils.isEmpty(applyInfo)) {
-            log.error("应用不存在");
+            log.error("应用不存在:{}", tokenInfo.getAppToken().getAppId());
             // 发送鉴权失败日志
             logInfoFillService.sendServiceAuthenticationLog(AuthResultEnum.FAIL, null, tokenInfo.getAppToken().getAppId(),
                     tokenInfo.getUserToken().getUserTokenId(), appTokenId, Collections.emptyList(),
@@ -108,7 +108,7 @@ public class ZeroTrustServiceAuthBusiness implements IZeroTrustServiceAuthBusine
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
         if (BooleanEnum.TRUE.getValue().equals(applyInfo.getApplyStatus())) {
-            log.error("应用已停用");
+            log.error("应用已停用:{},状态：{}", applyInfo.getApplyCode(), applyInfo.getApplyStatus());
             // 发送鉴权失败日志
             logInfoFillService.sendServiceAuthenticationLog(AuthResultEnum.FAIL, null, tokenInfo.getAppToken().getAppId(),
                     tokenInfo.getUserToken().getUserTokenId(), appTokenId, Collections.emptyList(),