From 08ae92b806a340832355d1850208b7a56b33c4fa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 三月 2026 10:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java | 3 +--
src/main/resources/application-zsjc.yml | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java
index f7c02a8..59ad625 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java
@@ -41,8 +41,7 @@
@Transactional(rollbackFor = Exception.class)
public void LoadProdDemandData(Integer currentPage, Integer pageSize) {
- System.out.println("aliDingConfig = " + aliDingConfig);
- String params = "appkey=" + "dingjnydbagc9ol7cwq4" + "&appsecret=" + "fO07qSZC5SMLw9It3Ydd3BuoFyVbRlsWXUnVr2kwPJXz0OpUntCAO5dqnr8G7zq5";
+ String params = "appkey=" + aliDingConfig.getAppKey() + "&appsecret=" + aliDingConfig.getAppSecret();
String tokenRes = HttpUtils.sendGet(aliDingConfig.getAccessTokenUrl(), params);
JSONObject tokenObj = JSON.parseObject(tokenRes);
diff --git a/src/main/resources/application-zsjc.yml b/src/main/resources/application-zsjc.yml
index 49601be..367ac75 100644
--- a/src/main/resources/application-zsjc.yml
+++ b/src/main/resources/application-zsjc.yml
@@ -26,8 +26,8 @@
intentComponent: uni.app.UNI099A590/io.dcloud.PandoraEntry
ali-ding:
- app-key: "dingj5d95ijzaf8lka7c"
- app-secret: "XqZUBeCfaz8z51vz0TdSu_KxP-aUuUu-ebJ5mT25yeELSyAuFrQ7F_g7exQBWf0sb"
+ app-key: "dingjnydbagc9ol7cwq4"
+ app-secret: "fO07qSZC5SMLw9It3Ydd3BuoFyVbRlsWXUnVr2kwPJXz0OpUntCAO5dqnr8G7zq5"
user-id: "290166234126410562"
app-type: "APP_UY8XMO7GNA8OF08EFNVQ"
form-uuid: "FORM-4IA66891C5H3QWMDBSGO05C0OX9628GRPYF7L8"
--
Gitblit v1.9.3