From a14c9acc9b3a934b4b510c8f12d10dc15f733a1a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 八月 2024 11:43:03 +0800
Subject: [PATCH] 8.24
---
ruoyi-service/ruoyi-account/pom.xml | 12 ++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 10 +++++++++-
ruoyi-common/ruoyi-common-core/pom.xml | 1 +
3 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 09938de..b28c301 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -16,6 +16,7 @@
</description>
<dependencies>
+
<!-- SpringCloud Openfeign -->
<dependency>
diff --git a/ruoyi-service/ruoyi-account/pom.xml b/ruoyi-service/ruoyi-account/pom.xml
index e109f2e..7d89a74 100644
--- a/ruoyi-service/ruoyi-account/pom.xml
+++ b/ruoyi-service/ruoyi-account/pom.xml
@@ -15,6 +15,7 @@
</description>
<dependencies>
+
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-order</artifactId>
@@ -139,6 +140,17 @@
<artifactId>alipay-sdk-java</artifactId>
<version>4.38.10.ALL</version>
</dependency>
+ <dependency>
+ <groupId>com.huaweicloud</groupId>
+ <artifactId>esdk-obs-java-bundle</artifactId>
+ <version>3.23.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openeuler</groupId>
+ <artifactId>bgmprovider</artifactId>
+ <version>1.0.4</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 6db28fa..63f8798 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -817,7 +817,15 @@
@GetMapping(value = "/user/car/getModel")
public R getModel(String id) throws Exception {
String modelById = CarBrandUtil.getModelById(id);
- return R.ok(modelById);
+ JSONObject jsonObject = JSON.parseObject(modelById);
+ JSONArray data = jsonObject.getJSONArray("data");
+ JSONArray backList = new JSONArray();
+ for (Object datum : data) {
+ JSONObject jsonObject1 = JSON.parseObject(datum.toString());
+ JSONArray list = jsonObject1.getJSONArray("list");
+ backList.addAll(list);
+ }
+ return R.ok(backList);
}
}
--
Gitblit v1.7.1