wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-18 11:06: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:56:20 +08:00
parent 7af7fe5dc2
commit 387dc5c939
1021 changed files with 3273 additions and 18434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/GatewayApplication.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/GatewayApplication.java
View File

@@ -1,9 +1,9 @@
package com.orange.demo.gateway;
package com.orangeforms.gateway;
import com.orange.demo.common.core.util.ApplicationContextHolder;
import com.orange.demo.gateway.filter.AuthenticationPostFilter;
import com.orange.demo.gateway.filter.AuthenticationPreFilter;
import com.orange.demo.gateway.filter.RequestLogFilter;
import com.orangeforms.common.core.util.ApplicationContextHolder;
import com.orangeforms.gateway.filter.AuthenticationPostFilter;
import com.orangeforms.gateway.filter.AuthenticationPreFilter;
import com.orangeforms.gateway.filter.RequestLogFilter;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

2
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/ApplicationConfig.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/config/ApplicationConfig.java
View File

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

2
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/CorsConfig.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/config/CorsConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.gateway.config;
package com.orangeforms.gateway.config;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Bean;

2
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/FilterConfig.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/config/FilterConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.gateway.config;
package com.orangeforms.gateway.config;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;

2
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/SentinelConfig.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/config/SentinelConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.gateway.config;
package com.orangeforms.gateway.config;
import com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter;
import com.alibaba.csp.sentinel.adapter.gateway.sc.exception.SentinelGatewayBlockExceptionHandler;

2
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/SwaggerResourceConfig.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/config/SwaggerResourceConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.gateway.config;
package com.orangeforms.gateway.config;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/constant/GatewayConstant.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/constant/GatewayConstant.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.gateway.constant;
package com.orangeforms.gateway.constant;
/**
* 网关业务相关的常量对象。

18
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/filter/AuthenticationPostFilter.java
View File

@@ -1,17 +1,17 @@
package com.orange.demo.gateway.filter;
package com.orangeforms.gateway.filter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.util.JwtUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.util.RedisKeyUtil;
import com.orange.demo.gateway.config.ApplicationConfig;
import com.orange.demo.gateway.constant.GatewayConstant;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.ResponseResult;
import com.orangeforms.common.core.object.TokenData;
import com.orangeforms.common.core.util.JwtUtil;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.RedisKeyUtil;
import com.orangeforms.gateway.config.ApplicationConfig;
import com.orangeforms.gateway.constant.GatewayConstant;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.reactivestreams.Publisher;

18
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPreFilter.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/filter/AuthenticationPreFilter.java
View File

@@ -1,15 +1,15 @@
package com.orange.demo.gateway.filter;
package com.orangeforms.gateway.filter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.util.JwtUtil;
import com.orange.demo.common.core.util.RedisKeyUtil;
import com.orange.demo.common.core.util.IpUtil;
import com.orange.demo.gateway.config.ApplicationConfig;
import com.orange.demo.gateway.constant.GatewayConstant;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.ResponseResult;
import com.orangeforms.common.core.object.TokenData;
import com.orangeforms.common.core.util.JwtUtil;
import com.orangeforms.common.core.util.RedisKeyUtil;
import com.orangeforms.common.core.util.IpUtil;
import com.orangeforms.gateway.config.ApplicationConfig;
import com.orangeforms.gateway.constant.GatewayConstant;
import io.jsonwebtoken.Claims;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;

11
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/RequestLogFilter.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/filter/RequestLogFilter.java
View File

@@ -1,8 +1,8 @@
package com.orange.demo.gateway.filter;
package com.orangeforms.gateway.filter;
import com.orange.demo.common.core.constant.ApplicationConstant;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.gateway.constant.GatewayConstant;
import com.orangeforms.common.core.constant.ApplicationConstant;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.gateway.constant.GatewayConstant;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@@ -25,8 +25,9 @@ public class RequestLogFilter implements GlobalFilter, Ordered {
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
log.info("开始请求，app={gateway}, url={}", exchange.getRequest().getURI().getPath());
final String traceId = MyCommonUtil.generateUuid();
MDC.put(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId);
log.info("开始请求，app={gateway}, url={}", exchange.getRequest().getURI().getPath());
// 分别记录traceId和执行开始时间。
exchange.getAttributes().put(GatewayConstant.START_TIME_ATTRIBUTE, System.currentTimeMillis());
ServerHttpRequest mutableReq = exchange.getRequest().mutate().header(

2
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/handler/SwaggerHandler.java → orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/java/com/orangeforms/gateway/handler/SwaggerHandler.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.gateway.handler;
package com.orangeforms.gateway.handler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;

6
orange-demo-multi/orange-demo-multi-service/application/gateway/src/main/resources/log4j2.xml
View File

@@ -22,8 +22,8 @@
[%-5p] [%d{YYYY-MM-dd HH:mm:ss}] [%t] ==> %msg%n
</property>
<property name="LOG_PATTERN_EX">
<!-- 下面注释中 %X{PtxId}, SpanId: %X{PspanId} 为PinPoint 中的traceid -->
[%-5p] [%d{YYYY-MM-dd HH:mm:ss}] T:[%X{traceId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
<!-- 下面注释中 %traceid 为SkyWalking 中的traceid -->
[%-5p] [%d{YYYY-MM-dd HH:mm:ss}] T:[%X{traceId}] [%t] ==> [%traceId] %msg%n
</property>
<!-- 日志保留天数 -->
<property name="EVERY_FILE_COUNT">31</property>
@@ -64,7 +64,7 @@
</Logger>
<!-- AsyncLogger 是基于Disruptor的全量异步队列，性能极高，队列默认大小4096。-->
<!-- 队列默认值可通过JVM参数设置，参考博客：https://www.jianshu.com/p/82469047acbf -->
<AsyncLogger name="com.orange.demo" additivity="false" level="info">
<AsyncLogger name="com.orangeforms" additivity="false" level="info">
<AppenderRef ref="console"/>
<AppenderRef ref="kafka_log"/>
<AppenderRef ref="file_log"/>