From 3ad5f38c2f98eb320a1860c51cc5e2c92c7b7469 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期四, 08 十月 2026 20:12:48 +0800
Subject: [PATCH] feat: 账号密码优先取系统配置的，没有再取写死的
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java
index 7ee5ad1..d75e92b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java
@@ -3,6 +3,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.other.domain.TPlatformConfig;
+import com.ruoyi.other.service.TPlatformConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -38,9 +42,16 @@
@Resource
private RestTemplate restTemplate;
+ @Resource
+ private TPlatformConfigService platformConfigService;
+
/** 登录华为 FusionSolar 并取得 XSRF-TOKEN。 */
public String getXsrfToken() {
- return getXsrfToken(DEFAULT_USER_NAME, DEFAULT_SYSTEM_CODE);
+ TPlatformConfig config = platformConfigService.getOne(Wrappers.lambdaQuery(TPlatformConfig.class).eq(TPlatformConfig::getPlatformName, "华为"));
+ if (config == null || StringUtils.isBlank(config.getAccount()) || StringUtils.isBlank(config.getPassword())) {
+ return getXsrfToken(DEFAULT_USER_NAME, DEFAULT_SYSTEM_CODE);
+ }
+ return getXsrfToken(config.getAccount(), config.getPassword());
}
/** 使用指定账号登录并取得 XSRF-TOKEN。 */
--
Gitblit v1.7.1