Merge branch 'huangzqa-fix-20230714' into 'release/v1.2.0'

Huangzqa fix 20230714

See merge request dcuc-tjdsj/auth-service!219

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/async/listener/RzySyslogSendRiskInfoEventListener.java

@@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
@@ -29,7 +28,6 @@ import java.util.List;
  */
 @Slf4j
 @Component
-@ConditionalOnProperty(name = "dcuc.auth.zerotrust.security-policy.type", havingValue = "rzy")
 public class RzySyslogSendRiskInfoEventListener implements ApplicationListener<SendRiskInfoEvent> {
 
     protected final Logger sysLogLogger = LoggerFactory.getLogger(Constant.AUTH_SYS_LOG_NAME);

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/async/listener/SyslogSecurityPolicyLogListener.java

@@ -6,7 +6,6 @@ import com.dragoninfo.dcuc.auth.constance.Constant;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
@@ -18,7 +17,6 @@ import org.springframework.stereotype.Component;
  * @author huangzqa
  * @date 2023/6/30
  */
-@ConditionalOnProperty(name = "dcuc.auth.zerotrust.security-policy.type", havingValue = "rzy")
 @Component
 public class SyslogSecurityPolicyLogListener implements ApplicationListener<SecurityPolicyLogEvent> {
     protected final Logger sysLogLogger = LoggerFactory.getLogger(Constant.AUTH_SYS_LOG_NAME);

dcuc-auth-service/src/main/resources/application-auth.yml

@@ -5,8 +5,6 @@ dcuc:
         host: 127.0.0.1
         port: 514
         facility: LOCAL0
-      security-policy:
-        type: rzy
       user-token-query-url:
       app-token-query-url:
       user-info-query-url: