From 94dcca1c72137bf5fd3097cd42b5dec55a1e6b94 Mon Sep 17 00:00:00 2001
From: wanglei <34475144@qqcom>
Date: Thu, 16 Oct 2025 21:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E7=BB=93=E6=9E=9C=E5=86=85=E5=AE=B9=E4=B8=BA?=
 =?UTF-8?q?json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.lua     | 10 ++++++----
 src/service/system/user.lua |  7 +++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/api/system/user.lua b/src/api/system/user.lua
index dadde25..5b30334 100644
--- a/src/api/system/user.lua
+++ b/src/api/system/user.lua
@@ -11,15 +11,17 @@ local resp = require("util.response")
 
 --获取所有用户信息
 function _M.get_allusers()
-    local res = dao.getAllUser()
-    response:json(0, 'index args', res)
+    local ret = dao.getAllUser()
+    local result = resp:json(0, 'ok', ret)
+    resp:send(result)
 end
 
 --根据用户id获取用户信息
 function _M.get_user(m)
     local id = m.id
-    local res = dao.getUser(id)
-    response:json(0, 'index args', res)
+    local ret = dao.getUser(id)
+    local result = resp:json(0, 'ok', ret)
+    resp:send(result)
 end
 
 return _M
\ No newline at end of file
diff --git a/src/service/system/user.lua b/src/service/system/user.lua
index a7f9806..11e4957 100644
--- a/src/service/system/user.lua
+++ b/src/service/system/user.lua
@@ -3,7 +3,7 @@
 --- Created by .
 --- DateTime: 2025/9/25 08:19
 --- 业务逻辑
-local cjson = require('cjson')
+--local cjson = require('cjson')
 local pgmoon = require('pgmoon')
 local dbconf = require("config.database")
 
@@ -45,8 +45,7 @@ function _M.getAllUser()
     --end
     --关闭数据库
     conn:disconnect()
-
-    return cjson.encode(res)
+    return res
 end
 
 --根据用户id获取用户信息
@@ -74,6 +73,6 @@ function _M.getUser(id)
     --关闭数据库
     conn:disconnect()
 
-    return cjson.encode(res)
+    return res
 end
 return _M