xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/abp' into abp

Browse Source
This commit is contained in:
橙子
2025-02-01 21:53:12 +08:00
parent 5dea4ab18c 7187397687
commit 0e90c54dbb
8 changed files with 152 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiTokenAuthorizationFilter.cs
View File

@@ -75,6 +75,7 @@ public class YiTokenAuthorizationFilter : IDashboardAsyncAuthorizationFilter, IT
function sendToken() { function sendToken() {
// 获取输入的 token // 获取输入的 token
var token = document.getElementById("tokenInput").value; var token = document.getElementById("tokenInput").value;
token = token.replace('Bearer ','');
// 构建请求 URL // 构建请求 URL
var url = "/hangfire"; var url = "/hangfire";
// 发送 GET 请求 // 发送 GET 请求
@@ -107,7 +108,7 @@ public class YiTokenAuthorizationFilter : IDashboardAsyncAuthorizationFilter, IT
<body style="text-align: center;"> <body style="text-align: center;">
<h1>Yi-hangfire</h1> <h1>Yi-hangfire</h1>
<h1>输入您的Token，我们将验证您是否为管理员</h1> <h1>输入您的Token，我们将验证您是否为管理员</h1>
<input type="text" id="tokenInput" placeholder="请输入 token" /> <textarea id="tokenInput" placeholder="请输入 token" style="width: 80%;height: 120px;margin: 0 10%;"></textarea>
<button onclick="sendToken()">校验</button> <button onclick="sendToken()">校验</button>
</body> </body>
</html> </html>

2
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScpoceInput.cs → Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScopeInput.cs
View File

@@ -2,7 +2,7 @@
namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Role namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Role
{ {
public class UpdateDataScpoceInput public class UpdateDataScopeInput
{ {
public Guid RoleId { get; set; } public Guid RoleId { get; set; }

2
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs
View File

@@ -39,7 +39,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
private ISqlSugarRepository<UserRoleEntity> _userRoleRepository; private ISqlSugarRepository<UserRoleEntity> _userRoleRepository;
public async Task UpdateDataScpoceAsync(UpdateDataScpoceInput input) public async Task UpdateDataScopeAsync(UpdateDataScopeInput input)
{ {
//只有自定义的需要特殊处理 //只有自定义的需要特殊处理
if (input.DataScope == DataScopeEnum.CUSTOM) if (input.DataScope == DataScopeEnum.CUSTOM)

21
Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.CommandLineUtils;
@@ -39,12 +40,11 @@ namespace Yi.Abp.Tool.Commands
} }
CheckFirstSlnPath(slnPath); CheckFirstSlnPath(slnPath);
var dotnetSlnCommandPart1 = $"dotnet sln \"{slnPath}\" add \"{modulePath}\\{moduleName}."; var dotnetSlnCommandPart = new List<string>() { "Application", "Application.Contracts", "Domain", "Domain.Shared", "SqlSugarCore" };
var dotnetSlnCommandPart2 = new List<string>() { "Application", "Application.Contracts", "Domain", "Domain.Shared", "SqlSugarCore" }; var paths = dotnetSlnCommandPart.Select(x => Path.Combine(modulePath, $"{moduleName}.{x}")).ToArray();
var paths = dotnetSlnCommandPart2.Select(x => $@"{modulePath}\{moduleName}." + x).ToArray();
CheckPathExist(paths); CheckPathExist(paths);
var cmdCommands = dotnetSlnCommandPart2.Select(x => dotnetSlnCommandPart1 + x+"\"").ToArray(); var cmdCommands = dotnetSlnCommandPart.Select(x => $"dotnet sln \"{slnPath}\" add \"{Path.Combine(modulePath, $"{moduleName}.{x}")}\"").ToArray();
StartCmd(cmdCommands); StartCmd(cmdCommands);
Console.WriteLine("恭喜~模块添加成功！"); Console.WriteLine("恭喜~模块添加成功！");
@@ -81,14 +81,23 @@ namespace Yi.Abp.Tool.Commands
{ {
ProcessStartInfo psi = new ProcessStartInfo ProcessStartInfo psi = new ProcessStartInfo
{ {
FileName = "cmd.exe",
Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}",
RedirectStandardInput = true, RedirectStandardInput = true,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = true, RedirectStandardError = true,
CreateNoWindow = true, CreateNoWindow = true,
UseShellExecute = false UseShellExecute = false
}; };
// 判断操作系统
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
psi.FileName = "cmd.exe";
psi.Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}";
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
psi.FileName = "/bin/bash";
psi.Arguments = $"-c \"{string.Join("; ", cmdCommands)}\"";
}
Process proc = new Process Process proc = new Process
{ {

14
Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.CommandLineUtils;
@@ -35,14 +36,23 @@ namespace Yi.Abp.Tool.Commands
{ {
ProcessStartInfo psi = new ProcessStartInfo ProcessStartInfo psi = new ProcessStartInfo
{ {
FileName = "cmd.exe",
Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}",
RedirectStandardInput = true, RedirectStandardInput = true,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = true, RedirectStandardError = true,
CreateNoWindow = true, CreateNoWindow = true,
UseShellExecute = false UseShellExecute = false
}; };
// 判断操作系统
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
psi.FileName = "cmd.exe";
psi.Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}";
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
psi.FileName = "/bin/bash";
psi.Arguments = $"-c \"{string.Join("; ", cmdCommands)}\"";
}
Process proc = new Process Process proc = new Process
{ {

2
Yi.Pure.Vue3/src/api/system/role.ts
View File

@@ -38,7 +38,7 @@ export const delRole = roleIds => {
/** 修改角色数据权限 */ /** 修改角色数据权限 */
export const updataDataScope = data => { export const updataDataScope = data => {
return http.request<Result>("put", `/role/data-scpoce`, { data }); return http.request<Result>("put", `/role/data-scope`, { data });
}; };
/** 根据角色ID查询菜单下拉树结构 */ /** 根据角色ID查询菜单下拉树结构 */

2
Yi.RuoYi.Vue3/src/api/system/role.js
View File

@@ -40,7 +40,7 @@ export function updateRole(data) {
// 角色数据权限 // 角色数据权限
export function dataScope(data) { export function dataScope(data) {
return request({ return request({
url: '/role/data-scpoce', url: '/role/data-scope',
method: 'put', method: 'put',
data: data data: data
}) })

45
Yi.RuoYi.Vue3/src/views/system/role/index.vue
View File

@@ -185,6 +185,7 @@ import {
listMenu, listMenu,
} from "@/api/system/menu"; } from "@/api/system/menu";
import {listDept, roleDeptTreeselect} from "@/api/system/dept"; import {listDept, roleDeptTreeselect} from "@/api/system/dept";
const router = useRouter(); const router = useRouter();
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
const {sys_normal_disable} = proxy.useDict("sys_normal_disable"); const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
@@ -219,8 +220,7 @@ const dataScopeOptions = ref([
]); ]);
const data = reactive({ const data = reactive({
form: { form: {},
},
queryParams: { queryParams: {
skipCount: 1, skipCount: 1,
maxResultCount: 10, maxResultCount: 10,
@@ -254,17 +254,20 @@ function getList() {
} }
); );
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
queryParams.value.skipCount = 1; queryParams.value.skipCount = 1;
getList(); getList();
} }
/** 重置按钮操作 */ /** 重置按钮操作 */
function resetQuery() { function resetQuery() {
dateRange.value = []; dateRange.value = [];
proxy.resetForm("queryRef"); proxy.resetForm("queryRef");
handleQuery(); handleQuery();
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const roleIds = row.id || ids.value; const roleIds = row.id || ids.value;
@@ -277,8 +280,10 @@ function handleDelete(row) {
getList(); getList();
proxy.$modal.msgSuccess("删除成功"); proxy.$modal.msgSuccess("删除成功");
}) })
.catch(() => { }); .catch(() => {
});
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download( proxy.download(
@@ -289,12 +294,14 @@ function handleExport() {
`role_${new Date().getTime()}.xlsx` `role_${new Date().getTime()}.xlsx`
); );
} }
/** 多选框选中数据 */ /** 多选框选中数据 */
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map((item) => item.id); ids.value = selection.map((item) => item.id);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
/** 角色状态修改 */ /** 角色状态修改 */
function handleStatusChange(row) { function handleStatusChange(row) {
let text = row.state === true ? "启用" : "停用"; let text = row.state === true ? "启用" : "停用";
@@ -310,6 +317,7 @@ function handleStatusChange(row) {
row.state = row.state === true ? false : true; row.state = row.state === true ? false : true;
}); });
} }
/** 更多操作 */ /** 更多操作 */
function handleCommand(command, row) { function handleCommand(command, row) {
switch (command) { switch (command) {
@@ -323,10 +331,12 @@ function handleCommand(command, row) {
break; break;
} }
} }
/** 分配用户 */ /** 分配用户 */
function handleAuthUser(row) { function handleAuthUser(row) {
router.push("/system/role-auth/user/" + row.id); router.push("/system/role-auth/user/" + row.id);
} }
/** 查询菜单树结构 */ /** 查询菜单树结构 */
function getMenuTreeselect() { function getMenuTreeselect() {
return listMenu().then((response) => { return listMenu().then((response) => {
@@ -354,6 +364,7 @@ function getDeptAllCheckedKeys() {
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys); checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys; return checkedKeys;
} }
/** 重置新增的表单以及其他数据 */ /** 重置新增的表单以及其他数据 */
function reset() { function reset() {
if (menuRef.value != undefined) { if (menuRef.value != undefined) {
@@ -379,6 +390,7 @@ function reset() {
}; };
proxy.resetForm("roleRef"); proxy.resetForm("roleRef");
} }
/** 添加角色 */ /** 添加角色 */
function handleAdd() { function handleAdd() {
reset(); reset();
@@ -386,6 +398,7 @@ function handleAdd() {
open.value = true; open.value = true;
title.value = "添加角色"; title.value = "添加角色";
} }
/** 修改角色 */ /** 修改角色 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset();
@@ -398,6 +411,7 @@ function handleAdd() {
title.value = "修改角色"; title.value = "修改角色";
}); });
} }
/** 根据角色ID查询菜单树结构 */ /** 根据角色ID查询菜单树结构 */
function getRoleMenuTreeselect(roleId) { function getRoleMenuTreeselect(roleId) {
//1：获取该角色下的全部菜单id //1：获取该角色下的全部菜单id
@@ -422,6 +436,7 @@ function handleAdd() {
} }
/** 根据角色ID查询部门树结构 */ /** 根据角色ID查询部门树结构 */
function getDeptTree(roleId) { function getDeptTree(roleId) {
return listDept().then((response) => { return listDept().then((response) => {
@@ -448,6 +463,7 @@ function getDeptTree(roleId) {
}); });
}); });
} }
/** 树权限（展开/折叠）*/ /** 树权限（展开/折叠）*/
function handleCheckedTreeExpand(value, type) { function handleCheckedTreeExpand(value, type) {
if (type == "menu") { if (type == "menu") {
@@ -462,6 +478,7 @@ function handleCheckedTreeExpand(value, type) {
} }
} }
} }
/** 树权限（全选/全不选） */ /** 树权限（全选/全不选） */
function handleCheckedTreeNodeAll(value, type) { function handleCheckedTreeNodeAll(value, type) {
if (type == "menu") { if (type == "menu") {
@@ -470,6 +487,7 @@ function handleCheckedTreeNodeAll(value, type) {
deptRef.value.setCheckedNodes(value ? deptOptions.value : []); deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
} }
} }
/** 树权限（父子联动） */ /** 树权限（父子联动） */
function handleCheckedTreeConnect(value, type) { function handleCheckedTreeConnect(value, type) {
if (type == "menu") { if (type == "menu") {
@@ -478,6 +496,7 @@ function handleCheckedTreeConnect(value, type) {
form.value.deptCheckStrictly = value ? true : false; form.value.deptCheckStrictly = value ? true : false;
} }
} }
/** 所有菜单节点数据 */ /** 所有菜单节点数据 */
function getMenuAllCheckedKeys() { function getMenuAllCheckedKeys() {
// 目前被选中的菜单节点 // 目前被选中的菜单节点
@@ -487,6 +506,7 @@ function getMenuAllCheckedKeys() {
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys); checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys; return checkedKeys;
} }
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["roleRef"].validate((valid) => { proxy.$refs["roleRef"].validate((valid) => {
@@ -509,27 +529,43 @@ function submitForm() {
} }
}); });
} }
/** 取消按钮 */ /** 取消按钮 */
function cancel() { function cancel() {
open.value = false; open.value = false;
reset(); reset();
} }
/** 选择角色权限范围触发 */ /** 选择角色权限范围触发 */
function dataScopeSelectChange(value) { function dataScopeSelectChange(value) {
if (value !== "2") { if (value !== "2") {
deptRef.value.setCheckedKeys([]); deptRef.value.setCheckedKeys([]);
} }
} }
// 判断返回值是否是数字
function isNumeric(value) {
return /^[+-]?\d+(\.\d+)?$/;
}
/** 分配数据权限操作 */ /** 分配数据权限操作 */
function handleDataScope(row) { function handleDataScope(row) {
reset(); reset();
getDeptTree(row.id); getDeptTree(row.id);
getRole(row.id).then((response) => { getRole(row.id).then((response) => {
form.value = response.data; if(response && response.data) {
let data = {...response.data};
if(isNumeric(data.dataScope)) {
let obj = dataScopeOptions.value[data.dataScope];
if(obj) {
data["dataScope"] = obj["value"];
}
form.value = {...data};
}
}
openDataScope.value = true; openDataScope.value = true;
title.value = "分配数据权限"; title.value = "分配数据权限";
}); });
} }
/** 提交按钮（数据权限） */ /** 提交按钮（数据权限） */
function submitDataScope() { function submitDataScope() {
if (form.value.id != undefined) { if (form.value.id != undefined) {
@@ -547,6 +583,7 @@ console.log(data)
}); });
} }
} }
/** 取消按钮（数据权限）*/ /** 取消按钮（数据权限）*/
function cancelDataScope() { function cancelDataScope() {
openDataScope.value = false; openDataScope.value = false;