From 22226239da651b3c3a890a4cdb18300e19b70f13 Mon Sep 17 00:00:00 2001 From: wanglei <34475144@qq.com> Date: Thu, 6 Nov 2025 15:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=9D=83=E9=99=90=E7=A0=81=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=80=BC=EF=BC=8C=E5=9C=A8=E5=87=BD=E6=95=B0=E4=B8=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=EF=BC=8C=E5=90=8C=E6=97=B6=E5=B0=86token?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=9A=84=E4=BF=A1=E6=81=AF=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=88=B0ngx.var.uid=E4=B8=AD=E7=9C=8B=E5=9C=A8=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E4=B8=AD=E6=98=AF=E5=90=A6=E8=83=BD=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/account.lua | 5 +++++ src/api/system/application.lua | 5 +++++ src/api/system/department.lua | 5 +++++ src/api/system/permission.lua | 7 ++++++- src/api/system/postion.lua | 5 +++++ src/api/system/role.lua | 5 +++++ src/api/system/user.lua | 5 +++++ src/auth/jwt-auth.lua | 5 +++++ src/config.lua | 2 +- src/service/auth/auth.lua | 3 ++- src/service/system/user.lua | 16 ++++++++++++++-- 11 files changed, 58 insertions(+), 5 deletions(-) diff --git a/src/api/system/account.lua b/src/api/system/account.lua index 4673cb1..68c4a20 100644 --- a/src/api/system/account.lua +++ b/src/api/system/account.lua @@ -16,26 +16,31 @@ local routes = { paths = { "/api/system/accounts" }, methods = { "GET" }, handler = systemAccount.getSystemAccounts, + metadata = "system::accounts::list", }, { paths = { "/api/system/accounts/:id" }, methods = { "GET" }, handler = systemAccount.getSystemAccount, + metadata = "system::accounts::view", }, { paths = { "/api/system/accounts" }, methods = { "POST" }, handler = systemAccount.addSystemAccount, + metadata = "system::accounts::add", }, { paths = { "/api/system/accounts/:id" }, methods = { "DELETE" }, handler = systemAccount.deleteSystemAccount, + metadata = "system::accounts::delete", }, { paths = { "/api/system/accounts/:id" }, methods = { "PUT" }, handler = systemAccount.updateSystemAccount, + metadata = "system::accounts::edit", }, } diff --git a/src/api/system/application.lua b/src/api/system/application.lua index f9c3bff..e2303cc 100644 --- a/src/api/system/application.lua +++ b/src/api/system/application.lua @@ -16,26 +16,31 @@ local routes = { paths = { "/api/system/applications" }, methods = { "GET" }, handler = systemApplication.getSystemApplications, + metadata = "system::applications::list", }, { paths = { "/api/system/applications/:id" }, methods = { "GET" }, handler = systemApplication.getSystemApplication, + metadata = "system::applications::view", }, { paths = { "/api/system/applications" }, methods = { "POST" }, handler = systemApplication.addSystemApplication, + metadata = "system::applications::add", }, { paths = { "/api/system/applications/:id" }, methods = { "DELETE" }, handler = systemApplication.deleteSystemApplication, + metadata = "system::applications::delete", }, { paths = { "/api/system/applications/:id" }, methods = { "PUT" }, handler = systemApplication.updateSystemApplication, + metadata = "system::applications::edit", }, } diff --git a/src/api/system/department.lua b/src/api/system/department.lua index edbd17e..9eb268f 100644 --- a/src/api/system/department.lua +++ b/src/api/system/department.lua @@ -16,26 +16,31 @@ local routes = { paths = { "/api/system/departments" }, methods = { "GET" }, handler = systemDepartment.getSystemDepartments, + metadata = "system::departments::list", }, { paths = { "/api/system/departments/:id" }, methods = { "GET" }, handler = systemDepartment.getSystemDepartment, + metadata = "system::departments::view", }, { paths = { "/api/system/departments" }, methods = { "POST" }, handler = systemDepartment.addSystemDepartment, + metadata = "system::departments::add", }, { paths = { "/api/system/departments/:id" }, methods = { "DELETE" }, handler = systemDepartment.deleteSystemDepartment, + metadata = "system::departments::delete", }, { paths = { "/api/system/departments/:id" }, methods = { "PUT" }, handler = systemDepartment.updateSystemDepartment, + metadata = "system::departments::edit", }, } diff --git a/src/api/system/permission.lua b/src/api/system/permission.lua index bfd0f00..a92585e 100644 --- a/src/api/system/permission.lua +++ b/src/api/system/permission.lua @@ -16,26 +16,31 @@ local routes = { paths = { "/api/system/permissions" }, methods = { "GET" }, handler = systemPermission.getSystemPermissions, + metadata = "system::permissions::list", }, { paths = { "/api/system/permissions/:id" }, methods = { "GET" }, handler = systemPermission.getSystemPermission, + metadata = "system::permissions::view", }, { paths = { "/api/system/permissions" }, methods = { "POST" }, handler = systemPermission.addSystemPermission, + metadata = "system::permissions::add", }, { paths = { "/api/system/permissions/:id" }, methods = { "DELETE" }, handler = systemPermission.deleteSystemPermission, + metadata = "system::permissions::delete", }, { - paths = { "/api/system/permission/:id" }, + paths = { "/api/system/permissions/:id" }, methods = { "PUT" }, handler = systemPermission.updateSystemPermission, + metadata = "system::permissions::edit", }, } diff --git a/src/api/system/postion.lua b/src/api/system/postion.lua index 7caad16..42dca38 100644 --- a/src/api/system/postion.lua +++ b/src/api/system/postion.lua @@ -16,26 +16,31 @@ local routes = { paths = { "/api/system/positions" }, methods = { "GET" }, handler = systemPosition.getSystemPositions, + metadata = "system::positions::list", }, { paths = { "/api/system/positions/:id" }, methods = { "GET" }, handler = systemPosition.getSystemPosition, + metadata = "system::positions::list", }, { paths = { "/api/system/positions" }, methods = { "POST" }, handler = systemPosition.addSystemPosition, + metadata = "system::positions::list", }, { paths = { "/api/system/positions/:id" }, methods = { "DELETE" }, handler = systemPosition.deleteSystemPosition, + metadata = "system::positions::list", }, { paths = { "/api/system/positions/:id" }, methods = { "PUT" }, handler = systemPosition.updateSystemPosition, + metadata = "system::positions::list", }, } diff --git a/src/api/system/role.lua b/src/api/system/role.lua index ea115ec..002fd0e 100644 --- a/src/api/system/role.lua +++ b/src/api/system/role.lua @@ -16,26 +16,31 @@ local routes = { paths = { "/api/system/roles" }, methods = { "GET" }, handler = systemRole.getSystemRoles, + metadata = "system::roles::list", }, { paths = { "/api/system/roles/:id" }, methods = { "GET" }, handler = systemRole.getSystemRole, + metadata = "system::roles::view", }, { paths = { "/api/system/roles" }, methods = { "POST" }, handler = systemRole.addSystemRole, + metadata = "system::roles::add", }, { paths = { "/api/system/roles/:id" }, methods = { "DELETE" }, handler = systemRole.deleteSystemRole, + metadata = "system::roles::delete", }, { paths = { "/api/system/roles/:id" }, methods = { "PUT" }, handler = systemRole.updateSystemRole, + metadata = "system::roles::edit", }, } diff --git a/src/api/system/user.lua b/src/api/system/user.lua index 444cdee..7cc3eb0 100644 --- a/src/api/system/user.lua +++ b/src/api/system/user.lua @@ -15,26 +15,31 @@ local routes = { paths = { "/api/system/users" }, methods = { "GET" }, handler = systemUser.getSystemUsers, + metadata = "system::users::list", }, { paths = { "/api/system/users/:id" }, methods = { "GET" }, handler = systemUser.getSystemUser, + metadata = "system::users::view", }, { paths = { "/api/system/users" }, methods = { "POST" }, handler = systemUser.addSystemUser, + metadata = "system::users::add", }, { paths = { "/api/system/users/:id" }, methods = { "DELETE" }, handler = systemUser.deleteSystemUser, + metadata = "system::users::delete", }, { paths = { "/api/system/users/:id" }, methods = { "PUT" }, handler = systemUser.updateSystemUser, + metadata = "system::users::edit", }, } diff --git a/src/auth/jwt-auth.lua b/src/auth/jwt-auth.lua index a91a2aa..9e0b18f 100644 --- a/src/auth/jwt-auth.lua +++ b/src/auth/jwt-auth.lua @@ -48,5 +48,10 @@ if jwt_obj.payload.exp and ngx.time() > jwt_obj.payload.exp then ngx.exit(ngx.HTTP_UNAUTHORIZED) end +-- Access claims in the payload +local claims = verified.claims +-- write the uid variable +ngx.var.uid = jwt_obj.payload + --全部校验完成后，说明令牌有效，返回令牌数据 ngx.log(ngx.INFO, "令牌校验通过 JWT: " .. cjson.encode(jwt_obj)) \ No newline at end of file diff --git a/src/config.lua b/src/config.lua index 396f101..5d71edf 100644 --- a/src/config.lua +++ b/src/config.lua @@ -2,7 +2,7 @@ --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by admin. --- DateTime: 2025/9/24 16:31 ---- +--- 配置文件配置信息 SYSTEM_CONFIG = { APP_ENV = "dev", -- dev/prod diff --git a/src/service/auth/auth.lua b/src/service/auth/auth.lua index 65baf00..0e712a5 100644 --- a/src/service/auth/auth.lua +++ b/src/service/auth/auth.lua @@ -95,7 +95,8 @@ function _M.logout() --验证成功记录登出的日志信息 local userid = ret["body"]["payload"]["userid"] local username = ret["body"]["payload"]["username"] - ngx.log(ngx.INFO, "userid:"..userid.." username:"..username.." logout system") + local rolename = ret["body"]["payload"]["username"] + ngx.log(ngx.INFO, "userid:"..userid.." username:"..username.." rolename:"..rolename.." logout system") local result = resp:json(0, "用户退出系统成功") resp:send(result) end diff --git a/src/service/system/user.lua b/src/service/system/user.lua index a3e1434..aca8aa9 100644 --- a/src/service/system/user.lua +++ b/src/service/system/user.lua @@ -23,8 +23,15 @@ local function getUserId() return userid end +--判断用户是都有权限使用接口 +--local payload = ngx.var.uid + --获取所有用户信息 -function _M.getSystemUsers() +function _M.getSystemUsers(m) + --获取登录的用户信息 + local payload = ngx.var.uid + local metadata = m.metadata + ngx.log(ngx.INFO, "metadata value:"..metadata) --获取页码和请求的数据量 --local args = ngx.req.get_uri_args() local pageNum = ngx.var.pagenum or 1 @@ -36,6 +43,11 @@ end --根据用户id获取用户信息 function _M.getSystemUser(m) + --获取登录的用户信息 + local payload = ngx.var.uid + local metadata = m.metadata + ngx.log(ngx.INFO, "metadata value:"..metadata) + local userid = getUserId() if userid ~= m.id then ngx.log(ngx.WARN, "用户与使用token中的用户id不一致") @@ -48,7 +60,7 @@ function _M.getSystemUser(m) end --根据用户id获取用户信息 -function _M.addSystemUser() +function _M.addSystemUser(m) --读取请求体的数据 ngx.req.read_body() --获取请求数据