Compare commits
154 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 03d4b54e77 | |||
| c8896896ed | |||
| 17edb17de9 | |||
| 041f3eeda1 | |||
| 1650b8a127 | |||
| e99cb2aff9 | |||
| 4f6d465602 | |||
| fe19289b79 | |||
| e4d71a516d | |||
| c15abdc5bb | |||
| 4a5a7b96fc | |||
| 3f4f547338 | |||
| d01ead8283 | |||
| dc3249428a | |||
| 3e089351d5 | |||
| d9a930faf8 | |||
| 257ef9245c | |||
| e5a0f925a0 | |||
| 62ac7790e8 | |||
| f6aee1be0f | |||
| e62153289f | |||
| 94d0b7028f | |||
| a202595687 | |||
| 6f61176f13 | |||
| bb32c95e06 | |||
| fe31bf0579 | |||
| 51cc9fa80c | |||
| 541c0616bf | |||
| 0a03e27b0e | |||
| 798043a53a | |||
| fd0218a6fd | |||
| 2ff146664e | |||
| e62bdae538 | |||
| 60e8451048 | |||
| 83deb735d0 | |||
| 585f8f4e43 | |||
| 35efc11e56 | |||
| f89d137d9a | |||
| 24e20f64d7 | |||
| d5a7f0fca2 | |||
| 220b19d152 | |||
| 7d0fcd4906 | |||
| 9b6e053721 | |||
|
|
eef6661c92 | ||
| 7a7bf0e578 | |||
| d4956c94e0 | |||
| 20f09c8ea1 | |||
| e0a4a40314 | |||
| 6fed7ec752 | |||
| 4afda0fbde | |||
| a3b4608919 | |||
| 9155db4d9d | |||
| 72cc3c42fd | |||
| f50dfc8f19 | |||
| e82a172598 | |||
| c9e570f11d | |||
| 278e10d8fc | |||
| ddac448087 | |||
| a2de0bcbd1 | |||
| 13a4896828 | |||
| 6580516e81 | |||
| d827d56e49 | |||
| b0a4f46af3 | |||
| 7b8f1b0fcd | |||
| 52e7f93cc2 | |||
| 81ac00d1f1 | |||
| 9c81ce6f9f | |||
| ac4bb50b66 | |||
| 377c28c570 | |||
| 4d45a72243 | |||
| f3651f1432 | |||
| ce697588f5 | |||
| 93fe9e41b7 | |||
| 5815ca8594 | |||
| 44e21423cc | |||
| f7c91252cd | |||
| ef17a8bd79 | |||
| e5e1d6f50f | |||
| 7c47c09838 | |||
| b1678e2537 | |||
| 442a69f90d | |||
| f1fd53f72b | |||
| ae4ed8b3ef | |||
| 4e4a1d0dff | |||
| 098cfc135e | |||
| 0285eea352 | |||
| 725662693b | |||
| 9504c96f40 | |||
| d1e4704adc | |||
| 0b036e9d67 | |||
| 89846d9783 | |||
| 194eb89d31 | |||
| d622111f53 | |||
| c2a2b27afd | |||
| 4228bd5c32 | |||
| b24642e5c9 | |||
| 4eecc0b4ce | |||
| 01058ba728 | |||
| a6f6a8f0a3 | |||
| 4f12b5064d | |||
| 2acf88cad1 | |||
| 180119019c | |||
| f5203782aa | |||
| 4874a58eee | |||
| b4ca6d5626 | |||
| 63d7a3ed4a | |||
| ef2a0c3280 | |||
| c69655e353 | |||
| f0e1155ee8 | |||
| 03745ff767 | |||
| ee94d47551 | |||
| 155deedd15 | |||
| a0a04590c9 | |||
| c88c8d293d | |||
| 7501138e31 | |||
| cb75d19202 | |||
| e8a2d27c00 | |||
| 440c7ffcb9 | |||
| e8b568426b | |||
| 37b45c9f36 | |||
| 7ed30406c9 | |||
| 71bfdaafa8 | |||
| cec96390a5 | |||
| 0e412db6ce | |||
| 4d857f1861 | |||
| d74a7e13ef | |||
| 2f16efd291 | |||
| 81d9b0b3bb | |||
| ef2f0de095 | |||
| 6d87d8e9cd | |||
| 69dc407002 | |||
| 6c71c74a27 | |||
| 4e9f605ea2 | |||
| d28d7e9a18 | |||
| a6018edb87 | |||
| 841a4195e7 | |||
| 5e9b67bca8 | |||
| 76e5fdcd94 | |||
| c68f695555 | |||
| 587b22014d | |||
| 2f300285aa | |||
| 1743f4ff28 | |||
| 7fc5fca5d9 | |||
| d8dbb28cfc | |||
| 27aafacd54 | |||
| e6ce5afd99 | |||
| d1503a859b | |||
| 26e3698f57 | |||
| 3069b8fbc4 | |||
| 4d63bd6bf5 | |||
| f00046265a | |||
| 0848c8b7e5 | |||
| 8479f69bdc | |||
| a454f2ab2d |
1
.drone/workflows/README.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
drone workflows
|
||||||
@@ -18,6 +18,8 @@ indent_size = 2 # 对于 JSON 和 YAML 文件,缩进大小为 2 个空格
|
|||||||
|
|
||||||
[*.cs]
|
[*.cs]
|
||||||
dotnet_analyzer_diagnostic.severity = warning # 设置 C# 文件中所有 dotnet_analyzer_diagnostic 的严重性级别为 warning
|
dotnet_analyzer_diagnostic.severity = warning # 设置 C# 文件中所有 dotnet_analyzer_diagnostic 的严重性级别为 warning
|
||||||
|
[{*.g.cs,*.generated.cs}]
|
||||||
|
dotnet_analyzer_diagnostic.severity = none # 对于生成的文件,取消所有 dotnet_analyzer_diagnostic 的警告
|
||||||
|
|
||||||
# ReSharper properties
|
# ReSharper properties
|
||||||
resharper_align_linq_query = true # 启用对LINQ查询的对齐
|
resharper_align_linq_query = true # 启用对LINQ查询的对齐
|
||||||
|
|||||||
6
.github/workflows/nightly-build.yml
vendored
@@ -12,7 +12,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [ 22.x ]
|
node-version: [ 23.x ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
@@ -37,8 +37,8 @@ jobs:
|
|||||||
path: ~/.nuget/packages
|
path: ~/.nuget/packages
|
||||||
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
|
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
|
||||||
restore-keys: ${{ runner.os }}-nuget
|
restore-keys: ${{ runner.os }}-nuget
|
||||||
- working-directory: ./src/backend/NetAdmin.AdmServer.Host
|
- working-directory: ./src/backend/YourSolution.AdmServer.Host
|
||||||
run: dotnet publish NetAdmin.AdmServer.Host.csproj -c Release
|
run: dotnet publish YourSolution.AdmServer.Host.csproj -c Release
|
||||||
- run: docker build -t nsnail/netadmin:nightly .
|
- run: docker build -t nsnail/netadmin:nightly .
|
||||||
- uses: docker/login-action@v3
|
- uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
|
|||||||
6
.github/workflows/release.yml
vendored
@@ -12,7 +12,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [ 22.x ]
|
node-version: [ 23.x ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
@@ -37,8 +37,8 @@ jobs:
|
|||||||
path: ~/.nuget/packages
|
path: ~/.nuget/packages
|
||||||
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
|
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
|
||||||
restore-keys: ${{ runner.os }}-nuget
|
restore-keys: ${{ runner.os }}-nuget
|
||||||
- working-directory: ./src/backend/NetAdmin.AdmServer.Host
|
- working-directory: ./src/backend/YourSolution.AdmServer.Host
|
||||||
run: dotnet publish NetAdmin.AdmServer.Host.csproj -c Release
|
run: dotnet publish YourSolution.AdmServer.Host.csproj -c Release
|
||||||
- uses: actions/create-release@v1
|
- uses: actions/create-release@v1
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
1
.gitignore
vendored
@@ -397,7 +397,6 @@ FodyWeavers.xsd
|
|||||||
# JetBrains Rider
|
# JetBrains Rider
|
||||||
*.sln.iml
|
*.sln.iml
|
||||||
.idea/
|
.idea/
|
||||||
!src/backend/CloudCode.DataGrip/.idea
|
|
||||||
|
|
||||||
# User Define
|
# User Define
|
||||||
dist/
|
dist/
|
||||||
|
|||||||
6
.gitmodules
vendored
@@ -4,6 +4,6 @@
|
|||||||
[submodule "refs/ns-ext"]
|
[submodule "refs/ns-ext"]
|
||||||
path = refs/ns-ext
|
path = refs/ns-ext
|
||||||
url = https://github.com/nsnail/ns-ext.git
|
url = https://github.com/nsnail/ns-ext.git
|
||||||
[submodule "refs/FreeSql"]
|
[submodule "refs/NetAdmin.FreeSql"]
|
||||||
path = refs/FreeSql
|
path = refs/NetAdmin.FreeSql
|
||||||
url = https://github.com/nsnail/FreeSql.git
|
url = https://github.com/nsnail/NetAdmin.FreeSql.git
|
||||||
367
CHANGELOG.md
@@ -1,128 +1,363 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
All notable changes to this project will be documented in this file.
|
||||||
|
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||||
|
|
||||||
|
## [2.4.0](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.4.0) (2025-07-02)
|
||||||
|
|
||||||
|
### ⚠ BREAKING CHANGES
|
||||||
|
|
||||||
|
* [skip ci]
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨ 表格操作栏按钮下拉菜单 ([51cc9fa](https://github.com/nsnail/NetAdmin/commit/51cc9fa80ca296fa6c320d0a47ed51ee0aaef1ce))
|
||||||
|
* ✨ 表格右键菜单增加排序功能 ([a202595](https://github.com/nsnail/NetAdmin/commit/a2025956878d4e8fb935659f4db0adee02cd8071))
|
||||||
|
* ✨ 财务管理 ([94d0b70](https://github.com/nsnail/NetAdmin/commit/94d0b7028f8a0d31af67b435f5ed14f7eb2de0b4))
|
||||||
|
* ✨
|
||||||
|
菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
|
||||||
|
* ✨ 分组统计功能 ([0b036e9](https://github.com/nsnail/NetAdmin/commit/0b036e9d67ffdf7a07c772606009f02744e6a3c3))
|
||||||
|
* ✨ 框架代码同步 ([098cfc1](https://github.com/nsnail/NetAdmin/commit/098cfc135e781a0cf172cd1289e5e871c7a76419))
|
||||||
|
* ✨ 框架代码同步 ([7256626](https://github.com/nsnail/NetAdmin/commit/725662693b7b47f6fae4c1917dd8d80220c7640a))
|
||||||
|
* ✨
|
||||||
|
文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
|
||||||
|
* ✨ 移动国家代码 ([2ff1466](https://github.com/nsnail/NetAdmin/commit/2ff146664e539c395d98530856783f33d3bbd6f2))
|
||||||
|
* ✨ 营销管理 ([62ac779](https://github.com/nsnail/NetAdmin/commit/62ac7790e80408c9194a71b032f7597c5d8c16cf))
|
||||||
|
* ✨ 营销管理-返佣比率 ([e5a0f92](https://github.com/nsnail/NetAdmin/commit/e5a0f925a0650a263b79de0e5793b8db2348a7ae))
|
||||||
|
* ✨ 自助充值 ([e621532](https://github.com/nsnail/NetAdmin/commit/e62153289fd13c5588518a5ee7cfc05c799df6b9))
|
||||||
|
* ✨ 作业增加请求地址显示查询 ([585f8f4](https://github.com/nsnail/NetAdmin/commit/585f8f4e43ae7fe0c9c387cc41f629f4f279740a))
|
||||||
|
* ✨ select-filter badge
|
||||||
|
icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 🐛
|
||||||
|
按钮文字提示 ([#227](https://github.com/nsnail/NetAdmin/issues/227)) ([c88c8d2](https://github.com/nsnail/NetAdmin/commit/c88c8d293d44f2707f3b5232e6a40a141af9981c))
|
||||||
|
* 🐛 初次访问时前端js错误 ([9b6e053](https://github.com/nsnail/NetAdmin/commit/9b6e053721c95cf5fbdfa11112892a51e047af59))
|
||||||
|
* 🐛 档案管理空列表loading状态 ([ac4bb50](https://github.com/nsnail/NetAdmin/commit/ac4bb50b66034f9841ba2398a168ed746c673aea))
|
||||||
|
* 🐛
|
||||||
|
导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
|
||||||
|
* 🐛
|
||||||
|
导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
|
||||||
|
* 🐛 个性主题色冲突 ([4e4a1d0](https://github.com/nsnail/NetAdmin/commit/4e4a1d0dff7f3698e9a9cfcf46368260cfd70cbd))
|
||||||
|
* 🐛 前端警告 ([9c81ce6](https://github.com/nsnail/NetAdmin/commit/9c81ce6f9fe9573c33a99eb86fcf727ed0cbf9f0))
|
||||||
|
* 🐛
|
||||||
|
请求日志批量插入,漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
|
||||||
|
* 🐛 文件下载编码匹配 ([541c061](https://github.com/nsnail/NetAdmin/commit/541c0616bf5d405a62eac0c5eb967f0ddd4c5139))
|
||||||
|
* 🐛 修复一些样式问题 ([442a69f](https://github.com/nsnail/NetAdmin/commit/442a69f90de179539f78c01d967572f83bd2eff8))
|
||||||
|
* 🐛 样式问题 ([377c28c](https://github.com/nsnail/NetAdmin/commit/377c28c57049d453108f9da41b168e1fdb64d7e1))
|
||||||
|
* 🐛
|
||||||
|
用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
|
||||||
|
* 🐛 种子数据 ([f6aee1b](https://github.com/nsnail/NetAdmin/commit/f6aee1be0f05113cf1b798e23a176c02686348b5))
|
||||||
|
* 🐛 build err ([60e8451](https://github.com/nsnail/NetAdmin/commit/60e8451048a42cfa47d7c82b038eb8db7e017697))
|
||||||
|
* 🐛 build error ([278e10d](https://github.com/nsnail/NetAdmin/commit/278e10d8fc750eeb0933a86b64d69f5cc7e0b1cb))
|
||||||
|
* 🐛 editUser ([ef2a0c3](https://github.com/nsnail/NetAdmin/commit/ef2a0c3280532ac24889279e4780a1b1a2561a6b))
|
||||||
|
* 🐛
|
||||||
|
idd ([#208](https://github.com/nsnail/NetAdmin/issues/208)) ([4e9f605](https://github.com/nsnail/NetAdmin/commit/4e9f605ea2cc6fe394068cfea5638e51920b9096))
|
||||||
|
* 🐛 scTable dataChanged ([52e7f93](https://github.com/nsnail/NetAdmin/commit/52e7f93cc2de967a7a90448813b4c1030996d170))
|
||||||
|
* 🐛 version 条件重复指定 ([01058ba](https://github.com/nsnail/NetAdmin/commit/01058ba7288bcc645f66de2f78e1d659d55333cf))
|
||||||
|
* 🐛 version lock ([4eecc0b](https://github.com/nsnail/NetAdmin/commit/4eecc0b4ce09f620f83109949e4c2b67b7f8ba90))
|
||||||
|
* 🐛 vue3-json-viewer 升级出现问题 ([0a03e27](https://github.com/nsnail/NetAdmin/commit/0a03e27b0e7a62de0d836de2dea061adc392cf0f))
|
||||||
|
* flowchart显示问题 ([eef6661](https://github.com/nsnail/NetAdmin/commit/eef6661c9233c88b3447cc94b44c025b7b87ff8a))
|
||||||
|
|
||||||
|
### [2.3.1](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.3.1) (2024-12-13)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨
|
||||||
|
菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
|
||||||
|
* ✨ 分组统计功能 ([0b036e9](https://github.com/nsnail/NetAdmin/commit/0b036e9d67ffdf7a07c772606009f02744e6a3c3))
|
||||||
|
* ✨ 框架代码同步 ([098cfc1](https://github.com/nsnail/NetAdmin/commit/098cfc135e781a0cf172cd1289e5e871c7a76419))
|
||||||
|
* ✨ 框架代码同步 ([7256626](https://github.com/nsnail/NetAdmin/commit/725662693b7b47f6fae4c1917dd8d80220c7640a))
|
||||||
|
* ✨
|
||||||
|
文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
|
||||||
|
* ✨ select-filter badge
|
||||||
|
icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 🐛
|
||||||
|
按钮文字提示 ([#227](https://github.com/nsnail/NetAdmin/issues/227)) ([c88c8d2](https://github.com/nsnail/NetAdmin/commit/c88c8d293d44f2707f3b5232e6a40a141af9981c))
|
||||||
|
* 🐛
|
||||||
|
导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
|
||||||
|
* 🐛
|
||||||
|
导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
|
||||||
|
* 🐛 个性主题色冲突 ([4e4a1d0](https://github.com/nsnail/NetAdmin/commit/4e4a1d0dff7f3698e9a9cfcf46368260cfd70cbd))
|
||||||
|
* 🐛
|
||||||
|
请求日志批量插入,漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
|
||||||
|
* 🐛 修复一些样式问题 ([442a69f](https://github.com/nsnail/NetAdmin/commit/442a69f90de179539f78c01d967572f83bd2eff8))
|
||||||
|
* 🐛
|
||||||
|
用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
|
||||||
|
* 🐛 editUser ([ef2a0c3](https://github.com/nsnail/NetAdmin/commit/ef2a0c3280532ac24889279e4780a1b1a2561a6b))
|
||||||
|
* 🐛
|
||||||
|
idd ([#208](https://github.com/nsnail/NetAdmin/issues/208)) ([4e9f605](https://github.com/nsnail/NetAdmin/commit/4e9f605ea2cc6fe394068cfea5638e51920b9096))
|
||||||
|
* 🐛 version 条件重复指定 ([01058ba](https://github.com/nsnail/NetAdmin/commit/01058ba7288bcc645f66de2f78e1d659d55333cf))
|
||||||
|
* 🐛 version lock ([4eecc0b](https://github.com/nsnail/NetAdmin/commit/4eecc0b4ce09f620f83109949e4c2b67b7f8ba90))
|
||||||
|
|
||||||
|
## [2.3.0](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.3.0) (2024-12-12)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨
|
||||||
|
菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
|
||||||
|
* ✨ 分组统计功能 ([0b036e9](https://github.com/nsnail/NetAdmin/commit/0b036e9d67ffdf7a07c772606009f02744e6a3c3))
|
||||||
|
* ✨ 框架代码同步 ([098cfc1](https://github.com/nsnail/NetAdmin/commit/098cfc135e781a0cf172cd1289e5e871c7a76419))
|
||||||
|
* ✨ 框架代码同步 ([7256626](https://github.com/nsnail/NetAdmin/commit/725662693b7b47f6fae4c1917dd8d80220c7640a))
|
||||||
|
* ✨
|
||||||
|
文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
|
||||||
|
* ✨ select-filter badge
|
||||||
|
icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 🐛
|
||||||
|
按钮文字提示 ([#227](https://github.com/nsnail/NetAdmin/issues/227)) ([c88c8d2](https://github.com/nsnail/NetAdmin/commit/c88c8d293d44f2707f3b5232e6a40a141af9981c))
|
||||||
|
* 🐛
|
||||||
|
导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
|
||||||
|
* 🐛
|
||||||
|
导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
|
||||||
|
* 🐛 个性主题色冲突 ([4e4a1d0](https://github.com/nsnail/NetAdmin/commit/4e4a1d0dff7f3698e9a9cfcf46368260cfd70cbd))
|
||||||
|
* 🐛
|
||||||
|
请求日志批量插入,漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
|
||||||
|
* 🐛
|
||||||
|
用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
|
||||||
|
* 🐛 editUser ([ef2a0c3](https://github.com/nsnail/NetAdmin/commit/ef2a0c3280532ac24889279e4780a1b1a2561a6b))
|
||||||
|
* 🐛
|
||||||
|
idd ([#208](https://github.com/nsnail/NetAdmin/issues/208)) ([4e9f605](https://github.com/nsnail/NetAdmin/commit/4e9f605ea2cc6fe394068cfea5638e51920b9096))
|
||||||
|
* 🐛 version 条件重复指定 ([01058ba](https://github.com/nsnail/NetAdmin/commit/01058ba7288bcc645f66de2f78e1d659d55333cf))
|
||||||
|
* 🐛 version lock ([4eecc0b](https://github.com/nsnail/NetAdmin/commit/4eecc0b4ce09f620f83109949e4c2b67b7f8ba90))
|
||||||
|
|
||||||
|
### [2.2.1](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.2.1) (2024-12-04)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨
|
||||||
|
菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
|
||||||
|
* ✨
|
||||||
|
文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
|
||||||
|
* ✨ select-filter badge
|
||||||
|
icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 🐛
|
||||||
|
按钮文字提示 ([#227](https://github.com/nsnail/NetAdmin/issues/227)) ([c88c8d2](https://github.com/nsnail/NetAdmin/commit/c88c8d293d44f2707f3b5232e6a40a141af9981c))
|
||||||
|
* 🐛
|
||||||
|
导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
|
||||||
|
* 🐛
|
||||||
|
导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
|
||||||
|
* 🐛
|
||||||
|
请求日志批量插入,漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
|
||||||
|
* 🐛
|
||||||
|
用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
|
||||||
|
* 🐛 editUser ([ef2a0c3](https://github.com/nsnail/NetAdmin/commit/ef2a0c3280532ac24889279e4780a1b1a2561a6b))
|
||||||
|
* 🐛
|
||||||
|
idd ([#208](https://github.com/nsnail/NetAdmin/issues/208)) ([4e9f605](https://github.com/nsnail/NetAdmin/commit/4e9f605ea2cc6fe394068cfea5638e51920b9096))
|
||||||
|
* 🐛 version 条件重复指定 ([01058ba](https://github.com/nsnail/NetAdmin/commit/01058ba7288bcc645f66de2f78e1d659d55333cf))
|
||||||
|
* 🐛 version lock ([4eecc0b](https://github.com/nsnail/NetAdmin/commit/4eecc0b4ce09f620f83109949e4c2b67b7f8ba90))
|
||||||
|
|
||||||
|
## [2.2.0](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.2.0) (2024-11-27)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨
|
||||||
|
菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
|
||||||
|
* ✨
|
||||||
|
文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
|
||||||
|
* ✨ select-filter badge
|
||||||
|
icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 🐛
|
||||||
|
导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
|
||||||
|
* 🐛
|
||||||
|
导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
|
||||||
|
* 🐛
|
||||||
|
请求日志批量插入,漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
|
||||||
|
* 🐛
|
||||||
|
用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
|
||||||
|
* 🐛
|
||||||
|
idd ([#208](https://github.com/nsnail/NetAdmin/issues/208)) ([4e9f605](https://github.com/nsnail/NetAdmin/commit/4e9f605ea2cc6fe394068cfea5638e51920b9096))
|
||||||
|
|
||||||
|
## [2.1.0](https://github.com/nsnail/NetAdmin/compare/v2.0.0...v2.1.0) (2024-11-15)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨
|
||||||
|
首页仪表板自定义布局 ([#201](https://github.com/nsnail/NetAdmin/issues/201)) ([2f30028](https://github.com/nsnail/NetAdmin/commit/2f300285aa2afbfaea1fd9ffe299cc2badf98e0f))
|
||||||
|
* ✨
|
||||||
|
用户选择器 ([#189](https://github.com/nsnail/NetAdmin/issues/189)) ([8479f69](https://github.com/nsnail/NetAdmin/commit/8479f69bdccac93a497e039dd01e18333ec2bbdc))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 🐛 --el-color-primary
|
||||||
|
变量有闪烁现象 ([#194](https://github.com/nsnail/NetAdmin/issues/194)) ([26e3698](https://github.com/nsnail/NetAdmin/commit/26e3698f57a2986f3b727fa38f293ca40c89f3ab))
|
||||||
|
* 🐛
|
||||||
|
404 ([#198](https://github.com/nsnail/NetAdmin/issues/198)) ([d8dbb28](https://github.com/nsnail/NetAdmin/commit/d8dbb28cfc8ad427062eb8d81be67cc25ded6fb6))
|
||||||
|
* 🐛 module
|
||||||
|
name ([#193](https://github.com/nsnail/NetAdmin/issues/193)) ([3069b8f](https://github.com/nsnail/NetAdmin/commit/3069b8fbc451c4c257becf0523ab6ea6cc9af7e2))
|
||||||
|
|
||||||
## [2.0.0](https://github.com/nsnail/NetAdmin/compare/v1.6.0...v2.0.0) (2024-11-04)
|
## [2.0.0](https://github.com/nsnail/NetAdmin/compare/v1.6.0...v2.0.0) (2024-11-04)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 查询过滤器保存 ([779d8e5](https://github.com/nsnail/NetAdmin/commit/779d8e511a84d2be91d74ea308c22b969d6963f3))
|
* ✨ 查询过滤器保存 ([779d8e5](https://github.com/nsnail/NetAdmin/commit/779d8e511a84d2be91d74ea308c22b969d6963f3))
|
||||||
* ✨ 框架代码同步 ([#173](https://github.com/nsnail/NetAdmin/issues/173)) ([c088492](https://github.com/nsnail/NetAdmin/commit/c088492cfabada198ad563e43278ab7e869029bc))
|
* ✨
|
||||||
* ✨ 框架代码同步 ([#178](https://github.com/nsnail/NetAdmin/issues/178)) ([58e4572](https://github.com/nsnail/NetAdmin/commit/58e4572723ba68700fb6414167cb27b03c864db1))
|
框架代码同步 ([#173](https://github.com/nsnail/NetAdmin/issues/173)) ([c088492](https://github.com/nsnail/NetAdmin/commit/c088492cfabada198ad563e43278ab7e869029bc))
|
||||||
|
* ✨
|
||||||
|
框架代码同步 ([#178](https://github.com/nsnail/NetAdmin/issues/178)) ([58e4572](https://github.com/nsnail/NetAdmin/commit/58e4572723ba68700fb6414167cb27b03c864db1))
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* 🐛 public const int SECS_CACHE_LOGIN_BY_USER_ID = 3600 * 24 * 30; // 秒:缓存时间-通过用户编号登录的用户信息 ([#179](https://github.com/nsnail/NetAdmin/issues/179)) ([000e3d6](https://github.com/nsnail/NetAdmin/commit/000e3d68a85eaee7758b4160d1d0ffa52aa4aae0))
|
* 🐛 public const int SECS_CACHE_LOGIN_BY_USER_ID = 3600 * 24 * 30;
|
||||||
|
秒:缓存时间-通过用户编号登录的用户信息 ([#179](https://github.com/nsnail/NetAdmin/issues/179)) ([000e3d6](https://github.com/nsnail/NetAdmin/commit/000e3d68a85eaee7758b4160d1d0ffa52aa4aae0))
|
||||||
|
|
||||||
## [1.6.0](https://github.com/nsnail/NetAdmin/compare/v1.5.0...v1.6.0) (2024-08-12)
|
## [1.6.0](https://github.com/nsnail/NetAdmin/compare/v1.5.0...v1.6.0) (2024-08-12)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 移除RedLocker,更改为自实现 ([#169](https://github.com/nsnail/NetAdmin/issues/169)) ([cd8ed67](https://github.com/nsnail/NetAdmin/commit/cd8ed674e0615b33fc0e025b9412c2f16d252f0f))
|
* ✨
|
||||||
|
移除RedLocker,更改为自实现 ([#169](https://github.com/nsnail/NetAdmin/issues/169)) ([cd8ed67](https://github.com/nsnail/NetAdmin/commit/cd8ed674e0615b33fc0e025b9412c2f16d252f0f))
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* 🐛 站内信角标颜色 ([#167](https://github.com/nsnail/NetAdmin/issues/167)) ([e00c30c](https://github.com/nsnail/NetAdmin/commit/e00c30c96123769d8a9e6f30cc9a2c3e8099e34c))
|
* 🐛
|
||||||
* 🐛 ip归属地查询接口地址更新 ([#168](https://github.com/nsnail/NetAdmin/issues/168)) ([4733ade](https://github.com/nsnail/NetAdmin/commit/4733adede5e8993f741e9b94541aafeb6a733859))
|
站内信角标颜色 ([#167](https://github.com/nsnail/NetAdmin/issues/167)) ([e00c30c](https://github.com/nsnail/NetAdmin/commit/e00c30c96123769d8a9e6f30cc9a2c3e8099e34c))
|
||||||
* 🐛 ip显示问题 ([#166](https://github.com/nsnail/NetAdmin/issues/166)) ([6b63250](https://github.com/nsnail/NetAdmin/commit/6b6325003924b1605b610f759b2131c15013ffa0))
|
* 🐛
|
||||||
* 🐛 trimSuffix ([#163](https://github.com/nsnail/NetAdmin/issues/163)) ([7c56c8d](https://github.com/nsnail/NetAdmin/commit/7c56c8d571d4f29fcb20f238893dbf61e5e538f0))
|
ip归属地查询接口地址更新 ([#168](https://github.com/nsnail/NetAdmin/issues/168)) ([4733ade](https://github.com/nsnail/NetAdmin/commit/4733adede5e8993f741e9b94541aafeb6a733859))
|
||||||
|
* 🐛
|
||||||
|
ip显示问题 ([#166](https://github.com/nsnail/NetAdmin/issues/166)) ([6b63250](https://github.com/nsnail/NetAdmin/commit/6b6325003924b1605b610f759b2131c15013ffa0))
|
||||||
|
* 🐛
|
||||||
|
trimSuffix ([#163](https://github.com/nsnail/NetAdmin/issues/163)) ([7c56c8d](https://github.com/nsnail/NetAdmin/commit/7c56c8d571d4f29fcb20f238893dbf61e5e538f0))
|
||||||
|
|
||||||
## [1.5.0](https://github.com/nsnail/NetAdmin/compare/v1.4.0...v1.5.0) (2024-07-26)
|
## [1.5.0](https://github.com/nsnail/NetAdmin/compare/v1.4.0...v1.5.0) (2024-07-26)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 登录日志独立存储 ([#161](https://github.com/nsnail/NetAdmin/issues/161)) ([faaf5aa](https://github.com/nsnail/NetAdmin/commit/faaf5aa0fc5299633ca4f384d6287171bb241ff4))
|
* ✨
|
||||||
* ✨ 框架代码同步 ([#158](https://github.com/nsnail/NetAdmin/issues/158)) ([1a28e8d](https://github.com/nsnail/NetAdmin/commit/1a28e8d5a62aeab7e4fda5049b4f733a16480b67))
|
登录日志独立存储 ([#161](https://github.com/nsnail/NetAdmin/issues/161)) ([faaf5aa](https://github.com/nsnail/NetAdmin/commit/faaf5aa0fc5299633ca4f384d6287171bb241ff4))
|
||||||
* ✨ 请求日志增加TraceId ([#154](https://github.com/nsnail/NetAdmin/issues/154)) ([aaea283](https://github.com/nsnail/NetAdmin/commit/aaea28389a56566e055b6651cf48a89194a72cb7))
|
* ✨
|
||||||
* ✨ cron表达式的自然语言表达 ([#156](https://github.com/nsnail/NetAdmin/issues/156)) ([6d4ccf3](https://github.com/nsnail/NetAdmin/commit/6d4ccf344595e128a445f1cb7596a7a1c28fd4cd))
|
框架代码同步 ([#158](https://github.com/nsnail/NetAdmin/issues/158)) ([1a28e8d](https://github.com/nsnail/NetAdmin/commit/1a28e8d5a62aeab7e4fda5049b4f733a16480b67))
|
||||||
* ✨ logoBar显示程序版本号 ([#153](https://github.com/nsnail/NetAdmin/issues/153)) ([be5b9a1](https://github.com/nsnail/NetAdmin/commit/be5b9a160d1f06cfdf36cea4e5eb95908523fed2))
|
* ✨
|
||||||
|
请求日志增加TraceId ([#154](https://github.com/nsnail/NetAdmin/issues/154)) ([aaea283](https://github.com/nsnail/NetAdmin/commit/aaea28389a56566e055b6651cf48a89194a72cb7))
|
||||||
|
* ✨
|
||||||
|
cron表达式的自然语言表达 ([#156](https://github.com/nsnail/NetAdmin/issues/156)) ([6d4ccf3](https://github.com/nsnail/NetAdmin/commit/6d4ccf344595e128a445f1cb7596a7a1c28fd4cd))
|
||||||
|
* ✨
|
||||||
|
logoBar显示程序版本号 ([#153](https://github.com/nsnail/NetAdmin/issues/153)) ([be5b9a1](https://github.com/nsnail/NetAdmin/commit/be5b9a160d1f06cfdf36cea4e5eb95908523fed2))
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* 🐛 error CS0117: 'Numbers' does not contain a definition for 'SECS_CACHE_DIC_CATALOG_CODE' ([#155](https://github.com/nsnail/NetAdmin/issues/155)) ([1733802](https://github.com/nsnail/NetAdmin/commit/1733802e02b7e69e4c8646f259da5098b87888f7))
|
* 🐛 error CS0117: 'Numbers' does not contain a definition for '
|
||||||
|
SECS_CACHE_DIC_CATALOG_CODE' ([#155](https://github.com/nsnail/NetAdmin/issues/155)) ([1733802](https://github.com/nsnail/NetAdmin/commit/1733802e02b7e69e4c8646f259da5098b87888f7))
|
||||||
|
|
||||||
## [1.4.0](https://github.com/nsnail/NetAdmin/compare/v1.3.0...v1.4.0) (2024-07-03)
|
## [1.4.0](https://github.com/nsnail/NetAdmin/compare/v1.3.0...v1.4.0) (2024-07-03)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 框架代码同步 ([#150](https://github.com/nsnail/NetAdmin/issues/150)) ([e1b0030](https://github.com/nsnail/NetAdmin/commit/e1b0030193556fa0564ea059657b4b43c98085c2))
|
* ✨
|
||||||
|
框架代码同步 ([#150](https://github.com/nsnail/NetAdmin/issues/150)) ([e1b0030](https://github.com/nsnail/NetAdmin/commit/e1b0030193556fa0564ea059657b4b43c98085c2))
|
||||||
|
|
||||||
## [1.3.0](https://github.com/nsnail/NetAdmin/compare/v1.2.0...v1.3.0) (2024-06-24)
|
## [1.3.0](https://github.com/nsnail/NetAdmin/compare/v1.2.0...v1.3.0) (2024-06-24)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 补充多语种文件 ([#146](https://github.com/nsnail/NetAdmin/issues/146)) ([1442e0a](https://github.com/nsnail/NetAdmin/commit/1442e0a37cb2f27d8ba7b77bed91feaa5d7b1fdd))
|
* ✨
|
||||||
* ✨ 更新实体增加sql过滤参数 ([#140](https://github.com/nsnail/NetAdmin/issues/140)) ([a3ab970](https://github.com/nsnail/NetAdmin/commit/a3ab97019dd1fc2267db987ade80fa6749e24e4d))
|
补充多语种文件 ([#146](https://github.com/nsnail/NetAdmin/issues/146)) ([1442e0a](https://github.com/nsnail/NetAdmin/commit/1442e0a37cb2f27d8ba7b77bed91feaa5d7b1fdd))
|
||||||
* ✨ 框架代码同步 ([#139](https://github.com/nsnail/NetAdmin/issues/139)) ([608a1de](https://github.com/nsnail/NetAdmin/commit/608a1ded5c0e9987161444efd48597a687c693e1))
|
* ✨
|
||||||
* ✨ 框架代码同步 ([#144](https://github.com/nsnail/NetAdmin/issues/144)) ([ae2d1c4](https://github.com/nsnail/NetAdmin/commit/ae2d1c4932bf1229ea36d28d486beaee8de16d53))
|
更新实体增加sql过滤参数 ([#140](https://github.com/nsnail/NetAdmin/issues/140)) ([a3ab970](https://github.com/nsnail/NetAdmin/commit/a3ab97019dd1fc2267db987ade80fa6749e24e4d))
|
||||||
* ✨ 框架代码同步 ([#148](https://github.com/nsnail/NetAdmin/issues/148)) ([8bc8aa9](https://github.com/nsnail/NetAdmin/commit/8bc8aa960cdd1ed5036927bd508fce4c218618c7))
|
* ✨
|
||||||
* ✨ 前端版本更新器 ([#145](https://github.com/nsnail/NetAdmin/issues/145)) ([6100e9e](https://github.com/nsnail/NetAdmin/commit/6100e9e9c88005d6a2f3c2706ca750a6ad62d2c7))
|
框架代码同步 ([#139](https://github.com/nsnail/NetAdmin/issues/139)) ([608a1de](https://github.com/nsnail/NetAdmin/commit/608a1ded5c0e9987161444efd48597a687c693e1))
|
||||||
|
* ✨
|
||||||
|
框架代码同步 ([#144](https://github.com/nsnail/NetAdmin/issues/144)) ([ae2d1c4](https://github.com/nsnail/NetAdmin/commit/ae2d1c4932bf1229ea36d28d486beaee8de16d53))
|
||||||
|
* ✨
|
||||||
|
框架代码同步 ([#148](https://github.com/nsnail/NetAdmin/issues/148)) ([8bc8aa9](https://github.com/nsnail/NetAdmin/commit/8bc8aa960cdd1ed5036927bd508fce4c218618c7))
|
||||||
|
* ✨
|
||||||
|
前端版本更新器 ([#145](https://github.com/nsnail/NetAdmin/issues/145)) ([6100e9e](https://github.com/nsnail/NetAdmin/commit/6100e9e9c88005d6a2f3c2706ca750a6ad62d2c7))
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* 🐛 补充多语种文件 ([#147](https://github.com/nsnail/NetAdmin/issues/147)) ([d00f0d2](https://github.com/nsnail/NetAdmin/commit/d00f0d2d9cc2243908a8b6979b9c4a5811b2a57e))
|
* 🐛
|
||||||
* 🐛 操作日志不显示userName ([#141](https://github.com/nsnail/NetAdmin/issues/141)) ([705d027](https://github.com/nsnail/NetAdmin/commit/705d027da44af159d29db9c93e47b549317c793e))
|
补充多语种文件 ([#147](https://github.com/nsnail/NetAdmin/issues/147)) ([d00f0d2](https://github.com/nsnail/NetAdmin/commit/d00f0d2d9cc2243908a8b6979b9c4a5811b2a57e))
|
||||||
|
* 🐛
|
||||||
|
操作日志不显示userName ([#141](https://github.com/nsnail/NetAdmin/issues/141)) ([705d027](https://github.com/nsnail/NetAdmin/commit/705d027da44af159d29db9c93e47b549317c793e))
|
||||||
|
|
||||||
## [1.2.0](https://github.com/nsnail/NetAdmin/compare/v1.1.1...v1.2.0) (2024-06-06)
|
## [1.2.0](https://github.com/nsnail/NetAdmin/compare/v1.1.1...v1.2.0) (2024-06-06)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 计划作业-上次执行耗时 ([#133](https://github.com/nsnail/NetAdmin/issues/133)) ([57b71e1](https://github.com/nsnail/NetAdmin/commit/57b71e1354ab8b0be995b5f563dd8c3fb7965d5f))
|
* ✨
|
||||||
* ✨ 框架代码同步 ([#129](https://github.com/nsnail/NetAdmin/issues/129)) ([b01b8b2](https://github.com/nsnail/NetAdmin/commit/b01b8b24ba574c08ba5605e103ff2ccf15e5830a))
|
计划作业-上次执行耗时 ([#133](https://github.com/nsnail/NetAdmin/issues/133)) ([57b71e1](https://github.com/nsnail/NetAdmin/commit/57b71e1354ab8b0be995b5f563dd8c3fb7965d5f))
|
||||||
* ✨ 框架代码同步 ([#130](https://github.com/nsnail/NetAdmin/issues/130)) ([5edcf63](https://github.com/nsnail/NetAdmin/commit/5edcf63e24f6b13f5515e01ee8cf120b1a814d40))
|
* ✨
|
||||||
* ✨ 默认头像根据用户名绘制svg ([#132](https://github.com/nsnail/NetAdmin/issues/132)) ([127f6e9](https://github.com/nsnail/NetAdmin/commit/127f6e9f6c8c12974e5340e9697281250737bed3))
|
框架代码同步 ([#129](https://github.com/nsnail/NetAdmin/issues/129)) ([b01b8b2](https://github.com/nsnail/NetAdmin/commit/b01b8b24ba574c08ba5605e103ff2ccf15e5830a))
|
||||||
* ✨ 手动执行计划作业 ([#122](https://github.com/nsnail/NetAdmin/issues/122)) ([3b83361](https://github.com/nsnail/NetAdmin/commit/3b8336105a908ba6bc300bec6ac4f49747ea66e9))
|
* ✨
|
||||||
* ✨ 增强作业执行记录页面 ([#135](https://github.com/nsnail/NetAdmin/issues/135)) ([7ae473d](https://github.com/nsnail/NetAdmin/commit/7ae473d492b9ba60cbb1c355894917d14f5ffa8f))
|
框架代码同步 ([#130](https://github.com/nsnail/NetAdmin/issues/130)) ([5edcf63](https://github.com/nsnail/NetAdmin/commit/5edcf63e24f6b13f5515e01ee8cf120b1a814d40))
|
||||||
* ✨ naColId组件 ([#118](https://github.com/nsnail/NetAdmin/issues/118)) ([47e67dd](https://github.com/nsnail/NetAdmin/commit/47e67dd503dd0ba6818e8b798e41c62420363f58))
|
* ✨
|
||||||
* **frontend:** ✨ 手机端分页控件显示总条数 ([#124](https://github.com/nsnail/NetAdmin/issues/124)) ([e0d15f8](https://github.com/nsnail/NetAdmin/commit/e0d15f8039a74a9826a0395983960ab620308899))
|
默认头像根据用户名绘制svg ([#132](https://github.com/nsnail/NetAdmin/issues/132)) ([127f6e9](https://github.com/nsnail/NetAdmin/commit/127f6e9f6c8c12974e5340e9697281250737bed3))
|
||||||
|
* ✨
|
||||||
|
手动执行计划作业 ([#122](https://github.com/nsnail/NetAdmin/issues/122)) ([3b83361](https://github.com/nsnail/NetAdmin/commit/3b8336105a908ba6bc300bec6ac4f49747ea66e9))
|
||||||
|
* ✨
|
||||||
|
增强作业执行记录页面 ([#135](https://github.com/nsnail/NetAdmin/issues/135)) ([7ae473d](https://github.com/nsnail/NetAdmin/commit/7ae473d492b9ba60cbb1c355894917d14f5ffa8f))
|
||||||
|
* ✨
|
||||||
|
naColId组件 ([#118](https://github.com/nsnail/NetAdmin/issues/118)) ([47e67dd](https://github.com/nsnail/NetAdmin/commit/47e67dd503dd0ba6818e8b798e41c62420363f58))
|
||||||
|
* **frontend:** ✨
|
||||||
|
手机端分页控件显示总条数 ([#124](https://github.com/nsnail/NetAdmin/issues/124)) ([e0d15f8](https://github.com/nsnail/NetAdmin/commit/e0d15f8039a74a9826a0395983960ab620308899))
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* 🐛 字段顺序 ([#131](https://github.com/nsnail/NetAdmin/issues/131)) ([d1951db](https://github.com/nsnail/NetAdmin/commit/d1951dbcb5fa50a7ff308f6b6d554da5f791bcf2))
|
* 🐛
|
||||||
* 🐛 字段长度 ([#134](https://github.com/nsnail/NetAdmin/issues/134)) ([c20a6c3](https://github.com/nsnail/NetAdmin/commit/c20a6c369d7b6d6dcfd07b3f3eaeab0fa309e766))
|
字段顺序 ([#131](https://github.com/nsnail/NetAdmin/issues/131)) ([d1951db](https://github.com/nsnail/NetAdmin/commit/d1951dbcb5fa50a7ff308f6b6d554da5f791bcf2))
|
||||||
|
* 🐛
|
||||||
|
字段长度 ([#134](https://github.com/nsnail/NetAdmin/issues/134)) ([c20a6c3](https://github.com/nsnail/NetAdmin/commit/c20a6c369d7b6d6dcfd07b3f3eaeab0fa309e766))
|
||||||
* 🐛 take count ([c08ea62](https://github.com/nsnail/NetAdmin/commit/c08ea62064cc522d7cca9c90a5f15f23d833b6e3))
|
* 🐛 take count ([c08ea62](https://github.com/nsnail/NetAdmin/commit/c08ea62064cc522d7cca9c90a5f15f23d833b6e3))
|
||||||
* **backend:** 🐛 更新计划作业在sqlite数据库环境报错 ([#120](https://github.com/nsnail/NetAdmin/issues/120)) ([3152a8d](https://github.com/nsnail/NetAdmin/commit/3152a8d3e8054524470883c336fb6e93903a8426))
|
* **backend:** 🐛
|
||||||
|
更新计划作业在sqlite数据库环境报错 ([#120](https://github.com/nsnail/NetAdmin/issues/120)) ([3152a8d](https://github.com/nsnail/NetAdmin/commit/3152a8d3e8054524470883c336fb6e93903a8426))
|
||||||
|
|
||||||
### [1.1.1](https://github.com/nsnail/NetAdmin/compare/v1.1.0...v1.1.1) (2024-04-29)
|
### [1.1.1](https://github.com/nsnail/NetAdmin/compare/v1.1.0...v1.1.1) (2024-04-29)
|
||||||
|
|
||||||
## [1.1.0](https://github.com/nsnail/NetAdmin/compare/v1.0.0...v1.1.0) (2024-04-29)
|
## [1.1.0](https://github.com/nsnail/NetAdmin/compare/v1.0.0...v1.1.0) (2024-04-29)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 版本更新日志组件 ([#96](https://github.com/nsnail/NetAdmin/issues/96)) ([a37acc4](https://github.com/nsnail/NetAdmin/commit/a37acc4b55c91d57d51c7fa079da8700530412a5))
|
* ✨
|
||||||
* ✨ 计划作业 ([#87](https://github.com/nsnail/NetAdmin/issues/87)) ([8293ec0](https://github.com/nsnail/NetAdmin/commit/8293ec0297875ebc9ad75cce9465bd587929c0bf))
|
版本更新日志组件 ([#96](https://github.com/nsnail/NetAdmin/issues/96)) ([a37acc4](https://github.com/nsnail/NetAdmin/commit/a37acc4b55c91d57d51c7fa079da8700530412a5))
|
||||||
* ✨ 计划作业执行记录 ([#89](https://github.com/nsnail/NetAdmin/issues/89)) ([6f89015](https://github.com/nsnail/NetAdmin/commit/6f890151989ad733e35653933b7597eec478cc3b))
|
* ✨
|
||||||
* ✨ 将数据库结构同步和种子数据初始化作为命令行开关 ([#78](https://github.com/nsnail/NetAdmin/issues/78)) ([05ed3d3](https://github.com/nsnail/NetAdmin/commit/05ed3d3746aa274a0f88f7afadfea12a3c8a80ff))
|
计划作业 ([#87](https://github.com/nsnail/NetAdmin/issues/87)) ([8293ec0](https://github.com/nsnail/NetAdmin/commit/8293ec0297875ebc9ad75cce9465bd587929c0bf))
|
||||||
* ✨ 快捷启用/禁用用户 ([#91](https://github.com/nsnail/NetAdmin/issues/91)) ([6c2d167](https://github.com/nsnail/NetAdmin/commit/6c2d1676e45b9f1ecf3be3ae5a172db49b62a81d))
|
* ✨
|
||||||
* ✨ 前端表格高级筛选 ([#100](https://github.com/nsnail/NetAdmin/issues/100)) ([3847d6f](https://github.com/nsnail/NetAdmin/commit/3847d6fdbbd27efb53921bcc8374157f0da47155))
|
计划作业执行记录 ([#89](https://github.com/nsnail/NetAdmin/issues/89)) ([6f89015](https://github.com/nsnail/NetAdmin/commit/6f890151989ad733e35653933b7597eec478cc3b))
|
||||||
* ✨ 日志管理独立出来、增加登录日志界面 ([#65](https://github.com/nsnail/NetAdmin/issues/65)) ([9134c4f](https://github.com/nsnail/NetAdmin/commit/9134c4fe01165a87ebc7e2cbd0a2abff3c9fb3ea))
|
* ✨
|
||||||
* ✨ 首页仪表面板 ([#103](https://github.com/nsnail/NetAdmin/issues/103)) ([149e1af](https://github.com/nsnail/NetAdmin/commit/149e1afa533b142a3666a325ec84a091d53c1840))
|
将数据库结构同步和种子数据初始化作为命令行开关 ([#78](https://github.com/nsnail/NetAdmin/issues/78)) ([05ed3d3](https://github.com/nsnail/NetAdmin/commit/05ed3d3746aa274a0f88f7afadfea12a3c8a80ff))
|
||||||
* ✨ cron表达式选择器 ([#92](https://github.com/nsnail/NetAdmin/issues/92)) ([bde9fb1](https://github.com/nsnail/NetAdmin/commit/bde9fb1ea264bd0b786ac68d590691892d7ce067))
|
* ✨
|
||||||
|
快捷启用/禁用用户 ([#91](https://github.com/nsnail/NetAdmin/issues/91)) ([6c2d167](https://github.com/nsnail/NetAdmin/commit/6c2d1676e45b9f1ecf3be3ae5a172db49b62a81d))
|
||||||
|
* ✨
|
||||||
|
前端表格高级筛选 ([#100](https://github.com/nsnail/NetAdmin/issues/100)) ([3847d6f](https://github.com/nsnail/NetAdmin/commit/3847d6fdbbd27efb53921bcc8374157f0da47155))
|
||||||
|
* ✨
|
||||||
|
日志管理独立出来、增加登录日志界面 ([#65](https://github.com/nsnail/NetAdmin/issues/65)) ([9134c4f](https://github.com/nsnail/NetAdmin/commit/9134c4fe01165a87ebc7e2cbd0a2abff3c9fb3ea))
|
||||||
|
* ✨
|
||||||
|
首页仪表面板 ([#103](https://github.com/nsnail/NetAdmin/issues/103)) ([149e1af](https://github.com/nsnail/NetAdmin/commit/149e1afa533b142a3666a325ec84a091d53c1840))
|
||||||
|
* ✨
|
||||||
|
cron表达式选择器 ([#92](https://github.com/nsnail/NetAdmin/issues/92)) ([bde9fb1](https://github.com/nsnail/NetAdmin/commit/bde9fb1ea264bd0b786ac68d590691892d7ce067))
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* 🐛 'Numbers' does not contain a definition for 'CACHE_SECS_DEFAULT' ([#102](https://github.com/nsnail/NetAdmin/issues/102)) ([8f69c29](https://github.com/nsnail/NetAdmin/commit/8f69c2907be282b1b39f4a179badb11502aa2403))
|
* 🐛 'Numbers' does not contain a definition for '
|
||||||
* 🐛 低版本jetbrains.resharper.globaltools搞乱了代码 ([#97](https://github.com/nsnail/NetAdmin/issues/97)) ([c117ddf](https://github.com/nsnail/NetAdmin/commit/c117ddfe7a433215b3449cdd6b19318a1f3cbf37))
|
CACHE_SECS_DEFAULT' ([#102](https://github.com/nsnail/NetAdmin/issues/102)) ([8f69c29](https://github.com/nsnail/NetAdmin/commit/8f69c2907be282b1b39f4a179badb11502aa2403))
|
||||||
* 🐛 前端样式问题 ([#84](https://github.com/nsnail/NetAdmin/issues/84)) ([6615df3](https://github.com/nsnail/NetAdmin/commit/6615df339934f6d19880c9822b44d5305c2f2a75))
|
* 🐛
|
||||||
* 🐛 请求日志客户端IP显示不正确 ([#60](https://github.com/nsnail/NetAdmin/issues/60)) ([ec698ce](https://github.com/nsnail/NetAdmin/commit/ec698ce4db49861eaaeb8bf5080764939e6d7231))
|
低版本jetbrains.resharper.globaltools搞乱了代码 ([#97](https://github.com/nsnail/NetAdmin/issues/97)) ([c117ddf](https://github.com/nsnail/NetAdmin/commit/c117ddfe7a433215b3449cdd6b19318a1f3cbf37))
|
||||||
* 🐛 时区问题 ([#107](https://github.com/nsnail/NetAdmin/issues/107)) ([59c85ce](https://github.com/nsnail/NetAdmin/commit/59c85cef217c121b36d52993b6b5a774fe22df9e))
|
* 🐛
|
||||||
* 🐛 小问题 ([#76](https://github.com/nsnail/NetAdmin/issues/76)) ([52ddf27](https://github.com/nsnail/NetAdmin/commit/52ddf273c856d8f7e363ce23e5886b9eedf4604f))
|
前端样式问题 ([#84](https://github.com/nsnail/NetAdmin/issues/84)) ([6615df3](https://github.com/nsnail/NetAdmin/commit/6615df339934f6d19880c9822b44d5305c2f2a75))
|
||||||
* 🐛 在弹窗界面中引用的列表组件,点击重置搜索条件按钮时,会关闭弹窗的bug ([#95](https://github.com/nsnail/NetAdmin/issues/95)) ([8fee14c](https://github.com/nsnail/NetAdmin/commit/8fee14cd6ebd86456956fc59bbb61c545faa1fdd))
|
* 🐛
|
||||||
* 🐛 tinymce editor css 加载路径错误 ([#93](https://github.com/nsnail/NetAdmin/issues/93)) ([5fe7387](https://github.com/nsnail/NetAdmin/commit/5fe73878a2a53dc5e7e2dcbcbf22f91ffb4376dd))
|
请求日志客户端IP显示不正确 ([#60](https://github.com/nsnail/NetAdmin/issues/60)) ([ec698ce](https://github.com/nsnail/NetAdmin/commit/ec698ce4db49861eaaeb8bf5080764939e6d7231))
|
||||||
* 🐛 tinymce editor css 加载路径错误 ([#94](https://github.com/nsnail/NetAdmin/issues/94)) ([802251e](https://github.com/nsnail/NetAdmin/commit/802251e42347bfe4fa0bcb4867b615d7c03abf19))
|
* 🐛
|
||||||
|
时区问题 ([#107](https://github.com/nsnail/NetAdmin/issues/107)) ([59c85ce](https://github.com/nsnail/NetAdmin/commit/59c85cef217c121b36d52993b6b5a774fe22df9e))
|
||||||
|
* 🐛
|
||||||
|
小问题 ([#76](https://github.com/nsnail/NetAdmin/issues/76)) ([52ddf27](https://github.com/nsnail/NetAdmin/commit/52ddf273c856d8f7e363ce23e5886b9eedf4604f))
|
||||||
|
* 🐛
|
||||||
|
在弹窗界面中引用的列表组件,点击重置搜索条件按钮时,会关闭弹窗的bug ([#95](https://github.com/nsnail/NetAdmin/issues/95)) ([8fee14c](https://github.com/nsnail/NetAdmin/commit/8fee14cd6ebd86456956fc59bbb61c545faa1fdd))
|
||||||
|
* 🐛 tinymce editor css
|
||||||
|
加载路径错误 ([#93](https://github.com/nsnail/NetAdmin/issues/93)) ([5fe7387](https://github.com/nsnail/NetAdmin/commit/5fe73878a2a53dc5e7e2dcbcbf22f91ffb4376dd))
|
||||||
|
* 🐛 tinymce editor css
|
||||||
|
加载路径错误 ([#94](https://github.com/nsnail/NetAdmin/issues/94)) ([802251e](https://github.com/nsnail/NetAdmin/commit/802251e42347bfe4fa0bcb4867b615d7c03abf19))
|
||||||
|
|
||||||
## 1.0.0 (2023-11-17)
|
## 1.0.0 (2023-11-17)
|
||||||
|
|
||||||
|
|||||||
@@ -10,28 +10,30 @@
|
|||||||
<Authors>nsnail</Authors>
|
<Authors>nsnail</Authors>
|
||||||
<BaseIntermediateOutputPath>$(SolutionDir)/dist/backend/$(MSBuildProjectName)/obj</BaseIntermediateOutputPath>
|
<BaseIntermediateOutputPath>$(SolutionDir)/dist/backend/$(MSBuildProjectName)/obj</BaseIntermediateOutputPath>
|
||||||
<BaseOutputPath>$(SolutionDir)/dist/backend/$(MSBuildProjectName)/bin</BaseOutputPath>
|
<BaseOutputPath>$(SolutionDir)/dist/backend/$(MSBuildProjectName)/bin</BaseOutputPath>
|
||||||
<Copyright>© 2006-2023 nsnail</Copyright>
|
<Copyright>© 2006-2024 nsnail</Copyright>
|
||||||
<Description>通用后台权限管理系统、快速开发框架(基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建,具有十分整洁、优雅的编码规范)</Description>
|
<Description>通用后台权限管理系统、快速开发框架(基于C#13/.NET9、Vue3/Vite、ElementPlus等现代技术构建,具有十分整洁、优雅的编码规范)</Description>
|
||||||
<EnableBaseIntermediateOutputPathMismatchWarning>false</EnableBaseIntermediateOutputPathMismatchWarning>
|
<EnableBaseIntermediateOutputPathMismatchWarning>false</EnableBaseIntermediateOutputPathMismatchWarning>
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<MinVerDefaultPreReleaseIdentifiers>beta</MinVerDefaultPreReleaseIdentifiers>
|
<MinVerDefaultPreReleaseIdentifiers>beta</MinVerDefaultPreReleaseIdentifiers>
|
||||||
<MinVerTagPrefix>v</MinVerTagPrefix>
|
<MinVerTagPrefix>v</MinVerTagPrefix>
|
||||||
<NoWarn>CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SYSLIB1045;SA1010</NoWarn>
|
<NoWarn>CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0072;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SA1010;SYSLIB1045</NoWarn>
|
||||||
<Product>NetAdmin</Product>
|
<Product>NetAdmin</Product>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
<RepositoryUrl>https://github.com/nsnail/NetAdmin.git</RepositoryUrl>
|
<RepositoryUrl>https://github.com/nsnail/NetAdmin.git</RepositoryUrl>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework Condition="'$(OS)' != 'Windows_NT'">net9.0</TargetFramework>
|
||||||
|
<TargetFramework Condition="'$(OS)' == 'Windows_NT'">net9.0-windows</TargetFramework>
|
||||||
|
<UseWindowsForms Condition="'$(OS)' == 'Windows_NT'">true</UseWindowsForms>
|
||||||
<Title>$(AssemblyName)</Title>
|
<Title>$(AssemblyName)</Title>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MinVer" Version="6.0.0">
|
<PackageReference Include="MinVer" Version="6.1.0-beta.1">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="../GlobalUsings.cs" Link="GlobalUsings.cs" />
|
<Compile Include="$(SolutionDir)/src/backend/GlobalUsings.cs" Link="GlobalUsings.cs"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:9.0.9 AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
RUN apt update
|
RUN apt update
|
||||||
RUN apt install -y redis
|
RUN apt install -y redis
|
||||||
COPY ./dist/backend/NetAdmin.AdmServer.Host/bin/Release/net9.0/publish .
|
COPY ./dist/backend/YourSolution.AdmServer.Host/bin/Release/net9.0/publish .
|
||||||
ENTRYPOINT redis-server --daemonize yes && dotnet NetAdmin.AdmServer.Host.dll -is
|
ENTRYPOINT redis-server --daemonize yes && dotnet YourSolution.AdmServer.Host.dll -is
|
||||||
226
NetAdmin.sln
@@ -1,226 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 17
|
|
||||||
VisualStudioVersion = 17.0.31903.59
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C84EB5A0-37AD-4B17-A51E-E36888C4441E}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "backend", "backend", "{4DAF9366-855F-46BB-AE4C-660C92FA0697}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0CAC-4828-A807-34A693F73859}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
.commitlintrc.js = .commitlintrc.js
|
|
||||||
.editorconfig = .editorconfig
|
|
||||||
.gitattributes = .gitattributes
|
|
||||||
.gitignore = .gitignore
|
|
||||||
.gitmodules = .gitmodules
|
|
||||||
CHANGELOG.md = CHANGELOG.md
|
|
||||||
Directory.Build.props = Directory.Build.props
|
|
||||||
Dockerfile = Dockerfile
|
|
||||||
dotnet-tools.json = dotnet-tools.json
|
|
||||||
global.json = global.json
|
|
||||||
LICENSE = LICENSE
|
|
||||||
NetAdmin.sln.DotSettings = NetAdmin.sln.DotSettings
|
|
||||||
nuget.config = nuget.config
|
|
||||||
package.json = package.json
|
|
||||||
README.md = README.md
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B25C9-0901-4923-913F-00F9A6B352A5}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
1.git.pull.request.ps1 = scripts/1.git.pull.request.ps1
|
|
||||||
2.git.release.ps1 = scripts/2.git.release.ps1
|
|
||||||
3.git.recreate.branch.ps1 = scripts/3.git.recreate.branch.ps1
|
|
||||||
4.git.del.obsolete.tags.ps1 = scripts/4.git.del.obsolete.tags.ps1
|
|
||||||
clean.ln.csx = scripts/clean.ln.csx
|
|
||||||
code.clean.csx = scripts/code.clean.csx
|
|
||||||
code.clean.ps1 = scripts/code.clean.ps1
|
|
||||||
find.unused.ln.csx = scripts/find.unused.ln.csx
|
|
||||||
gen.cs.tt = scripts/gen.cs.tt
|
|
||||||
gen.id.linq = scripts/gen.id.linq
|
|
||||||
gen.ln.cmd = scripts/gen.ln.cmd
|
|
||||||
gen.resx.tt = scripts/gen.resx.tt
|
|
||||||
image.optimize.csx = scripts/image.optimize.csx
|
|
||||||
install.as.tpl.ps1 = scripts/install.as.tpl.ps1
|
|
||||||
rename.csx = scripts/rename.csx
|
|
||||||
resharper.full.ps1 = scripts/resharper.full.ps1
|
|
||||||
switcher.freesql.json = scripts/switcher.freesql.json
|
|
||||||
switcher.gurion.json = scripts/switcher.gurion.json
|
|
||||||
switcher.nsext.json = scripts/switcher.nsext.json
|
|
||||||
switcher.ps1 = scripts/switcher.ps1
|
|
||||||
sync.sln.files.csx = scripts/sync.sln.files.csx
|
|
||||||
wait.server.stop.sh = scripts/wait.server.stop.sh
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1129FE25-466B-4F4F-85FC-3752664245E1}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3C6F049E-3EE8-4D66-9AFF-E8A369032487}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
nightly-build.yml = .github/workflows/nightly-build.yml
|
|
||||||
README.md = .github/workflows/README.md
|
|
||||||
release.yml = .github/workflows/release.yml
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA-9493-4892-80C4-5E174C504829}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
code.quality.props = build/code.quality.props
|
|
||||||
copy.pkg.xml.comment.files.targets = build/copy.pkg.xml.comment.files.targets
|
|
||||||
minver.targets = build/minver.targets
|
|
||||||
prebuild.targets = build/prebuild.targets
|
|
||||||
stylecop.analyzers.ruleset = build/stylecop.analyzers.ruleset
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Infrastructure", "src\backend\NetAdmin.Infrastructure\NetAdmin.Infrastructure.csproj", "{1E62C322-EE42-4699-A6F1-791C53EFA62D}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Application", "src\backend\NetAdmin.AdmServer.Application\NetAdmin.AdmServer.Application.csproj", "{E38B2EB4-D7A5-4777-9236-3B348919DF23}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Host", "src\backend\NetAdmin.AdmServer.Host\NetAdmin.AdmServer.Host.csproj", "{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03.hosted-servers", "03.hosted-servers", "{12AE5B4B-CB1A-498E-83B8-04E201E31D86}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Domain", "src\backend\NetAdmin.Domain\NetAdmin.Domain.csproj", "{58509C57-09FA-4E3C-BC07-78E786A2A326}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Application", "src\backend\NetAdmin.Application\NetAdmin.Application.csproj", "{70C54E1B-2083-4196-AB68-34CAF0075D82}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Host", "src\backend\NetAdmin.Host\NetAdmin.Host.csproj", "{91839A15-D08F-4848-A301-F793412BC688}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Cache", "src\backend\NetAdmin.Cache\NetAdmin.Cache.csproj", "{91452C22-4B57-4F16-9AF6-42C7BF830504}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Cache", "src\backend\NetAdmin.AdmServer.Cache\NetAdmin.AdmServer.Cache.csproj", "{7CB632D3-3635-4F8D-AFE7-F496D37D422B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Host", "src\backend\NetAdmin.SysComponent.Host\NetAdmin.SysComponent.Host.csproj", "{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Cache", "src\backend\NetAdmin.SysComponent.Cache\NetAdmin.SysComponent.Cache.csproj", "{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Application", "src\backend\NetAdmin.SysComponent.Application\NetAdmin.SysComponent.Application.csproj", "{34650E82-D257-46DA-BD6B-DE307113347B}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02.components", "02.components", "{3F23258D-8299-4992-9F51-2EE9B52CF9D2}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01.frameworks", "01.frameworks", "{D9C3EF66-2757-473D-A26B-54FD08DA203F}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04.tests", "04.tests", "{89260294-80FC-49F1-8D73-AECD39AFF2B7}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05.tools", "05.tools", "{79409163-5006-405D-AC96-406FA0AD77B7}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\backend\UnitTests\UnitTests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Tests", "src\backend\NetAdmin.Tests\NetAdmin.Tests.csproj", "{00604162-C444-478B-B773-3AB23C856CA7}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E80A1018-C354-4A26-9029-8847BB9DA864}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
README.md = docker/README.md
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Domain", "src\backend\NetAdmin.SysComponent.Domain\NetAdmin.SysComponent.Domain.csproj", "{51D6E603-0749-4A11-A78C-9E5BB127E03A}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Domain", "src\backend\NetAdmin.AdmServer.Domain\NetAdmin.AdmServer.Domain.csproj", "{932520DF-D312-415A-A128-1117F8221D68}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Infrastructure", "src\backend\NetAdmin.AdmServer.Infrastructure\NetAdmin.AdmServer.Infrastructure.csproj", "{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Infrastructure", "src\backend\NetAdmin.SysComponent.Infrastructure\NetAdmin.SysComponent.Infrastructure.csproj", "{48EE6FC4-B64A-40D3-B889-36837E067880}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Any CPU = Debug|Any CPU
|
|
||||||
Release|Any CPU = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{1E62C322-EE42-4699-A6F1-791C53EFA62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{1E62C322-EE42-4699-A6F1-791C53EFA62D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{1E62C322-EE42-4699-A6F1-791C53EFA62D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{1E62C322-EE42-4699-A6F1-791C53EFA62D}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{E38B2EB4-D7A5-4777-9236-3B348919DF23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{E38B2EB4-D7A5-4777-9236-3B348919DF23}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{E38B2EB4-D7A5-4777-9236-3B348919DF23}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{E38B2EB4-D7A5-4777-9236-3B348919DF23}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{58509C57-09FA-4E3C-BC07-78E786A2A326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{58509C57-09FA-4E3C-BC07-78E786A2A326}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{58509C57-09FA-4E3C-BC07-78E786A2A326}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{58509C57-09FA-4E3C-BC07-78E786A2A326}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{70C54E1B-2083-4196-AB68-34CAF0075D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{70C54E1B-2083-4196-AB68-34CAF0075D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{70C54E1B-2083-4196-AB68-34CAF0075D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{70C54E1B-2083-4196-AB68-34CAF0075D82}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{91839A15-D08F-4848-A301-F793412BC688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{91839A15-D08F-4848-A301-F793412BC688}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{91839A15-D08F-4848-A301-F793412BC688}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{91839A15-D08F-4848-A301-F793412BC688}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{91452C22-4B57-4F16-9AF6-42C7BF830504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{91452C22-4B57-4F16-9AF6-42C7BF830504}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{91452C22-4B57-4F16-9AF6-42C7BF830504}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{91452C22-4B57-4F16-9AF6-42C7BF830504}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{7CB632D3-3635-4F8D-AFE7-F496D37D422B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{7CB632D3-3635-4F8D-AFE7-F496D37D422B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{7CB632D3-3635-4F8D-AFE7-F496D37D422B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{7CB632D3-3635-4F8D-AFE7-F496D37D422B}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{34650E82-D257-46DA-BD6B-DE307113347B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{34650E82-D257-46DA-BD6B-DE307113347B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{34650E82-D257-46DA-BD6B-DE307113347B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{34650E82-D257-46DA-BD6B-DE307113347B}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{C7F27698-DA05-4ACD-B0D7-4791B3972002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{C7F27698-DA05-4ACD-B0D7-4791B3972002}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{C7F27698-DA05-4ACD-B0D7-4791B3972002}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{C7F27698-DA05-4ACD-B0D7-4791B3972002}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{00604162-C444-478B-B773-3AB23C856CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{00604162-C444-478B-B773-3AB23C856CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{51D6E603-0749-4A11-A78C-9E5BB127E03A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{51D6E603-0749-4A11-A78C-9E5BB127E03A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{51D6E603-0749-4A11-A78C-9E5BB127E03A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{51D6E603-0749-4A11-A78C-9E5BB127E03A}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{932520DF-D312-415A-A128-1117F8221D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{932520DF-D312-415A-A128-1117F8221D68}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{48EE6FC4-B64A-40D3-B889-36837E067880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{48EE6FC4-B64A-40D3-B889-36837E067880}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(NestedProjects) = preSolution
|
|
||||||
{4DAF9366-855F-46BB-AE4C-660C92FA0697} = {C84EB5A0-37AD-4B17-A51E-E36888C4441E}
|
|
||||||
{12AE5B4B-CB1A-498E-83B8-04E201E31D86} = {4DAF9366-855F-46BB-AE4C-660C92FA0697}
|
|
||||||
{3F23258D-8299-4992-9F51-2EE9B52CF9D2} = {4DAF9366-855F-46BB-AE4C-660C92FA0697}
|
|
||||||
{D9C3EF66-2757-473D-A26B-54FD08DA203F} = {4DAF9366-855F-46BB-AE4C-660C92FA0697}
|
|
||||||
{70C54E1B-2083-4196-AB68-34CAF0075D82} = {D9C3EF66-2757-473D-A26B-54FD08DA203F}
|
|
||||||
{91452C22-4B57-4F16-9AF6-42C7BF830504} = {D9C3EF66-2757-473D-A26B-54FD08DA203F}
|
|
||||||
{58509C57-09FA-4E3C-BC07-78E786A2A326} = {D9C3EF66-2757-473D-A26B-54FD08DA203F}
|
|
||||||
{91839A15-D08F-4848-A301-F793412BC688} = {D9C3EF66-2757-473D-A26B-54FD08DA203F}
|
|
||||||
{1E62C322-EE42-4699-A6F1-791C53EFA62D} = {D9C3EF66-2757-473D-A26B-54FD08DA203F}
|
|
||||||
{E38B2EB4-D7A5-4777-9236-3B348919DF23} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
|
|
||||||
{7CB632D3-3635-4F8D-AFE7-F496D37D422B} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
|
|
||||||
{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
|
|
||||||
{89260294-80FC-49F1-8D73-AECD39AFF2B7} = {4DAF9366-855F-46BB-AE4C-660C92FA0697}
|
|
||||||
{C7F27698-DA05-4ACD-B0D7-4791B3972002} = {89260294-80FC-49F1-8D73-AECD39AFF2B7}
|
|
||||||
{00604162-C444-478B-B773-3AB23C856CA7} = {D9C3EF66-2757-473D-A26B-54FD08DA203F}
|
|
||||||
{34650E82-D257-46DA-BD6B-DE307113347B} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
|
|
||||||
{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
|
|
||||||
{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
|
|
||||||
{79409163-5006-405D-AC96-406FA0AD77B7} = {4DAF9366-855F-46BB-AE4C-660C92FA0697}
|
|
||||||
{51D6E603-0749-4A11-A78C-9E5BB127E03A} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
|
|
||||||
{932520DF-D312-415A-A128-1117F8221D68} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
|
|
||||||
{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
|
|
||||||
{48EE6FC4-B64A-40D3-B889-36837E067880} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
|
|
||||||
{3C6F049E-3EE8-4D66-9AFF-E8A369032487} = {1129FE25-466B-4F4F-85FC-3752664245E1}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
93
NetAdmin.slnx
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
<Solution>
|
||||||
|
<Folder Name="/.drone/"/>
|
||||||
|
<Folder Name="/.drone/workflows/">
|
||||||
|
<File Path=".drone/workflows/README.md"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/.github/"/>
|
||||||
|
<Folder Name="/.github/workflows/">
|
||||||
|
<File Path=".github/workflows/nightly-build.yml"/>
|
||||||
|
<File Path=".github/workflows/README.md"/>
|
||||||
|
<File Path=".github/workflows/release.yml"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/build/">
|
||||||
|
<File Path="build/code.quality.props"/>
|
||||||
|
<File Path="build/copy.pkg.xml.comment.files.targets"/>
|
||||||
|
<File Path="build/minver.targets"/>
|
||||||
|
<File Path="build/prebuild.targets"/>
|
||||||
|
<File Path="build/stylecop.analyzers.ruleset"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/docker/">
|
||||||
|
<File Path="docker/README.md"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/meta/">
|
||||||
|
<File Path=".commitlintrc.js"/>
|
||||||
|
<File Path=".editorconfig"/>
|
||||||
|
<File Path=".gitattributes"/>
|
||||||
|
<File Path=".gitignore"/>
|
||||||
|
<File Path=".gitmodules"/>
|
||||||
|
<File Path="CHANGELOG.md"/>
|
||||||
|
<File Path="Directory.Build.props"/>
|
||||||
|
<File Path="Dockerfile"/>
|
||||||
|
<File Path="dotnet-tools.json"/>
|
||||||
|
<File Path="global.json"/>
|
||||||
|
<File Path="LICENSE"/>
|
||||||
|
<File Path="NetAdmin.slnx.DotSettings"/>
|
||||||
|
<File Path="nuget.config"/>
|
||||||
|
<File Path="package.json"/>
|
||||||
|
<File Path="README.md"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/scripts/">
|
||||||
|
<File Path="scripts/1.git.pull.request.ps1"/>
|
||||||
|
<File Path="scripts/2.git.release.ps1"/>
|
||||||
|
<File Path="scripts/3.git.recreate.branch.ps1"/>
|
||||||
|
<File Path="scripts/4.git.del.obsolete.tags.ps1"/>
|
||||||
|
<File Path="scripts/5.git.update.submodule.ps1"/>
|
||||||
|
<File Path="scripts/clean.ln.csx"/>
|
||||||
|
<File Path="scripts/code.clean.csx"/>
|
||||||
|
<File Path="scripts/code.clean.ps1"/>
|
||||||
|
<File Path="scripts/find.unused.ln.csx"/>
|
||||||
|
<File Path="scripts/gen.cs.tt"/>
|
||||||
|
<File Path="scripts/gen.id.linq"/>
|
||||||
|
<File Path="scripts/gen.ln.cmd"/>
|
||||||
|
<File Path="scripts/gen.resx.tt"/>
|
||||||
|
<File Path="scripts/git.config.cmd"/>
|
||||||
|
<File Path="scripts/image.optimize.csx"/>
|
||||||
|
<File Path="scripts/install.as.tpl.ps1"/>
|
||||||
|
<File Path="scripts/rename.csx"/>
|
||||||
|
<File Path="scripts/resharper.full.ps1"/>
|
||||||
|
<File Path="scripts/switch.nuget.or.project.csx"/>
|
||||||
|
<File Path="scripts/sync.slnx.files.csx"/>
|
||||||
|
<File Path="scripts/wait.server.stop.sh"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/src/"/>
|
||||||
|
<Folder Name="/src/backend/"/>
|
||||||
|
<Folder Name="/src/backend/01.frameworks/">
|
||||||
|
<!--<Project Type="Refs" Path="refs/Gurion/src/Gurion/Gurion.csproj"/>-->
|
||||||
|
<!--<Project Type="Refs" Path="refs/NetAdmin.FreeSql/src/FreeSql.DbContext/FreeSql.DbContext.csproj"/>-->
|
||||||
|
<!--<Project Type="Refs" Path="refs/NetAdmin.FreeSql/src/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj"/>-->
|
||||||
|
<!--<Project Type="Refs" Path="refs/NetAdmin.FreeSql/src/FreeSql/FreeSql.csproj"/>-->
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.Application/NetAdmin.Application.csproj"/>
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.Cache/NetAdmin.Cache.csproj"/>
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj"/>
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.Host/NetAdmin.Host.csproj"/>
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/src/backend/02.components/">
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj"/>
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj"/>
|
||||||
|
<Project Path="src/backend/NetAdmin/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/src/backend/03.hosted-servers/">
|
||||||
|
<Project Path="src/backend/YourSolution.AdmServer.Application/YourSolution.AdmServer.Application.csproj"/>
|
||||||
|
<Project Path="src/backend/YourSolution.AdmServer.Cache/YourSolution.AdmServer.Cache.csproj"/>
|
||||||
|
<Project Path="src/backend/YourSolution.AdmServer.Domain/YourSolution.AdmServer.Domain.csproj"/>
|
||||||
|
<Project Path="src/backend/YourSolution.AdmServer.Host/YourSolution.AdmServer.Host.csproj"/>
|
||||||
|
<Project Path="src/backend/YourSolution.AdmServer.Infrastructure/YourSolution.AdmServer.Infrastructure.csproj"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/src/backend/04.tests/">
|
||||||
|
<Project Path="src/backend/UnitTests/UnitTests.csproj"/>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/src/backend/05.tools/">
|
||||||
|
</Folder>
|
||||||
|
</Solution>
|
||||||
@@ -12,21 +12,61 @@
|
|||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantPatternParentheses/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantPatternParentheses/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestBaseTypeForParameter/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestBaseTypeForParameter/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestBaseTypeForParameterInConstructor/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestBaseTypeForParameterInConstructor/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">HINT</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">HINT</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_PREPROCESSOR_IF/@EntryValue">USUAL_INDENT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_PREPROCESSOR_OTHER/@EntryValue">USUAL_INDENT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INVOCABLE_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
|
||||||
|
|
||||||
<!-- CodeStyle-->
|
<!-- CodeStyle-->
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_DECLARATION_PARENS_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_EMBEDDED_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_EXPR_MEMBER_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INITIALIZER_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INVOCATION_PARENS_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_LIST_PATTERNS_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_PRIMARY_CONSTRUCTOR_DECLARATION_PARENS_ARRANGEMENT/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_PROPERTY_PATTERNS_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_SWITCH_EXPRESSION_ARRANGEMENT/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_LINQ_INTO_ON_NEW_LINE/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_COMMA/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_DECLARATION_RPAR/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_EQ/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_METHOD_CALL/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_LINQ_EXPRESSION/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_PRIMARY_CONSTRUCTOR_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_PRIMARY_CONSTRUCTOR_DECLARATION_RPAR/@EntryValue">False</s:Boolean>
|
||||||
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
|
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
|
||||||
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
|
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
|
||||||
|
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_FORMAL_PARAMETERS_ON_LINE/@EntryValue">1</s:Int64>
|
||||||
|
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_INVOCATION_ARGUMENTS_ON_LINE/@EntryValue">10000</s:Int64>
|
||||||
|
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_PRIMARY_CONSTRUCTOR_PARAMETERS_ON_LINE/@EntryValue">10000</s:Int64>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/NESTED_TERNARY_STYLE/@EntryValue">EXPANDED</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">END_OF_LINE</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_RECORD_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_RECORD_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_BINARY_EXPRESSIONS/@EntryValue">CHOP_IF_LONG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_BINARY_PATTERNS/@EntryValue">CHOP_IF_LONG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_IF_LONG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AE/@EntryIndexedValue">AE</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AE/@EntryIndexedValue">AE</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AF/@EntryIndexedValue">AF</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AF/@EntryIndexedValue">AF</s:String>
|
||||||
@@ -261,6 +301,7 @@
|
|||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UG/@EntryIndexedValue">UG</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UG/@EntryIndexedValue">UG</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UM/@EntryIndexedValue">UM</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UM/@EntryIndexedValue">UM</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=US/@EntryIndexedValue">US</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=US/@EntryIndexedValue">US</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=USDT/@EntryIndexedValue">USDT</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UY/@EntryIndexedValue">UY</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UY/@EntryIndexedValue">UY</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UZ/@EntryIndexedValue">UZ</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UZ/@EntryIndexedValue">UZ</s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VA/@EntryIndexedValue">VA</s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VA/@EntryIndexedValue">VA</s:String>
|
||||||
@@ -325,6 +366,7 @@
|
|||||||
</Patterns></s:String>
|
</Patterns></s:String>
|
||||||
|
|
||||||
<!-- Environment-->
|
<!-- Environment-->
|
||||||
|
<s:Boolean x:Key="/Default/Environment/Editor/UseCamelHumps/@EntryValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
|
||||||
67
README.md
@@ -1,6 +1,6 @@
|
|||||||
# NetAdmin
|
# NetAdmin
|
||||||
|
|
||||||
通用后台权限管理系统、快速开发框架(基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建,具有十分整洁、优雅的编码规范)
|
通用后台权限管理系统、快速开发框架(基于C#13/.NET9、Vue3/Vite、ElementPlus等现代技术构建,具有十分整洁、优雅的编码规范)
|
||||||
|
|
||||||
[](https://github.com/nsnail/NetAdmin/actions/workflows/nightly-build.yml)
|
[](https://github.com/nsnail/NetAdmin/actions/workflows/nightly-build.yml)
|
||||||
[](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
|
[](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
|
||||||
@@ -14,73 +14,87 @@ https://na.tools92.top
|
|||||||
|
|
||||||
```shell
|
```shell
|
||||||
docker run -p 8080:8080 nsnail/netadmin
|
docker run -p 8080:8080 nsnail/netadmin
|
||||||
# 需翻墙
|
# 墙内用户请自备梯子
|
||||||
```
|
```
|
||||||
|
|
||||||
## 构建步骤
|
## 构建步骤
|
||||||
|
|
||||||
|
所涉软件均推荐下载zip/tar版本,解压即用,一键删除,不会污染系统环境:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
# 1. 检查 dotnet sdk 版本 >=9.0.0
|
# 1. 检查 dotnet sdk 版本 >=9.0.0
|
||||||
dotnet --list-sdks
|
dotnet --list-sdks
|
||||||
# 下载 dotnet:https://dotnet.microsoft.com/zh-cn/download/dotnet
|
# 下载 dotnet:https://dotnet.microsoft.com/zh-cn/download/dotnet
|
||||||
|
|
||||||
# 2. 克隆代码仓库
|
# 2. 克隆代码仓库
|
||||||
git clone https://github.com/nsnail/NetAdmin.git && cd ./NetAdmin
|
git clone --depth 1 https://github.com/nsnail/NetAdmin.git && cd ./NetAdmin
|
||||||
|
|
||||||
# 3. 检查本机 redis 运行状态
|
# 3. 确认本机 redis 处于运行状态
|
||||||
redis-cli dbsize
|
redis-server # 启动服务器
|
||||||
|
redis-cli ping # 连接测试
|
||||||
# 下载 redis for windows:https://github.com/redis-windows/redis-windows/releases
|
# 下载 redis for windows:https://github.com/redis-windows/redis-windows/releases
|
||||||
# 下载 redis for linux/mac:https://redis.io/download
|
# 下载 redis for linux/mac:https://redis.io/download
|
||||||
|
|
||||||
# 4. 运行后端 WebApi
|
# 4. 运行后端 WebApi
|
||||||
dotnet run --project ./src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj --urls http://[::]:5010 -is
|
dotnet run --project ./src/backend/YourSolution.AdmServer.Host/YourSolution.AdmServer.Host.csproj --urls http://[::]:5010 -is
|
||||||
# 浏览器打开 http://localhost:5010 ,将看到Swagger(Knife4jUI)界面
|
# -i 插入种子数据;-s 同步数据库结构
|
||||||
|
# 浏览器访问 http://localhost:5010 ,将看到Swagger(Knife4jUI)界面
|
||||||
|
|
||||||
# 5. 检查 nodejs 版本 >=20
|
# 5. 检查 nodejs 版本 >=20
|
||||||
node -v
|
node -v
|
||||||
# 下载 nodejs:https://nodejs.org/en/download
|
# 下载 nodejs:https://nodejs.org/zh-cn/download
|
||||||
|
|
||||||
# 6. 安装 npm 依赖包
|
# 6. 安装 npm 依赖包
|
||||||
cd ./src/frontend/admin && npm install
|
cd ./src/frontend/admin && npm install
|
||||||
|
|
||||||
# 7. 运行前端项目
|
# 7. 运行前端项目
|
||||||
npm run dev
|
npm run dev
|
||||||
# 浏览器打开 http://localhost:5020 ,将看到管理界面(默认用户名:root,密码:1234qwer)
|
# 浏览器访问 http://localhost:5020 ,将看到管理界面(默认用户名密码:root 1234qwer)
|
||||||
```
|
```
|
||||||
|
|
||||||
## 文件目录树
|
## 文件目录
|
||||||
|
|
||||||
```
|
```
|
||||||
|
+---.github # github 工程文件目录
|
||||||
+---.template.config # dotnet 项目模板配置目录
|
+---.template.config # dotnet 项目模板配置目录
|
||||||
+---assets # 项目资源文件目录
|
+---assets # 项目资源文件目录
|
||||||
+---build # 构建相关的工程文件目录
|
+---build # 构建相关的工程文件目录
|
||||||
+---dist # 编译生成的二进制文件目录
|
+---dist # 编译生成的二进制文件目录
|
||||||
|
+---docker # docker 镜像构建文件目录
|
||||||
+---docs # 项目开发文档目录
|
+---docs # 项目开发文档目录
|
||||||
+---refs # 引用的第三方包的仓库目录
|
+---refs # 引用的第三方包的仓库目录
|
||||||
+---scripts # 各种工具脚本文件目录
|
+---scripts # 各种工具脚本文件目录
|
||||||
+---src # 项目源码文件目录
|
+---src # 项目源码文件目录
|
||||||
```
|
```
|
||||||
|
|
||||||
## 后端项目架构
|
## 项目架构
|
||||||
|
|
||||||
```mermaid
|
```mermaid
|
||||||
flowchart TD
|
flowchart TD
|
||||||
H["NetAdmin.Host\n公共主机层\n(.Net自托管主机程序)\n(输入输出格式化)\n(数据校验、鉴权)\n(...所有HTTP管道过滤器中间件)"] --> C["NetAdmin.Cache\n公共缓存层\n(基于Redis或MemoryCache的缓存策略实现)"]
|
sys-host["NetAdmin.SysComponent.Host<br>系统组件:主机层"]
|
||||||
C --> A["NetAdmin.Application\n公共业务逻辑层\n(内部服务增删改查)\n(外部服务增删改查)\n(...所有业务用例的计算与组合逻辑的模块化)"]
|
sys-cache["NetAdmin.SysComponent.Cache<br>系统组件:缓存层"]
|
||||||
A --> D["NetAdmin.Domain\n数据实体层\n(数据库关系实体映射)\n(DTO数据传输对象)\n(...所有数据模型的抽象与封装)"]
|
sys-app["NetAdmin.SysComponent.Application<br>系统组件:应用层"]
|
||||||
D --> I["NetAdmin.Infrastructure\n基础设施层\n(第三方组件和Nuget包引用)\n(公共构建和程序运行配置)\n(公共常量枚举异常定义)\n(全球化化和多语言)\n(...所有公共Utility工具)"]
|
host["<b>NetAdmin.Host</b><br>框架:主机层<br>(.Net自托管主机程序)<br>(输入输出格式化)<br>(数据校验、鉴权)<br>(...所有HTTP管道过滤器中间件)"]
|
||||||
|
cache["<b>NetAdmin.Cache</b><br>框架:缓存层<br>(基于Redis或MemoryCache的缓存策略实现)"]
|
||||||
XH["NetAdmin.XXX.Host\n(WebApi)"]-->H
|
app["<b>NetAdmin.Application</b><br>框架:业务应用层<br>(内部服务增删改查)<br>(外部服务增删改查)<br>(...所有业务用例的计算与组合逻辑的模块化)"]
|
||||||
XS["NetAdmin.XXXService\n(常驻内存服务)"]-->H
|
domain["<b>NetAdmin.Domain</b><br>框架:数据实体层<br>(数据库关系实体映射)<br>(DTO数据传输对象)<br>(...所有数据模型的抽象与封装)"]
|
||||||
XS["NetAdmin.XXXService\n(常驻内存服务)"]-->XC
|
infra["<b>NetAdmin.Infrastructure</b><br>框架:基础设施层<br>(第三方组件和Nuget包引用)<br>(公共构建和程序运行配置)<br>(公共常量枚举异常定义)<br>(全球化化和多语言)<br>(...所有公共Utility工具)"]
|
||||||
XC["NetAdmin.XXX.Cache\n(缓存层实例)"]-->C
|
biz-host["YourSolution.XXX.Host<br>业务实例:主机层"]
|
||||||
XA["NetAdmin.XXX.Application\n(业务逻辑层实例)"]-->A
|
biz-cache["YourSolution.XXX.Cache<br>业务实例:缓存层"]
|
||||||
|
biz-app["YourSolution.XXX.Application<br>业务实例:应用层"]
|
||||||
XH-->XC
|
biz-domain["YourSolution.XXX.Domain<br>业务实例:数据实体层"]
|
||||||
XC-->XA
|
biz-infra["YourSolution.XXX.Infrastructure<br>业务实例:基础设施层"]
|
||||||
|
biz-host-->biz-cache-->biz-app-->biz-domain-->biz-infra
|
||||||
|
sys-host-->sys-cache-->sys-app-->domain-->infra
|
||||||
|
host-->cache-->app-->domain-->infra
|
||||||
|
biz-host-->sys-host-->host
|
||||||
|
biz-cache-->sys-cache-->cache
|
||||||
|
biz-app-->sys-app-->app
|
||||||
|
biz-domain-->domain
|
||||||
|
biz-infra-->infra
|
||||||
```
|
```
|
||||||
|
|
||||||
## 引用的开源代码 / 特别鸣谢
|
## 特别鸣谢
|
||||||
|
|
||||||
| 语言 | 集成领域 | 开源库 |
|
| 语言 | 集成领域 | 开源库 |
|
||||||
|------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
@@ -88,7 +102,6 @@ XC-->XA
|
|||||||
| C# | 数据库关系映射 | [FreeSql](https://github.com/dotnetcore/FreeSql) |
|
| C# | 数据库关系映射 | [FreeSql](https://github.com/dotnetcore/FreeSql) |
|
||||||
| C# | 代码质量检查 | [Roslynator.Analyzers](https://github.com/josefpihrt/roslynator) \| [SonarAnalyzer.CSharp](https://github.com/SonarSource/sonar-dotnet) \| [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers) |
|
| C# | 代码质量检查 | [Roslynator.Analyzers](https://github.com/josefpihrt/roslynator) \| [SonarAnalyzer.CSharp](https://github.com/SonarSource/sonar-dotnet) \| [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers) |
|
||||||
| C# | 单元测试框架 | [xunit](https://github.com/xunit/xunit) \| [coverlet.collector](https://github.com/coverlet-coverage/coverlet) |
|
| C# | 单元测试框架 | [xunit](https://github.com/xunit/xunit) \| [coverlet.collector](https://github.com/coverlet-coverage/coverlet) |
|
||||||
| C# | 分布式锁 | [RedLock.net](https://github.com/samcook/RedLock.net) |
|
|
||||||
| C# | 控制台终端界面库 | [Spectre.Console](https://github.com/spectreconsole/spectre.console) |
|
| C# | 控制台终端界面库 | [Spectre.Console](https://github.com/spectreconsole/spectre.console) |
|
||||||
| C# | 扩展函数库 | [NSExt](https://github.com/nsnail/ns-ext.git) |
|
| C# | 扩展函数库 | [NSExt](https://github.com/nsnail/ns-ext.git) |
|
||||||
| C# | 图形处理库 | [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) |
|
| C# | 图形处理库 | [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) |
|
||||||
@@ -96,8 +109,6 @@ XC-->XA
|
|||||||
| C# | 性能监控采集 | [prometheus-net.AspNetCore](https://github.com/prometheus-net/prometheus-net) |
|
| C# | 性能监控采集 | [prometheus-net.AspNetCore](https://github.com/prometheus-net/prometheus-net) |
|
||||||
| C# | 雪花ID生成器 | [Yitter.IdGenerator](https://github.com/yitter/idgenerator) |
|
| C# | 雪花ID生成器 | [Yitter.IdGenerator](https://github.com/yitter/idgenerator) |
|
||||||
| C# | 自动化版本管理 | [MinVer](https://github.com/adamralph/minver) |
|
| C# | 自动化版本管理 | [MinVer](https://github.com/adamralph/minver) |
|
||||||
| C# | JavaScript引擎 | [MsieJavaScriptEngine](https://github.com/Taritsyn/MsieJavaScriptEngine) |
|
|
||||||
| C# | WebApi图形界面 | [IGeekFan.AspNetCore.Knife4jUI](https://github.com/luoyunchong/IGeekFan.AspNetCore.Knife4jUI) |
|
|
||||||
| TypeScript | SPA基础框架 | [Vue](https://github.com/vuejs/core) |
|
| TypeScript | SPA基础框架 | [Vue](https://github.com/vuejs/core) |
|
||||||
| TypeScript | 前端构建工具 | [Vite](https://github.com/vitejs/vite) |
|
| TypeScript | 前端构建工具 | [Vite](https://github.com/vitejs/vite) |
|
||||||
| TypeScript | UI控件库 | [ElementPlus](https://github.com/element-plus/element-plus) |
|
| TypeScript | UI控件库 | [ElementPlus](https://github.com/element-plus/element-plus) |
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
USDT
|
||||||
|
上次执行时间
|
||||||
|
上次执行状态
|
||||||
|
上次执行耗时
|
||||||
|
下次执行时间
|
||||||
不为其中之一
|
不为其中之一
|
||||||
不以什么开始
|
不以什么开始
|
||||||
不以什么结束
|
不以什么结束
|
||||||
@@ -8,63 +13,167 @@
|
|||||||
中专
|
中专
|
||||||
中共党员
|
中共党员
|
||||||
为其中之一
|
为其中之一
|
||||||
|
交易
|
||||||
|
人工
|
||||||
|
人工审核
|
||||||
|
代码模板导出
|
||||||
以什么开始
|
以什么开始
|
||||||
以什么结束
|
以什么结束
|
||||||
保密
|
作业名称
|
||||||
保密
|
作业状态
|
||||||
|
佣金收入
|
||||||
信息
|
信息
|
||||||
倒序排序
|
倒序排序
|
||||||
|
充值成功
|
||||||
|
充值订单导出
|
||||||
|
全部数据
|
||||||
|
公告
|
||||||
共青团员
|
共青团员
|
||||||
|
内部错误
|
||||||
出生证
|
出生证
|
||||||
|
创建时间
|
||||||
初中
|
初中
|
||||||
|
删除
|
||||||
|
到账确认中
|
||||||
包含
|
包含
|
||||||
博士
|
博士
|
||||||
博士后
|
博士后
|
||||||
|
发送失败
|
||||||
同步数据库结构
|
同步数据库结构
|
||||||
|
响应体
|
||||||
|
响应状态码
|
||||||
|
唯一编码
|
||||||
|
备注
|
||||||
外国人居留证
|
外国人居留证
|
||||||
外部错误
|
外部错误
|
||||||
大专
|
大专
|
||||||
大于
|
大于
|
||||||
大于等于
|
大于等于
|
||||||
女
|
女
|
||||||
女
|
字典内容导出
|
||||||
宕机
|
宕机
|
||||||
|
客户端IP
|
||||||
|
密
|
||||||
小于
|
小于
|
||||||
小于等于
|
小于等于
|
||||||
小学
|
小学
|
||||||
|
已冻结
|
||||||
|
已发送
|
||||||
已婚
|
已婚
|
||||||
|
已校验
|
||||||
|
已解冻
|
||||||
|
已读
|
||||||
并且
|
并且
|
||||||
|
归属角色
|
||||||
|
归属部门
|
||||||
|
微信支付
|
||||||
成功
|
成功
|
||||||
或者
|
或者
|
||||||
|
手机
|
||||||
|
手机号
|
||||||
|
执行耗时
|
||||||
|
执行计划
|
||||||
护照
|
护照
|
||||||
|
指定部门数据
|
||||||
|
按钮
|
||||||
|
排序
|
||||||
|
接口名称
|
||||||
|
接口导出
|
||||||
|
接口描述
|
||||||
|
接口路径
|
||||||
插入种子数据
|
插入种子数据
|
||||||
|
操作系统
|
||||||
|
支付宝
|
||||||
|
支付超时
|
||||||
|
支出
|
||||||
|
收入
|
||||||
|
数据范围
|
||||||
|
文档内容
|
||||||
|
文档内容导出
|
||||||
|
文档标题
|
||||||
无效操作
|
无效操作
|
||||||
无效输入
|
无效输入
|
||||||
|
无限权限
|
||||||
日期范围
|
日期范围
|
||||||
|
是否启用
|
||||||
|
显示仪表板
|
||||||
|
最后登录时间
|
||||||
未处理异常
|
未处理异常
|
||||||
未婚
|
未婚
|
||||||
|
未读
|
||||||
|
本人数据
|
||||||
本科
|
本科
|
||||||
|
本部门和下一级部门数据
|
||||||
|
本部门和所有子部门数据
|
||||||
|
本部门数据
|
||||||
|
来自
|
||||||
|
框架
|
||||||
比较数据库结构
|
比较数据库结构
|
||||||
|
注册
|
||||||
|
消息主题
|
||||||
|
消息摘要
|
||||||
|
消息类型
|
||||||
港澳台通行证
|
港澳台通行证
|
||||||
|
用户代理
|
||||||
|
用户名
|
||||||
|
用户导出
|
||||||
|
用户邀请导出
|
||||||
|
用户钱包导出
|
||||||
|
电子邮箱
|
||||||
男
|
男
|
||||||
男
|
登录
|
||||||
|
登录名
|
||||||
|
登录日志导出
|
||||||
硕士
|
硕士
|
||||||
示例导出
|
|
||||||
离异
|
离异
|
||||||
|
私信
|
||||||
|
空闲
|
||||||
|
站内信导出
|
||||||
等于
|
等于
|
||||||
等于
|
等待发送
|
||||||
等于
|
等待支付
|
||||||
|
管理员充值
|
||||||
|
管理员扣费
|
||||||
|
管理员赠送
|
||||||
管理模块
|
管理模块
|
||||||
系统模块
|
系统模块
|
||||||
|
绑定手机号码
|
||||||
结果非预期
|
结果非预期
|
||||||
群众
|
群众
|
||||||
|
自助充值
|
||||||
自定义
|
自定义
|
||||||
范围
|
范围
|
||||||
|
菜单
|
||||||
|
角色名称
|
||||||
|
角色导出
|
||||||
|
解绑手机号码
|
||||||
警告
|
警告
|
||||||
|
计划作业导出
|
||||||
|
计划作业执行记录导出
|
||||||
|
请求方式
|
||||||
|
请求日志导出
|
||||||
调试
|
调试
|
||||||
跟踪
|
|
||||||
身份证
|
身份证
|
||||||
|
转给
|
||||||
|
转账支出
|
||||||
|
转账收入
|
||||||
|
运行
|
||||||
|
追踪
|
||||||
|
追踪标识
|
||||||
|
通知
|
||||||
|
邮箱号
|
||||||
|
部门名称
|
||||||
|
部门导出
|
||||||
|
配置导出
|
||||||
|
重设密码
|
||||||
|
钱包交易导出
|
||||||
|
钱包冻结导出
|
||||||
|
链接
|
||||||
错误
|
错误
|
||||||
随机排序
|
随机排序
|
||||||
|
项值
|
||||||
|
项名
|
||||||
顺序排序
|
顺序排序
|
||||||
高中
|
高中
|
||||||
|
默认角色
|
||||||
|
默认部门
|
||||||
@@ -1,21 +1,124 @@
|
|||||||
|
1分钟内只能发送1次
|
||||||
6位数字
|
6位数字
|
||||||
8位以上数字字母组合
|
8位以上数字字母组合
|
||||||
XML注释文件不存在
|
XML注释文件不存在
|
||||||
|
不能设置自己为上级
|
||||||
中文姓名
|
中文姓名
|
||||||
事务已回滚
|
事务已回滚
|
||||||
事务已提交
|
事务已提交
|
||||||
|
交易失败
|
||||||
|
交易金额不正确
|
||||||
|
人机校验请求不能为空
|
||||||
|
人机验证未通过
|
||||||
|
作业名称不能为空
|
||||||
|
允许的文件大小
|
||||||
|
允许的文件格式
|
||||||
|
冻结状态不正确
|
||||||
区号电话号码分机号
|
区号电话号码分机号
|
||||||
参数格式不正确
|
参数格式不正确
|
||||||
|
唯一编码不能为空
|
||||||
|
图标代码不能为空
|
||||||
|
图标名称不能为空
|
||||||
|
婚姻状况不正确
|
||||||
|
字典名称不能为空
|
||||||
|
字典目录不存在
|
||||||
|
字典目录编号不能为空
|
||||||
|
字典编码不能为空
|
||||||
|
学历不正确
|
||||||
|
完全公开
|
||||||
|
密码不能为空
|
||||||
|
已处理完毕
|
||||||
|
并发冲突_请稍后重试
|
||||||
开始事务
|
开始事务
|
||||||
|
性别不正确
|
||||||
|
手机号码不正确
|
||||||
|
手机号码不能为空
|
||||||
|
指定的上级为该账号的下级用户
|
||||||
|
接口编码不存在
|
||||||
支付宝账号
|
支付宝账号
|
||||||
|
支付方式不正确
|
||||||
|
政治面貌不正确
|
||||||
数据库同步开始
|
数据库同步开始
|
||||||
|
数据库服务器时钟偏移
|
||||||
数据库结构同步完成
|
数据库结构同步完成
|
||||||
|
文件不能为空
|
||||||
|
文档内容不能为空
|
||||||
|
文档分类不存在
|
||||||
|
文档分类名称不能为空
|
||||||
|
文档分类编号不能为空
|
||||||
|
文档分类编码不能为空
|
||||||
|
文档标题不能为空
|
||||||
|
新密码不能为空
|
||||||
|
新手机号码验证码不正确
|
||||||
无效端口号
|
无效端口号
|
||||||
无效证件号码
|
无效证件号码
|
||||||
|
旧密码不正确
|
||||||
|
旧密码不能为空
|
||||||
|
旧手机号码不正确
|
||||||
|
旧手机号码验证码不正确
|
||||||
时间表达式
|
时间表达式
|
||||||
|
时间计划不能为空
|
||||||
|
未指定部门
|
||||||
|
未获取到待执行任务
|
||||||
|
档案可见性不正确
|
||||||
|
此操作不被允许
|
||||||
|
此节点已下线
|
||||||
|
民族不正确
|
||||||
|
消息主题不能为空
|
||||||
|
消息内容不能为空
|
||||||
|
父节点不存在
|
||||||
|
用户不存在
|
||||||
|
用户名不符合要求
|
||||||
|
用户名不能为空
|
||||||
用户名不能是手机号码
|
用户名不能是手机号码
|
||||||
用户名长度4位以上
|
用户名或密码错误
|
||||||
|
用户头像不能为空
|
||||||
|
用户编号不存在
|
||||||
|
登录用户
|
||||||
|
目标设备不能为空
|
||||||
|
短信验证请求不能为空
|
||||||
|
站内信不存在
|
||||||
|
站内信状态不正确
|
||||||
|
站内信类型不正确
|
||||||
|
缓存键不能为空
|
||||||
|
网络地址不正确
|
||||||
|
自己可见
|
||||||
|
菜单名称不能为空
|
||||||
|
菜单标题不能为空
|
||||||
|
菜单类型不正确
|
||||||
|
菜单编号不能为空
|
||||||
|
角色不存在
|
||||||
|
角色名称不能为空
|
||||||
|
角色数据范围不正确
|
||||||
|
角色编号不能为空
|
||||||
|
角色编号列表不能为空
|
||||||
|
记录已存在
|
||||||
|
设备类型不能为空
|
||||||
|
证件类型不正确
|
||||||
|
该角色下存在用户
|
||||||
|
该部门下存在子部门
|
||||||
|
该部门下存在用户
|
||||||
|
请求地址不能为空
|
||||||
请求对象不能为空
|
请求对象不能为空
|
||||||
|
请求方法不正确
|
||||||
|
请联系管理员激活账号
|
||||||
|
读取用户令牌出错
|
||||||
|
账号不能为空
|
||||||
邀请码不正确
|
邀请码不正确
|
||||||
|
邮箱验证码不正确
|
||||||
|
部门不存在
|
||||||
|
部门可见
|
||||||
|
部门名称不能为空
|
||||||
配置文件初始化完毕
|
配置文件初始化完毕
|
||||||
|
钱包可用余额不足
|
||||||
|
键值不能为空
|
||||||
|
键名称不能为空
|
||||||
|
随机延时结束时间不正确
|
||||||
|
随机延时起始时间不正确
|
||||||
非JSON字符串
|
非JSON字符串
|
||||||
|
验证数据不能为空
|
||||||
|
验证码不正确
|
||||||
|
验证码不能为空
|
||||||
|
验证码目标设备类型不正确
|
||||||
|
验证码类型不正确
|
||||||
|
验证码类型不能为空
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
上次执行时间
|
|
||||||
上次执行状态
|
|
||||||
上次执行耗时
|
|
||||||
下次执行时间
|
|
||||||
人工审核
|
|
||||||
作业名称
|
|
||||||
作业状态
|
|
||||||
全部数据
|
|
||||||
公告
|
|
||||||
创建时间
|
|
||||||
删除
|
|
||||||
发送失败
|
|
||||||
响应体
|
|
||||||
响应状态码
|
|
||||||
唯一编码
|
|
||||||
备注
|
|
||||||
字典内容导出
|
|
||||||
客户端IP
|
|
||||||
已发送
|
|
||||||
已校验
|
|
||||||
已读
|
|
||||||
所属角色
|
|
||||||
所属部门
|
|
||||||
手机
|
|
||||||
手机号
|
|
||||||
执行耗时
|
|
||||||
执行计划
|
|
||||||
指定部门数据
|
|
||||||
按钮
|
|
||||||
排序
|
|
||||||
接口名称
|
|
||||||
接口导出
|
|
||||||
接口描述
|
|
||||||
接口路径
|
|
||||||
操作系统
|
|
||||||
数据范围
|
|
||||||
无限权限
|
|
||||||
是否启用
|
|
||||||
显示仪表板
|
|
||||||
最后登录时间
|
|
||||||
未读
|
|
||||||
本人数据
|
|
||||||
本部门和下级部门数据
|
|
||||||
本部门数据
|
|
||||||
框架
|
|
||||||
注册
|
|
||||||
消息主题
|
|
||||||
消息摘要
|
|
||||||
消息类型
|
|
||||||
用户代理
|
|
||||||
用户名
|
|
||||||
用户导出
|
|
||||||
电子邮箱
|
|
||||||
登录
|
|
||||||
登录名
|
|
||||||
登录日志导出
|
|
||||||
空闲
|
|
||||||
站内信导出
|
|
||||||
等待发送
|
|
||||||
绑定手机号码
|
|
||||||
菜单
|
|
||||||
角色名称
|
|
||||||
角色导出
|
|
||||||
解绑手机号码
|
|
||||||
计划作业导出
|
|
||||||
计划作业执行记录导出
|
|
||||||
请求方式
|
|
||||||
请求日志导出
|
|
||||||
跟踪标识
|
|
||||||
运行
|
|
||||||
通知
|
|
||||||
邮箱号
|
|
||||||
部门名称
|
|
||||||
部门导出
|
|
||||||
配置导出
|
|
||||||
重设密码
|
|
||||||
链接
|
|
||||||
项值
|
|
||||||
项名
|
|
||||||
默认角色
|
|
||||||
默认部门
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
1分钟内只能发送1次
|
|
||||||
人机校验请求不能为空
|
|
||||||
人机验证未通过
|
|
||||||
作业名称不能为空
|
|
||||||
允许的文件大小
|
|
||||||
允许的文件格式
|
|
||||||
唯一编码不能为空
|
|
||||||
图标代码不能为空
|
|
||||||
图标名称不能为空
|
|
||||||
婚姻状况不正确
|
|
||||||
字典名称不能为空
|
|
||||||
字典目录不存在
|
|
||||||
字典目录编号不能为空
|
|
||||||
字典目录编号不能为空
|
|
||||||
字典编码不能为空
|
|
||||||
学历不正确
|
|
||||||
密码不能为空
|
|
||||||
密码不能为空
|
|
||||||
密码不能为空
|
|
||||||
密码不能为空
|
|
||||||
已处理完毕
|
|
||||||
已处理完毕
|
|
||||||
已处理完毕
|
|
||||||
并发冲突_请稍后重试
|
|
||||||
性别不正确
|
|
||||||
手机号码不正确
|
|
||||||
手机号码不能为空
|
|
||||||
接口编码不存在
|
|
||||||
政治面貌不正确
|
|
||||||
数据库服务器时钟偏移
|
|
||||||
文件不能为空
|
|
||||||
新密码不能为空
|
|
||||||
新手机号码验证码不正确
|
|
||||||
旧密码不正确
|
|
||||||
旧密码不能为空
|
|
||||||
旧手机号码不正确
|
|
||||||
旧手机号码验证码不正确
|
|
||||||
时间计划不能为空
|
|
||||||
未指定部门
|
|
||||||
未获取到待执行任务
|
|
||||||
模块名称不能为空
|
|
||||||
模块类型不能为空
|
|
||||||
模块说明不能为空
|
|
||||||
此节点已下线
|
|
||||||
此节点已下线
|
|
||||||
民族不正确
|
|
||||||
消息主题不能为空
|
|
||||||
消息内容不能为空
|
|
||||||
父节点不存在
|
|
||||||
用户不存在
|
|
||||||
用户名不能为空
|
|
||||||
用户名不能为空
|
|
||||||
用户名不能为空
|
|
||||||
用户名或密码错误
|
|
||||||
用户头像不能为空
|
|
||||||
用户编号不存在
|
|
||||||
目标设备不能为空
|
|
||||||
目标设备不能为空
|
|
||||||
短信验证请求不能为空
|
|
||||||
短信验证请求不能为空
|
|
||||||
短信验证请求不能为空
|
|
||||||
站内信不存在
|
|
||||||
站内信状态不正确
|
|
||||||
站内信类型不正确
|
|
||||||
缓存键不能为空
|
|
||||||
网络地址不正确
|
|
||||||
网络地址不正确
|
|
||||||
网络地址不正确
|
|
||||||
菜单名称不能为空
|
|
||||||
菜单标题不能为空
|
|
||||||
菜单类型不正确
|
|
||||||
菜单编号不能为空
|
|
||||||
角色不存在
|
|
||||||
角色名称不能为空
|
|
||||||
角色数据范围不正确
|
|
||||||
角色编号不能为空
|
|
||||||
角色编号列表不能为空
|
|
||||||
设备类型不能为空
|
|
||||||
证件类型不正确
|
|
||||||
该角色下存在用户
|
|
||||||
该部门下存在子部门
|
|
||||||
该部门下存在用户
|
|
||||||
请求地址不能为空
|
|
||||||
请求方法不正确
|
|
||||||
请稍后重试
|
|
||||||
请联系管理员激活账号
|
|
||||||
读取用户令牌出错
|
|
||||||
账号不能为空
|
|
||||||
邮箱验证码不正确
|
|
||||||
部门不存在
|
|
||||||
部门名称不能为空
|
|
||||||
键值不能为空
|
|
||||||
键名称不能为空
|
|
||||||
键名称不能为空
|
|
||||||
随机延时结束时间不正确
|
|
||||||
随机延时起始时间不正确
|
|
||||||
验证数据不能为空
|
|
||||||
验证码不正确
|
|
||||||
验证码不能为空
|
|
||||||
验证码目标设备类型不正确
|
|
||||||
验证码类型不正确
|
|
||||||
验证码类型不能为空
|
|
||||||
16
assets/seed-data/Sys_CodeTemplate.json
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"Enabled": true,
|
||||||
|
"Gender": 1,
|
||||||
|
"Id": 694360665923594,
|
||||||
|
"Name": "老王",
|
||||||
|
"Sort": 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Enabled": true,
|
||||||
|
"Gender": 2,
|
||||||
|
"Id": 694360665923595,
|
||||||
|
"Name": "媳妇儿",
|
||||||
|
"Sort": 100,
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
|
"CnyToPointRate": 100,
|
||||||
"Enabled": true,
|
"Enabled": true,
|
||||||
|
"Trc20ReceiptAddress": "TMTByCrcZkY7o8YMax1pXiYV5SUQBZEnCu",
|
||||||
|
"UsdToPointRate": 700,
|
||||||
"UserRegisterConfirm": false,
|
"UserRegisterConfirm": false,
|
||||||
"UserRegisterDeptId": 372119301627909,
|
"UserRegisterDeptId": 372119301627909,
|
||||||
"UserRegisterRoleId": 371729946431493
|
"UserRegisterRoleId": 371729946431493,
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -2,12 +2,29 @@
|
|||||||
{
|
{
|
||||||
"Enabled": true,
|
"Enabled": true,
|
||||||
"ExecutionCron": "0 * * * * ?",
|
"ExecutionCron": "0 * * * * ?",
|
||||||
"HttpMethod": 3,
|
"HttpMethod": 7,
|
||||||
"JobName": "HTTP 请求测试",
|
"JobName": "用户收入支出统计",
|
||||||
"NextExecTime": "2020-09-13 12:26:40",
|
"LastStatusCode": 200,
|
||||||
"NextTimeId": 1600000000,
|
"NextExecTime": "2025-06-27 19:07:00",
|
||||||
"RequestUrl": "https://httpbin.org/ip",
|
"NextTimeId": 1751022420,
|
||||||
|
"RequestBody": "{\"Sql\":\"UPDATE Sys_UserWallet SET TotalIncome = (SELECT COALESCE(SUM(Amount), 0) FROM Sys_WalletTrade WHERE Sys_WalletTrade.OwnerId = Sys_UserWallet.Id AND Sys_WalletTrade.TradeDirection = 1);UPDATE Sys_UserWallet SET TotalExpenditure = (SELECT COALESCE(SUM(Amount), 0) FROM Sys_WalletTrade WHERE Sys_WalletTrade.OwnerId = Sys_UserWallet.Id AND Sys_WalletTrade.TradeDirection = 2);\",\"TimeoutSecs\":60}",
|
||||||
|
"RequestHeader": "{\"Content-Type\":\"application/json\"}",
|
||||||
|
"RequestUrl": "https://na.tools92.top/api/sys/tools/execute.sql",
|
||||||
"Status": 1,
|
"Status": 1,
|
||||||
"UserId": 370942943322181,
|
"UserId": 664362432344581,
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
"Enabled": true,
|
||||||
|
"ExecutionCron": "0 * * * * ?",
|
||||||
|
"HttpMethod": 7,
|
||||||
|
"JobName": "充值到账确认",
|
||||||
|
"LastStatusCode": 200,
|
||||||
|
"NextExecTime": "2025-06-27 19:07:00",
|
||||||
|
"NextTimeId": 1751022420,
|
||||||
|
"RequestBody": "{\"readRecordCount\":100}",
|
||||||
|
"RequestHeader": "{\"Content-Type\":\"application/json\"}",
|
||||||
|
"RequestUrl": "https://na.tools92.top/api/sys/deposit.order/received.confirmation",
|
||||||
|
"Status": 1,
|
||||||
|
"UserId": 664362432344581,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
[
|
[
|
||||||
// ------------------------------ 主控面板 ------------------------------
|
// ------------------------------ 主控面板 /home ------------------------------
|
||||||
{
|
{
|
||||||
"Component": "home",
|
"Component": "home",
|
||||||
"Icon": "el-icon-house",
|
"Icon": "el-icon-house",
|
||||||
@@ -8,9 +8,9 @@
|
|||||||
"Path": "/home",
|
"Path": "/home",
|
||||||
"Sort": 999,
|
"Sort": 999,
|
||||||
"Title": "主控面板",
|
"Title": "主控面板",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
// ------------------------------ 权限管理 ------------------------------
|
// ------------------------------ 权限管理 /power ------------------------------
|
||||||
{
|
{
|
||||||
"Icon": "el-icon-setting",
|
"Icon": "el-icon-setting",
|
||||||
"Id": 373837917724677,
|
"Id": 373837917724677,
|
||||||
@@ -18,137 +18,222 @@
|
|||||||
"Path": "/power",
|
"Path": "/power",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
"Title": "权限管理",
|
"Title": "权限管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/user",
|
"Component": "sys/power/user",
|
||||||
"Icon": "el-icon-user",
|
"Icon": "el-icon-user",
|
||||||
"Id": 373837957840901,
|
"Id": 373837957840901,
|
||||||
"Name": "sys/user",
|
"Name": "sys/power/user",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/user",
|
"Path": "/power/user",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
"Title": "用户管理",
|
"Title": "用户管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/role",
|
"Component": "sys/power/role",
|
||||||
"Icon": "sc-icon-role",
|
"Icon": "sc-icon-role",
|
||||||
"Id": 373838018527237,
|
"Id": 373838018527237,
|
||||||
"Name": "sys/role",
|
"Name": "sys/power/role",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/role",
|
"Path": "/power/role",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
"Title": "角色管理",
|
"Title": "角色管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/dept",
|
"Component": "sys/power/dept",
|
||||||
"Icon": "sc-icon-dept",
|
"Icon": "sc-icon-dept",
|
||||||
"Id": 373838045605893,
|
"Id": 373838045605893,
|
||||||
"Name": "sys/dept",
|
"Name": "sys/power/dept",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/dept",
|
"Path": "/power/dept",
|
||||||
"Sort": 98,
|
"Sort": 98,
|
||||||
"Title": "部门管理",
|
"Title": "部门管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/menu",
|
"Component": "sys/power/menu",
|
||||||
"Icon": "el-icon-fold",
|
"Icon": "el-icon-fold",
|
||||||
"Id": 373838070898693,
|
"Id": 373838070898693,
|
||||||
"Name": "sys/menu",
|
"Name": "sys/power/menu",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/menu",
|
"Path": "/power/menu",
|
||||||
"Sort": 97,
|
"Sort": 97,
|
||||||
"Title": "菜单管理",
|
"Title": "菜单管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
// ------------------------------ 系统管理 ------------------------------
|
// ------------------------------ 财务管理 /finance ------------------------------
|
||||||
{
|
{
|
||||||
"Icon": "sc-icon-App",
|
"Icon": "el-icon-money",
|
||||||
"Id": 485278637670422,
|
"Id": 690906994118665,
|
||||||
"Name": "sys",
|
"Name": "sys/finance",
|
||||||
"Path": "/sys",
|
"Path": "/finance",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
"Title": "系统管理",
|
"Title": "财务管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/config",
|
"Component": "sys/finance/wallet",
|
||||||
|
"Icon": "el-icon-wallet",
|
||||||
|
"Id": 690907673255942,
|
||||||
|
"Name": "sys/finance/wallet",
|
||||||
|
"ParentId": 690906994118665,
|
||||||
|
"Path": "/finance/wallet",
|
||||||
|
"Sort": 100,
|
||||||
|
"Title": "钱包管理",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Component": "sys/finance/trade",
|
||||||
|
"Icon": "el-icon-calendar",
|
||||||
|
"Id": 690907673255943,
|
||||||
|
"Name": "sys/finance/trade",
|
||||||
|
"ParentId": 690906994118665,
|
||||||
|
"Path": "/finance/trade",
|
||||||
|
"Sort": 99,
|
||||||
|
"Title": "交易流水",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Component": "sys/finance/deposit",
|
||||||
|
"Icon": "el-icon-shopping-cart",
|
||||||
|
"Id": 690907673255944,
|
||||||
|
"Name": "sys/finance/deposit",
|
||||||
|
"ParentId": 690906994118665,
|
||||||
|
"Path": "/finance/deposit",
|
||||||
|
"Sort": 98,
|
||||||
|
"Title": "自助充值",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
// ------------------------------ 营销管理 /market ------------------------------
|
||||||
|
{
|
||||||
|
"Icon": "el-icon-share",
|
||||||
|
"Id": 692575802241032,
|
||||||
|
"Name": "market",
|
||||||
|
"Path": "/market",
|
||||||
|
"Sort": 98,
|
||||||
|
"Title": "营销管理",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Component": "sys/market/invite",
|
||||||
|
"Icon": "el-icon-connection",
|
||||||
|
"Id": 692575802245126,
|
||||||
|
"Name": "sys/market/invite",
|
||||||
|
"ParentId": 692575802241032,
|
||||||
|
"Path": "/market/invite",
|
||||||
|
"Sort": 100,
|
||||||
|
"Title": "粉丝管理",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
// ------------------------------ 系统管理 /system ------------------------------
|
||||||
|
{
|
||||||
|
"Icon": "sc-icon-app",
|
||||||
|
"Id": 485278637670422,
|
||||||
|
"Name": "system",
|
||||||
|
"Path": "/system",
|
||||||
|
"Sort": 98,
|
||||||
|
"Title": "系统管理",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Component": "sys/system/config",
|
||||||
"Icon": "el-icon-set-up",
|
"Icon": "el-icon-set-up",
|
||||||
"Id": 380415005847557,
|
"Id": 380415005847557,
|
||||||
"Name": "sys/config",
|
"Name": "sys/system/config",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/config",
|
"Path": "/system/config",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
"Title": "系统设置",
|
"Title": "系统设置",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/job",
|
"Component": "sys/system/job",
|
||||||
"Icon": "sc-icon-ScheduledJob",
|
"Icon": "sc-icon-scheduled-job",
|
||||||
"Id": 510067557638158,
|
"Id": 510067557638158,
|
||||||
"Name": "sys/job",
|
"Name": "sys/system/job",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/job",
|
"Path": "/system/job",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
"Title": "计划作业",
|
"Title": "计划作业",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/dic",
|
"Component": "sys/system/dic",
|
||||||
"Icon": "sc-icon-dic",
|
"Icon": "sc-icon-dic",
|
||||||
"Id": 375315654221829,
|
"Id": 375315654221829,
|
||||||
"Name": "sys/dic",
|
"Name": "sys/system/dic",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/dic",
|
"Path": "/system/dic",
|
||||||
"Sort": 98,
|
"Sort": 98,
|
||||||
"Title": "字典管理",
|
"Title": "字典管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/msg",
|
"Component": "sys/system/msg",
|
||||||
"Icon": "el-icon-message",
|
"Icon": "el-icon-message",
|
||||||
"Id": 482779610341392,
|
"Id": 482779610341392,
|
||||||
"Name": "sys/msg",
|
"Name": "sys/system/msg",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/msg",
|
"Path": "/system/msg",
|
||||||
"Sort": 97,
|
"Sort": 97,
|
||||||
"Title": "消息管理",
|
"Title": "消息管理",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/api",
|
"Component": "sys/system/api",
|
||||||
"Icon": "sc-icon-api",
|
"Icon": "sc-icon-api",
|
||||||
"Id": 397880678895621,
|
"Id": 397880678895621,
|
||||||
"Name": "sys/api",
|
"Name": "sys/system/api",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/api",
|
"Path": "/system/api",
|
||||||
"Sort": 96,
|
"Sort": 96,
|
||||||
"Title": "接口管理",
|
"Title": "接口管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/cache",
|
"Component": "sys/system/cache",
|
||||||
"Icon": "sc-icon-memory",
|
"Icon": "sc-icon-memory",
|
||||||
"Id": 374911555702789,
|
"Id": 374911555702789,
|
||||||
"Name": "sys/cache",
|
"Name": "sys/system/cache",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/cache",
|
"Path": "/system/cache",
|
||||||
"Sort": 95,
|
"Sort": 95,
|
||||||
"Title": "缓存管理",
|
"Title": "缓存管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
// ------------------------------ 日志管理 ------------------------------
|
// ------------------------------ 档案管理 /archive ------------------------------
|
||||||
|
{
|
||||||
|
"Icon": "sc-icon-archive",
|
||||||
|
"Id": 616214756757512,
|
||||||
|
"Name": "archive",
|
||||||
|
"Path": "/archive",
|
||||||
|
"Sort": 97,
|
||||||
|
"Title": "档案管理",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Component": "sys/archive/doc",
|
||||||
|
"Icon": "el-icon-document",
|
||||||
|
"Id": 616214756757516,
|
||||||
|
"Name": "sys/archive/doc",
|
||||||
|
"ParentId": 616214756757512,
|
||||||
|
"Path": "/archive/doc",
|
||||||
|
"Sort": 100,
|
||||||
|
"Title": "文档管理",
|
||||||
|
"Type": 1,
|
||||||
|
},
|
||||||
|
// ------------------------------ 日志管理 /log ------------------------------
|
||||||
{
|
{
|
||||||
"Icon": "el-icon-tickets",
|
"Icon": "el-icon-tickets",
|
||||||
"Id": 374792687640581,
|
"Id": 374792687640581,
|
||||||
"Name": "log",
|
"Name": "log",
|
||||||
"Path": "/log",
|
"Path": "/log",
|
||||||
"Sort": 98,
|
"Sort": 96,
|
||||||
"Title": "日志管理",
|
"Title": "日志管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/log/operation",
|
"Component": "sys/log/operation",
|
||||||
@@ -156,60 +241,71 @@
|
|||||||
"Id": 485285246504976,
|
"Id": 485285246504976,
|
||||||
"Name": "sys/log/operation",
|
"Name": "sys/log/operation",
|
||||||
"ParentId": 374792687640581,
|
"ParentId": 374792687640581,
|
||||||
"Path": "/sys/log/operation",
|
"Path": "/log/operation",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
"Title": "操作日志",
|
"Title": "操作日志",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "sys/log/login",
|
"Component": "sys/log/login",
|
||||||
"Icon": "sc-icon-OpenDoor",
|
"Icon": "sc-icon-open-door",
|
||||||
"Id": 485285246504970,
|
"Id": 485285246504970,
|
||||||
"Name": "sys/log/login",
|
"Name": "sys/log/login",
|
||||||
"ParentId": 374792687640581,
|
"ParentId": 374792687640581,
|
||||||
"Path": "/sys/log/login",
|
"Path": "/log/login",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
"Title": "登录日志",
|
"Title": "登录日志",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
},
|
},
|
||||||
// ------------------------------ 开发管理 ------------------------------
|
// ------------------------------ 开发管理 /dev ------------------------------
|
||||||
{
|
{
|
||||||
"Icon": "sc-icon-code",
|
"Icon": "sc-icon-code",
|
||||||
"Id": 373838105399301,
|
"Id": 373838105399301,
|
||||||
"Name": "dev",
|
"Name": "dev",
|
||||||
"Path": "/dev",
|
"Path": "/dev",
|
||||||
"Sort": 97,
|
"Sort": 95,
|
||||||
"Title": "开发管理",
|
"Title": "开发管理",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Component": "dev/code",
|
"Component": "sys/dev/code",
|
||||||
"Icon": "sc-icon-code2",
|
"Icon": "sc-icon-code2",
|
||||||
"Id": 373838147022853,
|
"Id": 373838147022853,
|
||||||
"Name": "dev/code",
|
"Name": "sys/dev/code",
|
||||||
"ParentId": 373838105399301,
|
"ParentId": 373838105399301,
|
||||||
"Path": "/dev/code",
|
"Path": "/dev/code",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
"Title": "代码生成",
|
"Title": "代码生成",
|
||||||
"Type": 1
|
"Type": 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Component": "sys/dev/template",
|
||||||
|
"Icon": "sc-icon-template",
|
||||||
|
"Id": 694076641718288,
|
||||||
|
"Name": "sys/dev/template",
|
||||||
|
"ParentId": 373838105399301,
|
||||||
|
"Path": "/dev/template",
|
||||||
|
"Sort": 99,
|
||||||
|
"Title": "页面模板",
|
||||||
|
"Type": 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Id": 482777529417739,
|
"Id": 482777529417739,
|
||||||
"ParentId": 373838105399301,
|
"ParentId": 373838105399301,
|
||||||
"Icon": "el-icon-eleme-filled",
|
"Icon": "el-icon-eleme-filled",
|
||||||
"Name": "dev/element",
|
"Name": "dev/element",
|
||||||
"Path": "http://element-plus.org/zh-CN/component/overview.html",
|
"Path": "https://element-plus.org/zh-CN/component/overview.html",
|
||||||
"Sort": 99,
|
"Sort": 98,
|
||||||
"Title": "Element",
|
"Title": "Element",
|
||||||
"Type": 3,
|
"Type": 3,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Id": 560217289232398,
|
"Id": 560217289232398,
|
||||||
"ParentId": 373838105399301,
|
"ParentId": 373838105399301,
|
||||||
"Icon": "sc-icon-FreeSql",
|
"Icon": "sc-icon-free-sql",
|
||||||
"Name": "dev/freesql",
|
"Name": "dev/freesql",
|
||||||
"Path": "https://freesql.net/guide",
|
"Path": "https://freesql.net/guide",
|
||||||
"Sort": 99,
|
"Sort": 97,
|
||||||
"Title": "FreeSql",
|
"Title": "FreeSql",
|
||||||
"Type": 3,
|
"Type": 3,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,5 +42,81 @@
|
|||||||
{
|
{
|
||||||
"ApiId": "api/sys/user/set.session.user.app.config",
|
"ApiId": "api/sys/user/set.session.user.app.config",
|
||||||
"RoleId": 371729946431493,
|
"RoleId": 371729946431493,
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/login.log/paged.query",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/login.log/get",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/login.log/count.by",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/login.log/export",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/user.wallet/paged.query",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/user.wallet/get",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/wallet.trade/paged.query",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/wallet.trade/count.by",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/wallet.trade/get",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/deposit.order/paged.query",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/deposit.order/count.by",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/deposit.order/create",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/deposit.order/get",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/deposit.order/get.deposit.config",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/deposit.order/pay.confirm",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/user.invite/query",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/wallet.frozen/get",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/wallet.frozen/paged.query",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/wallet.frozen/count.by",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
@@ -6,5 +6,37 @@
|
|||||||
{
|
{
|
||||||
"MenuId": 374967228141573,
|
"MenuId": 374967228141573,
|
||||||
"RoleId": 371729946431493
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 690906994118665,
|
||||||
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 690907673255942,
|
||||||
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 374792687640581,
|
||||||
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 485285246504970,
|
||||||
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 690907673255943,
|
||||||
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 690907673255944,
|
||||||
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 692575802241032,
|
||||||
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"MenuId": 692575802245126,
|
||||||
|
"RoleId": 371729946431493
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"Content": "<p>尊敬的用户:</p>\n<p style=\"padding-left: 40px;\">欢迎您使用 NetAdmin 后台管理系统!NetAdmin 是一款通用后台权限管理系统和快速开发框架,它基于 C#12/.NET9、Vue3/Vite、Element Plus 等现代技术构建,具有十分整洁、优雅的编码规范。</p>\n<p style=\"padding-left: 40px;\">NetAdmin 致力于为企业提供高效、安全、易用的解决方案,帮助您快速构建出符合业务需求的应用程序。系统提供了丰富的功能模块,包括用户管理、权限管理、日志管理、文件上传等,可以满足您日常管理的需求。</p>\n<p style=\"padding-left: 40px;\">在使用 NetAdmin 的过程中,我们真诚地希望您能够遵守以下规定:</p>\n<p style=\"padding-left: 80px;\">1. 不得利用 NetAdmin 进行非法活动或者侵犯他人权益;</p>\n<p style=\"padding-left: 80px;\">2. 不得对 NetAdmin 系统进行恶意攻击或者破坏;</p>\n<p style=\"padding-left: 80px;\">3. 不得将 NetAdmin 系统的任何部分用于商业目的或者未经授权的访问。</p>\n<p style=\"padding-left: 80px;\">4. 为了更好地为您提供服务,NetAdmin 将不断进行优化和升级,同时也欢迎您提出宝贵的意见和建议。如果您在使用过程中遇到任何问题,可以通过官方网站或者技术支持团队进行咨询和解决。</p>\n<p style=\"padding-left: 40px;\">再次感谢您对 NetAdmin 的信任和支持!我们相信,在您的使用过程中,NetAdmin 一定会成为您的得力助手,为您的事业发展提供强有力的支持!</p>\n<p style=\"text-align: right;\">NetAdmin 开发团队</p>",
|
"Content": "<p>尊敬的用户:</p>\n<p style=\"padding-left: 40px;\">欢迎您使用 NetAdmin 后台管理系统!NetAdmin 是一款通用后台权限管理系统和快速开发框架,它基于 C#13/.NET9、Vue3/Vite、ElementPlus 等现代技术构建,具有十分整洁、优雅的编码规范。</p>\n<p style=\"padding-left: 40px;\">NetAdmin 致力于为企业提供高效、安全、易用的解决方案,帮助您快速构建出符合业务需求的应用程序。系统提供了丰富的功能模块,包括用户管理、权限管理、日志管理、文件上传等,可以满足您日常管理的需求。</p>\n<p style=\"padding-left: 40px;\">在使用 NetAdmin 的过程中,我们真诚地希望您能够遵守以下规定:</p>\n<p style=\"padding-left: 80px;\">1. 不得利用 NetAdmin 进行非法活动或者侵犯他人权益;</p>\n<p style=\"padding-left: 80px;\">2. 不得对 NetAdmin 系统进行恶意攻击或者破坏;</p>\n<p style=\"padding-left: 80px;\">3. 不得将 NetAdmin 系统的任何部分用于商业目的或者未经授权的访问。</p>\n<p style=\"padding-left: 80px;\">4. 为了更好地为您提供服务,NetAdmin 将不断进行优化和升级,同时也欢迎您提出宝贵的意见和建议。如果您在使用过程中遇到任何问题,可以通过官方网站或者技术支持团队进行咨询和解决。</p>\n<p style=\"padding-left: 40px;\">再次感谢您对 NetAdmin 的信任和支持!我们相信,在您的使用过程中,NetAdmin 一定会成为您的得力助手,为您的事业发展提供强有力的支持!</p>\n<p style=\"text-align: right;\">NetAdmin 开发团队</p>",
|
||||||
"CreatedUserId": 370942943322181,
|
"CreatedUserId": 370942943322181,
|
||||||
"CreatedUserName": "root",
|
"CreatedUserName": "root",
|
||||||
"MsgType": 2,
|
"MsgType": 2,
|
||||||
"Summary": "尊敬的用户:\n欢迎您使用 NetAdmin 后台管理系统!NetAdmin 是一款通用后台权限管理系统和快速开发框架,它基于 C#12/.NET9、Vue3/Vite、Element Plus 等现代",
|
"Summary": "尊敬的用户:\n欢迎您使用 NetAdmin 后台管理系统!NetAdmin 是一款通用后台权限管理系统和快速开发框架,它基于 C#13/.NET9、Vue3/Vite、ElementPlus 等现代",
|
||||||
"Title": "欢迎使用 NetAdmin 后台管理系统",
|
"Title": "欢迎使用 NetAdmin 后台管理系统",
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -3,16 +3,27 @@
|
|||||||
"DeptId": 372119301627909,
|
"DeptId": 372119301627909,
|
||||||
"Enabled": true,
|
"Enabled": true,
|
||||||
"Id": 370942943322181,
|
"Id": 370942943322181,
|
||||||
|
"InviteCode": "Q09Y8O",
|
||||||
"Password": "A8E87D23-49BC-25A1-1C7C-59186BEF5D15",
|
"Password": "A8E87D23-49BC-25A1-1C7C-59186BEF5D15",
|
||||||
"Token": "A9AFD92E-A33D-4152-9A6C-A9C141D24887",
|
"Token": "A9AFD92E-A33D-4152-9A6C-A9C141D24887",
|
||||||
"UserName": "root"
|
"UserName": "root",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"DeptId": 372119301627909,
|
"DeptId": 372119301627909,
|
||||||
"Enabled": true,
|
"Enabled": true,
|
||||||
"Id": 560217289236492,
|
"Id": 560217289236492,
|
||||||
|
"InviteCode": "7ZH5PB",
|
||||||
"Password": "A8E87D23-49BC-25A1-1C7C-59186BEF5D15",
|
"Password": "A8E87D23-49BC-25A1-1C7C-59186BEF5D15",
|
||||||
"Token": "4208EA97-B32F-4E39-A290-4C0D27B61EBF",
|
"Token": "4208EA97-B32F-4E39-A290-4C0D27B61EBF",
|
||||||
"UserName": "user"
|
"UserName": "user",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"DeptId": 372119301627909,
|
||||||
|
"Enabled": true,
|
||||||
|
"Id": 664362432344581,
|
||||||
|
"InviteCode": "47Q56H",
|
||||||
|
"Password": "A8E87D23-49BC-25A1-1C7C-59186BEF5D15",
|
||||||
|
"Token": "751D599B-2B8C-417C-9565-CCF2363F5F6F",
|
||||||
|
"UserName": "jobs",
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
18
assets/seed-data/Sys_UserInvite.json
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"Id": 370942943322181,
|
||||||
|
"SelfDepositAllowed": true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Id": 560217289236492,
|
||||||
|
"OwnerDeptId": 372119301627909,
|
||||||
|
"OwnerId": 370942943322181,
|
||||||
|
"SelfDepositAllowed": true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Id": 664362432344581,
|
||||||
|
"OwnerDeptId": 372119301627909,
|
||||||
|
"OwnerId": 370942943322181,
|
||||||
|
"SelfDepositAllowed": true,
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -3,6 +3,10 @@
|
|||||||
"Id": 370942943322181,
|
"Id": 370942943322181,
|
||||||
"AppConfig": "[]"
|
"AppConfig": "[]"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Id": 664362432344581,
|
||||||
|
"AppConfig": "[]"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Id": 560217289236492,
|
"Id": 560217289236492,
|
||||||
"AppConfig": "[]"
|
"AppConfig": "[]"
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
"RoleId": 370943613149253,
|
"RoleId": 370943613149253,
|
||||||
"UserId": 370942943322181
|
"UserId": 370942943322181
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"RoleId": 370943613149253,
|
||||||
|
"UserId": 664362432344581
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"RoleId": 371729946431493,
|
"RoleId": 371729946431493,
|
||||||
"UserId": 560217289236492
|
"UserId": 560217289236492
|
||||||
|
|||||||
17
assets/seed-data/Sys_UserWallet.json
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"Id": 370942943322181,
|
||||||
|
"OwnerDeptId": 372119301627909,
|
||||||
|
"OwnerId": 370942943322181,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Id": 664362432344581,
|
||||||
|
"OwnerDeptId": 372119301627909,
|
||||||
|
"OwnerId": 664362432344581,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Id": 560217289236492,
|
||||||
|
"OwnerDeptId": 372119301627909,
|
||||||
|
"OwnerId": 560217289236492,
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -15,15 +15,15 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
|
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
|
<PackageReference Include="Roslynator.Analyzers" Version="4.14.0">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
|
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<Rule Id="SA1006" Action="Warning"/> <!-- Preprocessor keywords should not be preceded by space -->
|
<Rule Id="SA1006" Action="Warning"/> <!-- Preprocessor keywords should not be preceded by space -->
|
||||||
<Rule Id="SA1007" Action="Warning"/> <!-- Operator keyword should be followed by space -->
|
<Rule Id="SA1007" Action="Warning"/> <!-- Operator keyword should be followed by space -->
|
||||||
<Rule Id="SA1008" Action="None"/> <!-- Opening parenthesis should be spaced correctly -->
|
<Rule Id="SA1008" Action="None"/> <!-- Opening parenthesis should be spaced correctly -->
|
||||||
<Rule Id="SA1009" Action="Warning"/> <!-- Closing parenthesis should be spaced correctly -->
|
<Rule Id="SA1009" Action="None"/> <!-- Closing parenthesis should be spaced correctly -->
|
||||||
<Rule Id="SA1010" Action="Warning"/> <!-- Opening square brackets should be spaced correctly -->
|
<Rule Id="SA1010" Action="Warning"/> <!-- Opening square brackets should be spaced correctly -->
|
||||||
<Rule Id="SA1011" Action="Warning"/> <!-- Closing square brackets should be spaced correctly -->
|
<Rule Id="SA1011" Action="Warning"/> <!-- Closing square brackets should be spaced correctly -->
|
||||||
<Rule Id="SA1012" Action="Warning"/> <!-- Opening braces should be spaced correctly -->
|
<Rule Id="SA1012" Action="Warning"/> <!-- Opening braces should be spaced correctly -->
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
<Rule Id="SA1109" Action="Warning"/> <!-- Block statements should not contain embedded regions -->
|
<Rule Id="SA1109" Action="Warning"/> <!-- Block statements should not contain embedded regions -->
|
||||||
<Rule Id="SA1110"
|
<Rule Id="SA1110"
|
||||||
Action="Warning"/> <!-- Opening parenthesis or bracket should be on declaration line -->
|
Action="Warning"/> <!-- Opening parenthesis or bracket should be on declaration line -->
|
||||||
<Rule Id="SA1111" Action="Warning"/> <!-- Closing parenthesis should be on line of last parameter -->
|
<Rule Id="SA1111" Action="None"/> <!-- Closing parenthesis should be on line of last parameter -->
|
||||||
<Rule Id="SA1112"
|
<Rule Id="SA1112"
|
||||||
Action="Warning"/> <!-- Closing parenthesis should be on line of opening parenthesis -->
|
Action="Warning"/> <!-- Closing parenthesis should be on line of opening parenthesis -->
|
||||||
<Rule Id="SA1113" Action="None"/> <!-- Comma should be on the same line as previous parameter -->
|
<Rule Id="SA1113" Action="None"/> <!-- Comma should be on the same line as previous parameter -->
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 207 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 28 KiB |
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"version": "2.0.0",
|
"version": "2.4.0",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"cz-git": "^1.10.1",
|
"cz-git": "^1.12.0",
|
||||||
"commitizen": "^4.3.1",
|
"commitizen": "^4.3.1",
|
||||||
"prettier": "^3.3.3",
|
"prettier": "^3.6.2",
|
||||||
"standard-version": "^9.5.0"
|
"standard-version": "^9.5.0"
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
|
|||||||
1
refs/Gurion
Submodule
1
refs/NetAdmin.FreeSql
Submodule
@@ -1,3 +1,5 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
$branch = $( git branch --show-current )
|
$branch = $( git branch --show-current )
|
||||||
git add ../
|
git add ../
|
||||||
$skipFormat = Read-Host "输入 n 跳过代码整理"
|
$skipFormat = Read-Host "输入 n 跳过代码整理"
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
$types = @{
|
$types = @{
|
||||||
'1' = @('major', '主版本')
|
'1' = @('major', '主版本')
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
$branch = $( git branch --show-current )
|
$branch = $( git branch --show-current )
|
||||||
git checkout main
|
git checkout main
|
||||||
git pull
|
git pull
|
||||||
|
|||||||
@@ -1,2 +1,4 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
git push origin :refs/tags/$(git tag -l "*-*")
|
git push origin :refs/tags/$(git tag -l "*-*")
|
||||||
git tag -d $( git tag -l "*-*" )
|
git tag -d $( git tag -l "*-*" )
|
||||||
5
scripts/5.git.update.submodule.ps1
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
|
git submodule update --progress --init --recursive --force --remote -- "../refs/Gurion"
|
||||||
|
git submodule update --progress --init --recursive --force --remote -- "../refs/NetAdmin.FreeSql"
|
||||||
|
git submodule update --progress --init --recursive --force --remote -- "../refs/ns-ext"
|
||||||
@@ -18,7 +18,7 @@ using System.Net.Http.Json;
|
|||||||
{
|
{
|
||||||
CreateNoWindow = true,
|
CreateNoWindow = true,
|
||||||
FileName = "dotnet",
|
FileName = "dotnet",
|
||||||
Arguments = $"jb cleanupcode --include=\"{files}\" --no-build ../NetAdmin.sln",
|
Arguments = $"jb cleanupcode --include=\"{files}\" --no-build ../NetAdmin.slnx",
|
||||||
UseShellExecute = false,
|
UseShellExecute = false,
|
||||||
RedirectStandardOutput = true
|
RedirectStandardOutput = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
npm --prefix ../src/frontend/admin run prettier
|
npm --prefix ../src/frontend/admin run prettier
|
||||||
jb cleanupcode --no-build --include=$($(git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") }) -join ";") ../NetAdmin.sln
|
jb cleanupcode --no-build --include=$( $( git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") } ) -join ";" ) ../NetAdmin.slnx
|
||||||
dot rbom -w -e refs -e .git -e node_modules ../
|
dot rbom -w -e refs -e .git -e node_modules ../
|
||||||
dot trim -w -e refs -e .git -e node_modules ../
|
dot trim -w -e refs -e .git -e node_modules ../
|
||||||
dot tolf -w -e refs -e .git -e node_modules ../
|
dot tolf -w -e refs -e .git -e node_modules ../
|
||||||
26
scripts/fn_GetChannelDealer.sql
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
CREATE FUNCTION [RM].[fn_GetChannelDealer] (@UserId BIGINT) RETURNS TABLE AS RETURN (
|
||||||
|
WITH [as_tree_cte] AS (
|
||||||
|
SELECT
|
||||||
|
0 AS cte_level,
|
||||||
|
a.[Id],
|
||||||
|
a.[OwnerId]
|
||||||
|
FROM
|
||||||
|
[RM].[Sys_UserInvite] a
|
||||||
|
WHERE
|
||||||
|
(a.[Id] = @UserId) UNION ALL
|
||||||
|
SELECT
|
||||||
|
wct1.cte_level + 1 AS cte_level,
|
||||||
|
wct2.[Id],
|
||||||
|
wct2.[OwnerId]
|
||||||
|
FROM
|
||||||
|
[as_tree_cte] wct1
|
||||||
|
INNER JOIN [RM].[Sys_UserInvite] wct2 ON wct2.[Id] = wct1.[OwnerId]
|
||||||
|
) SELECT TOP
|
||||||
|
1 a.[Id] AS ChannelDealerId
|
||||||
|
FROM
|
||||||
|
[as_tree_cte] a
|
||||||
|
WHERE
|
||||||
|
a.id <> 370942943322181
|
||||||
|
ORDER BY
|
||||||
|
a.cte_level DESC
|
||||||
|
)
|
||||||
@@ -6,7 +6,6 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// This code was generated by a tool.
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
@@ -64,14 +63,12 @@ public sealed class Ln
|
|||||||
<#
|
<#
|
||||||
var xml = new XmlDocument();
|
var xml = new XmlDocument();
|
||||||
xml.Load("../assets/res/Ln.resx");
|
xml.Load("../assets/res/Ln.resx");
|
||||||
foreach (XmlNode data in xml.SelectNodes("//root/data")!)
|
foreach (XmlNode data in xml.SelectNodes("//root/data")!) {
|
||||||
{
|
|
||||||
#>
|
#>
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// <#= data.SelectSingleNode("value")?.InnerText #>
|
/// <#= data.SelectSingleNode("value")?.InnerText #>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string <#=
|
public static string <#= data.Attributes!["name"].Value.Replace(" ", "_") #> => ResourceManager.GetString("<#= data.Attributes!["name"].Value #>", Culture);
|
||||||
data.Attributes!["name"].Value.Replace(" ", "_") #> => ResourceManager.GetString("<#= data.Attributes!["name"].Value #>", Culture);
|
|
||||||
<#
|
<#
|
||||||
}
|
}
|
||||||
#>
|
#>
|
||||||
|
|||||||
@@ -29,8 +29,7 @@
|
|||||||
</resheader>
|
</resheader>
|
||||||
<#
|
<#
|
||||||
var regex = new Regex(@"^\d", RegexOptions.Compiled);
|
var regex = new Regex(@"^\d", RegexOptions.Compiled);
|
||||||
foreach (var line in Directory.GetFiles("../assets/res/", "*.ln").SelectMany(x => File.ReadLines(x)).Distinct())
|
foreach (var line in Directory.GetFiles("../assets/res/", "*.ln").SelectMany(x => File.ReadLines(x)).Distinct()) {
|
||||||
{
|
|
||||||
#>
|
#>
|
||||||
<data name="<#= regex.IsMatch(line) ? "_" : "" #><#= line #>" xml:space="preserve"><value><#= line #></value></data>
|
<data name="<#= regex.IsMatch(line) ? "_" : "" #><#= line #>" xml:space="preserve"><value><#= line #></value></data>
|
||||||
<#
|
<#
|
||||||
|
|||||||
4
scripts/git.config.cmd
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
git config --local core.eol lf
|
||||||
|
git config --local core.autocrlf false
|
||||||
|
git config --local core.longpaths true
|
||||||
|
git config --local pull.rebase false
|
||||||
@@ -1,2 +1,4 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
dotnet new uninstall ../
|
dotnet new uninstall ../
|
||||||
dotnet new --install ../
|
dotnet new --install ../
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
#r "nuget: NSExt, 2.2.0"
|
#r "nuget: NSExt, 2.3.5"
|
||||||
using NSExt.Extensions;
|
using NSExt.Extensions;
|
||||||
|
|
||||||
Console.WriteLine("请输入原始名称(NetAdmin):");
|
Console.WriteLine("请输入原始名称(NetAdmin):");
|
||||||
var oldName = Console.ReadLine().NullOrEmpty("NetAdmin");
|
var oldName = Console.ReadLine().NullOrEmpty("NetAdmin");
|
||||||
Console.WriteLine("请输入替换名称:");
|
Console.WriteLine("请输入替换名称:");
|
||||||
var newName = Console.ReadLine();
|
var newName = Console.ReadLine();
|
||||||
foreach (var path in Directory.EnumerateDirectories("../", $"*{oldName}*",
|
foreach (var path in Directory.EnumerateDirectories("../", $"*{oldName}*", SearchOption.AllDirectories).Where(x => !x.Contains(".git")))
|
||||||
SearchOption.AllDirectories))
|
|
||||||
{
|
{
|
||||||
Console.Write($"{path} --> ");
|
Console.Write($"{path} --> ");
|
||||||
var newPath = path.Replace(oldName, newName);
|
var newPath = path.Replace(oldName, newName);
|
||||||
@@ -16,7 +15,7 @@ foreach (var path in Directory.EnumerateDirectories("../", $"*{oldName}*",
|
|||||||
|
|
||||||
|
|
||||||
Console.WriteLine();
|
Console.WriteLine();
|
||||||
foreach (var path in Directory.EnumerateFiles("../", $"*.*", SearchOption.AllDirectories))
|
foreach (var path in Directory.EnumerateFiles("../", $"*.*", SearchOption.AllDirectories).Where(x => !x.Contains(".git")))
|
||||||
{
|
{
|
||||||
File.WriteAllText(path, File.ReadAllText(path).Replace(oldName, newName));
|
File.WriteAllText(path, File.ReadAllText(path).Replace(oldName, newName));
|
||||||
var newPath = path.Replace(oldName, newName);
|
var newPath = path.Replace(oldName, newName);
|
||||||
|
|||||||
@@ -1 +1,3 @@
|
|||||||
jb cleanupcode --no-build ../NetAdmin.sln
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
|
jb cleanupcode --no-build ../NetAdmin.slnx
|
||||||
37
scripts/switch.nuget.or.project.csx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
using System.Text.RegularExpressions;
|
||||||
|
string input = string.Empty;
|
||||||
|
while (!new[] { "1", "2" }.Contains(input))
|
||||||
|
{
|
||||||
|
Console.WriteLine("1.nuget 2.project");
|
||||||
|
input = Console.ReadLine();
|
||||||
|
}
|
||||||
|
var slnxFile = Directory.GetFiles(@"../", "*.slnx").First();
|
||||||
|
var csprojFiles = Directory.GetFiles(@"../src", "*.csproj", new EnumerationOptions { RecurseSubdirectories = true });
|
||||||
|
var slnContent = File.ReadAllText(slnxFile);
|
||||||
|
|
||||||
|
if (input == "1")
|
||||||
|
{
|
||||||
|
slnContent = Regex.Replace(slnContent, "<Project Type=\"Refs\"(.*)>", "<!--<Project Type=\"Refs\"$1>-->");
|
||||||
|
foreach (var csprojFile in csprojFiles)
|
||||||
|
{
|
||||||
|
var csprojContent = File.ReadAllText(csprojFile);
|
||||||
|
csprojContent = Regex.Replace(csprojContent," <ProjectReference(.*)Label=\"refs\"(.*)>", " <!--<ProjectReference$1Label=\"refs\"$2>-->");
|
||||||
|
csprojContent = Regex.Replace(csprojContent," <!--<PackageReference(.*)Label=\"refs\"(.*)>-->", " <PackageReference$1Label=\"refs\"$2>");
|
||||||
|
File.WriteAllText(csprojFile, csprojContent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
slnContent = Regex.Replace(slnContent, "<!--(.*)-->", "$1");
|
||||||
|
foreach (var csprojFile in csprojFiles)
|
||||||
|
{
|
||||||
|
var csprojContent = File.ReadAllText(csprojFile);
|
||||||
|
csprojContent = Regex.Replace(csprojContent," <!--<ProjectReference(.*)Label=\"refs\"(.*)>-->", " <ProjectReference$1Label=\"refs\"$2>");
|
||||||
|
csprojContent = Regex.Replace(csprojContent," <PackageReference(.*)Label=\"refs\"(.*)>", " <!--<PackageReference$1Label=\"refs\"$2>-->");
|
||||||
|
File.WriteAllText(csprojFile, csprojContent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Console.WriteLine(slnContent);
|
||||||
|
File.WriteAllText(slnxFile, slnContent);
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
{
|
|
||||||
"solution": "NetAdmin.sln",
|
|
||||||
"mappings": {
|
|
||||||
"FreeSql.NS": "../refs/FreeSql/FreeSql/FreeSql.csproj",
|
|
||||||
"FreeSql.DbContext.NS": "../refs/FreeSql/FreeSql.DbContext/FreeSql.DbContext.csproj"
|
|
||||||
},
|
|
||||||
"restore": [
|
|
||||||
{
|
|
||||||
"name": "NetAdmin.Infrastructure",
|
|
||||||
"packages": [
|
|
||||||
{
|
|
||||||
"packageName": "FreeSql.NS",
|
|
||||||
"version": "3.2.833-ns4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"packageName": "FreeSql.DbContext.NS",
|
|
||||||
"version": "3.2.833-ns4"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"solution": "NetAdmin.sln",
|
|
||||||
"mappings": {
|
|
||||||
"Gurion": "../refs/Gurion/src/Gurion.csproj"
|
|
||||||
},
|
|
||||||
"restore": [
|
|
||||||
{
|
|
||||||
"name": "NetAdmin.Infrastructure",
|
|
||||||
"packages": [
|
|
||||||
{
|
|
||||||
"packageName": "Gurion",
|
|
||||||
"version": "1.1.0"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"solution": "NetAdmin.sln",
|
|
||||||
"mappings": {
|
|
||||||
"NSExt": "../refs/ns-ext/src/NSExt/NSExt.csproj"
|
|
||||||
},
|
|
||||||
"restore": [
|
|
||||||
{
|
|
||||||
"name": "NetAdmin.Infrastructure",
|
|
||||||
"packages": [
|
|
||||||
{
|
|
||||||
"packageName": "NSExt",
|
|
||||||
"version": "2.2.0"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
# https://github.com/RicoSuter/DNT#switch-to-projects
|
|
||||||
$targets = @{
|
|
||||||
'1' = 'switch-to-projects'
|
|
||||||
'2' = 'switch-to-packages'
|
|
||||||
}
|
|
||||||
$key = ''
|
|
||||||
while ($null -eq $targets[$key])
|
|
||||||
{
|
|
||||||
$key = Read-Host '请选择:1(切换到项目引用) 2(切换到Nuget包引用)'
|
|
||||||
}
|
|
||||||
$files = Get-ChildItem Switcher.*.json
|
|
||||||
$file = 9999
|
|
||||||
while ($null -eq $files[[int]$file - 1])
|
|
||||||
{
|
|
||||||
$i = 0
|
|
||||||
Write-Host '请选择要切换的配置文件文件'
|
|
||||||
foreach ($file in $files)
|
|
||||||
{
|
|
||||||
$i++
|
|
||||||
Write-Host $i $file.Name
|
|
||||||
}
|
|
||||||
$file = Read-Host
|
|
||||||
}
|
|
||||||
$file = [int]$file - 1
|
|
||||||
Copy-Item $files[$file] 'switcher.json' -Force
|
|
||||||
dnt $targets[$key] ../NetAdmin.sln
|
|
||||||
Remove-Item switcher.json
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
using System.Text.RegularExpressions;
|
|
||||||
|
|
||||||
var slnFile = Directory.GetFiles(@"../", "*.sln").First();
|
|
||||||
var content = File.ReadAllText(slnFile);
|
|
||||||
|
|
||||||
content = Regex.Replace(
|
|
||||||
content,
|
|
||||||
"Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"meta\", \"meta\", \"{5198A03D-0CAC-4828-A807-34A693F73859}\"(?:.|\n)*?EndProject",
|
|
||||||
$$"""
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0CAC-4828-A807-34A693F73859}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
{{string.Join('\n',
|
|
||||||
Directory.GetFiles(@"../", "*").Where(x => !x.EndsWith(".sln") && !x.EndsWith(".user"))
|
|
||||||
.Select(x=>$" {Path.GetFileName(x)} = {Path.GetFileName(x)}")
|
|
||||||
)}}
|
|
||||||
EndProject
|
|
||||||
"""
|
|
||||||
);
|
|
||||||
|
|
||||||
content = Regex.Replace(
|
|
||||||
content,
|
|
||||||
"Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"docker\", \"docker\", \"{E80A1018-C354-4A26-9029-8847BB9DA864}\"(?:.|\n)*?EndProject",
|
|
||||||
$$"""
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E80A1018-C354-4A26-9029-8847BB9DA864}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
{{string.Join('\n',
|
|
||||||
Directory.GetFiles(@"../docker", "*")
|
|
||||||
.Select(x=>$" {Path.GetFileName(x)} = docker/{Path.GetFileName(x)}")
|
|
||||||
)}}
|
|
||||||
EndProject
|
|
||||||
"""
|
|
||||||
);
|
|
||||||
|
|
||||||
content = Regex.Replace(
|
|
||||||
content,
|
|
||||||
"Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"workflows\", \"workflows\", \"{3C6F049E-3EE8-4D66-9AFF-E8A369032487}\"(?:.|\n)*?EndProject",
|
|
||||||
$$"""
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3C6F049E-3EE8-4D66-9AFF-E8A369032487}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
{{string.Join('\n',
|
|
||||||
Directory.GetFiles(@"../.github/workflows", "*")
|
|
||||||
.Select(x=>$" {Path.GetFileName(x)} = .github/workflows/{Path.GetFileName(x)}")
|
|
||||||
)}}
|
|
||||||
EndProject
|
|
||||||
"""
|
|
||||||
);
|
|
||||||
|
|
||||||
content = Regex.Replace(
|
|
||||||
content,
|
|
||||||
"Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"scripts\", \"scripts\", \"{BB0B25C9-0901-4923-913F-00F9A6B352A5}\"(?:.|\n)*?EndProject",
|
|
||||||
$$"""
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B25C9-0901-4923-913F-00F9A6B352A5}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
{{string.Join('\n',
|
|
||||||
Directory.GetFiles(@"../scripts", "*")
|
|
||||||
.Select(x=>$" {Path.GetFileName(x)} = scripts/{Path.GetFileName(x)}")
|
|
||||||
)}}
|
|
||||||
EndProject
|
|
||||||
"""
|
|
||||||
);
|
|
||||||
|
|
||||||
content = Regex.Replace(
|
|
||||||
content,
|
|
||||||
"Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"build\", \"build\", \"{8E4C93BA-9493-4892-80C4-5E174C504829}\"(?:.|\n)*?EndProject",
|
|
||||||
$$"""
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA-9493-4892-80C4-5E174C504829}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
{{string.Join('\n',
|
|
||||||
Directory.GetFiles(@"../build", "*")
|
|
||||||
.Select(x=>$" {Path.GetFileName(x)} = build/{Path.GetFileName(x)}")
|
|
||||||
)}}
|
|
||||||
EndProject
|
|
||||||
"""
|
|
||||||
);
|
|
||||||
|
|
||||||
Console.WriteLine(content);
|
|
||||||
File.WriteAllText(slnFile, content);
|
|
||||||
87
scripts/sync.slnx.files.csx
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
var slnxFile = Directory.GetFiles(@"../", "*.slnx").First();
|
||||||
|
var content = File.ReadAllText(slnxFile);
|
||||||
|
|
||||||
|
content = Regex.Replace(
|
||||||
|
content,
|
||||||
|
"<Folder Name=\"/meta/\">(?:.|\n)*?</Folder>",
|
||||||
|
$$"""
|
||||||
|
<Folder Name="/meta/">
|
||||||
|
{{string.Join('\n',
|
||||||
|
Directory.GetFiles(@"../", "*").Where(x => !x.EndsWith(".slnx") && !x.EndsWith(".user"))
|
||||||
|
.Select(x=>$" <File Path=\"{Path.GetFileName(x)}\"/>")
|
||||||
|
)}}
|
||||||
|
</Folder>
|
||||||
|
"""
|
||||||
|
);
|
||||||
|
|
||||||
|
content = Regex.Replace(
|
||||||
|
content,
|
||||||
|
"<Folder Name=\"/docker/\">(?:.|\n)*?</Folder>",
|
||||||
|
$$"""
|
||||||
|
<Folder Name="/docker/">
|
||||||
|
{{string.Join('\n',
|
||||||
|
Directory.GetFiles(@"../docker", "*")
|
||||||
|
.Select(x=>$" <File Path=\"docker/{Path.GetFileName(x)}\"/>")
|
||||||
|
)}}
|
||||||
|
</Folder>
|
||||||
|
"""
|
||||||
|
);
|
||||||
|
|
||||||
|
content = Regex.Replace(
|
||||||
|
content,
|
||||||
|
"<Folder Name=\"/.github/workflows/\">(?:.|\n)*?</Folder>",
|
||||||
|
$$"""
|
||||||
|
<Folder Name="/.github/workflows/">
|
||||||
|
{{string.Join('\n',
|
||||||
|
Directory.GetFiles(@"../.github/workflows", "*")
|
||||||
|
.Select(x=>$" <File Path=\".github/workflows/{Path.GetFileName(x)}\"/>")
|
||||||
|
)}}
|
||||||
|
</Folder>
|
||||||
|
"""
|
||||||
|
);
|
||||||
|
|
||||||
|
content = Regex.Replace(
|
||||||
|
content,
|
||||||
|
"<Folder Name=\"/.drone/workflows/\">(?:.|\n)*?</Folder>",
|
||||||
|
$$"""
|
||||||
|
<Folder Name="/.drone/workflows/">
|
||||||
|
{{string.Join('\n',
|
||||||
|
Directory.GetFiles(@"../.drone/workflows", "*")
|
||||||
|
.Select(x=>$" <File Path=\".drone/workflows/{Path.GetFileName(x)}\"/>")
|
||||||
|
)}}
|
||||||
|
</Folder>
|
||||||
|
"""
|
||||||
|
);
|
||||||
|
|
||||||
|
content = Regex.Replace(
|
||||||
|
content,
|
||||||
|
"<Folder Name=\"/scripts/\">(?:.|\n)*?</Folder>",
|
||||||
|
$$"""
|
||||||
|
<Folder Name="/scripts/">
|
||||||
|
{{string.Join('\n',
|
||||||
|
Directory.GetFiles(@"../scripts", "*")
|
||||||
|
.Select(x=>$" <File Path=\"scripts/{Path.GetFileName(x)}\"/>")
|
||||||
|
)}}
|
||||||
|
</Folder>
|
||||||
|
"""
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
content = Regex.Replace(
|
||||||
|
content,
|
||||||
|
"<Folder Name=\"/build/\">(?:.|\n)*?</Folder>",
|
||||||
|
$$"""
|
||||||
|
<Folder Name="/build/">
|
||||||
|
{{string.Join('\n',
|
||||||
|
Directory.GetFiles(@"../build", "*")
|
||||||
|
.Select(x=>$" <File Path=\"build/{Path.GetFileName(x)}\"/>")
|
||||||
|
)}}
|
||||||
|
</Folder>
|
||||||
|
"""
|
||||||
|
);
|
||||||
|
|
||||||
|
Console.WriteLine(content);
|
||||||
|
File.WriteAllText(slnxFile, content);
|
||||||
@@ -32,7 +32,6 @@ global using Gurion.DataEncryption;
|
|||||||
global using Gurion.DataValidation;
|
global using Gurion.DataValidation;
|
||||||
global using Gurion.DependencyInjection;
|
global using Gurion.DependencyInjection;
|
||||||
global using Gurion.DynamicApiController;
|
global using Gurion.DynamicApiController;
|
||||||
global using Gurion.EventBus;
|
|
||||||
global using Gurion.SpecificationDocument;
|
global using Gurion.SpecificationDocument;
|
||||||
global using Gurion.UnifyResult;
|
global using Gurion.UnifyResult;
|
||||||
global using Mapster;
|
global using Mapster;
|
||||||
@@ -58,6 +57,7 @@ global using NetAdmin.Infrastructure.Configuration.Options.SubNodes.Redis;
|
|||||||
global using NetAdmin.Infrastructure.Configuration.Options.SubNodes.Upload;
|
global using NetAdmin.Infrastructure.Configuration.Options.SubNodes.Upload;
|
||||||
global using NetAdmin.Infrastructure.Constant;
|
global using NetAdmin.Infrastructure.Constant;
|
||||||
global using NetAdmin.Infrastructure.Enums;
|
global using NetAdmin.Infrastructure.Enums;
|
||||||
|
global using NetAdmin.Infrastructure.EventBus;
|
||||||
global using NetAdmin.Infrastructure.Exceptions;
|
global using NetAdmin.Infrastructure.Exceptions;
|
||||||
global using NetAdmin.Infrastructure.Extensions;
|
global using NetAdmin.Infrastructure.Extensions;
|
||||||
global using NetAdmin.Infrastructure.Languages;
|
global using NetAdmin.Infrastructure.Languages;
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<Import Project="$(SolutionDir)/build/code.quality.props"/>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../NetAdmin.AdmServer.Domain/NetAdmin.AdmServer.Domain.csproj"/>
|
|
||||||
<ProjectReference Include="../NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj"/>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="MailKit" Version="4.8.0"/>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<Import Project="$(SolutionDir)/build/code.quality.props"/>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj"/>
|
|
||||||
<ProjectReference Include="../NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj"/>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
using NetAdmin.AdmServer.Host.Filters;
|
|
||||||
using NetAdmin.Domain.DbMaps.Dependency.Fields;
|
|
||||||
using NetAdmin.SysComponent.Domain.Contexts;
|
|
||||||
using NetAdmin.SysComponent.Domain.Enums.Sys;
|
|
||||||
using NetAdmin.SysComponent.Host.Extensions;
|
|
||||||
|
|
||||||
namespace NetAdmin.AdmServer.Host.Extensions;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ServiceCollection 扩展方法
|
|
||||||
/// </summary>
|
|
||||||
[SuppressSniffer]
|
|
||||||
public static class ServiceCollectionExtensions
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 添加 FreeSql
|
|
||||||
/// </summary>
|
|
||||||
public static IServiceCollection AddFreeSqlWithArgs(this IServiceCollection me)
|
|
||||||
{
|
|
||||||
return me.AddFreeSql( //
|
|
||||||
(Startup.Args.SyncStructure ? FreeSqlInitMethods.SyncStructure : FreeSqlInitMethods.None) |
|
|
||||||
(Startup.Args.InsertSeedData ? FreeSqlInitMethods.InsertSeedData : FreeSqlInitMethods.None), freeSql => {
|
|
||||||
// 数据权限过滤器
|
|
||||||
_ = freeSql.GlobalFilter.ApplyOnlyIf<IFieldOwner>( //
|
|
||||||
Chars.FLG_FREE_SQL_GLOBAL_FILTER_DATA, () => ContextUserInfo.Create()?.Roles.All(x => x.DataScope == DataScopes.Self) ?? false
|
|
||||||
, a => a.OwnerId == ContextUserInfo.Create().Id);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 添加 jwt 授权处理器
|
|
||||||
/// </summary>
|
|
||||||
public static IServiceCollection AddJwt(this IServiceCollection me)
|
|
||||||
{
|
|
||||||
_ = me.AddJwt<JwtHandler>(enableGlobalAuthorize: true);
|
|
||||||
return me;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
/*
|
|
||||||
_ooOoo_
|
|
||||||
o8888888o
|
|
||||||
88" . "88
|
|
||||||
(| -_- |)
|
|
||||||
O\ = /O
|
|
||||||
____/`---'\____
|
|
||||||
.' \\| |// `.
|
|
||||||
/ \\||| : |||// \
|
|
||||||
/ _||||| -:- |||||- \
|
|
||||||
| | \\\ - /// | |
|
|
||||||
| \_| ''\---/'' | |
|
|
||||||
\ .-\__ `-` ___/-. /
|
|
||||||
___`. .' /--.--\ `. . __
|
|
||||||
."" '< `.___\_<|>_/___.' >'"".
|
|
||||||
| | : `- \`.;`\ _ /`;.`/ - ` : | |
|
|
||||||
\ \ `-. \_ __\ /__ _/ .-` / /
|
|
||||||
======`-.____`-.___\_____/___.-`____.-'======
|
|
||||||
`=---='
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
佛祖保佑 永无BUG
|
|
||||||
*/
|
|
||||||
|
|
||||||
using NetAdmin.AdmServer.Host;
|
|
||||||
using NetAdmin.AdmServer.Host.Extensions;
|
|
||||||
using NetAdmin.Host.Extensions;
|
|
||||||
using NetAdmin.Host.Middlewares;
|
|
||||||
using NetAdmin.SysComponent.Host.Extensions;
|
|
||||||
using NetAdmin.SysComponent.Host.Middlewares;
|
|
||||||
using Spectre.Console.Cli;
|
|
||||||
using ValidationResult = Spectre.Console.ValidationResult;
|
|
||||||
|
|
||||||
NetAdmin.Host.Startup.Entry<Startup>(args);
|
|
||||||
|
|
||||||
namespace NetAdmin.AdmServer.Host
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 启动类
|
|
||||||
/// </summary>
|
|
||||||
public sealed class Startup : NetAdmin.Host.Startup, ICommand<CommandLineArgs>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 命令行参数
|
|
||||||
/// </summary>
|
|
||||||
public static CommandLineArgs Args { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 配置应用程序中间件
|
|
||||||
/// </summary>
|
|
||||||
#pragma warning disable S2325
|
|
||||||
public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifeTime)
|
|
||||||
#pragma warning restore S2325
|
|
||||||
{
|
|
||||||
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
|
|
||||||
|
|
||||||
_ = app //
|
|
||||||
.UseMiddleware<SafetyShopHostMiddleware>() // 安全停机中间件
|
|
||||||
.EnableBuffering() // 启用请求体缓冲,允许多次读取请求体
|
|
||||||
.UseMiddleware<RequestAuditMiddleware>() // 使用RequestAuditMiddleware中间件,执行请求审计
|
|
||||||
#if DEBUG
|
|
||||||
.UseOpenApiSkin() // 使用OpenApiSkin中间件(仅在调试模式下),提供Swagger UI皮肤
|
|
||||||
#else
|
|
||||||
.UseVueAdmin() // 托管管理后台,仅在非调试模式下
|
|
||||||
.UsePrometheus() // 使用Prometheus中间件,启用HTTP性能监控
|
|
||||||
#endif
|
|
||||||
.UseInject(string.Empty) // 使用Inject中间件,Gurion脚手架的依赖注入支持
|
|
||||||
.UseUnifyResultStatusCodes() // 使用UnifyResultStatusCodes中间件,用于统一处理结果状态码
|
|
||||||
.UseCorsAccessor() // 使用CorsAccessor中间件,启用跨域资源共享(CORS)支持
|
|
||||||
.UseRouting() // 使用Routing中间件,配置路由映射
|
|
||||||
.UseAuthentication() // 使用Authentication中间件,启用身份验证
|
|
||||||
.UseAuthorization() // 使用Authorization中间件,启用授权
|
|
||||||
.UseMiddleware<RemoveNullNodeMiddleware>() // 使用RemoveNullNodeMiddleware中间件,删除JSON中的空节点
|
|
||||||
.UseWebSockets() // 使用WebSockets中间件,启用WebSocket支持
|
|
||||||
.UseMiddleware<VersionCheckerMiddleware>() // 使用VersionUpdaterMiddleware中间件,用于检查版本
|
|
||||||
.UseEndpoints(); // 配置端点以处理请求
|
|
||||||
_ = lifeTime.ApplicationStopping.Register(SafetyShopHostMiddleware.OnStopping);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 配置服务容器
|
|
||||||
/// </summary>
|
|
||||||
#pragma warning disable S2325
|
|
||||||
public void ConfigureServices(IServiceCollection services)
|
|
||||||
#pragma warning restore S2325
|
|
||||||
{
|
|
||||||
_ = services.AddConsoleFormatter() // 添加控制台日志模板
|
|
||||||
.AddAllOptions() // 添加配置项
|
|
||||||
.AddJwt() // 添加 Jwt 授权处理器
|
|
||||||
.AddSnowflake() // 添加雪花编号生成器
|
|
||||||
.AddEventBus() // 添加事件总线
|
|
||||||
.AddFreeSqlWithArgs() // 添加 freeSql
|
|
||||||
.AddRemoteRequest() // 添加远程请求
|
|
||||||
.AddCorsAccessor() // 添加支持跨域访问
|
|
||||||
.AddContextUserToken() // 添加上下文用户令牌
|
|
||||||
.AddContextUserInfo() // 添加上下文用户信息
|
|
||||||
.AddRedisCache() // 添加 Redis 缓存
|
|
||||||
.AddSchedules() // 添加计划任务
|
|
||||||
|
|
||||||
// IMvcBuilder
|
|
||||||
.AddControllers() // 添加控制器
|
|
||||||
.AddJsonSerializer(true) // 添加JSON序列化器,并设置显示枚举名而非数字枚举值
|
|
||||||
.AddDefaultApiResultHandler() // 添加默认的API结果处理程序
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#pragma warning disable ASA001
|
|
||||||
public async Task<int> Execute(CommandContext context, CommandLineArgs settings)
|
|
||||||
#pragma warning restore ASA001
|
|
||||||
{
|
|
||||||
Args = settings;
|
|
||||||
var webOpt = new WebApplicationOptions //
|
|
||||||
{
|
|
||||||
EnvironmentName = Environment.GetEnvironmentVariable("TEST_ENVIRONMENT").NullOrEmpty(null)
|
|
||||||
, Args = context.Remaining.Raw.ToArray()
|
|
||||||
};
|
|
||||||
Serve.BuildApplication(RunOptions.Default.ConfigureOptions(webOpt), null, out var startUrl, out var app);
|
|
||||||
await app.RunAsync(startUrl).ConfigureAwait(false);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#pragma warning disable ASA001
|
|
||||||
public Task<int> Execute(CommandContext context, CommandSettings settings)
|
|
||||||
#pragma warning restore ASA001
|
|
||||||
{
|
|
||||||
return Execute(context, (settings as CommandLineArgs)!);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public ValidationResult Validate(CommandContext context, CommandSettings settings)
|
|
||||||
{
|
|
||||||
return ValidationResult.Success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<Import Project="$(SolutionDir)/build/code.quality.props"/>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="$(SolutionDir)/assets/res/NetAdmin.AdmServer.Statements.ln">
|
|
||||||
<Link>Languages/NetAdmin.AdmServer.Statements.ln</Link>
|
|
||||||
</None>
|
|
||||||
<None Include="$(SolutionDir)/assets/res/NetAdmin.AdmServer.Fields.ln">
|
|
||||||
<Link>Languages/NetAdmin.AdmServer.Fields.ln</Link>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Update="*.json">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
using NetAdmin.Domain.Dto.Dependency;
|
|
||||||
using NetAdmin.Domain.Dto.Tpl.Example;
|
|
||||||
|
|
||||||
namespace NetAdmin.Application.Modules.Tpl;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 示例模块
|
|
||||||
/// </summary>
|
|
||||||
public interface IExampleModule : ICrudModule<CreateExampleReq, QueryExampleRsp // 创建类型
|
|
||||||
, QueryExampleReq, QueryExampleRsp // 查询类型
|
|
||||||
, DelReq // 删除类型
|
|
||||||
>;
|
|
||||||
@@ -1,159 +0,0 @@
|
|||||||
using CsvHelper;
|
|
||||||
using Microsoft.Net.Http.Headers;
|
|
||||||
using NetAdmin.Application.Repositories;
|
|
||||||
using NetAdmin.Domain;
|
|
||||||
using NetAdmin.Domain.DbMaps.Dependency;
|
|
||||||
using NetAdmin.Domain.DbMaps.Dependency.Fields;
|
|
||||||
using NetAdmin.Domain.Dto.Dependency;
|
|
||||||
|
|
||||||
namespace NetAdmin.Application.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 仓储服务基类
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <typeparam name="TPrimary">主键类型</typeparam>
|
|
||||||
/// <typeparam name="TLogger">日志类型</typeparam>
|
|
||||||
public abstract class RepositoryService<TEntity, TPrimary, TLogger>(BasicRepository<TEntity, TPrimary> rpo) : ServiceBase<TLogger>
|
|
||||||
where TEntity : EntityBase<TPrimary> //
|
|
||||||
where TPrimary : IEquatable<TPrimary>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 默认仓储
|
|
||||||
/// </summary>
|
|
||||||
protected BasicRepository<TEntity, TPrimary> Rpo => rpo;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 启用级联保存
|
|
||||||
/// </summary>
|
|
||||||
protected bool EnableCascadeSave {
|
|
||||||
get => Rpo.DbContextOptions.EnableCascadeSave;
|
|
||||||
set => Rpo.DbContextOptions.EnableCascadeSave = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 导出实体
|
|
||||||
/// </summary>
|
|
||||||
protected static async Task<IActionResult> ExportAsync<TQuery, TExport>( //
|
|
||||||
Func<QueryReq<TQuery>, ISelectGrouping<TEntity, TEntity>> selector, QueryReq<TQuery> query, string fileName
|
|
||||||
, Expression<Func<ISelectGroupingAggregate<TEntity, TEntity>, object>> listExp = null)
|
|
||||||
where TQuery : DataAbstraction, new()
|
|
||||||
{
|
|
||||||
var list = await selector(query).Take(Numbers.MAX_LIMIT_EXPORT).ToListAsync(listExp).ConfigureAwait(false);
|
|
||||||
return await GetExportFileStreamAsync<TExport>(fileName, list).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 导出实体
|
|
||||||
/// </summary>
|
|
||||||
protected static async Task<IActionResult> ExportAsync<TQuery, TExport>( //
|
|
||||||
Func<QueryReq<TQuery>, ISelect<TEntity>> selector, QueryReq<TQuery> query, string fileName, Expression<Func<TEntity, object>> listExp = null)
|
|
||||||
where TQuery : DataAbstraction, new()
|
|
||||||
{
|
|
||||||
var select = selector(query)
|
|
||||||
#if DBTYPE_SQLSERVER
|
|
||||||
.WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
|
|
||||||
#endif
|
|
||||||
.Take(Numbers.MAX_LIMIT_EXPORT);
|
|
||||||
|
|
||||||
object list = listExp == null ? await select.ToListAsync().ConfigureAwait(false) : await select.ToListAsync(listExp).ConfigureAwait(false);
|
|
||||||
|
|
||||||
return await GetExportFileStreamAsync<TExport>(fileName, list).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 更新实体
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="newValue">新的值</param>
|
|
||||||
/// <param name="includeFields">包含的属性</param>
|
|
||||||
/// <param name="excludeFields">排除的属性</param>
|
|
||||||
/// <param name="whereExp">查询表达式</param>
|
|
||||||
/// <param name="whereSql">查询sql</param>
|
|
||||||
/// <param name="ignoreVersion">是否忽略版本锁</param>
|
|
||||||
/// <returns>更新行数</returns>
|
|
||||||
protected Task<int> UpdateAsync( //
|
|
||||||
TEntity newValue //
|
|
||||||
, IEnumerable<string> includeFields //
|
|
||||||
, string[] excludeFields = null //
|
|
||||||
, Expression<Func<TEntity, bool>> whereExp = null //
|
|
||||||
, string whereSql = null //
|
|
||||||
, bool ignoreVersion = false)
|
|
||||||
{
|
|
||||||
// 默认匹配主键
|
|
||||||
whereExp ??= a => a.Id.Equals(newValue.Id);
|
|
||||||
var update = BuildUpdate(newValue, includeFields, excludeFields, ignoreVersion).Where(whereExp).Where(whereSql);
|
|
||||||
return update.ExecuteAffrowsAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
#if DBTYPE_SQLSERVER
|
|
||||||
/// <summary>
|
|
||||||
/// 更新实体
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="newValue">新的值</param>
|
|
||||||
/// <param name="includeFields">包含的属性</param>
|
|
||||||
/// <param name="excludeFields">排除的属性</param>
|
|
||||||
/// <param name="whereExp">查询表达式</param>
|
|
||||||
/// <param name="whereSql">查询sql</param>
|
|
||||||
/// <param name="ignoreVersion">是否忽略版本锁</param>
|
|
||||||
/// <returns>更新后的实体列表</returns>
|
|
||||||
protected Task<List<TEntity>> UpdateReturnListAsync( //
|
|
||||||
TEntity newValue //
|
|
||||||
, IEnumerable<string> includeFields //
|
|
||||||
, string[] excludeFields = null //
|
|
||||||
, Expression<Func<TEntity, bool>> whereExp = null //
|
|
||||||
, string whereSql = null //
|
|
||||||
, bool ignoreVersion = false)
|
|
||||||
{
|
|
||||||
// 默认匹配主键
|
|
||||||
whereExp ??= a => a.Id.Equals(newValue.Id);
|
|
||||||
return BuildUpdate(newValue, includeFields, excludeFields, ignoreVersion).Where(whereExp).Where(whereSql).ExecuteUpdatedAsync();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
private static async Task<IActionResult> GetExportFileStreamAsync<TExport>(string fileName, object list)
|
|
||||||
{
|
|
||||||
var listTyped = list.Adapt<List<TExport>>();
|
|
||||||
var stream = new MemoryStream();
|
|
||||||
var writer = new StreamWriter(stream);
|
|
||||||
var csv = new CsvWriter(writer, CultureInfo.InvariantCulture);
|
|
||||||
csv.WriteHeader<TExport>();
|
|
||||||
await csv.NextRecordAsync().ConfigureAwait(false);
|
|
||||||
|
|
||||||
foreach (var item in listTyped) {
|
|
||||||
csv.WriteRecord(item);
|
|
||||||
await csv.NextRecordAsync().ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
await csv.FlushAsync().ConfigureAwait(false);
|
|
||||||
_ = stream.Seek(0, SeekOrigin.Begin);
|
|
||||||
|
|
||||||
App.HttpContext.Response.Headers.ContentDisposition
|
|
||||||
= new ContentDispositionHeaderValue(Chars.FLG_HTTP_HEADER_VALUE_ATTACHMENT) {
|
|
||||||
FileNameStar
|
|
||||||
= $"{fileName}_{DateTime.Now:yyyy.MM.dd-HH.mm.ss}.csv"
|
|
||||||
}.ToString();
|
|
||||||
|
|
||||||
return new FileStreamResult(stream, Chars.FLG_HTTP_HEADER_VALUE_APPLICATION_OCTET_STREAM);
|
|
||||||
}
|
|
||||||
|
|
||||||
private IUpdate<TEntity> BuildUpdate( //
|
|
||||||
TEntity entity //
|
|
||||||
, IEnumerable<string> includeFields //
|
|
||||||
, string[] excludeFields = null //
|
|
||||||
, bool ignoreVersion = false)
|
|
||||||
{
|
|
||||||
var updateExp = includeFields == null
|
|
||||||
? Rpo.UpdateDiy.SetSource(entity)
|
|
||||||
: Rpo.UpdateDiy.SetDto(includeFields!.ToDictionary(
|
|
||||||
x => x, x => typeof(TEntity).GetProperty(x, BindingFlags.Public | BindingFlags.Instance)!.GetValue(entity)));
|
|
||||||
if (excludeFields != null) {
|
|
||||||
updateExp = updateExp.IgnoreColumns(excludeFields);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ignoreVersion && entity is IFieldVersion ver) {
|
|
||||||
updateExp = updateExp.Where($"{nameof(IFieldVersion.Version)} = @version", new { version = ver.Version });
|
|
||||||
}
|
|
||||||
|
|
||||||
return updateExp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
using NetAdmin.Application.Modules.Tpl;
|
|
||||||
|
|
||||||
namespace NetAdmin.Application.Services.Tpl.Dependency;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 示例服务
|
|
||||||
/// </summary>
|
|
||||||
public interface IExampleService : IService, IExampleModule;
|
|
||||||
@@ -1,128 +0,0 @@
|
|||||||
using NetAdmin.Application.Repositories;
|
|
||||||
using NetAdmin.Application.Services.Tpl.Dependency;
|
|
||||||
using NetAdmin.Domain.DbMaps.Tpl;
|
|
||||||
using NetAdmin.Domain.Dto.Dependency;
|
|
||||||
using NetAdmin.Domain.Dto.Tpl.Example;
|
|
||||||
|
|
||||||
namespace NetAdmin.Application.Services.Tpl;
|
|
||||||
|
|
||||||
/// <inheritdoc cref="IExampleService" />
|
|
||||||
public sealed class ExampleService(BasicRepository<Tpl_Example, long> rpo) //
|
|
||||||
: RepositoryService<Tpl_Example, long, IExampleService>(rpo), IExampleService
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<int> BulkDeleteAsync(BulkReq<DelReq> req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
var ret = 0;
|
|
||||||
|
|
||||||
// ReSharper disable once LoopCanBeConvertedToQuery
|
|
||||||
foreach (var item in req.Items) {
|
|
||||||
ret += await DeleteAsync(item).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<long> CountAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
return QueryInternal(req)
|
|
||||||
#if DBTYPE_SQLSERVER
|
|
||||||
.WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
|
|
||||||
#endif
|
|
||||||
.CountAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<QueryExampleRsp> CreateAsync(CreateExampleReq req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
var ret = await Rpo.InsertAsync(req).ConfigureAwait(false);
|
|
||||||
return ret.Adapt<QueryExampleRsp>();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<int> DeleteAsync(DelReq req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
return Rpo.DeleteAsync(a => a.Id == req.Id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<bool> ExistAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
return QueryInternal(req)
|
|
||||||
#if DBTYPE_SQLSERVER
|
|
||||||
.WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
|
|
||||||
#endif
|
|
||||||
.AnyAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<IActionResult> ExportAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
return ExportAsync<QueryExampleReq, QueryExampleRsp>(QueryInternal, req, Ln.示例导出);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<QueryExampleRsp> GetAsync(QueryExampleReq req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
var ret = await QueryInternal(new QueryReq<QueryExampleReq> { Filter = req, Order = Orders.None }).ToOneAsync().ConfigureAwait(false);
|
|
||||||
return ret.Adapt<QueryExampleRsp>();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<PagedQueryRsp<QueryExampleRsp>> PagedQueryAsync(PagedQueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
var list = await QueryInternal(req)
|
|
||||||
.Page(req.Page, req.PageSize)
|
|
||||||
#if DBTYPE_SQLSERVER
|
|
||||||
.WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
|
|
||||||
#endif
|
|
||||||
.Count(out var total)
|
|
||||||
.ToListAsync()
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
return new PagedQueryRsp<QueryExampleRsp>(req.Page, req.PageSize, total, list.Adapt<IEnumerable<QueryExampleRsp>>());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<IEnumerable<QueryExampleRsp>> QueryAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
req.ThrowIfInvalid();
|
|
||||||
var ret = await QueryInternal(req)
|
|
||||||
#if DBTYPE_SQLSERVER
|
|
||||||
.WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
|
|
||||||
#endif
|
|
||||||
.Take(req.Count)
|
|
||||||
.ToListAsync()
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
return ret.Adapt<IEnumerable<QueryExampleRsp>>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private ISelect<Tpl_Example> QueryInternal(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
var ret = Rpo.Select.WhereDynamicFilter(req.DynamicFilter).WhereDynamic(req.Filter);
|
|
||||||
|
|
||||||
// ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault
|
|
||||||
switch (req.Order) {
|
|
||||||
case Orders.None:
|
|
||||||
return ret;
|
|
||||||
case Orders.Random:
|
|
||||||
return ret.OrderByRandom();
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = ret.OrderByPropertyNameIf(req.Prop?.Length > 0, req.Prop, req.Order == Orders.Ascending);
|
|
||||||
if (!req.Prop?.Equals(nameof(req.Filter.Id), StringComparison.OrdinalIgnoreCase) ?? true) {
|
|
||||||
ret = ret.OrderByDescending(a => a.Id);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
using NetAdmin.Application.Modules.Tpl;
|
|
||||||
using NetAdmin.Application.Services.Tpl.Dependency;
|
|
||||||
|
|
||||||
namespace NetAdmin.Cache.Tpl.Dependency;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 示例缓存
|
|
||||||
/// </summary>
|
|
||||||
public interface IExampleCache : ICache<IDistributedCache, IExampleService>, IExampleModule;
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
using NetAdmin.Application.Services.Tpl.Dependency;
|
|
||||||
using NetAdmin.Cache.Tpl.Dependency;
|
|
||||||
using NetAdmin.Domain.Dto.Dependency;
|
|
||||||
using NetAdmin.Domain.Dto.Tpl.Example;
|
|
||||||
|
|
||||||
namespace NetAdmin.Cache.Tpl;
|
|
||||||
|
|
||||||
/// <inheritdoc cref="IExampleCache" />
|
|
||||||
public sealed class ExampleCache(IDistributedCache cache, IExampleService service)
|
|
||||||
: DistributedCache<IExampleService>(cache, service), IScoped, IExampleCache
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)
|
|
||||||
{
|
|
||||||
return Service.BulkDeleteAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<long> CountAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
return Service.CountAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryExampleRsp> CreateAsync(CreateExampleReq req)
|
|
||||||
{
|
|
||||||
return Service.CreateAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<int> DeleteAsync(DelReq req)
|
|
||||||
{
|
|
||||||
return Service.DeleteAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<bool> ExistAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
return Service.ExistAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<IActionResult> ExportAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
return Service.ExportAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryExampleRsp> GetAsync(QueryExampleReq req)
|
|
||||||
{
|
|
||||||
return Service.GetAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<PagedQueryRsp<QueryExampleRsp>> PagedQueryAsync(PagedQueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
return Service.PagedQueryAsync(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<IEnumerable<QueryExampleRsp>> QueryAsync(QueryReq<QueryExampleReq> req)
|
|
||||||
{
|
|
||||||
return Service.QueryAsync(req);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
namespace NetAdmin.Domain.Attributes;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 标记一个枚举的状态指示
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Enum)]
|
|
||||||
public sealed class IndicatorAttribute(string indicate) : Attribute
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 状态指示
|
|
||||||
/// </summary>
|
|
||||||
public string Indicate { get; } = indicate;
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
namespace NetAdmin.Domain.DbMaps.Tpl;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 示例表
|
|
||||||
/// </summary>
|
|
||||||
[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Tpl_Example))]
|
|
||||||
public record Tpl_Example : VersionEntity;
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
namespace NetAdmin.Domain.Dto.Dependency;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 请求:查询
|
|
||||||
/// </summary>
|
|
||||||
public record QueryReq<T> : DataAbstraction
|
|
||||||
where T : DataAbstraction, new()
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 取前n条
|
|
||||||
/// </summary>
|
|
||||||
[Range(1, Numbers.MAX_LIMIT_QUERY)]
|
|
||||||
public int Count { get; init; } = Numbers.MAX_LIMIT_QUERY;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 动态查询条件
|
|
||||||
/// </summary>
|
|
||||||
public DynamicFilterInfo DynamicFilter { get; init; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 查询条件
|
|
||||||
/// </summary>
|
|
||||||
public T Filter { get; init; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 查询关键字
|
|
||||||
/// </summary>
|
|
||||||
public string Keywords { get; init; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 排序方式
|
|
||||||
/// </summary>
|
|
||||||
public Orders? Order { get; init; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 排序字段
|
|
||||||
/// </summary>
|
|
||||||
public string Prop { get; init; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 所需字段
|
|
||||||
/// </summary>
|
|
||||||
public string[] RequiredFields { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 列表表达式
|
|
||||||
/// </summary>
|
|
||||||
public Expression<Func<TEntity, TEntity>> GetToListExp<TEntity>()
|
|
||||||
{
|
|
||||||
if (RequiredFields.NullOrEmpty()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
var expParameter = Expression.Parameter(typeof(TEntity), "a");
|
|
||||||
var bindings = new List<MemberBinding>();
|
|
||||||
|
|
||||||
// ReSharper disable once LoopCanBeConvertedToQuery
|
|
||||||
foreach (var field in RequiredFields) {
|
|
||||||
var prop = typeof(TEntity).GetProperty(field);
|
|
||||||
if (prop == null || prop.GetCustomAttribute<DangerFieldAttribute>() != null) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var propExp = Expression.Property(expParameter, prop);
|
|
||||||
var binding = Expression.Bind(prop, propExp);
|
|
||||||
bindings.Add(binding);
|
|
||||||
}
|
|
||||||
|
|
||||||
var expBody = Expression.MemberInit(Expression.New(typeof(TEntity)), bindings);
|
|
||||||
return Expression.Lambda<Func<TEntity, TEntity>>(expBody, expParameter);
|
|
||||||
}
|
|
||||||
}
|
|
||||||