From 844ed45c26ae055f7489c6df2d4a84c14e67c1f1 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Wed, 4 Mar 2020 10:40:50 +0800 Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20Upgrading=20dependencies.?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=87=E6=97=B6=E4=BE=9D=E8=B5=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEspring=20platform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/act/service/impl/EditorServiceImpl.java | 2 +- pom.xml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java index 9f90f319c..e543f4423 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java @@ -56,7 +56,7 @@ public class EditorServiceImpl implements EditorService { public Object getStencilset() { InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json"); try { - return IOUtils.toString(stencilsetStream, StandardCharsets.UTF_8); + return IOUtils.toString(stencilsetStream, StandardCharsets.UTF_8.name()); } catch (Exception e) { log.error("Error while loading stencil set", e); throw new ActivitiException("Error while loading stencil set", e); diff --git a/pom.xml b/pom.xml index 895aa70b5..f2cb30aca 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ 2.2.5.RELEASE Hoxton.SR2 2.2.0.RELEASE - Cairo-SR8 UTF-8 1.8 1.8 @@ -119,13 +118,6 @@ pom import - - io.spring.platform - platform-bom - ${spring-platform.version} - pom - import - org.springframework.cloud spring-cloud-dependencies