Merge remote-tracking branch 'origin/master'

# Conflicts:
#	datav-manager/pom.xml

common-lib/pom.xml

@@ -53,7 +53,16 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.rabbitmq</groupId>
+            <artifactId>amqp-client</artifactId>
+            <version>4.8.0</version>
+        </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

common-lib/src/main/java/com/mortals/xhx/common/keys/QueueKey.java

+package com.mortals.xhx.common.keys;
+
+/**
+ * rabbit 队列key定义
+ */
+public class QueueKey {
+
+
+    public static final String ACCESS_LOG_QUEUE = "ACCESS_LOG_QUEUE";
+
+    public static final String BIZ_LOG_QUEUE = "BIZ_LOG_QUEUE";
+
+    public static final String ERROR_LOG_QUEUE = "ERROR_LOG_QUEUE";
+
+    public static final String OPERATION_LOG_QUEUE = "OPERATION_LOG_QUEUE";
+
+
+
+    public static final String EXCHANGE = "LOG";
+
+    public static final String ROUTING_KEY = "LOG_ROUTING_KEY";
+
+
+
+}

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

+package com.mortals.xhx.system;
+
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.model.AccessLogPdu;
+import com.mortals.framework.model.BizLogPdu;
+import com.mortals.framework.model.ErrorLogPdu;
+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.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Component
+@Primary
+@Slf4j
+public class MessageProducer implements IMessageProduceService {
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    public void syncAccessSend(AccessLogPdu accessLogPdu) {
+        //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);
+    }
+
+    @Override
+    public void syncBizSend(BizLogPdu bizLogPdu) {
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
+    }
+
+    @Override
+    public void syncErrorSend(ErrorLogPdu errorLogPdu) {
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
+    }
+
+    @Override
+    public void syncOperSend(OperateLogPdu operLogPdu) {
+        log.info(JSON.toJSONString(operLogPdu));
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
+    }
+
+}

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

@@ -4,6 +4,9 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.mortals.framework.model.OperateLogPdu;
+import com.mortals.framework.service.IMessageProduceService;
+import com.mortals.xhx.system.MessageProducer;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -13,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -30,12 +34,27 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
 
     @Autowired
     private OperLogService operLogService;
+    @Autowired
+    private IMessageProduceService 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
@@ -43,6 +62,8 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
         // operLogService.insertOperLog(ip, requestUrl, null, "", loginName,
         // content);
         this.doHandlerLog(platformMark, null, "", loginName, requestUrl, content, ip, new Date());
+
+
     }
 
     @Pointcut("execution(public  * com.mortals.xhx..*Controller.*(..))")

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

@@ -27,8 +27,8 @@ import java.util.Map;
  * @author: zxfei
  * @date: 2022/4/20 9:24
  */
-@Aspect
-@Component
+//@Aspect
+//@Component
 @Slf4j
 @Order(1)
 @Profile({"default", "develop", "test"})

datav-manager/src/main/java/com/mortals/xhx/base/framework/security/SecurityUtils.java

-package com.mortals.xhx.base.framework.security;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-/**
- * 安全服务工具类
- *
- * @author zxfei
- */
-public class SecurityUtils {
-
-
-    /**
-     * 获取Authentication
-     */
-    public static Authentication getAuthentication() {
-        return SecurityContextHolder.getContext().getAuthentication();
-    }
-
-    /**
-     * 生成BCryptPasswordEncoder密码
-     *
-     * @param password 密码
-     * @return 加密字符串
-     */
-    public static String encryptPassword(String password) {
-        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        return passwordEncoder.encode(password);
-    }
-
-    /**
-     * 判断密码是否相同
-     *
-     * @param rawPassword     真实密码
-     * @param encodedPassword 加密后字符
-     * @return 结果
-     */
-    public static boolean matchesPassword(String rawPassword, String encodedPassword) {
-        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        return passwordEncoder.matches(rawPassword, encodedPassword);
-    }
-
-    /**
-     * 是否为管理员
-     *
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public static boolean isAdmin(Long userId) {
-        return userId != null && 1L == userId;
-    }
-}
+//package com.mortals.xhx.base.framework.security;
+//
+//import org.springframework.security.core.Authentication;
+//import org.springframework.security.core.context.SecurityContextHolder;
+//import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+//
+///**
+// * 安全服务工具类
+// *
+// * @author zxfei
+// */
+//public class SecurityUtils {
+//
+//
+//    /**
+//     * 获取Authentication
+//     */
+//    public static Authentication getAuthentication() {
+//        return SecurityContextHolder.getContext().getAuthentication();
+//    }
+//
+//    /**
+//     * 生成BCryptPasswordEncoder密码
+//     *
+//     * @param password 密码
+//     * @return 加密字符串
+//     */
+//    public static String encryptPassword(String password) {
+//        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+//        return passwordEncoder.encode(password);
+//    }
+//
+//    /**
+//     * 判断密码是否相同
+//     *
+//     * @param rawPassword     真实密码
+//     * @param encodedPassword 加密后字符
+//     * @return 结果
+//     */
+//    public static boolean matchesPassword(String rawPassword, String encodedPassword) {
+//        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+//        return passwordEncoder.matches(rawPassword, encodedPassword);
+//    }
+//
+//    /**
+//     * 是否为管理员
+//     *
+//     * @param userId 用户ID
+//     * @return 结果
+//     */
+//    public static boolean isAdmin(Long userId) {
+//        return userId != null && 1L == userId;
+//    }
+//}

datav-manager/src/main/java/com/mortals/xhx/module/picture/web/PictureGroupController.java

@@ -17,7 +17,6 @@ import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.picture.model.vo.PictureGroupCountVo;
 import com.mortals.xhx.module.picture.service.PictureMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -4,9 +4,11 @@ server:
     context-path: /dm
   tomcat:
     uri-encoding: utf-8
+platform:
+  mark: datav-manager
 spring:
   application:
-    name: certificate-manager
+    name: datav-manager
     profiles:
       active: @profiles.active@
   servlet:
@@ -16,6 +18,12 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+  rabbitmq:
+    host: @profiles.rabbitmq.host@
+    port: @profiles.rabbitmq.port@
+    username: @profiles.rabbitmq.username@
+    password: @profiles.rabbitmq.password@
+    virtualHost: @profiles.rabbitmq.virtualhost@
   security:
     enable: true
     user: