From d19b3965355a3c3926923f2df74561c75d6c6663 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 29 Apr 2019 17:28:53 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E6=9B=B4=E6=96=B0nacos=E3=80=81sentine?=
 =?UTF-8?q?l=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-service/blade-desk/pom.xml                    |  5 +++++
 .../desk/controller/LeaveController.java            | 13 +++----------
 pom.xml                                             |  5 +++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 3598072e..1c6d7073 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -37,6 +37,11 @@
             <artifactId>blade-dict-api</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java
index 064e13b5..2b455948 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java
@@ -20,12 +20,10 @@ import lombok.AllArgsConstructor;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.entity.ProcessLeave;
 import org.springblade.desk.service.ILeaveService;
-import org.springblade.flowable.core.constant.ProcessConstant;
 import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.core.feign.IFlowClient;
+import org.springblade.system.user.cache.UserCache;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -41,21 +39,16 @@ import springfox.documentation.annotations.ApiIgnore;
 public class LeaveController extends BladeController implements CacheNames {
 
 	private ILeaveService leaveService;
-	private IFlowClient flowClient;
 
 	/**
 	 * 详情
 	 *
-	 * @param taskId     任务主键
 	 * @param businessId 主键
 	 */
 	@GetMapping("detail")
-	public R<ProcessLeave> detail(String taskId, Integer businessId) {
+	public R<ProcessLeave> detail(Integer businessId) {
 		ProcessLeave detail = leaveService.getById(businessId);
-		R<Object> result = flowClient.taskVariable(taskId, ProcessConstant.TASK_VARIABLE_CREATE_USER);
-		if (result.isSuccess()) {
-			detail.getFlow().setAssigneeName(Func.toStr(result.getData(), "暂无"));
-		}
+		detail.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName());
 		return R.data(detail);
 	}
 
diff --git a/pom.xml b/pom.xml
index 11b9665b..31b8217a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,12 @@
         <curator.framework.version>4.0.1</curator.framework.version>
         <protostuff.version>1.6.0</protostuff.version>
         <flowable.version>6.4.1</flowable.version>
-        <alibaba.cloud.version>0.2.1.RELEASE</alibaba.cloud.version>
         <spring.boot.admin.version>2.1.2</spring.boot.admin.version>
 
+        <alibaba.cloud.version>0.9.0.RELEASE</alibaba.cloud.version>
+
         <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
-        <spring.cloud.version>Greenwich.RELEASE</spring.cloud.version>
+        <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
         <spring.platform.version>Cairo-SR7</spring.platform.version>
 
         <!-- 推荐使用Harbor -->