修改操作日志过滤

base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java

@@ -41,8 +41,9 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
             String content, String ip, Date logDate) {
         super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate);
+        //操作日志 只记录用户侧
+        if(userId==null) return;
         operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
-
         OperateLogPdu operateLogPdu = new OperateLogPdu();
         operateLogPdu.initAttrValue();
         operateLogPdu.setIp(ip);

base-manager/src/test/java/com/mortals/httpclient/holiday/HolidayController.http

@@ -14,16 +14,17 @@ Content-Type: application/json
 
 ###节假日更新与保存
 POST {{baseUrl}}/holiday/save
+Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "siteId":3374,
+        "siteId":1,
         "name":"rlubyj",
         "summary":"70cuql",
-        "year":2788,
+        "year":2023,
         "startTime":"2022-01-20",
         "endTime":"2022-01-20",
-        "workorholiday":9809
+        "workorholiday":1
 }
 
 > {%

base-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http

@@ -13,14 +13,6 @@ POST {{baseUrl}}/workman/list
 Content-Type: application/json
 
 {
-    "deptId":6389 ,
-    "deptName":"ne8rqn" ,
-    "windowId":4325 ,
-    "windowName":"xrj91w" ,
-    "siteId":6949 ,
-    "siteName":"ifug3n" ,
-    "name":"fujlcs" ,
-    "number":"kpg7fk" ,
     "page":1,
     "size":10
 }

common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java

@@ -25,12 +25,10 @@ public class MessageProducer implements IMessageProduceService {
     private RabbitTemplate rabbitTemplate;
 
     public void syncAccessSend(AccessLogPdu accessLogPdu) {
-       // new Message()
-
         //new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
-        rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
+        //rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
 
-        //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
         //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
     }