From 2168a225f5e2537d78b4fcf362b638ae1154b1e9 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 8 May 2023 15:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B911?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buscenter/api/bussalesorder/BusSalesOrderFeign.java     | 2 +-
 .../java/com/yxt/anrui/portal/biz/flow/FlowableRest.java    | 6 ++++--
 .../java/com/yxt/anrui/portal/biz/flow/FlowableService.java | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
index 7fb3658cb1..29181599d6 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
@@ -119,7 +119,7 @@ public interface BusSalesOrderFeign {
     ResultBean taskReject(@RequestBody BusSalesOrderFlowDto dto);
 
     @ApiOperation(value = "终止任务")
-    @PutMapping("/breakProcess")
+    @PostMapping("/breakProcess")
     @ResponseBody
     ResultBean breakProcess(@RequestBody BusSalesOrderFlowDto dto);
 
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
index b2672a1b5c..24b81f6dd5 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
@@ -288,11 +288,13 @@ public class FlowableRest implements FlowableFeign {
             //根据流程定义key查询终止地址
             SysUrlConfig sysUrlConifg = sysUrlConfigService.selectByKey(proDefKey);
             if(sysUrlConifg != null){
-                f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+//                f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+                f.setStopUrl(sysUrlConifg.getUrl());
             }else{
                 sysUrlConifg = sysUrlConfigService.selectByKey("defaultKey");
                 if(sysUrlConifg!= null){
-                    f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+//                    f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+                    f.setStopUrl(sysUrlConifg.getUrl());
                 }
             }
         }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
index 89ce5b6ab1..6b716ae9f7 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
@@ -689,11 +689,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             //根据流程定义key查询终止地址
             SysUrlConfig sysUrlConifg = sysUrlConfigService.selectByKey(proDefKey);
             if(sysUrlConifg != null){
-                f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+//                f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+                f.setStopUrl(sysUrlConifg.getUrl());
             }else{
                 sysUrlConifg = sysUrlConfigService.selectByKey("defaultKey");
                 if(sysUrlConifg!= null){
-                    f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+//                    f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
+                    f.setStopUrl(sysUrlConifg.getUrl());
                 }
             }