zhangFan / gateway · 提交

转到一个项目

作者 朱兆平
提交 fe17a66b8a066dd554b3043f5a103670e9c291c4 1 个父辈 d11b0cc5

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 48 行增加 和 34 行删除
  1 +FROM java:8u111
  2 +VOLUME /tmp
  3 +
  4 +ENV PINPOINT_VERSION="2.3.1"
  5 +ENV AGENT_ID="gateway-Utf8-master1.0"
  6 +ENV APP_NAME="gateway-Utf8"
  7 +ENV JAVA_OPTS="-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dspring.profiles.active=${SPRING_PROFILES}"
  8 +
  9 +ADD *.jar app.jar
  10 +EXPOSE 12343
  11 +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
  12 +RUN echo "Asia/Shanghai" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
  13 +#ENTRYPOINT ["java","$JAVA_OPTS","-jar","/app.jar"]
  14 +ENTRYPOINT java $JAVA_OPTS -jar /app.jar
  15 +# Ubuntu 时区
  16 +
@@ -64,8 +64,11 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered { @@ -64,8 +64,11 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered {
64 return exchange.getResponse().setComplete(); 64 return exchange.getResponse().setComplete();
65 } 65 }
66 66
67 - ServerHttpResponse response = exchange.getResponse();  
68 - DataBufferFactory bufferFactory = response.bufferFactory(); 67 +// ServerHttpResponse response = exchange.getResponse();
  68 +// DataBufferFactory bufferFactory = response.bufferFactory();
  69 +
  70 +
  71 + //----------------------------------old
69 // ServerHttpResponseDecorator decorator = new ServerHttpResponseDecorator(response) { 72 // ServerHttpResponseDecorator decorator = new ServerHttpResponseDecorator(response) {
70 // @Override 73 // @Override
71 // public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) { 74 // public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
@@ -93,18 +96,22 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered { @@ -93,18 +96,22 @@ public class WrapperResponseGlobalFilter implements GlobalFilter, Ordered {
93 // return super.writeWith(body); 96 // return super.writeWith(body);
94 // } 97 // }
95 // }; 98 // };
96 -  
97 - ServerHttpResponseDecorator decoratedResponse= new UTF8ServerHttpResponseDecorator(response);  
98 - if (DEFAULT_SYSTEM.equals(systemInfo)){  
99 - decoratedResponse= new UTF8ServerHttpResponseDecorator(response);  
100 - }else {  
101 - decoratedResponse= new GBKServerHttpResponseDecorator(response);  
102 - } 99 + //----------------------------------old
  100 +
  101 + /**
  102 + * 取消返回数据的修改
  103 + */
  104 +// ServerHttpResponseDecorator decoratedResponse= new UTF8ServerHttpResponseDecorator(response);
  105 +// if (DEFAULT_SYSTEM.equals(systemInfo)){
  106 +// decoratedResponse= new UTF8ServerHttpResponseDecorator(response);
  107 +// }else {
  108 +// decoratedResponse= new GBKServerHttpResponseDecorator(response);
  109 +// }
103 // 110 //
104 111
105 - return chain.filter(exchange.mutate().response(decoratedResponse).build());  
106 -//  
107 -// return chain.filter(exchange); 112 +// return chain.filter(exchange.mutate().response(decoratedResponse).build());
  113 +
  114 + return chain.filter(exchange);
108 } 115 }
109 116
110 @Override 117 @Override
1 ${AnsiColor.YELLOW} 1 ${AnsiColor.YELLOW}
2 - ##################*CETC-TIANBO*#########################  
3 -  
4 - .::::.  
5 - .::::::::.  
6 - :::::::::::  
7 - ..:::::::::::'  
8 - '::::::::::::'  
9 - .::::::::::  
10 - '::::::::::::::..  
11 - ..::::::::::::.  
12 - ``::::::::::::::::  
13 - ::::``:::::::::' .:::.  
14 - ::::' ':::::' .::::::::.  
15 - .::::' :::: .:::::::'::::.  
16 - .:::' ::::: .:::::::::' ':::::.  
17 - .::' :::::.:::::::::' ':::::.  
18 - .::' ::::::::::::::' ``::::.  
19 - ...::: ::::::::::::' ``::.  
20 - ```` ':. ':::::::::' ::::..  
21 - '.:::::' ':'````..  
22 - ######################################################### 2 + ##################*CETC-TIANBO*###################################
  3 + |
  4 + |
  5 + |
  6 + _|_
  7 + /___\
  8 + /_____\
  9 + /oo oo\
  10 + \___________________________\ /___________________________/
  11 + `-----------|------|--------\_____/--------|------|-----------'
  12 + ( ) ( ) O|OOo|oOO|O ( ) ( )
  13 + ###################################################################
23 14
24 15
25 16
@@ -27,4 +18,4 @@ ${AnsiColor.YELLOW} @@ -27,4 +18,4 @@ ${AnsiColor.YELLOW}
27 ================================================== 18 ==================================================
28 Application Info：${application.title} 19 Application Info：${application.title}
29 ver:${application.version} 20 ver:${application.version}
30 -Powered by：Spring Boot ${spring-boot.version}  
  21 +Powered by：Spring Boot ${spring-boot.version}