zhangFan / gateway · 提交

转到一个项目

作者 朱兆平
提交 c117b80ef87de102a08a826518f8db8840ea969c 1 个父辈 97f3e4bf

优化基于win或者linux的乱码返回方法

内嵌 并排对比
正在显示 4 个修改的文件 包含 115 行增加 和 46 行删除
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 </parent> 11 </parent>
12 <groupId>com.example</groupId> 12 <groupId>com.example</groupId>
13 <artifactId>gateway</artifactId> 13 <artifactId>gateway</artifactId>
14 - <version>0.0.1-SNAPSHOT</version> 14 + <version>1.0-WIN</version>
15 <name>gateway</name> 15 <name>gateway</name>
16 <description>gateway project for Spring Boot</description> 16 <description>gateway project for Spring Boot</description>
17 17
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray; @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.example.gateway.model.PERMISSION; 5 import com.example.gateway.model.PERMISSION;
6 import com.example.gateway.model.ROLE; 6 import com.example.gateway.model.ROLE;
  7 +import com.example.gateway.routerImpl.GBKServerHttpResponseDecorator;
  8 +import com.example.gateway.routerImpl.UTF8ServerHttpResponseDecorator;
7 import com.example.gateway.util.JsonToBean; 9 import com.example.gateway.util.JsonToBean;
8 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
9 import org.reactivestreams.Publisher; 11 import org.reactivestreams.Publisher;
@@ -85,44 +87,8 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered { @@ -85,44 +87,8 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered {
85 // } 87 // }
86 // }; 88 // };
87 89
88 -  
89 -  
90 - /**  
91 - * 测试返回中文乱码  
92 - */  
93 - ServerHttpResponseDecorator decoratedResponseWindows = new ServerHttpResponseDecorator(response) {  
94 - @Override  
95 - public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {  
96 - if (HttpStatus.OK.equals(getStatusCode()) && body instanceof Flux) {  
97 - Flux<? extends DataBuffer> fluxBody = Flux.from(body);  
98 - return super.writeWith(fluxBody.buffer().map(dataBuffers -> {  
99 -  
100 - StringBuffer stringBuffer = new StringBuffer();  
101 - dataBuffers.forEach(dataBuffer -> {  
102 - byte[] content = new byte[dataBuffer.readableByteCount()];  
103 - dataBuffer.read(content);  
104 - DataBufferUtils.release(dataBuffer);  
105 - String tempStr = new String(content, Charset.forName("ISO_8859_1"));  
106 - stringBuffer.append(tempStr);  
107 - });  
108 -  
109 - String str = new String(stringBuffer);  
110 -// String fileKey = "\":\"" + Const.DATA_BASE_FILE_URL_HEAD + Const.M00;  
111 -// if (str.contains(fileKey)) {  
112 -// //修改  
113 -// String value = "\":\"" + Const.SYSTEMS_FILE_URL_HEAD + Const.DATA_BASE_FILE_URL_HEAD + Const.M00;  
114 -// str = str.replaceAll(fileKey, value);  
115 -// }  
116 -  
117 - byte[] content = str.getBytes(Charset.forName("ISO_8859_1"));  
118 - return bufferFactory().wrap(content);  
119 - }));  
120 - }  
121 - // if body is not a flux. never got there.  
122 - return super.writeWith(body);  
123 - }  
124 - };  
125 - return chain.filter(exchange.mutate().response(decoratedResponseWindows).build()); 90 + ServerHttpResponseDecorator decoratedResponseGBK= new GBKServerHttpResponseDecorator(response);
  91 + return chain.filter(exchange.mutate().response(decoratedResponseGBK).build());
126 // 92 //
127 // return chain.filter(exchange); 93 // return chain.filter(exchange);
128 } 94 }
@@ -137,8 +103,6 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered { @@ -137,8 +103,6 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered {
137 if (anonymousUrlFilter(request)){ 103 if (anonymousUrlFilter(request)){
138 return true; 104 return true;
139 } 105 }
140 -  
141 - boolean flag = false;  
142 String token = ""; 106 String token = "";
143 if (!request.getPath().toString().contains(LOGIN)) { 107 if (!request.getPath().toString().contains(LOGIN)) {
144 HttpHeaders rqHeader = request.getHeaders(); 108 HttpHeaders rqHeader = request.getHeaders();
@@ -157,15 +121,14 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered { @@ -157,15 +121,14 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered {
157 log.trace("访问url:[{}]<->权限[{}]",request.getPath().toString(),permission.getUrl()); 121 log.trace("访问url:[{}]<->权限[{}]",request.getPath().toString(),permission.getUrl());
158 if (pathMatcher.match(permission.getUrl(), request.getPath().toString())) { 122 if (pathMatcher.match(permission.getUrl(), request.getPath().toString())) {
159 log.info("[FILTER]-[URL:{}]->鉴权成功",request.getPath().toString()); 123 log.info("[FILTER]-[URL:{}]->鉴权成功",request.getPath().toString());
160 - flag = true;  
161 - break; 124 + return true;
162 } 125 }
163 } 126 }
164 }else { 127 }else {
165 log.info("[FILTER]-没有对应token的redis缓存,鉴权失败"); 128 log.info("[FILTER]-没有对应token的redis缓存,鉴权失败");
166 } 129 }
167 log.info("[FILTER]-[URL:{}]->鉴权失败",request.getPath().toString()); 130 log.info("[FILTER]-[URL:{}]->鉴权失败",request.getPath().toString());
168 - return flag; 131 + return false;
169 } 132 }
170 133
171 public boolean anonymousUrlFilter(ServerHttpRequest request){ 134 public boolean anonymousUrlFilter(ServerHttpRequest request){
@@ -185,6 +148,7 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered { @@ -185,6 +148,7 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered {
185 if(permissionList!=null && !permissionList.isEmpty()){ 148 if(permissionList!=null && !permissionList.isEmpty()){
186 for (PERMISSION permission : permissionList) { 149 for (PERMISSION permission : permissionList) {
187 if (pathMatcher.match(permission.getUrl(), request.getPath().toString())) { 150 if (pathMatcher.match(permission.getUrl(), request.getPath().toString())) {
  151 + log.info("[ANONYMOUS-FILTER-SUCCESS]-匿名者过滤器适配到规则-PATH:[{}]",request.getPath().toString());
188 return true; 152 return true;
189 } 153 }
190 } 154 }
@@ -192,13 +156,13 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered { @@ -192,13 +156,13 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered {
192 } 156 }
193 } 157 }
194 }catch (Exception e){ 158 }catch (Exception e){
195 - log.error("[ANONYMOUS-FILTER]匿名者过滤规则审核出错->{}",e.toString()); 159 + log.error("[ANONYMOUS-FILTER-ERR]匿名者过滤规则审核出错->{}",e.toString());
196 return false; 160 return false;
197 } 161 }
198 162
199 163
200 } 164 }
201 - log.info("[ANONYMOUS-FILTER]-匿名者过滤器为适配到符合条件的规则-PATH:[{}]",request.getPath().toString()); 165 + log.info("[ANONYMOUS-FILTER-FALSE]-匿名者过滤器未适配到规则-PATH:[{}]",request.getPath().toString());
202 return false; 166 return false;
203 } 167 }
204 } 168 }
  1 +package com.example.gateway.routerImpl;
  2 +
  3 +import lombok.extern.slf4j.Slf4j;
  4 +import org.reactivestreams.Publisher;
  5 +import org.springframework.core.io.buffer.DataBuffer;
  6 +import org.springframework.core.io.buffer.DataBufferFactory;
  7 +import org.springframework.core.io.buffer.DataBufferUtils;
  8 +import org.springframework.core.io.buffer.DefaultDataBufferFactory;
  9 +import org.springframework.http.HttpStatus;
  10 +import org.springframework.http.server.reactive.ServerHttpResponse;
  11 +import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
  12 +import reactor.core.publisher.Flux;
  13 +import reactor.core.publisher.Mono;
  14 +
  15 +import java.nio.charset.Charset;
  16 +import java.nio.charset.StandardCharsets;
  17 +
  18 +@Slf4j
  19 +public class GBKServerHttpResponseDecorator extends ServerHttpResponseDecorator {
  20 +
  21 + public GBKServerHttpResponseDecorator(ServerHttpResponse delegate) {
  22 + super(delegate);
  23 + }
  24 +
  25 + @Override
  26 + public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
  27 + if (HttpStatus.OK.equals(getStatusCode()) && body instanceof Flux) {
  28 + Flux<? extends DataBuffer> fluxBody = Flux.from(body);
  29 + return super.writeWith(fluxBody.buffer().map(dataBuffers -> {
  30 +
  31 + StringBuffer stringBuffer = new StringBuffer();
  32 + dataBuffers.forEach(dataBuffer -> {
  33 + byte[] content = new byte[dataBuffer.readableByteCount()];
  34 + dataBuffer.read(content);
  35 + DataBufferUtils.release(dataBuffer);
  36 + String tempStr = new String(content, Charset.forName("ISO_8859_1"));
  37 + stringBuffer.append(tempStr);
  38 + });
  39 +
  40 + String str = new String(stringBuffer);
  41 +// String fileKey = "\":\"" + Const.DATA_BASE_FILE_URL_HEAD + Const.M00;
  42 +// if (str.contains(fileKey)) {
  43 +// //修改
  44 +// String value = "\":\"" + Const.SYSTEMS_FILE_URL_HEAD + Const.DATA_BASE_FILE_URL_HEAD + Const.M00;
  45 +// str = str.replaceAll(fileKey, value);
  46 +// }
  47 +// log.info("[RESPONSE]-{}",str);
  48 + byte[] content = str.getBytes(Charset.forName("ISO_8859_1"));
  49 + return bufferFactory().wrap(content);
  50 + }));
  51 + }
  52 + // if body is not a flux. never got there.
  53 + return super.writeWith(body);
  54 + }
  55 +}
  1 +package com.example.gateway.routerImpl;
  2 +
  3 +import lombok.extern.slf4j.Slf4j;
  4 +import org.reactivestreams.Publisher;
  5 +import org.springframework.core.io.buffer.DataBuffer;
  6 +import org.springframework.core.io.buffer.DataBufferFactory;
  7 +import org.springframework.core.io.buffer.DataBufferUtils;
  8 +import org.springframework.core.io.buffer.DefaultDataBufferFactory;
  9 +import org.springframework.http.server.reactive.ServerHttpResponse;
  10 +import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
  11 +import reactor.core.publisher.Flux;
  12 +import reactor.core.publisher.Mono;
  13 +
  14 +import java.nio.charset.StandardCharsets;
  15 +import java.util.Date;
  16 +
  17 +@Slf4j
  18 +public class UTF8ServerHttpResponseDecorator extends ServerHttpResponseDecorator {
  19 +
  20 + public UTF8ServerHttpResponseDecorator(ServerHttpResponse delegate) {
  21 + super(delegate);
  22 + }
  23 +
  24 + @Override
  25 + public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
  26 +
  27 + if (body instanceof Flux) {
  28 + Flux<? extends DataBuffer> fluxBody = (Flux<? extends DataBuffer>) body;
  29 + return super.writeWith(fluxBody.buffer().map(dataBuffer -> {
  30 + DataBufferFactory dataBufferFactory = new DefaultDataBufferFactory();
  31 + DataBuffer join = dataBufferFactory.join(dataBuffer);
  32 + byte[] content = new byte[join.readableByteCount()];
  33 + join.read(content);
  34 +
  35 + //释放掉内存
  36 + DataBufferUtils.release(join);
  37 + String s = new String(content, StandardCharsets.UTF_8);
  38 + //TODO，s就是response的值，
  39 +// cacheService.saveCacheList(path,s,"10");
  40 + log.info("[RESPONSE]-{}",s);
  41 + byte[] uppedContent = new String(s.getBytes(), StandardCharsets.UTF_8).getBytes();
  42 +
  43 + return bufferFactory().wrap(uppedContent);
  44 + }));
  45 + }
  46 +
  47 + // if body is not a flux. never got there.
  48 + return super.writeWith(body);
  49 + }
  50 +}