diff --git a/pig-auth/Dockerfile b/pig-auth/Dockerfile
index 5cf7383e05d258d8d38360c640b45cda39137de7..5265c46ead52d4fc41cfb429151ca3b748a52b27 100755
--- a/pig-auth/Dockerfile
+++ b/pig-auth/Dockerfile
@@ -1,20 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-auth.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
-ENV TZ=Asia/Shanghai
-ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-auth
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+RUN mkdir -p /pig-auth
+
+WORKDIR /pig-auth
+
+ARG JAR_FILE=target/pig-auth.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 3000
 
-CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
\ No newline at end of file
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS
diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java
index e880d48d1cf63413908933a75837b8d34c01b00f..c11544afedc5f133e41863316c6975eedd0723b8 100644
--- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java
+++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java
@@ -16,6 +16,7 @@
 
 package com.pig4cloud.pig.common.security.component;
 
+import cn.hutool.core.map.MapUtil;
 import com.pig4cloud.pig.common.core.constant.SecurityConstants;
 import com.pig4cloud.pig.common.security.datascope.UserDataScope;
 import com.pig4cloud.pig.common.security.service.PigUser;
@@ -26,12 +27,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.oauth2.provider.token.UserAuthenticationConverter;
 import org.springframework.util.StringUtils;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author lengleng
@@ -78,8 +74,10 @@ public class PigUserAuthenticationConverter implements UserAuthenticationConvert
 			Object value = map.get(SecurityConstants.DETAILS_USER_DATA_SCOPE);
 			if (value != null) {
 				Map<String, ?> userDataScopeMap = (Map) value;
-				userDataScope.setAllScope((boolean) userDataScopeMap.get("allScope"));
-				userDataScope.setOnlySelf((boolean) userDataScopeMap.get("onlySelf"));
+				userDataScope.setAllScope(MapUtil.getBool(userDataScopeMap, "allScope"));
+				userDataScope.setOnlySelf(MapUtil.getBool(userDataScopeMap, "onlySelf"));
+
+				userDataScope.setScopeUserIds(new HashSet<>((List) userDataScopeMap.get("scopeUserIds")));
 				userDataScope.setScopeUserIds(new HashSet<>((List) userDataScopeMap.get("scopeUserIds")));
 				userDataScope.setScopeDeptIds(new HashSet<>((List) userDataScopeMap.get("scopeDeptIds")));
 			}
diff --git a/pig-gateway/Dockerfile b/pig-gateway/Dockerfile
index d33353eb990f87b0127a63cb93841abc320577c0..90b3544ab4fcfd66b5931a57856ccc2033acbdfc 100755
--- a/pig-gateway/Dockerfile
+++ b/pig-gateway/Dockerfile
@@ -1,19 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-gateway.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-gateway
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+RUN mkdir -p /pig-gateway
+
+WORKDIR /pig-gateway
+
+ARG JAR_FILE=target/pig-gateway.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 9999
 
-CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
\ No newline at end of file
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS
diff --git a/pig-register/Dockerfile b/pig-register/Dockerfile
index f989b9bdb88065751fe106ef31320d5097d7bfc8..02bb9c5224317fc15b7e64de00cb0612c1138880 100755
--- a/pig-register/Dockerfile
+++ b/pig-register/Dockerfile
@@ -1,20 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-register.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
 
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-register
+RUN mkdir -p /pig-register
+
+WORKDIR /pig-register
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+ARG JAR_FILE=target/pig-register.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 8848
 
-CMD sleep 30; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 30; java -jar app.jar $JAVA_OPTS
diff --git a/pig-upms/pig-upms-biz/Dockerfile b/pig-upms/pig-upms-biz/Dockerfile
index 10f98efac41bb87849b95c4f9b9f1ad06f2bb103..90b6ba6bb22b0de7af254a7baba33bbfa4562ded 100644
--- a/pig-upms/pig-upms-biz/Dockerfile
+++ b/pig-upms/pig-upms-biz/Dockerfile
@@ -1,19 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-upms-biz.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-upms
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+RUN mkdir -p /pig-upms-biz
+
+WORKDIR /pig-upms-biz
+
+ARG JAR_FILE=target/pig-upms-biz.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 4000
 
-CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
\ No newline at end of file
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS
diff --git a/pig-visual/pig-codegen/Dockerfile b/pig-visual/pig-codegen/Dockerfile
index b2ae337707fddb3c922da589f272c5f8be92dfee..a90156b4582cc1278c716b51b167d61eae930eb7 100644
--- a/pig-visual/pig-codegen/Dockerfile
+++ b/pig-visual/pig-codegen/Dockerfile
@@ -1,19 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-codegen.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-codegen
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+RUN mkdir -p /pig-codegen
+
+WORKDIR /pig-codegen
+
+ARG JAR_FILE=target/pig-codegen.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 5002
 
-CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
\ No newline at end of file
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS
diff --git a/pig-visual/pig-monitor/Dockerfile b/pig-visual/pig-monitor/Dockerfile
index 98e1e3cc1be7792e8059a1de89a3df8a9d4aa72c..c4d35690ba92a3e14aa03ef74124aa33cdec6df2 100755
--- a/pig-visual/pig-monitor/Dockerfile
+++ b/pig-visual/pig-monitor/Dockerfile
@@ -1,19 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-monitor.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-monitor
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+RUN mkdir -p /pig-monitor
+
+WORKDIR /pig-monitor
+
+ARG JAR_FILE=target/pig-monitor.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 5001
 
-CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
\ No newline at end of file
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS
diff --git a/pig-visual/pig-sentinel-dashboard/Dockerfile b/pig-visual/pig-sentinel-dashboard/Dockerfile
index 1c60d7766cc47eab2667b9b5110113ce93c93a2e..6ea0326f93fb367832c2076c93ccdb1c6e1dac0e 100644
--- a/pig-visual/pig-sentinel-dashboard/Dockerfile
+++ b/pig-visual/pig-sentinel-dashboard/Dockerfile
@@ -1,19 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-sentinel-dashboard.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-sentinel-dashboard
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+RUN mkdir -p /pig-sentinel-dashboard
+
+WORKDIR /pig-sentinel-dashboard
+
+ARG JAR_FILE=target/pig-sentinel-dashboard.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 5003
 
-CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
\ No newline at end of file
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS
diff --git a/pig-visual/pig-xxl-job-admin/Dockerfile b/pig-visual/pig-xxl-job-admin/Dockerfile
index 4fab252b9a31fd3ca84e1f7b14788db3621df70e..2eced2db48d1dec763713aac045bffc030a0d2a1 100644
--- a/pig-visual/pig-xxl-job-admin/Dockerfile
+++ b/pig-visual/pig-xxl-job-admin/Dockerfile
@@ -1,19 +1,15 @@
-FROM moxm/java:1.8-full as builder
-WORKDIR /build
-ARG JAR_FILE=target/pig-xxl-job-admin.jar
-COPY ${JAR_FILE} app.jar
-RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
-
 FROM moxm/java:1.8-full
-LABEL maintainer="jclazz@outlook.com"
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-WORKDIR pig-xxl-job-admin
 
-COPY --from=builder /build/dependencies/ ./
-COPY --from=builder /build/snapshot-dependencies/ ./
-COPY --from=builder /build/spring-boot-loader/ ./
-COPY --from=builder /build/application/ ./
+RUN mkdir -p /pig-xxl-job-admin
+
+WORKDIR /pig-xxl-job-admin
+
+ARG JAR_FILE=target/pig-xxl-job-admin.jar
+
+COPY ${JAR_FILE} app.jar
 
 EXPOSE 5004
 
-CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher
\ No newline at end of file
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS