From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
index d385490..9a381fe 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
@@ -6,10 +6,7 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.PdfTemplateUtil;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.config.ServerConfig;
@@ -56,6 +53,9 @@
 
     @Value("${custom.upload.network-path}")
     private String networkPath;
+
+    @Autowired
+    OssUtils ossUtils;
 
 
     /**
@@ -196,5 +196,9 @@
         return AjaxResult.success(data);
     }
 
+    @GetMapping("/getOssToken")
+    public AjaxResult getOssToken(){
+        return AjaxResult.success(ossUtils.getToken());
+    }
 
 }

--
Gitblit v1.8.0