Commit cdbb3a3a authored by liqin's avatar liqin 💬

bug fixed

parent eb368a89
FROM openjdk:8-jdk-alpine
USER root
MAINTAINER Danny Lee
VOLUME /opt
ARG JAR_FILE
#ADD ./project-web-api/target/data-station.jar data-station.jar
COPY ./wisenergy-web-admin/target/shop-mall-1.0.0-SNAPSHOT.jar /opt/
ADD hosts /tmp
WORKDIR /opt
EXPOSE 8080
ENV TZ=Asia/Shanghai
#ENV TZ=PRC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
CMD cat /tmp/hosts >> /etc/hosts
CMD ["java","-Djava.security.egd=file:/dev/./urandom","-jar","shop-mall-1.0.0-SNAPSHOT.jar"]
#CMD cat /etc/hosts
#RUN/ENTRYPOINT/CMD nohup java -jar -Xmx512m -Xms512m -Xss256k -XX:MaxDirectMemorySize=512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=40 -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Dserver.port=8090 data-station.jar > data-station.log 2>&1 &
\ No newline at end of file
......@@ -44,7 +44,7 @@
<!-- MAVEN构建 -->
<build>
<finalName>${project.artifactId}-${moduleVersion.wisenergy-web-admin}</finalName>
<finalName>shop-mall-${moduleVersion.wisenergy-web-admin}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
......
......@@ -74,7 +74,7 @@ public class AuthFilter extends AuthenticatingFilter {
HttpServletResponse httpResponse = (HttpServletResponse) response;
httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
httpResponse.setCharacterEncoding("gbk");
httpResponse.setCharacterEncoding("UTF-8");
Result result = new Result();
result.setResult(Result.RESULT_FLG.FAIL.getValue());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment