业务日志添加

log-manager/pom.xml

@@ -42,8 +42,8 @@
 				<profiles.log.level>DEBUG</profiles.log.level>
 				<profiles.log.path>/logs</profiles.log.path>
 				<profiles.data.path>/data</profiles.data.path>
-
-				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
+<!--				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>-->
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
@@ -117,6 +117,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-amqp</artifactId>
+
 		</dependency>
 
 		<dependency>

log-manager/src/main/java/com/mortals/xhx/base/framework/config/RabbitConfig.java

@@ -135,16 +135,16 @@ public class RabbitConfig {
             @Override
             public void fromClass(Class<?> aClass, MessageProperties messageProperties) {
                 //反序列化指定类路径
-                if (messageProperties.getConsumerQueue().equalsIgnoreCase(QueueKey.ACCESS_LOG_QUEUE)) {
-                  //  messageProperties.setHeader("__TypeId__", "com.mortals.xhx.module.access.model.AccessLogEntity");
-                }else if(messageProperties.getConsumerQueue().equalsIgnoreCase(QueueKey.BIZ_LOG_QUEUE)){
+/*                if (messageProperties.getConsumerQueue().equalsIgnoreCase(QueueKey.ACCESS_LOG_QUEUE)) {
+                    messageProperties.setHeader("__TypeId__", "java.lang.String");
+                }
+               else if(messageProperties.getConsumerQueue().equalsIgnoreCase(QueueKey.BIZ_LOG_QUEUE)){
                     messageProperties.setHeader("__TypeId__", "com.mortals.xhx.module.biz.model.BizLogEntity");
                 }else if(messageProperties.getConsumerQueue().equalsIgnoreCase(QueueKey.ERROR_LOG_QUEUE)){
                     messageProperties.setHeader("__TypeId__", "com.mortals.xhx.module.error.model.ErrorLogEntity");
                 }else if(messageProperties.getConsumerQueue().equalsIgnoreCase(QueueKey.OPERATION_LOG_QUEUE)){
                     messageProperties.setHeader("__TypeId__", "com.mortals.xhx.module.operate.model.OperateLogEntity");
-                }
-
+                }*/
             }
 
             @Override
@@ -161,7 +161,6 @@ public class RabbitConfig {
                 }
                 return String.class;
             }
-
         });
         return jackson2JsonMessageConverter;
     }

log-manager/src/main/java/com/mortals/xhx/base/framework/listener/BizMessageConsumerListener.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  * @description:
  **/
 @Slf4j
-@Component
+//@Component
 @RabbitListener(queues = QueueKey.BIZ_LOG_QUEUE,
         containerFactory = "consumerBatchContainerFactory")
 public class BizMessageConsumerListener {

log-manager/src/main/java/com/mortals/xhx/base/framework/listener/ErrorMessageConsumerListener.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  * @description:
  **/
 @Slf4j
-@Component
+//@Component
 @RabbitListener(queues = QueueKey.ERROR_LOG_QUEUE,
         containerFactory = "consumerBatchContainerFactory")
 public class ErrorMessageConsumerListener {

log-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -61,9 +61,11 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
         UserPdu userPdu = new UserPdu();
+       // userPdu.initAttrValue();
         userPdu.setLoginName(loginName);
         userPdu.setPassword(password);
         String resp = userFeign.portalLogin(userPdu);
+        //String resp="";
         return resp;
 
        /* String securityCode = loginForm.getSecurityCode();

log-manager/src/main/resources/bootstrap.yml

@@ -15,8 +15,6 @@ spring:
     serialization:
       WRITE_DATES_AS_TIMESTAMPS: true
     default-property-inclusion: NON_NULL
-#    time-zone: GMT+8
-#    date-format: yyyy-MM-dd HH:mm:ss
   redis:
     host: @profiles.redis.uri@
     port: @profiles.redis.port@
@@ -77,48 +75,5 @@ application:
 
 upload:
   path: @profiles.filepath@
-#feign:
-#  hystrix:
-#    enabled: false
 
-#queue:
-#  type: @profiles.queue.type@ # memory or kafka (Apache Kafka) or rabbitmq (RabbitMQ)
-#  core:
-#    topic: tb_core
-#    poll-interval: 25
-#    partitions: 10
-#    pack-processing-timeout: 2000
-#  in_memory:
-#    stats:
-#      print-interval-ms: 60000
-#  kafka:
-#    bootstrap.servers: @profiles.kafka.brokers@
-#    acks: all
-#    retries: 1
-#    batch.size: 16384
-#    linger.ms: 1
-#    buffer.memory: 33554432
-#    replication_factor: 1
-#    max_poll_interval_ms: 300000
-#    max_poll_records: 8192
-#    max_partition_fetch_bytes: 16777216
-#    fetch_max_bytes: 134217728
-#    use_confluent_cloud: false
-#    consumer-stats:
-#      enabled: true
-#      print-interval-ms: 60000
-#      kafka-response-timeout-ms: 1000
-#  rabbitmq:
-#    exchange_name: @profiles.rabbitmq.exchange@
-#    host: @profiles.rabbitmq.host@
-#    port: @profiles.rabbitmq.port@
-#    virtual_host: @profiles.rabbitmq.virtualhost@
-#    username: @profiles.rabbitmq.username@
-#    password: @profiles.rabbitmq.password@
-#    automatic_recovery_enabled: false
-#    connection_timeout: 5000
-#    handshake_timeout: 10000
-#    queue-properties:
-#      x-message-ttl: 86400000
-#      x-max-length-bytes: 1048576000