zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/very_pig' into leng_dev

Browse Source
This commit is contained in:
pig666 committed 2020-05-24 17:24:04 +08:00
2 parents 65003cfb82 2dfd732d04
commit b72b8c2526
14 files changed
+35 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 3000
ADD ./target/pigx-auth.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-auth.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-auth.jar
pigx-gateway/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 9999
ADD ./target/pigx-gateway.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-gateway.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-gateway.jar
pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java
+9 -5
View File
@@ -127,12 +127,16 @@ public class PasswordDecoderFilter extends AbstractGatewayFilterFactory {
// 获取请求密码并解密
Map<String, String> inParamsMap = HttpUtil.decodeParamMap((String) s, CharsetUtil.CHARSET_UTF_8);
byte[] result = aes.decrypt(Base64.decode(inParamsMap.get(PASSWORD)
.getBytes(StandardCharsets.UTF_8)));
String password = new String(result, StandardCharsets.UTF_8);
if(inParamsMap.containsKey(PASSWORD)){
byte[] result = aes.decrypt(Base64.decode(inParamsMap.get(PASSWORD)
.getBytes(StandardCharsets.UTF_8)));
String password = new String(result, StandardCharsets.UTF_8);
// 返回修改后报文字符
inParamsMap.put(PASSWORD, password.trim());
// 返回修改后报文字符
inParamsMap.put(PASSWORD, password.trim());
} else {
log.error("非法请求数据:{}",s);
}
return Mono.just(HttpUtil.toParams(inParamsMap));
};
}
pigx-register/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -15,6 +16,6 @@ EXPOSE 8848
ADD ./target/pigx-register.jar ./
CMD sleep 60;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-register.jar
CMD sleep 60;java $JAVA_OPTS -jar pigx-register.jar
pigx-upms/pigx-upms-biz/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 4000
ADD ./target/pigx-upms-biz.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-upms-biz.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-upms-biz.jar
pigx-visual/pigx-codegen/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 5003
ADD ./target/pigx-codegen.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-codegen.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-codegen.jar
pigx-visual/pigx-daemon-elastic-job/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 5002
ADD ./target/pigx-daemon-elastic-job.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-elastic-job.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-daemon-elastic-job.jar
pigx-visual/pigx-daemon-quartz/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 5007
ADD ./target/pigx-daemon-quartz.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-quartz.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-daemon-quartz.jar
pigx-visual/pigx-monitor/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 5001
ADD ./target/pigx-monitor.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-monitor.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-monitor.jar
pigx-visual/pigx-mp-platform/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 6000
ADD ./target/pigx-mp-platform.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-mp-platform.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-mp-platform.jar
pigx-visual/pigx-oa-platform/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 5005
ADD ./target/pigx-oa-platform.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-oa-platform.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-oa-platform.jar
pigx-visual/pigx-pay-platform/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 5010
ADD ./target/pigx-pay-platform.jar ./
CMD sleep 180;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-pay-platform.jar
CMD sleep 180;java $JAVA_OPTS -jar pigx-pay-platform.jar
pigx-visual/pigx-sentinel-dashboard/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -14,4 +15,4 @@ EXPOSE 5020
ADD ./target/pigx-sentinel-dashboard.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-sentinel-dashboard.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-sentinel-dashboard.jar
pigx-visual/pigx-tx-manager/Dockerfile
+2 -1
View File
@@ -3,6 +3,7 @@ FROM pig4cloud/java:8-jre
MAINTAINER wangiegie@gmail.com
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -15,4 +16,4 @@ EXPOSE 9998
ADD ./target/pigx-tx-manager.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-tx-manager.jar
CMD sleep 120;java $JAVA_OPTS -jar pigx-tx-manager.jar