feature: 代码合并报错修改

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

@@ -10,7 +10,6 @@ import com.dragoninfo.dcuc.auth.audit.service.log.QmAuditPushService;
 import com.dragoninfo.dcuc.auth.business.ICacheBusiness;
 import com.dragoninfo.dcuc.auth.business.zerotrust.IAuthTokenBusiness;
 import com.dragoninfo.dcuc.auth.business.zerotrust.ITokenRemoteCallBusiness;
-import com.dragoninfo.dcuc.auth.config.zerotrust.DcucAuthZerotrustConfig;
 import com.dragoninfo.dcuc.auth.sub.entity.AuthUserInfo;
 import com.dragoninfo.dcuc.auth.sub.service.IAuthUserInfoService;
 import com.dragoninfo.dcuc.auth.sub.vo.ApplyInfoVo;
@@ -28,7 +27,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -86,11 +84,6 @@ public class AuthTokenBusinessImpl implements IAuthTokenBusiness {
         this.userInfoService = userInfoService;
     }
 
-    @Autowired
-    public void setTokenBusiness(IAuthTokenBusiness tokenBusiness) {
-        this.tokenBusiness = tokenBusiness;
-    }
-
     @Override
     public UserTokenInfoRespVO getUserTokenInfo(String userTokenId) {
         // 从缓存获取的都是经过令牌签名校验的

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

@@ -52,6 +52,11 @@ public class TokenRemoteCallBusinessImpl implements ITokenRemoteCallBusiness {
 
     private DcucAuthZerotrustConfig zerotrustConfig;
 
+    @Autowired
+    public void setObjectMapper(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
     @Autowired
     public void setZerotrustConfig(DcucAuthZerotrustConfig zerotrustConfig) {
         this.zerotrustConfig = zerotrustConfig;