Merge remote-tracking branch 'origin/master'

Dockerfile

+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.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","-Dspring.profiles.active=test","-jar","shop-mall.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

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

wisenergy-web-admin/pom.xml

@@ -44,7 +44,7 @@
 
     <!-- MAVEN构建 -->
     <build>
-        <finalName>${project.artifactId}-${moduleVersion.wisenergy-web-admin}</finalName>
+        <finalName>shop-mall</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/filter/AuthFilter.java

@@ -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());