From 0a81a9ce836b1b2b8538c9c850525a5dc38d2724 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 15 Jun 2019 09:26:50 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E5=A2=9E=E5=8A=A0blade-resource?=
 =?UTF-8?q?=E7=9A=84docker=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/support/BladeJwtTokenEnhancer.java       |  5 +++--
 blade-ops/blade-resource/Dockerfile               | 15 +++++++++++++++
 script/docker/deploy.sh                           |  2 +-
 script/docker/docker-compose.yml                  |  7 +++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 blade-ops/blade-resource/Dockerfile

diff --git a/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java b/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java
index 494dbc07..2283969b 100644
--- a/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java
+++ b/blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java
@@ -18,6 +18,7 @@ package org.springblade.auth.support;
 
 import org.springblade.auth.service.BladeUserDetails;
 import org.springblade.auth.utils.TokenUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
@@ -37,8 +38,8 @@ public class BladeJwtTokenEnhancer implements TokenEnhancer {
 		BladeUserDetails principal = (BladeUserDetails) authentication.getUserAuthentication().getPrincipal();
 		Map<String, Object> info = new HashMap<>(16);
 		info.put(TokenUtil.CLIENT_ID, TokenUtil.getClientIdFromHeader());
-		info.put(TokenUtil.USER_ID, principal.getUserId());
-		info.put(TokenUtil.ROLE_ID, principal.getRoleId());
+		info.put(TokenUtil.USER_ID, Func.toStr(principal.getUserId()));
+		info.put(TokenUtil.ROLE_ID, Func.toStr(principal.getRoleId()));
 		info.put(TokenUtil.TENANT_ID, principal.getTenantId());
 		info.put(TokenUtil.ACCOUNT, principal.getAccount());
 		info.put(TokenUtil.USER_NAME, principal.getUsername());
diff --git a/blade-ops/blade-resource/Dockerfile b/blade-ops/blade-resource/Dockerfile
new file mode 100644
index 00000000..72ee5432
--- /dev/null
+++ b/blade-ops/blade-resource/Dockerfile
@@ -0,0 +1,15 @@
+FROM anapsix/alpine-java:8_server-jre_unlimited
+
+MAINTAINER smallchill@163.com
+
+RUN mkdir -p /blade/resource
+
+WORKDIR /blade/resource
+
+EXPOSE 8010
+
+ADD ./target/blade-resource.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=test"]
diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh
index 9510d01f..61893aff 100644
--- a/script/docker/deploy.sh
+++ b/script/docker/deploy.sh
@@ -42,7 +42,7 @@ base(){
 
 #启动程序模块
 modules(){
-	docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log blade-flow blade-flow-design
+	docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log blade-flow blade-flow-design blade-resource
 }
 
 #启动监控模块
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 499391ca..3fb1fb5f 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -147,6 +147,13 @@ services:
     networks:
       - blade_net
 
+  blade-resource:
+    image: "${REGISTER}/blade/blade-resource:${TAG}"
+    privileged: true
+    restart: always
+    networks:
+      - blade_net
+
 networks:
   blade_net:
     driver: bridge