添加初始化数据库脚本

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

@@ -4,11 +4,14 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.mortals.framework.model.OperateLogPdu;
+import com.mortals.xhx.system.MessageProducer;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
+import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,16 +32,30 @@ import com.mortals.xhx.base.system.oper.service.OperLogService;
 @Component
 public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
 
-    private final static Logger logger = LoggerFactory.getLogger(OperlogAspect.class);
-
     @Autowired
     private OperLogService operLogService;
+    @Autowired
+    private MessageProducer messageProducer;
 
     @Override
     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);
         operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
+
+        OperateLogPdu operateLogPdu = new OperateLogPdu();
+        operateLogPdu.initAttrValue();
+        operateLogPdu.setIp(ip);
+        operateLogPdu.setRequestUrl(requestUrl);
+        operateLogPdu.setUserId(userId);
+        operateLogPdu.setUserName(userName);
+        operateLogPdu.setLoginName(loginName);
+        operateLogPdu.setPlatformMark(platformMark);
+        operateLogPdu.setLogDate(logDate);
+        operateLogPdu.setContent(content);
+        operateLogPdu.setOperType(1);
+        messageProducer.syncOperSend(operateLogPdu);
+
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -114,6 +114,9 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
         operLogEntity.setContent(content);
 
         save(operLogEntity, null);
+
+
+
     }
     private void formatterLogContent(OperLogEntity operLogEntity, String content, String id, OperTypeEnum operType) {
         if (operType == OperTypeEnum.SAVE) {

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

 {
   "base-local": {
-    "baseUrl": "http://127.0.0.1:17211/base"
+    "baseUrl": "http://127.0.0.1:17214/base"
   },
   "base-dev": {
     "baseUrl": "http://192.168.0.60:17211/base"

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

@@ -8,11 +8,14 @@ import com.mortals.framework.model.OperateLogPdu;
 import com.mortals.framework.service.IMessageProduceService;
 import com.mortals.xhx.common.keys.QueueKey;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
+import java.nio.charset.StandardCharsets;
+
 @Component
 @Primary
 @Slf4j
@@ -22,7 +25,12 @@ public class MessageProducer implements IMessageProduceService {
     private RabbitTemplate rabbitTemplate;
 
     public void syncAccessSend(AccessLogPdu accessLogPdu) {
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(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.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
         //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
     }
 

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

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.mortals.framework.model.OperateLogPdu;
+import com.mortals.xhx.system.MessageProducer;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -27,18 +29,31 @@ import com.mortals.xhx.base.system.oper.service.OperLogService;
  * @date: 2021/11/5 13:28
  */
 @Component
-public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
-
-    private final static Logger logger = LoggerFactory.getLogger(OperlogAspect.class);
+public class OperlogAspect extends FileLogServiceImpl implements ILogService {
 
     @Autowired
     private OperLogService operLogService;
+    @Autowired
+    private MessageProducer messageProducer;
 
     @Override
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
-            String content, String ip, Date logDate) {
+                             String content, String ip, Date logDate) {
         super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate);
         operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
+
+        OperateLogPdu operateLogPdu = new OperateLogPdu();
+        operateLogPdu.initAttrValue();
+        operateLogPdu.setIp(ip);
+        operateLogPdu.setRequestUrl(requestUrl);
+        operateLogPdu.setUserId(userId);
+        operateLogPdu.setUserName(userName);
+        operateLogPdu.setLoginName(loginName);
+        operateLogPdu.setPlatformMark(platformMark);
+        operateLogPdu.setLogDate(logDate);
+        operateLogPdu.setContent(content);
+        operateLogPdu.setOperType(1);
+        messageProducer.syncOperSend(operateLogPdu);
     }
 
     @Override

portal-manager/src/test/java/com/mortals/httpclient/http-client.env.json

 {
   "portal-local": {
-    "baseUrl": "http://127.0.0.1:17212/zwfw"
+    "baseUrl": "http://127.0.0.1:17214/zwfw"
   },
   "portal-dev": {
     "baseUrl": "http://192.168.0.98:11072/zwfw"

portal-manager/src/test/java/com/mortals/httpclient/menu/MenuController.http

 
 ###菜单信息业务列表
 POST {{baseUrl}}/menu/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {