From a32564ac1e404a9a9f977b9fc0284551d198281a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Fri, 26 Jul 2019 13:11:36 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20fix=20#435=20?=
 =?UTF-8?q?=E3=80=90=E6=94=AF=E4=BB=98=E6=A8=A1=E5=9D=97=E3=80=91=20?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=9B=9E=E8=B0=83=E4=B8=A4=E6=AC=A1?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/auth/config/AuthorizationServerConfig.java          | 3 ++-
 .../pigx/common/data/datascope/DataScopeInterceptor.java     | 5 +++--
 pigx-visual/pigx-monitor/src/main/resources/ui/login.html    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
index cf8906e74..0f6cbb268 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
@@ -19,6 +19,7 @@
 
 package com.pig4cloud.pigx.auth.config;
 
+import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
 import com.pig4cloud.pigx.common.security.component.PigxWebResponseExceptionTranslator;
@@ -99,7 +100,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
 		tokenStore.setAuthenticationKeyGenerator(new DefaultAuthenticationKeyGenerator() {
 			@Override
 			public String extractKey(OAuth2Authentication authentication) {
-				return super.extractKey(authentication) + ":" + TenantContextHolder.getTenantId();
+				return super.extractKey(authentication) + StrUtil.COLON + TenantContextHolder.getTenantId();
 			}
 		});
 		return tokenStore;
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java
index ee34f19ff..3d8eb7660 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.common.data.datascope;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Db;
 import cn.hutool.db.Entity;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
@@ -92,7 +93,7 @@ public class DataScopeInterceptor extends AbstractSqlParserHandler implements In
 			List<String> roleIdList = user.getAuthorities()
 					.stream().map(GrantedAuthority::getAuthority)
 					.filter(authority -> authority.startsWith(SecurityConstants.ROLE))
-					.map(authority -> authority.split("_")[1])
+					.map(authority -> authority.split(StrUtil.UNDERLINE)[1])
 					.collect(Collectors.toList());
 
 			Entity query = Db.use(dataSource)
@@ -107,7 +108,7 @@ public class DataScopeInterceptor extends AbstractSqlParserHandler implements In
 			// 自定义
 			if (DataScopeTypeEnum.CUSTOM.getType() == dsType) {
 				String dsScope = query.getStr("ds_scope");
-				deptIds.addAll(Arrays.stream(dsScope.split(","))
+				deptIds.addAll(Arrays.stream(dsScope.split(StrUtil.COMMA))
 						.map(Integer::parseInt).collect(Collectors.toList()));
 			}
 			// 查询本级及其下级
diff --git a/pigx-visual/pigx-monitor/src/main/resources/ui/login.html b/pigx-visual/pigx-monitor/src/main/resources/ui/login.html
index 61577aa55..75ac41c58 100644
--- a/pigx-visual/pigx-monitor/src/main/resources/ui/login.html
+++ b/pigx-visual/pigx-monitor/src/main/resources/ui/login.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><base th:href="@{${adminContextPath} + '/'}" href=/ ><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=format-detection content="telephone=no,email=no"><meta name=theme-color content=#42d3a5><link rel="shortcut icon" href=assets/img/favicon.png type=image/png><title>Spring Boot Admin - Login</title><link href=assets/css/chunk-vendors.a476dbd7.css rel=stylesheet><link href=assets/css/chunk-common.9808b72e.css rel=stylesheet></head><body class=login><section class="hero is-fullheight"><div class=hero-body><div class="container has-text-centered"><div class="column is-4 is-offset-4"><div class=box><figure class="image is-128x128 login--logo"><img src=assets/img/icon-spring-boot-admin.svg></figure><h1 class="title has-text-primary">PigX 服务状态监控</h1><form method=post><input type=hidden th:if=${_csrf} th:name=${_csrf.parameterName} th:value=${_csrf.token}><div class=field><p class="is-medium has-text-danger" th:unless="${param.error == null}">Invalid username or password</p><p class=is-medium th:unless="${param.logout == null}">Logout successful</p></div><div class=field><div class=control><input class="input is-medium" type=input name=username placeholder=Username autofocus th:classappend="${param.error != null} ? is-danger"></div></div><div class=field><div class=control><input class="input is-medium" type=password name=password placeholder=Password th:classappend="${param.error != null} ? is-danger"></div></div><div class=field><div class=control><input type=submit class="button is-block is-primary is-medium is-fullwidth" value=Login></div></div></form></div></div></div></div></section><script src=assets/js/chunk-vendors.2f924319.js></script><script src=assets/js/chunk-common.4230ea45.js></script><script src=assets/js/login.614c6c50.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><base th:href="@{'/'}" href=/ ><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=format-detection content="telephone=no,email=no"><meta name=theme-color content=#42d3a5><link rel="shortcut icon" href=assets/img/favicon.png type=image/png><title>Spring Boot Admin - Login</title><link href=assets/css/chunk-vendors.8675e282.css rel=stylesheet><link href=assets/css/chunk-common.cb64c16b.css rel=stylesheet></head><body class=login><section class="hero is-fullheight"><div class=hero-body><div class="container has-text-centered"><div class="column is-4 is-offset-4"><div class=box><figure class="image is-128x128 login--logo"><img src=assets/img/icon-spring-boot-admin.svg></figure><h1 class="title has-text-primary">PigX 服务状态监控</h1><form method=post><input type=hidden th:if=${_csrf} th:name=${_csrf.parameterName} th:value=${_csrf.token}><div class=field><p class="is-medium has-text-danger" th:unless="${param.error == null}">Invalid username or password</p><p class=is-medium th:unless="${param.logout == null}">Logout successful</p></div><div class=field><div class=control><input class="input is-medium" type=input name=username placeholder=Username autofocus th:classappend="${param.error != null} ? is-danger"></div></div><div class=field><div class=control><input class="input is-medium" type=password name=password placeholder=Password th:classappend="${param.error != null} ? is-danger"></div></div><div class=field><div class=control><input type=submit class="button is-block is-primary is-medium is-fullwidth" value=Login></div></div></form></div></div></div></div></section><script src=assets/js/chunk-vendors.1b24de4b.js></script><script src=assets/js/chunk-common.74097ff8.js></script><script src=assets/js/login.c31addf9.js></script></body></html>
\ No newline at end of file