wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步2.1版本

Browse Source
This commit is contained in:
Jerry
2021-12-16 21:59:51 +08:00
parent 387dc5c939
commit 1597afbfe1
383 changed files with 3014 additions and 1704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orange-demo-single/orange-demo-single-service/common/common-log/pom.xml
View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>com.orange.demo</groupId>
<groupId>com.orangeforms</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>com.orange.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-sequence</artifactId>
<version>1.0.0</version>
</dependency>

4
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/annotation/OperationLog.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.common.log.annotation;
package com.orangeforms.common.log.annotation;
import com.orange.demo.common.log.model.constant.SysOperationLogType;
import com.orangeforms.common.log.model.constant.SysOperationLogType;
import java.lang.annotation.*;

35
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/aop/OperationLogAspect.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java
View File

@@ -1,20 +1,20 @@
package com.orange.demo.common.log.aop;
package com.orangeforms.common.log.aop;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.orange.demo.common.core.constant.ApplicationConstant;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.util.ContextUtil;
import com.orange.demo.common.core.util.IpUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.log.annotation.OperationLog;
import com.orange.demo.common.log.config.OperationLogProperties;
import com.orange.demo.common.log.model.SysOperationLog;
import com.orange.demo.common.log.model.constant.SysOperationLogType;
import com.orange.demo.common.log.service.SysOperationLogService;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.core.constant.ApplicationConstant;
import com.orangeforms.common.core.object.ResponseResult;
import com.orangeforms.common.core.object.TokenData;
import com.orangeforms.common.core.util.ContextUtil;
import com.orangeforms.common.core.util.IpUtil;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.log.annotation.OperationLog;
import com.orangeforms.common.log.config.OperationLogProperties;
import com.orangeforms.common.log.model.SysOperationLog;
import com.orangeforms.common.log.model.constant.SysOperationLogType;
import com.orangeforms.common.log.service.SysOperationLogService;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
@@ -63,7 +63,7 @@ public class OperationLogAspect {
/**
* 所有controller方法。
*/
@Pointcut("execution(public * com.orange.demo..controller..*(..))")
@Pointcut("execution(public * com.orangeforms..controller..*(..))")
public void operationLogPointCut() {
// 空注释，避免sonar警告
}
@@ -80,7 +80,7 @@ public class OperationLogAspect {
response.setHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId);
MDC.put(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId);
TokenData tokenData = TokenData.takeFromRequest();
// 为log4j2日志设定变量，使日志可以输出更多有价值的信息。
// 为日志框架设定变量，使日志可以输出更多有价值的信息。
if (tokenData != null) {
MDC.put("sessionId", tokenData.getSessionId());
MDC.put("userId", tokenData.getUserId().toString());
@@ -129,6 +129,11 @@ public class OperationLogAspect {
operationLog.setElapse(System.currentTimeMillis() - start);
operationLogService.saveNewAsync(operationLog);
}
MDC.remove(ApplicationConstant.HTTP_HEADER_TRACE_ID);
if (tokenData != null) {
MDC.remove("sessionId");
MDC.remove("userId");
}
}
return result;
}

2
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/CommonLogAutoConfig.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.common.log.config;
package com.orangeforms.common.log.config;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

2
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/OperationLogProperties.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.common.log.config;
package com.orangeforms.common.log.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

6
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/SysOperationLogMapper.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.common.log.dao;
package com.orangeforms.common.log.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.log.model.SysOperationLog;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.log.model.SysOperationLog;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/mapper/SysOperationLogMapper.xml → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.orange.demo.common.log.dao.SysOperationLogMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.common.log.model.SysOperationLog">
<mapper namespace="com.orangeforms.common.log.dao.SysOperationLogMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.log.model.SysOperationLog">
<id column="log_id" jdbcType="BIGINT" property="logId"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="operation_type" jdbcType="INTEGER" property="operationType"/>
@@ -87,7 +87,7 @@
</foreach>
</insert>
<select id="getSysOperationLogList" resultMap="BaseResultMap" parameterType="com.orange.demo.common.log.model.SysOperationLog">
<select id="getSysOperationLogList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.log.model.SysOperationLog">
SELECT * FROM zz_sys_operation_log
<where>
<include refid="filterRef"/>

4
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/SysOperationLog.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.common.log.model;
package com.orangeforms.common.log.model;
import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.common.core.annotation.TenantFilterColumn;
import com.orangeforms.common.core.annotation.TenantFilterColumn;
import lombok.Data;
import java.util.Date;

23
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/constant/SysOperationLogType.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.common.log.model.constant;
package com.orangeforms.common.log.model.constant;
import java.util.HashMap;
import java.util.Map;
@@ -86,23 +86,27 @@ public final class SysOperationLogType {
/**
* 启动流程。
*/
public static final int START_PROCESS = 100;
public static final int START_FLOW = 100;
/**
* 停止流程。
*/
public static final int STOP_PROCESS = 105;
public static final int STOP_FLOW = 105;
/**
* 删除流程。
*/
public static final int DELETE_PROCESS = 110;
public static final int DELETE_FLOW = 110;
/**
* 取消流程。
*/
public static final int CANCEL_PROCESS = 115;
public static final int CANCEL_FLOW = 115;
/**
* 提交任务。
*/
public static final int SUBMIT_TASK = 120;
/**
* 催办任务。
*/
public static final int REMIND_TASK = 125;
private static final Map<Object, String> DICT_MAP = new HashMap<>(15);
static {
@@ -124,11 +128,12 @@ public final class SysOperationLogType {
DICT_MAP.put(UNPUBLISH, "取消发布");
DICT_MAP.put(SUSPEND, "暂停");
DICT_MAP.put(RESUME, "恢复");
DICT_MAP.put(START_PROCESS, "启动流程");
DICT_MAP.put(STOP_PROCESS, "停止流程");
DICT_MAP.put(DELETE_PROCESS, "删除流程");
DICT_MAP.put(CANCEL_PROCESS, "取消流程");
DICT_MAP.put(START_FLOW, "启动流程");
DICT_MAP.put(STOP_FLOW, "停止流程");
DICT_MAP.put(DELETE_FLOW, "删除流程");
DICT_MAP.put(CANCEL_FLOW, "取消流程");
DICT_MAP.put(SUBMIT_TASK, "提交任务");
DICT_MAP.put(REMIND_TASK, "催办任务");
}
/**

6
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/SysOperationLogService.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.common.log.service;
package com.orangeforms.common.log.service;
import com.orange.demo.common.core.base.service.IBaseService;
import com.orange.demo.common.log.model.SysOperationLog;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.log.model.SysOperationLog;
import java.util.List;

16
orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/impl/SysOperationLogServiceImpl.java → orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java
View File

@@ -1,12 +1,12 @@
package com.orange.demo.common.log.service.impl;
package com.orangeforms.common.log.service.impl;
import com.orange.demo.common.core.annotation.MyDataSource;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.core.constant.ApplicationConstant;
import com.orange.demo.common.log.dao.SysOperationLogMapper;
import com.orange.demo.common.log.model.SysOperationLog;
import com.orange.demo.common.log.service.SysOperationLogService;
import com.orangeforms.common.core.annotation.MyDataSource;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.constant.ApplicationConstant;
import com.orangeforms.common.log.dao.SysOperationLogMapper;
import com.orangeforms.common.log.model.SysOperationLog;
import com.orangeforms.common.log.service.SysOperationLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

2
orange-demo-single/orange-demo-single-service/common/common-log/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.orange.demo.common.log.config.CommonLogAutoConfig
com.orangeforms.common.log.config.CommonLogAutoConfig