From 4206c5215ac19650cba36c8b8671ca3c6a091a50 Mon Sep 17 00:00:00 2001
From: efren <79289982@qq.com>
Date: Thu, 7 Aug 2025 16:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/CoscoProcessEnvService.java       |  2 ++
 .../impl/CoscoProcessEnvServiceImpl.java      | 32 +++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/CoscoProcessEnvService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/CoscoProcessEnvService.java
index 404b4fd..4e62eb5 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/CoscoProcessEnvService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/CoscoProcessEnvService.java
@@ -8,4 +8,6 @@ public interface CoscoProcessEnvService extends IBaseService<CoscoProcessEnv> {
     CoscoProcessEnv selectByBusinessType(String businessType);
 
     String buildBusinessUrl(String businessType, Object obj);
+
+    String buildBusinessUrl(String businessType, String userId, Object obj);
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/impl/CoscoProcessEnvServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/impl/CoscoProcessEnvServiceImpl.java
index 87d5936..ff317a9 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/impl/CoscoProcessEnvServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/impl/CoscoProcessEnvServiceImpl.java
@@ -48,16 +48,20 @@ public class CoscoProcessEnvServiceImpl extends BaseServiceImpl<CoscoProcessEnvM
      */
     @Override
     public String buildBusinessUrl(String businessType, Object obj) {
+        return buildBusinessUrl(businessType, null, obj);
+    }
+
+    @Override
+    public String buildBusinessUrl(String businessType, String userId, Object obj) {
         CoscoProcessEnv env = selectByBusinessType(businessType);
         if (env == null || env.getBusinessUrl() == null) return null;
         String baseUrl = env.getBusinessUrl();
-        String paramStr = toKeyValueString(obj);
+        String paramStr = toKeyValueString(obj, userId);
         log.info("paramStr: {}", paramStr);
         if (paramStr.isEmpty()) {
             return baseUrl;
         } else {
-            String encoded = Base64.getEncoder()
-                .encodeToString(paramStr.getBytes(StandardCharsets.UTF_8));
+            String encoded = Base64.getUrlEncoder().withoutPadding().encodeToString(paramStr.getBytes(StandardCharsets.UTF_8));
             return baseUrl + "?code=" + encoded;
         }
     }
@@ -67,8 +71,8 @@ public class CoscoProcessEnvServiceImpl extends BaseServiceImpl<CoscoProcessEnvM
      * @param obj 对象
      * @return 拼接后的字符串
      */
-    private String toKeyValueString(Object obj) {
-        if (obj == null) return "";
+    private String toKeyValueString(Object obj, String userId) {
+        if (obj == null) return userId == null ? "" : ("userId=" + userId);
         StringBuilder sb = new StringBuilder();
         Field[] fields = obj.getClass().getDeclaredFields();
         for (Field field : fields) {
@@ -81,14 +85,16 @@ public class CoscoProcessEnvServiceImpl extends BaseServiceImpl<CoscoProcessEnvM
                 }
             } catch (IllegalAccessException ignored) {}
         }
-        // 通过TokenUtil获取userId并拼接
-        try {
-            String userId = TokenUtil.getCurrentUser().getUserId();
-            if (userId != null && !userId.isEmpty()) {
-                if (sb.length() > 0) sb.append("&");
-                sb.append("userId=").append(userId);
-            }
-        } catch (Exception ignored) {}
+        String finalUserId = userId;
+        if (finalUserId == null || finalUserId.isEmpty()) {
+            try {
+                finalUserId = TokenUtil.getCurrentUser().getUserId();
+            } catch (Exception ignored) {}
+        }
+        if (finalUserId != null && !finalUserId.isEmpty()) {
+            if (sb.length() > 0) sb.append("&");
+            sb.append("userId=").append(finalUserId);
+        }
         return sb.toString();
     }
 }