From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index 09e34f3..32cf3b3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -32,9 +32,10 @@
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;
@@ -81,7 +82,7 @@
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, user.getTenantId(), null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
user = userService.fillRoleIdsForResponse(user);
- return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
+ return R.ok("Sign In Success").add(buildPageRowsUtils.rowsMap(new LoginResult(accessToken, user, tenant.getName())));
}
@GetMapping("/email/code")
@@ -140,7 +141,7 @@
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
- return R.ok("Sign Up Success").add(new LoginResult(accessToken, user, tenant.getName()));
+ return R.ok("Sign Up Success").add(buildPageRowsUtils.rowsMap(new LoginResult(accessToken, user, tenant.getName())));
}
@GetMapping("/system/info")
@@ -154,7 +155,7 @@
@GetMapping("/tenant/list")
public R tenantList() {
- return R.ok().add(tenantService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(tenantService.list()));
}
@GetMapping("/auth/user")
@@ -174,7 +175,7 @@
&& !vo.getName().equals("menu.menu")
).collect(Collectors.toList());
}
- return R.ok().add(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren));
+ return R.ok().add(buildPageRowsUtils.rowsMap(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren)));
}
@OperationLog("Update UserInfo")
@@ -196,7 +197,7 @@
}
}
if (userService.updateById(user)) {
- return R.ok("Save Success").add(userService.getById(user.getId()));
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(userService.getById(user.getId())));
}
return R.error("Save Fail");
}
@@ -252,3 +253,4 @@
}
}
+
--
Gitblit v1.9.1