gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
488 Commits 1 Branch 0 Tags 68 MiB
aa800074b8
Commit Graph

488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zuohuaijun
aa800074b8 😎代码优化 2024-08-15 14:49:31 +08:00
zuohuaijun
e614e11b76 😎1、增加国家地名库同步 2、增加根据区划生成组织架构 3、调整组织架构种子 4、默认不发异常邮件 5、修复在线用户连接异常 6、其他优化 2024-08-15 13:56:57 +08:00
zuohuaijun
79c5ddcb89 Merge pull request 'main' (#96) from 362270511/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/96
 2024-08-15 12:53:36 +08:00
362270511
64ef44d2d8 更新 Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs 
修改OrderId和OrderStatus字段类型改为string，这样兼容性更强
 2024-08-15 12:10:53 +08:00
362270511
cacd32b389 更新 Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs 
修改OrderId和OrderStatus字段类型改为string，这样兼容性更强
 2024-08-15 12:07:37 +08:00
362270511
cbb2082bde 更新 Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs 
修改OrderId和OrderStatus改为字符串，字符串兼容性更好
 2024-08-15 12:05:20 +08:00
362270511
6d1e8b12e5 更新 Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs 
修改OrderId和OrderStatus改为字符串，字符串兼容性更好
 2024-08-15 12:04:26 +08:00
zuohuaijun
b808d352c4 😎1、增加国家地名库同步 2、增加行政区域转组织架构 3、文件管理增加租户管理 2024-08-15 02:25:00 +08:00
zuohuaijun
882350c21f Merge pull request '更新 Admin.NET/Admin.NET.Web.Core/Handlers/JwtHandler.cs' (#95) from 362270511/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/95
 2024-08-14 17:24:28 +08:00
362270511
9249de0235 更新 Admin.NET/Admin.NET.Web.Core/Handlers/JwtHandler.cs 
Contains有个问题就是 如果我两个api的地址重复率比较高，就拿通知接口举例子，接口1是 sysNotice/page， 接口2是sysNotice/pageReceived 。黑名单中有一个sysNotice/page这个接口，用Contains方法sysNotice/page这块就重复了，我勾选了通知菜单，但是我访问sysNotice/pageReceived就提示没有权限。因为，Contains就匹配上了 sysNotice/page，所以不能用Contains，用EndsWith比较合适，匹配和path最后一致就行
 2024-08-14 15:44:51 +08:00
zuohuaijun
e070ca1eaa 😎暂时去掉fast-crud插件 2024-08-14 14:13:25 +08:00
zuohuaijun
eca5cf0c56 😎调整租户相关 2024-08-14 13:58:16 +08:00
zuohuaijun
312aa17914 😎升级.NET 6.0.33 2024-08-14 03:23:40 +08:00
zuohuaijun
c22289eed5 😎升级Furion v4.9.5.3 2024-08-14 03:09:49 +08:00
zuohuaijun
ae9e2870e0 😎1、增加接口名称翻译 2、去掉多余的匿名接口特性 2024-08-14 02:51:40 +08:00
zuohuaijun
8e81bad181 😎1、调整站内信接口 2、优化文件权限相关 2024-08-14 01:16:05 +08:00
zuohuaijun
b1fbd40745 Merge pull request 'main 文件管理功能，通过权限进行附件私有化和公开管理' (#94) from 362270511/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/94
 2024-08-14 00:58:36 +08:00
362270511
0daab05e70 更新 Web/src/views/system/file/component/editFile.vue 
文件管理功能添加是否公开附件功能
 2024-08-13 17:10:06 +08:00
362270511
62eee58b5a 更新 Web/src/views/system/file/index.vue 
文件管理功能添加是否公开附件功能
 2024-08-13 17:09:46 +08:00
362270511
3fb475c882 更新 Web/src/api-services/models/file-output.ts 
文件管理功能添加是否公开附件功能
 2024-08-13 17:09:16 +08:00
362270511
43be46338d 更新 Web/src/api-services/models/file-input.ts 
文件管理功能添加是否公开附件功能
 2024-08-13 17:08:49 +08:00
362270511
a78b0ef713 更新 Web/src/api-services/apis/sys-file-api.ts 
文件管理功能添加是否公开附件功能
 2024-08-13 17:08:14 +08:00
362270511
61b5bef016 更新 Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs 
文件管理功能添加是否公开附件功能
 2024-08-13 17:07:13 +08:00
362270511
b899c47e5c 更新 Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs 
文件管理功能添加是否公开附件功能
 2024-08-13 17:06:26 +08:00
362270511
9e04a15e9c 更新 Admin.NET/Admin.NET.Core/Entity/SysFile.cs 
添加是否公开字段，如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看
文件添加数据权限，用于进行私有附件处理
 2024-08-13 17:05:37 +08:00
zuohuaijun
ced6b45b4e 😎去掉unocss （样式冲突） 2024-08-13 13:31:19 +08:00
zuohuaijun
1973f6dbe2 😎优化角色管理，拆分菜单授权 2024-08-13 02:35:31 +08:00
zuohuaijun
5603e52553 😎恢复文件预览模式（暂定） 2024-08-13 01:27:00 +08:00
zuohuaijun
312c1e4101 Merge pull request '修复：文件预览路径错误' (#93) from coolcalf/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/93
 2024-08-13 00:58:24 +08:00
zuohuaijun
ce138fc6fa 😎增加清空缓存 2024-08-13 00:55:21 +08:00
zuohuaijun
78caebebb8 😎1、调整短线验证码 2、代码优化 2024-08-13 00:38:29 +08:00
zuohuaijun
949b23fb50 Merge branch 'main' of http://101.43.53.74:3000/Admin.NET/Admin.NET 2024-08-13 00:22:24 +08:00
zuohuaijun
30b3f27e07 😎调整按钮权限分配与接口黑名单模式 2024-08-13 00:22:16 +08:00
coolcalf
6587a22d8c 修复：文件预览路径错误 2024-08-12 21:14:38 +08:00
coolcalf
9f502434e5 Merge pull request 'Merge pull request '修改：文件预览' (#91) from coolcalf/Admin.NET.Pro:main into main' (#1) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/coolcalf/Admin.NET.Pro/pulls/1
 2024-08-12 20:31:24 +08:00
zuohuaijun
03692ee0ef Merge pull request '修改：文件预览' (#91) from coolcalf/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/91
 2024-08-12 12:16:14 +08:00
coolcalf
c686d8a376 修改：文件预览 2024-08-12 12:08:38 +08:00
zuohuaijun
10e0f65fb4 😎恢复机构缓存处理 2024-08-12 10:26:35 +08:00
zuohuaijun
1d35abaacb 😎代码优化 2024-08-12 02:49:51 +08:00
zuohuaijun
eb249a2ed1 Merge pull request 'main-d' (#90) from x4689221/Admin.NET.Pro:main-d into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/90
 2024-08-12 02:36:56 +08:00
zuohuaijun
24f33c4d40 😎调整用户接口权限模式（按钮权限+接口资源 互补） 2024-08-11 04:08:29 +08:00
zuohuaijun
ac4265296a 😎调整文件夹名称为小写打头 2024-08-11 00:10:46 +08:00
zuohuaijun
939f82eac3 😎调整文件夹名称为小写开头 2024-08-10 23:52:43 +08:00
zuohuaijun
b4248f7bed 😎1、优化首页布局 2、恢复按钮权限分配 2024-08-10 22:57:18 +08:00
yong
ff9cab2e7a 缓存部分做了更新 2024-08-10 16:26:14 +08:00
yong
c4df772888 ++ 2024-08-10 10:37:10 +08:00
zuohuaijun
5295f1cd7a 😎代码优化 2024-08-10 03:54:29 +08:00
zuohuaijun
d621527805 Merge pull request '开启单设备登陆情况下，单用户可以在PC、APP端同时登陆连接signlar，不被强制下线并可以接收消息' (#89) from zhao-fuck-sky/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/89
 2024-08-09 23:15:36 +08:00
zuohuaijun
7cbbfb9717 Merge pull request '集成unocss' (#88) from skywolf627/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/88
 2024-08-09 23:14:50 +08:00
zuohuaijun
2025edabee Merge pull request '✍️修复缓存列表显示不完整' (#87) from IMaster/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/87
 2024-08-09 19:09:04 +08:00