From 324ed9fac852bc4117ee0da65a586adef258bd52 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 11:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 0f5f3f5..24dab3c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -143,6 +143,11 @@
System.out.println("根据id获取用户："+id);
return appUserService.getById(id);
}
+ // 获取所有用户
+ @PostMapping("/getAppUserAll")
+ public List<AppUser> getAppUserAll() {
+ return appUserService.list();
+ }
@PostMapping("/getBaseUserById")
public R<Map<String, Object>> getBaseUserById(@RequestParam("id") Long id) {
@@ -566,7 +571,7 @@
if (result == null || result.get("total_points") == null) {
userStatistics.setTotalScore(0L);
}else {
- userStatistics.setTotalScore(((BigDecimal) result.get("total_points")).longValue());
+ userStatistics.setTotalScore(Long.valueOf(result.get("total_points").toString()));
}
//条件构造 消费积分现金支付金额
queryWrapper.clear();
@@ -642,7 +647,7 @@
return R.ok(s);
}*/
- private static final String FILE_DIRECTORY = "/var/files/ldf_files"; // Linux路径
+ private static final String FILE_DIRECTORY = "/dev/xvdb/project/upload_files"; // Linux路径
// private static final String FILE_DIRECTORY = "E://ldf_files"; // Linux路径
@PostMapping("/upload")
@@ -670,7 +675,7 @@
File targetFile = new File(filePath);
file.transferTo(targetFile);
// 5. 返回可访问的URL（修正路径分隔符为Web格式）
- return R.ok("http://zjrqxny.com/account/app-user/download" + datePath + "/" + UUID+file.getOriginalFilename());
+ return R.ok("https://zjrqxny.com/images" + datePath + "/" + UUID+file.getOriginalFilename());
} catch (IOException e) {
e.printStackTrace();
return R.fail("上传文件失败");
--
Gitblit v1.7.1