Compare commits
192 Commits
Author | SHA1 | Date | |
---|---|---|---|
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 | ||
3293683835 | |||
![]() |
e71661663f | ||
![]() |
13ba536df2 | ||
![]() |
072cc1e491 | ||
![]() |
6fbb519256 | ||
![]() |
a4e63c971d | ||
![]() |
bac4a39544 | ||
![]() |
f0c3ec109f | ||
![]() |
000e3d68a8 | ||
![]() |
58e4572723 | ||
![]() |
dfe6b03b21 | ||
![]() |
135f082b06 | ||
![]() |
c088492cfa | ||
![]() |
b9b228c9e1 | ||
779d8e511a | |||
![]() |
6922a863ec | ||
5b69ce8688 | |||
![]() |
cd8ed674e0 | ||
![]() |
4733adede5 | ||
![]() |
e00c30c961 | ||
![]() |
6b63250039 | ||
![]() |
2fa8b56f9c | ||
![]() |
2b4c25c07c | ||
![]() |
7c56c8d571 | ||
![]() |
5fb6f7bea7 | ||
e48b425121 | |||
![]() |
faaf5aa0fc | ||
![]() |
e1bea2ec31 | ||
![]() |
33e60a5bd7 | ||
![]() |
1a28e8d5a6 | ||
![]() |
60ec6ea2c1 | ||
![]() |
6d4ccf3445 | ||
![]() |
1733802e02 | ||
![]() |
aaea28389a | ||
![]() |
be5b9a160d | ||
![]() |
67eaa5b783 | ||
![]() |
8b01112f42 | ||
d6a479b693 | |||
![]() |
e1b0030193 | ||
![]() |
beba4124b0 | ||
8a29640aeb | |||
![]() |
8bc8aa960c | ||
![]() |
d00f0d2d9c | ||
![]() |
1442e0a37c | ||
![]() |
6100e9e9c8 | ||
![]() |
ae2d1c4932 | ||
![]() |
366a26a5cd | ||
![]() |
8b53f66331 | ||
![]() |
705d027da4 | ||
![]() |
a3ab97019d | ||
![]() |
608a1ded5c | ||
![]() |
366ca0d237 | ||
![]() |
56b111b1cf | ||
![]() |
f5bd69ef60 | ||
ddf891e3bc | |||
![]() |
7ae473d492 | ||
![]() |
c20a6c369d | ||
![]() |
57b71e1354 | ||
![]() |
127f6e9f6c | ||
![]() |
d1951dbcb5 | ||
![]() |
5edcf63e24 | ||
![]() |
b01b8b24ba | ||
![]() |
d9c7085472 | ||
![]() |
a01acddb9c | ||
![]() |
e5208cd751 | ||
![]() |
dc326c324c | ||
![]() |
e0d15f8039 | ||
![]() |
169ab08b88 | ||
![]() |
3b8336105a | ||
![]() |
7214a22ea5 | ||
![]() |
3152a8d3e8 | ||
![]() |
40e8eff5f3 | ||
![]() |
47e67dd503 | ||
![]() |
903ea1820a | ||
![]() |
c08ea62064 | ||
![]() |
4860299959 | ||
![]() |
72f9d1a3ec | ||
![]() |
98718a010c |
1
.drone/workflows/README.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
drone workflows
|
@ -10,6 +10,7 @@ ij_xml_text_wrap = off # IntelliJ IDEA 中 XML 文本不换行
|
|||||||
indent_size = 4 # 缩进大小为 4 个空格
|
indent_size = 4 # 缩进大小为 4 个空格
|
||||||
indent_style = space # 使用空格进行缩进
|
indent_style = space # 使用空格进行缩进
|
||||||
insert_final_newline = false # 不在文件末尾插入空行
|
insert_final_newline = false # 不在文件末尾插入空行
|
||||||
|
max_line_length = 150 # 行长度限制为 150 个字符
|
||||||
trim_trailing_whitespace = true # 删除行尾的空格
|
trim_trailing_whitespace = true # 删除行尾的空格
|
||||||
|
|
||||||
[{*.json,*.yml}]
|
[{*.json,*.yml}]
|
||||||
|
1
.github/workflows/README.md
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
github workflows
|
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: [ 20.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: [ 20.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 }}
|
||||||
|
2
.gitignore
vendored
@ -402,4 +402,4 @@ FodyWeavers.xsd
|
|||||||
dist/
|
dist/
|
||||||
*.[Dd]esigner.cs
|
*.[Dd]esigner.cs
|
||||||
*.db
|
*.db
|
||||||
/assets/res/Ln.resx
|
/assets/res/Ln.resx
|
12
.gitmodules
vendored
@ -1,9 +1,9 @@
|
|||||||
[submodule "refs/Furion"]
|
[submodule "refs/Gurion"]
|
||||||
path = refs/Furion
|
path = refs/Gurion
|
||||||
url = https://github.com/nsnail/Furion.git
|
url = https://github.com/nsnail/Gurion.git
|
||||||
[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
|
212
CHANGELOG.md
@ -2,33 +2,207 @@
|
|||||||
|
|
||||||
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.
|
||||||
|
|
||||||
### [1.1.1](https://github.com/nsnail/NetAdmin/compare/v1.0.0...v1.1.1) (2024-04-29)
|
### [2.3.1](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.3.1) (2024-12-13)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* ✨ 版本更新日志组件 ([#96](https://github.com/nsnail/NetAdmin/issues/96)) ([a37acc4](https://github.com/nsnail/NetAdmin/commit/a37acc4b55c91d57d51c7fa079da8700530412a5))
|
* ✨ 菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
|
||||||
* ✨ 计划作业 ([#87](https://github.com/nsnail/NetAdmin/issues/87)) ([8293ec0](https://github.com/nsnail/NetAdmin/commit/8293ec0297875ebc9ad75cce9465bd587929c0bf))
|
* ✨ 分组统计功能 ([0b036e9](https://github.com/nsnail/NetAdmin/commit/0b036e9d67ffdf7a07c772606009f02744e6a3c3))
|
||||||
* ✨ 计划作业执行记录 ([#89](https://github.com/nsnail/NetAdmin/issues/89)) ([6f89015](https://github.com/nsnail/NetAdmin/commit/6f890151989ad733e35653933b7597eec478cc3b))
|
* ✨ 框架代码同步 ([098cfc1](https://github.com/nsnail/NetAdmin/commit/098cfc135e781a0cf172cd1289e5e871c7a76419))
|
||||||
* ✨ 将数据库结构同步和种子数据初始化作为命令行开关 ([#78](https://github.com/nsnail/NetAdmin/issues/78)) ([05ed3d3](https://github.com/nsnail/NetAdmin/commit/05ed3d3746aa274a0f88f7afadfea12a3c8a80ff))
|
* ✨ 框架代码同步 ([7256626](https://github.com/nsnail/NetAdmin/commit/725662693b7b47f6fae4c1917dd8d80220c7640a))
|
||||||
* ✨ 快捷启用/禁用用户 ([#91](https://github.com/nsnail/NetAdmin/issues/91)) ([6c2d167](https://github.com/nsnail/NetAdmin/commit/6c2d1676e45b9f1ecf3be3ae5a172db49b62a81d))
|
* ✨ 文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
|
||||||
* ✨ 前端表格高级筛选 ([#100](https://github.com/nsnail/NetAdmin/issues/100)) ([3847d6f](https://github.com/nsnail/NetAdmin/commit/3847d6fdbbd27efb53921bcc8374157f0da47155))
|
* ✨ select-filter badge icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
|
||||||
* ✨ 日志管理独立出来、增加登录日志界面 ([#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))
|
* 🐛 按钮文字提示 ([#227](https://github.com/nsnail/NetAdmin/issues/227)) ([c88c8d2](https://github.com/nsnail/NetAdmin/commit/c88c8d293d44f2707f3b5232e6a40a141af9981c))
|
||||||
* 🐛 低版本jetbrains.resharper.globaltools搞乱了代码 ([#97](https://github.com/nsnail/NetAdmin/issues/97)) ([c117ddf](https://github.com/nsnail/NetAdmin/commit/c117ddfe7a433215b3449cdd6b19318a1f3cbf37))
|
* 🐛 导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
|
||||||
* 🐛 前端样式问题 ([#84](https://github.com/nsnail/NetAdmin/issues/84)) ([6615df3](https://github.com/nsnail/NetAdmin/commit/6615df339934f6d19880c9822b44d5305c2f2a75))
|
* 🐛 导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
|
||||||
* 🐛 请求日志客户端IP显示不正确 ([#60](https://github.com/nsnail/NetAdmin/issues/60)) ([ec698ce](https://github.com/nsnail/NetAdmin/commit/ec698ce4db49861eaaeb8bf5080764939e6d7231))
|
* 🐛 个性主题色冲突 ([4e4a1d0](https://github.com/nsnail/NetAdmin/commit/4e4a1d0dff7f3698e9a9cfcf46368260cfd70cbd))
|
||||||
* 🐛 时区问题 ([#107](https://github.com/nsnail/NetAdmin/issues/107)) ([59c85ce](https://github.com/nsnail/NetAdmin/commit/59c85cef217c121b36d52993b6b5a774fe22df9e))
|
* 🐛 请求日志批量插入,漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
|
||||||
* 🐛 小问题 ([#76](https://github.com/nsnail/NetAdmin/issues/76)) ([52ddf27](https://github.com/nsnail/NetAdmin/commit/52ddf273c856d8f7e363ce23e5886b9eedf4604f))
|
* 🐛 修复一些样式问题 ([442a69f](https://github.com/nsnail/NetAdmin/commit/442a69f90de179539f78c01d967572f83bd2eff8))
|
||||||
* 🐛 在弹窗界面中引用的列表组件,点击重置搜索条件按钮时,会关闭弹窗的bug ([#95](https://github.com/nsnail/NetAdmin/issues/95)) ([8fee14c](https://github.com/nsnail/NetAdmin/commit/8fee14cd6ebd86456956fc59bbb61c545faa1fdd))
|
* 🐛 用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
|
||||||
* 🐛 tinymce editor css 加载路径错误 ([#93](https://github.com/nsnail/NetAdmin/issues/93)) ([5fe7387](https://github.com/nsnail/NetAdmin/commit/5fe73878a2a53dc5e7e2dcbcbf22f91ffb4376dd))
|
* 🐛 editUser ([ef2a0c3](https://github.com/nsnail/NetAdmin/commit/ef2a0c3280532ac24889279e4780a1b1a2561a6b))
|
||||||
* 🐛 tinymce editor css 加载路径错误 ([#94](https://github.com/nsnail/NetAdmin/issues/94)) ([802251e](https://github.com/nsnail/NetAdmin/commit/802251e42347bfe4fa0bcb4867b615d7c03abf19))
|
* 🐛 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)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨ 查询过滤器保存 ([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))
|
||||||
|
|
||||||
|
|
||||||
|
### 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))
|
||||||
|
|
||||||
|
## [1.6.0](https://github.com/nsnail/NetAdmin/compare/v1.5.0...v1.6.0) (2024-08-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨ 移除RedLocker,更改为自实现 ([#169](https://github.com/nsnail/NetAdmin/issues/169)) ([cd8ed67](https://github.com/nsnail/NetAdmin/commit/cd8ed674e0615b33fc0e025b9412c2f16d252f0f))
|
||||||
|
|
||||||
|
|
||||||
|
### 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))
|
||||||
|
* 🐛 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)
|
||||||
|
|
||||||
|
|
||||||
|
### 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))
|
||||||
|
* ✨ 请求日志增加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
|
||||||
|
|
||||||
|
* 🐛 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)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ✨ 框架代码同步 ([#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)
|
||||||
|
|
||||||
|
|
||||||
|
### 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))
|
||||||
|
* ✨ 框架代码同步 ([#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
|
||||||
|
|
||||||
|
* 🐛 补充多语种文件 ([#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)
|
||||||
|
|
||||||
|
|
||||||
|
### 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))
|
||||||
|
* ✨ 框架代码同步 ([#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))
|
||||||
|
* ✨ 手动执行计划作业 ([#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
|
||||||
|
|
||||||
|
* 🐛 字段顺序 ([#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))
|
||||||
|
* **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.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)
|
||||||
|
|
||||||
|
@ -1,23 +1,24 @@
|
|||||||
<!-- 注意此文件名大小写不可变更 -->
|
<!-- 注意此文件名大小写不可变更 -->
|
||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<DefineConstants>DBTYPE_SQLITE</DefineConstants>
|
||||||
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
|
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)/build/minver.targets" />
|
<Import Project="$(SolutionDir)/build/minver.targets"/>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<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>
|
||||||
@ -25,12 +26,12 @@
|
|||||||
<Title>$(AssemblyName)</Title>
|
<Title>$(AssemblyName)</Title>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MinVer" Version="5.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.0-preview.3 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:9.0.4 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
|
187
NetAdmin.sln
@ -1,187 +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
|
|
||||||
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.furion.json = scripts/switcher.furion.json
|
|
||||||
switcher.nsext.json = scripts/switcher.nsext.json
|
|
||||||
switcher.ps1 = scripts/switcher.ps1
|
|
||||||
sync.sln.files.csx = scripts/sync.sln.files.csx
|
|
||||||
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
|
|
||||||
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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Tests", "src\backend\NetAdmin.AdmServer.Tests\NetAdmin.AdmServer.Tests.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
|
|
||||||
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
|
|
||||||
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}
|
|
||||||
{3C6F049E-3EE8-4D66-9AFF-E8A369032487} = {1129FE25-466B-4F4F-85FC-3752664245E1}
|
|
||||||
{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}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
@ -1,93 +0,0 @@
|
|||||||
<wpf:ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xml:space="preserve">
|
|
||||||
<!-- CodeEditing-->
|
|
||||||
<s:Boolean x:Key="/Default/CodeEditing/TypingAssist/SkipClosingBracesOnTabInStringLiterals/@EntryValue">True</s:Boolean>
|
|
||||||
<s:String x:Key="/Default/CodeEditing/GenerateMemberBody/DocumentationGenerationKind/@EntryValue">Inherit</s:String>
|
|
||||||
|
|
||||||
<!-- CodeInspection-->
|
|
||||||
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ett/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">OFF</s:String>
|
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentInConditionalExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DuplicateResource/@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/=SuggestBaseTypeForParameterInConstructor/@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/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
|
||||||
|
|
||||||
<!-- CodeStyle-->
|
|
||||||
<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: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_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/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_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/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue"><Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy></s:String>
|
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue"><Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="AA_BB" /></Policy></s:String>
|
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=669e5282_002Dfb4b_002D4e90_002D91e7_002D07d269d04b60/@EntryIndexedValue"><Policy><Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></Policy></s:String>
|
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a0b4bc4d_002Dd13b_002D4a37_002Db37e_002Dc9c6864e4302/@EntryIndexedValue"><Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"><ElementKinds><Kind Name="NAMESPACE" /><Kind Name="CLASS" /><Kind Name="STRUCT" /><Kind Name="ENUM" /><Kind Name="DELEGATE" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /></Policy></s:String>
|
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=c873eafb_002Dd57f_002D481d_002D8c93_002D77f6863c2f88/@EntryIndexedValue"><Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static readonly fields (not private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy></s:String>
|
|
||||||
|
|
||||||
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue"><?xml version="1.0" encoding="utf-16"?>
|
|
||||||
<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns">
|
|
||||||
<TypePattern>
|
|
||||||
<Entry>
|
|
||||||
<Entry.SortBy>
|
|
||||||
<Kind>
|
|
||||||
<Kind.Order>
|
|
||||||
<DeclarationKind>Constant</DeclarationKind>
|
|
||||||
<DeclarationKind>Field</DeclarationKind>
|
|
||||||
<DeclarationKind>Constructor</DeclarationKind>
|
|
||||||
<DeclarationKind>Destructor</DeclarationKind>
|
|
||||||
<DeclarationKind>Delegate</DeclarationKind>
|
|
||||||
<DeclarationKind>Event</DeclarationKind>
|
|
||||||
<DeclarationKind>Enum</DeclarationKind>
|
|
||||||
<DeclarationKind>Interface</DeclarationKind>
|
|
||||||
<DeclarationKind>Property</DeclarationKind>
|
|
||||||
<DeclarationKind>Indexer</DeclarationKind>
|
|
||||||
<DeclarationKind>Method</DeclarationKind>
|
|
||||||
<DeclarationKind>Struct</DeclarationKind>
|
|
||||||
<DeclarationKind>Record</DeclarationKind>
|
|
||||||
<DeclarationKind>Class</DeclarationKind>
|
|
||||||
</Kind.Order>
|
|
||||||
</Kind>
|
|
||||||
<Access>
|
|
||||||
<Access.Order>
|
|
||||||
<AccessModifier>Public</AccessModifier>
|
|
||||||
<AccessModifier>Internal</AccessModifier>
|
|
||||||
<AccessModifier>ProtectedInternal</AccessModifier>
|
|
||||||
<AccessModifier>Protected</AccessModifier>
|
|
||||||
<AccessModifier>PrivateProtected</AccessModifier>
|
|
||||||
<AccessModifier>Private</AccessModifier>
|
|
||||||
</Access.Order>
|
|
||||||
</Access>
|
|
||||||
<Static />
|
|
||||||
<Readonly />
|
|
||||||
<Name />
|
|
||||||
</Entry.SortBy>
|
|
||||||
</Entry>
|
|
||||||
</TypePattern>
|
|
||||||
</Patterns></s:String>
|
|
||||||
|
|
||||||
<!-- Environment-->
|
|
||||||
<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_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
|
|
||||||
<!-- ReSpeller-->
|
|
||||||
<s:Boolean x:Key="/Default/ReSpeller/ReSpellerEnabled/@EntryValue">True</s:Boolean>
|
|
||||||
|
|
||||||
<!-- UserDictionary-->
|
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLG/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLGL/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=RGX/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=RGXL/@EntryIndexedValue">True</s:Boolean>
|
|
||||||
|
|
||||||
</wpf:ResourceDictionary>
|
|
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>
|
346
NetAdmin.slnx.DotSettings
Normal file
@ -0,0 +1,346 @@
|
|||||||
|
<wpf:ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xml:space="preserve">
|
||||||
|
<!-- CodeEditing-->
|
||||||
|
<s:Boolean x:Key="/Default/CodeEditing/TypingAssist/SkipClosingBracesOnTabInStringLiterals/@EntryValue">True</s:Boolean>
|
||||||
|
<s:String x:Key="/Default/CodeEditing/GenerateMemberBody/DocumentationGenerationKind/@EntryValue">Inherit</s:String>
|
||||||
|
|
||||||
|
<!-- CodeInspection-->
|
||||||
|
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ett/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">OFF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentInConditionalExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DuplicateResource/@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/=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/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
|
|
||||||
|
<!-- CodeStyle-->
|
||||||
|
<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: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_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/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_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/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/=AF/@EntryIndexedValue">AF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AG/@EntryIndexedValue">AG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AL/@EntryIndexedValue">AL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AM/@EntryIndexedValue">AM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AO/@EntryIndexedValue">AO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AQ/@EntryIndexedValue">AQ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AR/@EntryIndexedValue">AR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AS/@EntryIndexedValue">AS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AT/@EntryIndexedValue">AT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AU/@EntryIndexedValue">AU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AW/@EntryIndexedValue">AW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AX/@EntryIndexedValue">AX</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AZ/@EntryIndexedValue">AZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BA/@EntryIndexedValue">BA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BB/@EntryIndexedValue">BB</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BD/@EntryIndexedValue">BD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BE/@EntryIndexedValue">BE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BF/@EntryIndexedValue">BF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BG/@EntryIndexedValue">BG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BH/@EntryIndexedValue">BH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BI/@EntryIndexedValue">BI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BJ/@EntryIndexedValue">BJ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BL/@EntryIndexedValue">BL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BM/@EntryIndexedValue">BM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BN/@EntryIndexedValue">BN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BO/@EntryIndexedValue">BO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BQ/@EntryIndexedValue">BQ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BR/@EntryIndexedValue">BR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BS/@EntryIndexedValue">BS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BT/@EntryIndexedValue">BT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BV/@EntryIndexedValue">BV</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BW/@EntryIndexedValue">BW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BY/@EntryIndexedValue">BY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BZ/@EntryIndexedValue">BZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CA/@EntryIndexedValue">CA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CC/@EntryIndexedValue">CC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CD/@EntryIndexedValue">CD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CF/@EntryIndexedValue">CF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CG/@EntryIndexedValue">CG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CH/@EntryIndexedValue">CH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CI/@EntryIndexedValue">CI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CK/@EntryIndexedValue">CK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CL/@EntryIndexedValue">CL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CM/@EntryIndexedValue">CM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CN/@EntryIndexedValue">CN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CO/@EntryIndexedValue">CO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CR/@EntryIndexedValue">CR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CU/@EntryIndexedValue">CU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CV/@EntryIndexedValue">CV</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CW/@EntryIndexedValue">CW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CX/@EntryIndexedValue">CX</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CY/@EntryIndexedValue">CY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CZ/@EntryIndexedValue">CZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DE/@EntryIndexedValue">DE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DJ/@EntryIndexedValue">DJ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DK/@EntryIndexedValue">DK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DM/@EntryIndexedValue">DM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DO/@EntryIndexedValue">DO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DZ/@EntryIndexedValue">DZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EC/@EntryIndexedValue">EC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EE/@EntryIndexedValue">EE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EG/@EntryIndexedValue">EG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EH/@EntryIndexedValue">EH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ER/@EntryIndexedValue">ER</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ES/@EntryIndexedValue">ES</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ET/@EntryIndexedValue">ET</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FI/@EntryIndexedValue">FI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FJ/@EntryIndexedValue">FJ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FK/@EntryIndexedValue">FK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FM/@EntryIndexedValue">FM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FO/@EntryIndexedValue">FO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FR/@EntryIndexedValue">FR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GA/@EntryIndexedValue">GA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GB/@EntryIndexedValue">GB</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GD/@EntryIndexedValue">GD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GE/@EntryIndexedValue">GE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GF/@EntryIndexedValue">GF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GG/@EntryIndexedValue">GG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GH/@EntryIndexedValue">GH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GI/@EntryIndexedValue">GI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GM/@EntryIndexedValue">GM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GN/@EntryIndexedValue">GN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GP/@EntryIndexedValue">GP</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GQ/@EntryIndexedValue">GQ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GR/@EntryIndexedValue">GR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GS/@EntryIndexedValue">GS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GT/@EntryIndexedValue">GT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GU/@EntryIndexedValue">GU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GW/@EntryIndexedValue">GW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GY/@EntryIndexedValue">GY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HK/@EntryIndexedValue">HK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HM/@EntryIndexedValue">HM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HN/@EntryIndexedValue">HN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HR/@EntryIndexedValue">HR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HT/@EntryIndexedValue">HT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HU/@EntryIndexedValue">HU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IE/@EntryIndexedValue">IE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IM/@EntryIndexedValue">IM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IN/@EntryIndexedValue">IN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IQ/@EntryIndexedValue">IQ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IR/@EntryIndexedValue">IR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IS/@EntryIndexedValue">IS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IT/@EntryIndexedValue">IT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JE/@EntryIndexedValue">JE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JM/@EntryIndexedValue">JM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JO/@EntryIndexedValue">JO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KE/@EntryIndexedValue">KE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KG/@EntryIndexedValue">KG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KH/@EntryIndexedValue">KH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KI/@EntryIndexedValue">KI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KM/@EntryIndexedValue">KM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KN/@EntryIndexedValue">KN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KP/@EntryIndexedValue">KP</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KW/@EntryIndexedValue">KW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KY/@EntryIndexedValue">KY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KZ/@EntryIndexedValue">KZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LA/@EntryIndexedValue">LA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LB/@EntryIndexedValue">LB</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LC/@EntryIndexedValue">LC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LI/@EntryIndexedValue">LI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LK/@EntryIndexedValue">LK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LR/@EntryIndexedValue">LR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LS/@EntryIndexedValue">LS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LT/@EntryIndexedValue">LT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LU/@EntryIndexedValue">LU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LV/@EntryIndexedValue">LV</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LY/@EntryIndexedValue">LY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MA/@EntryIndexedValue">MA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MC/@EntryIndexedValue">MC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ME/@EntryIndexedValue">ME</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MF/@EntryIndexedValue">MF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MG/@EntryIndexedValue">MG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MH/@EntryIndexedValue">MH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MK/@EntryIndexedValue">MK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ML/@EntryIndexedValue">ML</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MM/@EntryIndexedValue">MM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MN/@EntryIndexedValue">MN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MO/@EntryIndexedValue">MO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MP/@EntryIndexedValue">MP</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MQ/@EntryIndexedValue">MQ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MR/@EntryIndexedValue">MR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MS/@EntryIndexedValue">MS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MT/@EntryIndexedValue">MT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MU/@EntryIndexedValue">MU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MV/@EntryIndexedValue">MV</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MW/@EntryIndexedValue">MW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MX/@EntryIndexedValue">MX</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MY/@EntryIndexedValue">MY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MZ/@EntryIndexedValue">MZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NA/@EntryIndexedValue">NA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NC/@EntryIndexedValue">NC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NE/@EntryIndexedValue">NE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NF/@EntryIndexedValue">NF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NG/@EntryIndexedValue">NG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NI/@EntryIndexedValue">NI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NL/@EntryIndexedValue">NL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NO/@EntryIndexedValue">NO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NP/@EntryIndexedValue">NP</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NR/@EntryIndexedValue">NR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NU/@EntryIndexedValue">NU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NZ/@EntryIndexedValue">NZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OM/@EntryIndexedValue">OM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OTP/@EntryIndexedValue">OTP</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PA/@EntryIndexedValue">PA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PE/@EntryIndexedValue">PE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PF/@EntryIndexedValue">PF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PG/@EntryIndexedValue">PG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PH/@EntryIndexedValue">PH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PK/@EntryIndexedValue">PK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PL/@EntryIndexedValue">PL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PN/@EntryIndexedValue">PN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PR/@EntryIndexedValue">PR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PS/@EntryIndexedValue">PS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PT/@EntryIndexedValue">PT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PW/@EntryIndexedValue">PW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PY/@EntryIndexedValue">PY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QA/@EntryIndexedValue">QA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RE/@EntryIndexedValue">RE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RO/@EntryIndexedValue">RO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RS/@EntryIndexedValue">RS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RU/@EntryIndexedValue">RU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RW/@EntryIndexedValue">RW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SA/@EntryIndexedValue">SA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SB/@EntryIndexedValue">SB</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SC/@EntryIndexedValue">SC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SD/@EntryIndexedValue">SD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SE/@EntryIndexedValue">SE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SG/@EntryIndexedValue">SG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SH/@EntryIndexedValue">SH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SI/@EntryIndexedValue">SI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SJ/@EntryIndexedValue">SJ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SK/@EntryIndexedValue">SK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SL/@EntryIndexedValue">SL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SM/@EntryIndexedValue">SM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SN/@EntryIndexedValue">SN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SO/@EntryIndexedValue">SO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SR/@EntryIndexedValue">SR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ST/@EntryIndexedValue">ST</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SV/@EntryIndexedValue">SV</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SX/@EntryIndexedValue">SX</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SY/@EntryIndexedValue">SY</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SZ/@EntryIndexedValue">SZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TC/@EntryIndexedValue">TC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TD/@EntryIndexedValue">TD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TF/@EntryIndexedValue">TF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TG/@EntryIndexedValue">TG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TH/@EntryIndexedValue">TH</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TJ/@EntryIndexedValue">TJ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TL/@EntryIndexedValue">TL</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TM/@EntryIndexedValue">TM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TN/@EntryIndexedValue">TN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TO/@EntryIndexedValue">TO</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TR/@EntryIndexedValue">TR</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TT/@EntryIndexedValue">TT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TV/@EntryIndexedValue">TV</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TW/@EntryIndexedValue">TW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TZ/@EntryIndexedValue">TZ</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UA/@EntryIndexedValue">UA</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/=US/@EntryIndexedValue">US</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/=VA/@EntryIndexedValue">VA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VC/@EntryIndexedValue">VC</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VE/@EntryIndexedValue">VE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VG/@EntryIndexedValue">VG</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VI/@EntryIndexedValue">VI</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VN/@EntryIndexedValue">VN</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VU/@EntryIndexedValue">VU</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WF/@EntryIndexedValue">WF</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WS/@EntryIndexedValue">WS</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=YE/@EntryIndexedValue">YE</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=YT/@EntryIndexedValue">YT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ZA/@EntryIndexedValue">ZA</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ZM/@EntryIndexedValue">ZM</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ZW/@EntryIndexedValue">ZW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue"><Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy></s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue"><Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="AA_BB" /></Policy></s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=669e5282_002Dfb4b_002D4e90_002D91e7_002D07d269d04b60/@EntryIndexedValue"><Policy><Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></Policy></s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a0b4bc4d_002Dd13b_002D4a37_002Db37e_002Dc9c6864e4302/@EntryIndexedValue"><Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"><ElementKinds><Kind Name="NAMESPACE" /><Kind Name="CLASS" /><Kind Name="STRUCT" /><Kind Name="ENUM" /><Kind Name="DELEGATE" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /></Policy></s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=c873eafb_002Dd57f_002D481d_002D8c93_002D77f6863c2f88/@EntryIndexedValue"><Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static readonly fields (not private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy></s:String>
|
||||||
|
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue"><?xml version="1.0" encoding="utf-16"?>
|
||||||
|
<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns">
|
||||||
|
<TypePattern>
|
||||||
|
<Entry>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Kind>
|
||||||
|
<Kind.Order>
|
||||||
|
<DeclarationKind>Constant</DeclarationKind>
|
||||||
|
<DeclarationKind>Field</DeclarationKind>
|
||||||
|
<DeclarationKind>Constructor</DeclarationKind>
|
||||||
|
<DeclarationKind>Destructor</DeclarationKind>
|
||||||
|
<DeclarationKind>Delegate</DeclarationKind>
|
||||||
|
<DeclarationKind>Event</DeclarationKind>
|
||||||
|
<DeclarationKind>Enum</DeclarationKind>
|
||||||
|
<DeclarationKind>Interface</DeclarationKind>
|
||||||
|
<DeclarationKind>Property</DeclarationKind>
|
||||||
|
<DeclarationKind>Indexer</DeclarationKind>
|
||||||
|
<DeclarationKind>Method</DeclarationKind>
|
||||||
|
<DeclarationKind>Struct</DeclarationKind>
|
||||||
|
<DeclarationKind>Record</DeclarationKind>
|
||||||
|
<DeclarationKind>Class</DeclarationKind>
|
||||||
|
</Kind.Order>
|
||||||
|
</Kind>
|
||||||
|
<Access>
|
||||||
|
<Access.Order>
|
||||||
|
<AccessModifier>Public</AccessModifier>
|
||||||
|
<AccessModifier>Internal</AccessModifier>
|
||||||
|
<AccessModifier>ProtectedInternal</AccessModifier>
|
||||||
|
<AccessModifier>Protected</AccessModifier>
|
||||||
|
<AccessModifier>PrivateProtected</AccessModifier>
|
||||||
|
<AccessModifier>Private</AccessModifier>
|
||||||
|
</Access.Order>
|
||||||
|
</Access>
|
||||||
|
<Static />
|
||||||
|
<Readonly />
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
</TypePattern>
|
||||||
|
</Patterns></s:String>
|
||||||
|
|
||||||
|
<!-- 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_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_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
|
||||||
|
<!-- ReSpeller-->
|
||||||
|
<s:Boolean x:Key="/Default/ReSpeller/ReSpellerEnabled/@EntryValue">True</s:Boolean>
|
||||||
|
|
||||||
|
<!-- UserDictionary-->
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLG/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLGL/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=RGX/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=RGXL/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
|
||||||
|
</wpf:ResourceDictionary>
|
135
README.md
@ -1,113 +1,106 @@
|
|||||||
# NetAdmin
|
# NetAdmin
|
||||||
|
|
||||||
通用后台权限管理系统、快速开发框架(基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建,具有十分整洁、优雅的编码规范)
|
通用后台权限管理系统、快速开发框架(基于C#13/.NET9、Vue3/Vite、ElementPlus等现代技术构建,具有十分整洁、优雅的编码规范)
|
||||||
|
|
||||||
[](https://github.com/nsnail/NetAdmin/actions/workflows/ci.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)
|
||||||
[](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
|
|
||||||
[](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
|
[](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
|
||||||
|
|
||||||
## 在线预览
|
## 在线预览
|
||||||
|
|
||||||
http://na.yaopy.com (演示站点仅300kbps带宽,访问较慢)
|
https://na.tools92.top
|
||||||
|
|
||||||
## 一键运行
|
## 一键运行
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
docker run -p 8080:8080 nsnail/netadmin
|
docker run -p 8080:8080 nsnail/netadmin
|
||||||
|
# 墙内用户请自备梯子
|
||||||
```
|
```
|
||||||
|
|
||||||
## 构建步骤
|
## 构建步骤
|
||||||
|
|
||||||
- 后端
|
所涉软件均推荐下载zip/tar版本,解压即用,一键删除,不会污染系统环境:
|
||||||
1. 检查dotnet-sdk版本>=9.0.0
|
```shell
|
||||||
``` shell
|
# 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. 克隆代码仓库
|
||||||
```
|
git clone --depth 1 https://github.com/nsnail/NetAdmin.git && cd ./NetAdmin
|
||||||
2. 克隆代码仓库
|
|
||||||
``` shell
|
|
||||||
git clone https://github.com/nsnail/NetAdmin.git
|
|
||||||
cd ./NetAdmin
|
|
||||||
|
|
||||||
# 下载 git https://git-scm.com/downloads
|
# 3. 确认本机 redis 处于运行状态
|
||||||
```
|
redis-server # 启动服务器
|
||||||
3. 确保本机redis处于运行状态
|
redis-cli ping # 连接测试
|
||||||
``` shell
|
# 下载 redis for windows:https://github.com/redis-windows/redis-windows/releases
|
||||||
redis-cli
|
# 下载 redis for linux/mac:https://redis.io/download
|
||||||
|
|
||||||
# 下载 redis for windows https://github.com/redis-windows/redis-windows/releases
|
# 4. 运行后端 WebApi
|
||||||
# 下载 redis for linux/mac https://redis.io/download
|
dotnet run --project ./src/backend/YourSolution.AdmServer.Host/YourSolution.AdmServer.Host.csproj --urls http://[::]:5010 -is
|
||||||
```
|
# -i 插入种子数据;-s 同步数据库结构
|
||||||
4. 运行后端WebApi
|
# 浏览器访问 http://localhost:5010 ,将看到Swagger(Knife4jUI)界面
|
||||||
``` shell
|
|
||||||
dotnet run --project ./src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj --urls http://[::]:5010 -is
|
|
||||||
```
|
|
||||||
5. 体验WebApi程序
|
|
||||||
- 浏览器打开 http://localhost:5010 ,将看到Swagger(Knife4jUI)界面
|
|
||||||
|
|
||||||
---
|
# 5. 检查 nodejs 版本 >=20
|
||||||
|
node -v
|
||||||
|
# 下载 nodejs:https://nodejs.org/zh-cn/download
|
||||||
|
|
||||||
- 前端
|
# 6. 安装 npm 依赖包
|
||||||
1. 检查nodejs版本>=20
|
cd ./src/frontend/admin && npm install
|
||||||
``` shell
|
|
||||||
node -v
|
|
||||||
|
|
||||||
# 下载 nodejs https://nodejs.org/en/download
|
# 7. 运行前端项目
|
||||||
```
|
npm run dev
|
||||||
2. 安装npm依赖包
|
# 浏览器访问 http://localhost:5020 ,将看到管理界面(默认用户名密码:root 1234qwer)
|
||||||
``` shell
|
```
|
||||||
cd ./src/frontend/admin
|
|
||||||
npm install
|
|
||||||
```
|
|
||||||
3. 运行前端项目
|
|
||||||
``` shell
|
|
||||||
npm run dev
|
|
||||||
```
|
|
||||||
4. 体验前端程序
|
|
||||||
- 浏览器打开 http://localhost:5020 ,将看到管理界面(默认用户名:root,密码:1234qwer)
|
|
||||||
|
|
||||||
## 文件目录树
|
## 文件目录
|
||||||
|
|
||||||
```
|
```
|
||||||
|
+---.github # github 工程文件目录
|
||||||
+---.template.config # dotnet 项目模板配置目录
|
+---.template.config # dotnet 项目模板配置目录
|
||||||
+---assets # 程序运行需要的资源文件目录
|
+---assets # 项目资源文件目录
|
||||||
+---dist # 程序编译与分发的二进制文件目录
|
+---build # 构建相关的工程文件目录
|
||||||
+---docs # 项目文档目录
|
+---dist # 编译生成的二进制文件目录
|
||||||
+---refs # 引用的第三方项目仓库目录
|
+---docker # docker 镜像构建文件目录
|
||||||
+---src # 项目源文件目录
|
+---docs # 项目开发文档目录
|
||||||
|
+---refs # 引用的第三方包的仓库目录
|
||||||
|
+---scripts # 各种工具脚本文件目录
|
||||||
|
+---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
|
||||||
```
|
```
|
||||||
|
|
||||||
## 引用的开源代码 / 特别鸣谢
|
## 特别鸣谢
|
||||||
|
|
||||||
| 语言 | 集成领域 | 开源库 |
|
| 语言 | 集成领域 | 开源库 |
|
||||||
|------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
| C# | Web基础框架 | [ASP.NET Core](https://github.com/dotnet/aspnetcore) |
|
| C# | Web基础框架 | [ASP.NET Core](https://github.com/dotnet/aspnetcore) |
|
||||||
| C# | 快速开发脚手架 | [Furion](https://gitee.com/dotnetchina/Furion) |
|
|
||||||
| 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) |
|
||||||
@ -115,11 +108,9 @@ 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控件库 | [Element Plus](https://github.com/element-plus/element-plus) |
|
| TypeScript | UI控件库 | [ElementPlus](https://github.com/element-plus/element-plus) |
|
||||||
| TypeScript | CSS解析器 | [Sass](https://github.com/sass/sass) |
|
| TypeScript | CSS解析器 | [Sass](https://github.com/sass/sass) |
|
||||||
| TypeScript | 图表和数据可视化 | [ECharts](https://github.com/apache/echarts) |
|
| TypeScript | 图表和数据可视化 | [ECharts](https://github.com/apache/echarts) |
|
||||||
| JavaScript | 后台管理界面 | [SCUI](https://gitee.com/lolicode/scui) |
|
| JavaScript | 后台管理界面 | [SCUI](https://gitee.com/lolicode/scui) |
|
||||||
|
249
assets/res/CountryCodes.ln
Normal file
@ -0,0 +1,249 @@
|
|||||||
|
不丹
|
||||||
|
东帝汶
|
||||||
|
中国
|
||||||
|
中非
|
||||||
|
丹麦
|
||||||
|
乌克兰
|
||||||
|
乌兹别克斯坦
|
||||||
|
乌干达
|
||||||
|
乌拉圭
|
||||||
|
乍得
|
||||||
|
也门
|
||||||
|
亚美尼亚
|
||||||
|
以色列
|
||||||
|
伊拉克
|
||||||
|
伊朗
|
||||||
|
伯利兹
|
||||||
|
佛得角
|
||||||
|
俄罗斯
|
||||||
|
保加利亚
|
||||||
|
克罗地亚
|
||||||
|
关岛
|
||||||
|
冈比亚
|
||||||
|
冰岛
|
||||||
|
几内亚
|
||||||
|
几内亚比绍
|
||||||
|
列支敦士登
|
||||||
|
刚果共和国
|
||||||
|
刚果民主共和国
|
||||||
|
利比亚
|
||||||
|
利比里亚
|
||||||
|
加拿大
|
||||||
|
加纳
|
||||||
|
加蓬
|
||||||
|
匈牙利
|
||||||
|
北马其顿
|
||||||
|
北马里亚纳群岛
|
||||||
|
南乔治亚和南桑威奇群岛
|
||||||
|
南极洲
|
||||||
|
南苏丹
|
||||||
|
南非
|
||||||
|
博茨瓦纳
|
||||||
|
卡塔尔
|
||||||
|
卢旺达
|
||||||
|
卢森堡
|
||||||
|
印度
|
||||||
|
印度尼西亚
|
||||||
|
危地马拉
|
||||||
|
厄瓜多尔
|
||||||
|
厄立特里亚
|
||||||
|
叙利亚
|
||||||
|
古巴
|
||||||
|
台湾
|
||||||
|
吉尔吉斯斯坦
|
||||||
|
吉布提
|
||||||
|
哈萨克斯坦
|
||||||
|
哥伦比亚
|
||||||
|
哥斯达黎加
|
||||||
|
喀麦隆
|
||||||
|
图瓦卢
|
||||||
|
土库曼斯坦
|
||||||
|
土耳其
|
||||||
|
圣卢西亚
|
||||||
|
圣基茨和尼维斯
|
||||||
|
圣多美和普林西比
|
||||||
|
圣巴泰勒米
|
||||||
|
圣文森特和格林纳丁斯
|
||||||
|
圣皮埃尔和密克隆
|
||||||
|
圣诞岛
|
||||||
|
圣赫勒拿
|
||||||
|
圣马力诺
|
||||||
|
圭亚那
|
||||||
|
坦桑尼亚
|
||||||
|
埃及
|
||||||
|
埃塞俄比亚
|
||||||
|
基里巴斯
|
||||||
|
塔吉克斯坦
|
||||||
|
塞内加尔
|
||||||
|
塞尔维亚
|
||||||
|
塞拉利昂
|
||||||
|
塞浦路斯
|
||||||
|
塞舌尔
|
||||||
|
墨西哥
|
||||||
|
多哥
|
||||||
|
多米尼克
|
||||||
|
多米尼加
|
||||||
|
奥兰
|
||||||
|
奥地利
|
||||||
|
委内瑞拉
|
||||||
|
孟加拉国
|
||||||
|
安哥拉
|
||||||
|
安圭拉
|
||||||
|
安提瓜和巴布达
|
||||||
|
安道尔
|
||||||
|
密克罗尼西亚联邦
|
||||||
|
尼加拉瓜
|
||||||
|
尼日利亚
|
||||||
|
尼日尔
|
||||||
|
尼泊尔
|
||||||
|
巴勒斯坦
|
||||||
|
巴哈马
|
||||||
|
巴基斯坦
|
||||||
|
巴巴多斯
|
||||||
|
巴布亚新几内亚
|
||||||
|
巴拉圭
|
||||||
|
巴拿马
|
||||||
|
巴林
|
||||||
|
巴西
|
||||||
|
布基纳法索
|
||||||
|
布隆迪
|
||||||
|
布韦岛
|
||||||
|
希腊
|
||||||
|
帕劳
|
||||||
|
库克群岛
|
||||||
|
库拉索
|
||||||
|
开曼群岛
|
||||||
|
德国
|
||||||
|
意大利
|
||||||
|
所罗门群岛
|
||||||
|
托克劳
|
||||||
|
拉脱维亚
|
||||||
|
挪威
|
||||||
|
捷克
|
||||||
|
摩尔多瓦
|
||||||
|
摩洛哥
|
||||||
|
摩纳哥
|
||||||
|
文莱
|
||||||
|
斐济
|
||||||
|
斯威士兰
|
||||||
|
斯洛伐克
|
||||||
|
斯洛文尼亚
|
||||||
|
斯瓦尔巴和扬马延
|
||||||
|
斯里兰卡
|
||||||
|
新加坡
|
||||||
|
新喀里多尼亚
|
||||||
|
新西兰
|
||||||
|
日本
|
||||||
|
智利
|
||||||
|
朝鲜
|
||||||
|
柬埔寨
|
||||||
|
根西
|
||||||
|
格林纳达
|
||||||
|
格陵兰
|
||||||
|
格鲁吉亚
|
||||||
|
梵蒂冈
|
||||||
|
比利时
|
||||||
|
毛里塔尼亚
|
||||||
|
毛里求斯
|
||||||
|
汤加
|
||||||
|
沙特阿拉伯
|
||||||
|
法国
|
||||||
|
法属南部和南极领地
|
||||||
|
法属圣马丁
|
||||||
|
法属圭亚那
|
||||||
|
法属波利尼西亚
|
||||||
|
法罗群岛
|
||||||
|
波兰
|
||||||
|
波多黎各
|
||||||
|
波黑
|
||||||
|
泰国
|
||||||
|
泽西
|
||||||
|
津巴布韦
|
||||||
|
洪都拉斯
|
||||||
|
海地
|
||||||
|
澳大利亚
|
||||||
|
澳门
|
||||||
|
爱尔兰
|
||||||
|
爱沙尼亚
|
||||||
|
牙买加
|
||||||
|
特克斯和凯科斯群岛
|
||||||
|
特立尼达和多巴哥
|
||||||
|
玻利维亚
|
||||||
|
瑙鲁
|
||||||
|
瑞典
|
||||||
|
瑞士
|
||||||
|
瓜德罗普
|
||||||
|
瓦利斯和富图纳
|
||||||
|
瓦努阿图
|
||||||
|
留尼汪
|
||||||
|
白俄罗斯
|
||||||
|
百慕大
|
||||||
|
皮特凯恩群岛
|
||||||
|
直布罗陀
|
||||||
|
福克兰群岛
|
||||||
|
科威特
|
||||||
|
科摩罗
|
||||||
|
科特迪瓦
|
||||||
|
科科斯基林群岛
|
||||||
|
秘鲁
|
||||||
|
突尼斯
|
||||||
|
立陶宛
|
||||||
|
索马里
|
||||||
|
约旦
|
||||||
|
纳米比亚
|
||||||
|
纽埃
|
||||||
|
缅甸
|
||||||
|
罗马尼亚
|
||||||
|
美国
|
||||||
|
美国本土外小岛屿
|
||||||
|
美属维尔京群岛
|
||||||
|
美属萨摩亚
|
||||||
|
老挝
|
||||||
|
肯尼亚
|
||||||
|
芬兰
|
||||||
|
苏丹
|
||||||
|
苏里南
|
||||||
|
英国
|
||||||
|
英属印度洋领地
|
||||||
|
英属维尔京群岛
|
||||||
|
荷兰
|
||||||
|
荷兰加勒比区
|
||||||
|
荷属圣马丁
|
||||||
|
莫桑比克
|
||||||
|
莱索托
|
||||||
|
菲律宾
|
||||||
|
萨尔瓦多
|
||||||
|
萨摩亚
|
||||||
|
葡萄牙
|
||||||
|
蒙古
|
||||||
|
蒙特塞拉特
|
||||||
|
西撒哈拉
|
||||||
|
西班牙
|
||||||
|
诺福克岛
|
||||||
|
贝宁
|
||||||
|
赞比亚
|
||||||
|
赤道几内亚
|
||||||
|
赫德岛和麦克唐纳群岛
|
||||||
|
越南
|
||||||
|
阿塞拜疆
|
||||||
|
阿富汗
|
||||||
|
阿尔及利亚
|
||||||
|
阿尔巴尼亚
|
||||||
|
阿曼
|
||||||
|
阿根廷
|
||||||
|
阿联酋
|
||||||
|
阿鲁巴
|
||||||
|
韩国
|
||||||
|
香港
|
||||||
|
马尔代夫
|
||||||
|
马恩岛
|
||||||
|
马拉维
|
||||||
|
马提尼克
|
||||||
|
马来西亚
|
||||||
|
马约特
|
||||||
|
马绍尔群岛
|
||||||
|
马耳他
|
||||||
|
马达加斯加
|
||||||
|
马里
|
||||||
|
黎巴嫩
|
||||||
|
黑山
|
@ -1,16 +1,22 @@
|
|||||||
|
上次执行时间
|
||||||
|
上次执行状态
|
||||||
|
上次执行耗时
|
||||||
|
下次执行时间
|
||||||
不为其中之一
|
不为其中之一
|
||||||
不以什么开始
|
不以什么开始
|
||||||
不以什么结束
|
不以什么结束
|
||||||
不包含
|
不包含
|
||||||
不排序
|
不排序
|
||||||
不等于
|
不等于
|
||||||
管理模块
|
|
||||||
丧偶
|
丧偶
|
||||||
中专
|
中专
|
||||||
中共党员
|
中共党员
|
||||||
为其中之一
|
为其中之一
|
||||||
|
人工审核
|
||||||
以什么开始
|
以什么开始
|
||||||
以什么结束
|
以什么结束
|
||||||
|
作业名称
|
||||||
|
作业状态
|
||||||
保密
|
保密
|
||||||
信息
|
信息
|
||||||
倒序排序
|
倒序排序
|
||||||
@ -18,6 +24,7 @@
|
|||||||
公告
|
公告
|
||||||
共青团员
|
共青团员
|
||||||
出生证
|
出生证
|
||||||
|
创建时间
|
||||||
初中
|
初中
|
||||||
删除
|
删除
|
||||||
包含
|
包含
|
||||||
@ -25,12 +32,19 @@
|
|||||||
博士后
|
博士后
|
||||||
发送失败
|
发送失败
|
||||||
同步数据库结构
|
同步数据库结构
|
||||||
|
响应体
|
||||||
|
响应状态码
|
||||||
|
唯一编码
|
||||||
|
备注
|
||||||
外国人居留证
|
外国人居留证
|
||||||
|
外部错误
|
||||||
大专
|
大专
|
||||||
大于
|
大于
|
||||||
大于等于
|
大于等于
|
||||||
女
|
女
|
||||||
|
字典内容导出
|
||||||
宕机
|
宕机
|
||||||
|
客户端IP
|
||||||
小于
|
小于
|
||||||
小于等于
|
小于等于
|
||||||
小学
|
小学
|
||||||
@ -39,17 +53,36 @@
|
|||||||
已校验
|
已校验
|
||||||
已读
|
已读
|
||||||
并且
|
并且
|
||||||
意外错误
|
|
||||||
成功
|
成功
|
||||||
或者
|
或者
|
||||||
|
所属角色
|
||||||
|
所属部门
|
||||||
手机
|
手机
|
||||||
|
手机号
|
||||||
|
执行耗时
|
||||||
|
执行计划
|
||||||
护照
|
护照
|
||||||
指定部门数据
|
指定部门数据
|
||||||
按钮
|
按钮
|
||||||
|
排序
|
||||||
|
接口名称
|
||||||
|
接口导出
|
||||||
|
接口描述
|
||||||
|
接口路径
|
||||||
插入种子数据
|
插入种子数据
|
||||||
|
操作系统
|
||||||
|
数据范围
|
||||||
|
文档内容
|
||||||
|
文档内容导出
|
||||||
|
文档标题
|
||||||
无效操作
|
无效操作
|
||||||
无效输入
|
无效输入
|
||||||
|
无限权限
|
||||||
日期范围
|
日期范围
|
||||||
|
是否启用
|
||||||
|
显示仪表板
|
||||||
|
最后登录时间
|
||||||
|
未处理异常
|
||||||
未婚
|
未婚
|
||||||
未读
|
未读
|
||||||
本人数据
|
本人数据
|
||||||
@ -59,33 +92,58 @@
|
|||||||
框架
|
框架
|
||||||
比较数据库结构
|
比较数据库结构
|
||||||
注册
|
注册
|
||||||
|
消息主题
|
||||||
|
消息摘要
|
||||||
|
消息类型
|
||||||
港澳台通行证
|
港澳台通行证
|
||||||
|
用户代理
|
||||||
|
用户名
|
||||||
|
用户导出
|
||||||
电子邮箱
|
电子邮箱
|
||||||
男
|
男
|
||||||
登录
|
登录
|
||||||
|
登录名
|
||||||
|
登录日志导出
|
||||||
硕士
|
硕士
|
||||||
|
示例导出
|
||||||
离异
|
离异
|
||||||
私信
|
|
||||||
空闲
|
空闲
|
||||||
|
站内信导出
|
||||||
等于
|
等于
|
||||||
等待发送
|
等待发送
|
||||||
|
管理模块
|
||||||
系统模块
|
系统模块
|
||||||
绑定手机号
|
绑定手机号码
|
||||||
结果非预期
|
结果非预期
|
||||||
群众
|
群众
|
||||||
自定义
|
自定义
|
||||||
范围
|
范围
|
||||||
菜单
|
菜单
|
||||||
解绑手机号
|
角色名称
|
||||||
|
角色导出
|
||||||
|
解绑手机号码
|
||||||
警告
|
警告
|
||||||
|
计划作业导出
|
||||||
|
计划作业执行记录导出
|
||||||
|
请求方式
|
||||||
|
请求日志导出
|
||||||
调试
|
调试
|
||||||
跟踪
|
追踪
|
||||||
|
追踪标识
|
||||||
身份证
|
身份证
|
||||||
运行
|
运行
|
||||||
通知
|
通知
|
||||||
|
邮箱号
|
||||||
|
部门名称
|
||||||
|
部门导出
|
||||||
|
配置导出
|
||||||
重设密码
|
重设密码
|
||||||
链接
|
链接
|
||||||
错误
|
错误
|
||||||
随机排序
|
随机排序
|
||||||
|
项值
|
||||||
|
项名
|
||||||
顺序排序
|
顺序排序
|
||||||
高中
|
高中
|
||||||
|
默认角色
|
||||||
|
默认部门
|
@ -21,8 +21,10 @@ XML注释文件不存在
|
|||||||
字典目录编号不能为空
|
字典目录编号不能为空
|
||||||
字典编码不能为空
|
字典编码不能为空
|
||||||
学历不正确
|
学历不正确
|
||||||
|
完全公开
|
||||||
密码不能为空
|
密码不能为空
|
||||||
已处理完毕
|
已处理完毕
|
||||||
|
并发冲突_请稍后重试
|
||||||
开始事务
|
开始事务
|
||||||
性别不正确
|
性别不正确
|
||||||
手机号码不正确
|
手机号码不正确
|
||||||
@ -33,44 +35,51 @@ XML注释文件不存在
|
|||||||
数据库同步开始
|
数据库同步开始
|
||||||
数据库服务器时钟偏移
|
数据库服务器时钟偏移
|
||||||
数据库结构同步完成
|
数据库结构同步完成
|
||||||
数据版本不能为空
|
|
||||||
文件不能为空
|
文件不能为空
|
||||||
|
文档内容不能为空
|
||||||
|
文档分类不存在
|
||||||
|
文档分类名称不能为空
|
||||||
|
文档分类编号不能为空
|
||||||
|
文档分类编码不能为空
|
||||||
|
文档标题不能为空
|
||||||
新密码不能为空
|
新密码不能为空
|
||||||
新手机号码验证码不正确
|
新手机号码验证码不正确
|
||||||
无效端口号
|
无效端口号
|
||||||
无效证件号码
|
无效证件号码
|
||||||
日志长度超过限制
|
|
||||||
旧密码不正确
|
旧密码不正确
|
||||||
旧密码不能为空
|
旧密码不能为空
|
||||||
旧手机号码不正确
|
旧手机号码不正确
|
||||||
旧手机号码验证码不正确
|
旧手机号码验证码不正确
|
||||||
时间戳缺失或误差过大
|
|
||||||
时间表达式
|
时间表达式
|
||||||
时间计划不能为空
|
时间计划不能为空
|
||||||
未指定部门
|
未指定部门
|
||||||
未获取到待执行任务
|
未获取到待执行任务
|
||||||
|
档案可见性不正确
|
||||||
模块名称不能为空
|
模块名称不能为空
|
||||||
|
模块类型不能为空
|
||||||
模块说明不能为空
|
模块说明不能为空
|
||||||
|
此节点已下线
|
||||||
民族不正确
|
民族不正确
|
||||||
消息主题不能为空
|
消息主题不能为空
|
||||||
消息内容不能为空
|
消息内容不能为空
|
||||||
父节点不存在
|
父节点不存在
|
||||||
用户不存在
|
用户不存在
|
||||||
用户名不能为空
|
用户名不能为空
|
||||||
用户名不能是手机号
|
用户名不能是手机号码
|
||||||
用户名或密码错误
|
用户名或密码错误
|
||||||
用户名长度4位以上
|
用户名长度4位以上
|
||||||
用户头像不能为空
|
用户头像不能为空
|
||||||
用户档案不能为空
|
|
||||||
用户编号不存在
|
用户编号不存在
|
||||||
用户编号不能为空
|
登录用户
|
||||||
目标设备不能为空
|
目标设备不能为空
|
||||||
短信验证请求不能为空
|
短信验证请求不能为空
|
||||||
|
种子数据插入完成
|
||||||
站内信不存在
|
站内信不存在
|
||||||
站内信状态不正确
|
站内信状态不正确
|
||||||
站内信类型不正确
|
站内信类型不正确
|
||||||
签名缺失
|
缓存键不能为空
|
||||||
网络地址不正确
|
网络地址不正确
|
||||||
|
自己可见
|
||||||
菜单名称不能为空
|
菜单名称不能为空
|
||||||
菜单标题不能为空
|
菜单标题不能为空
|
||||||
菜单类型不正确
|
菜单类型不正确
|
||||||
@ -80,6 +89,7 @@ XML注释文件不存在
|
|||||||
角色数据范围不正确
|
角色数据范围不正确
|
||||||
角色编号不能为空
|
角色编号不能为空
|
||||||
角色编号列表不能为空
|
角色编号列表不能为空
|
||||||
|
记录已存在
|
||||||
设备类型不能为空
|
设备类型不能为空
|
||||||
证件类型不正确
|
证件类型不正确
|
||||||
该角色下存在用户
|
该角色下存在用户
|
||||||
@ -88,16 +98,21 @@ XML注释文件不存在
|
|||||||
请求地址不能为空
|
请求地址不能为空
|
||||||
请求对象不能为空
|
请求对象不能为空
|
||||||
请求方法不正确
|
请求方法不正确
|
||||||
|
请稍后重试
|
||||||
请联系管理员激活账号
|
请联系管理员激活账号
|
||||||
读取用户令牌出错
|
读取用户令牌出错
|
||||||
账号不能为空
|
账号不能为空
|
||||||
邀请码不正确
|
邀请码不正确
|
||||||
邮箱验证码不正确
|
邮箱验证码不正确
|
||||||
部门不存在
|
部门不存在
|
||||||
|
部门可见
|
||||||
部门名称不能为空
|
部门名称不能为空
|
||||||
配置文件初始化完毕
|
配置文件初始化完毕
|
||||||
键值不能为空
|
键值不能为空
|
||||||
键名称不能为空
|
键名称不能为空
|
||||||
|
随机延时结束时间不正确
|
||||||
|
随机延时起始时间不正确
|
||||||
|
非JSON字符串
|
||||||
验证数据不能为空
|
验证数据不能为空
|
||||||
验证码不正确
|
验证码不正确
|
||||||
验证码不能为空
|
验证码不能为空
|
0
assets/res/YourSolution.AdmServer.Fields.ln
Normal file
0
assets/res/YourSolution.AdmServer.Statements.ln
Normal file
@ -4,7 +4,7 @@
|
|||||||
"ExecutionCron": "0 * * * * ?",
|
"ExecutionCron": "0 * * * * ?",
|
||||||
"HttpMethod": 3,
|
"HttpMethod": 3,
|
||||||
"JobName": "HTTP 请求测试",
|
"JobName": "HTTP 请求测试",
|
||||||
"NextExecTime": "2020/9/13 12:26:40",
|
"NextExecTime": "2020-09-13 12:26:40",
|
||||||
"NextTimeId": 1600000000,
|
"NextTimeId": 1600000000,
|
||||||
"RequestUrl": "https://httpbin.org/ip",
|
"RequestUrl": "https://httpbin.org/ip",
|
||||||
"Status": 1,
|
"Status": 1,
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
"Id": 373837717815301,
|
"Id": 373837717815301,
|
||||||
"Name": "home",
|
"Name": "home",
|
||||||
"Path": "/home",
|
"Path": "/home",
|
||||||
"Sort": 100,
|
"Sort": 999,
|
||||||
"Title": "主控面板",
|
"Title": "主控面板",
|
||||||
"Type": 1
|
"Type": 1
|
||||||
},
|
},
|
||||||
@ -24,7 +24,7 @@
|
|||||||
"Component": "sys/user",
|
"Component": "sys/user",
|
||||||
"Icon": "el-icon-user",
|
"Icon": "el-icon-user",
|
||||||
"Id": 373837957840901,
|
"Id": 373837957840901,
|
||||||
"Name": "sys-user",
|
"Name": "sys/user",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/user",
|
"Path": "/sys/user",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
@ -35,7 +35,7 @@
|
|||||||
"Component": "sys/role",
|
"Component": "sys/role",
|
||||||
"Icon": "sc-icon-role",
|
"Icon": "sc-icon-role",
|
||||||
"Id": 373838018527237,
|
"Id": 373838018527237,
|
||||||
"Name": "sys-role",
|
"Name": "sys/role",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/role",
|
"Path": "/sys/role",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
@ -46,7 +46,7 @@
|
|||||||
"Component": "sys/dept",
|
"Component": "sys/dept",
|
||||||
"Icon": "sc-icon-dept",
|
"Icon": "sc-icon-dept",
|
||||||
"Id": 373838045605893,
|
"Id": 373838045605893,
|
||||||
"Name": "sys-dept",
|
"Name": "sys/dept",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/dept",
|
"Path": "/sys/dept",
|
||||||
"Sort": 98,
|
"Sort": 98,
|
||||||
@ -57,7 +57,7 @@
|
|||||||
"Component": "sys/menu",
|
"Component": "sys/menu",
|
||||||
"Icon": "el-icon-fold",
|
"Icon": "el-icon-fold",
|
||||||
"Id": 373838070898693,
|
"Id": 373838070898693,
|
||||||
"Name": "sys-menu",
|
"Name": "sys/menu",
|
||||||
"ParentId": 373837917724677,
|
"ParentId": 373837917724677,
|
||||||
"Path": "/sys/menu",
|
"Path": "/sys/menu",
|
||||||
"Sort": 97,
|
"Sort": 97,
|
||||||
@ -78,7 +78,7 @@
|
|||||||
"Component": "sys/config",
|
"Component": "sys/config",
|
||||||
"Icon": "el-icon-set-up",
|
"Icon": "el-icon-set-up",
|
||||||
"Id": 380415005847557,
|
"Id": 380415005847557,
|
||||||
"Name": "sys-config",
|
"Name": "sys/config",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/config",
|
"Path": "/sys/config",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
@ -89,7 +89,7 @@
|
|||||||
"Component": "sys/job",
|
"Component": "sys/job",
|
||||||
"Icon": "sc-icon-ScheduledJob",
|
"Icon": "sc-icon-ScheduledJob",
|
||||||
"Id": 510067557638158,
|
"Id": 510067557638158,
|
||||||
"Name": "sys-job",
|
"Name": "sys/job",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/job",
|
"Path": "/sys/job",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
@ -100,7 +100,7 @@
|
|||||||
"Component": "sys/dic",
|
"Component": "sys/dic",
|
||||||
"Icon": "sc-icon-dic",
|
"Icon": "sc-icon-dic",
|
||||||
"Id": 375315654221829,
|
"Id": 375315654221829,
|
||||||
"Name": "sys-dic",
|
"Name": "sys/dic",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/dic",
|
"Path": "/sys/dic",
|
||||||
"Sort": 98,
|
"Sort": 98,
|
||||||
@ -111,7 +111,7 @@
|
|||||||
"Component": "sys/msg",
|
"Component": "sys/msg",
|
||||||
"Icon": "el-icon-message",
|
"Icon": "el-icon-message",
|
||||||
"Id": 482779610341392,
|
"Id": 482779610341392,
|
||||||
"Name": "sys-msg",
|
"Name": "sys/msg",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/msg",
|
"Path": "/sys/msg",
|
||||||
"Sort": 97,
|
"Sort": 97,
|
||||||
@ -122,7 +122,7 @@
|
|||||||
"Component": "sys/api",
|
"Component": "sys/api",
|
||||||
"Icon": "sc-icon-api",
|
"Icon": "sc-icon-api",
|
||||||
"Id": 397880678895621,
|
"Id": 397880678895621,
|
||||||
"Name": "sys-api",
|
"Name": "sys/api",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/api",
|
"Path": "/sys/api",
|
||||||
"Sort": 96,
|
"Sort": 96,
|
||||||
@ -133,20 +133,41 @@
|
|||||||
"Component": "sys/cache",
|
"Component": "sys/cache",
|
||||||
"Icon": "sc-icon-memory",
|
"Icon": "sc-icon-memory",
|
||||||
"Id": 374911555702789,
|
"Id": 374911555702789,
|
||||||
"Name": "sys-cache",
|
"Name": "sys/cache",
|
||||||
"ParentId": 485278637670422,
|
"ParentId": 485278637670422,
|
||||||
"Path": "/sys/cache",
|
"Path": "/sys/cache",
|
||||||
"Sort": 95,
|
"Sort": 95,
|
||||||
"Title": "缓存管理",
|
"Title": "缓存管理",
|
||||||
"Type": 1
|
"Type": 1
|
||||||
},
|
},
|
||||||
|
// ------------------------------ 档案管理 ------------------------------
|
||||||
|
{
|
||||||
|
"Icon": "sc-icon-Archive",
|
||||||
|
"Id": 616214756757512,
|
||||||
|
"Name": "archive",
|
||||||
|
"Path": "/archive",
|
||||||
|
"Sort": 98,
|
||||||
|
"Title": "档案管理",
|
||||||
|
"Type": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Component": "sys/doc",
|
||||||
|
"Icon": "el-icon-document",
|
||||||
|
"Id": 616214756757516,
|
||||||
|
"Name": "archive/doc",
|
||||||
|
"ParentId": 616214756757512,
|
||||||
|
"Path": "/archive/doc",
|
||||||
|
"Sort": 100,
|
||||||
|
"Title": "文档管理",
|
||||||
|
"Type": 1
|
||||||
|
},
|
||||||
// ------------------------------ 日志管理 ------------------------------
|
// ------------------------------ 日志管理 ------------------------------
|
||||||
{
|
{
|
||||||
"Icon": "el-icon-tickets",
|
"Icon": "el-icon-tickets",
|
||||||
"Id": 374792687640581,
|
"Id": 374792687640581,
|
||||||
"Name": "log",
|
"Name": "log",
|
||||||
"Path": "/log",
|
"Path": "/log",
|
||||||
"Sort": 98,
|
"Sort": 97,
|
||||||
"Title": "日志管理",
|
"Title": "日志管理",
|
||||||
"Type": 1
|
"Type": 1
|
||||||
},
|
},
|
||||||
@ -154,7 +175,7 @@
|
|||||||
"Component": "sys/log/operation",
|
"Component": "sys/log/operation",
|
||||||
"Icon": "el-icon-pointer",
|
"Icon": "el-icon-pointer",
|
||||||
"Id": 485285246504976,
|
"Id": 485285246504976,
|
||||||
"Name": "sys-log-operation",
|
"Name": "sys/log/operation",
|
||||||
"ParentId": 374792687640581,
|
"ParentId": 374792687640581,
|
||||||
"Path": "/sys/log/operation",
|
"Path": "/sys/log/operation",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
@ -165,7 +186,7 @@
|
|||||||
"Component": "sys/log/login",
|
"Component": "sys/log/login",
|
||||||
"Icon": "sc-icon-OpenDoor",
|
"Icon": "sc-icon-OpenDoor",
|
||||||
"Id": 485285246504970,
|
"Id": 485285246504970,
|
||||||
"Name": "sys-log-login",
|
"Name": "sys/log/login",
|
||||||
"ParentId": 374792687640581,
|
"ParentId": 374792687640581,
|
||||||
"Path": "/sys/log/login",
|
"Path": "/sys/log/login",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
@ -178,7 +199,7 @@
|
|||||||
"Id": 373838105399301,
|
"Id": 373838105399301,
|
||||||
"Name": "dev",
|
"Name": "dev",
|
||||||
"Path": "/dev",
|
"Path": "/dev",
|
||||||
"Sort": 97,
|
"Sort": 96,
|
||||||
"Title": "开发管理",
|
"Title": "开发管理",
|
||||||
"Type": 1
|
"Type": 1
|
||||||
},
|
},
|
||||||
@ -186,7 +207,7 @@
|
|||||||
"Component": "dev/code",
|
"Component": "dev/code",
|
||||||
"Icon": "sc-icon-code2",
|
"Icon": "sc-icon-code2",
|
||||||
"Id": 373838147022853,
|
"Id": 373838147022853,
|
||||||
"Name": "dev-code",
|
"Name": "dev/code",
|
||||||
"ParentId": 373838105399301,
|
"ParentId": 373838105399301,
|
||||||
"Path": "/dev/code",
|
"Path": "/dev/code",
|
||||||
"Sort": 100,
|
"Sort": 100,
|
||||||
@ -197,10 +218,20 @@
|
|||||||
"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": "https://element-plus.gitee.io/zh-CN/component/button.html",
|
"Path": "https://element-plus.org/zh-CN/component/overview.html",
|
||||||
"Sort": 99,
|
"Sort": 99,
|
||||||
"Title": "Element",
|
"Title": "Element",
|
||||||
"Type": 3,
|
"Type": 3,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Id": 560217289232398,
|
||||||
|
"ParentId": 373838105399301,
|
||||||
|
"Icon": "sc-icon-FreeSql",
|
||||||
|
"Name": "dev/freesql",
|
||||||
|
"Path": "https://freesql.net/guide",
|
||||||
|
"Sort": 99,
|
||||||
|
"Title": "FreeSql",
|
||||||
|
"Type": 3,
|
||||||
}
|
}
|
||||||
]
|
]
|
@ -9,7 +9,7 @@
|
|||||||
"Sort": 100
|
"Sort": 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"DataScope": 1,
|
"DataScope": 4,
|
||||||
"Enabled": true,
|
"Enabled": true,
|
||||||
"Id": 371729946431493,
|
"Id": 371729946431493,
|
||||||
"Name": "普通用户",
|
"Name": "普通用户",
|
||||||
|
@ -14,5 +14,49 @@
|
|||||||
{
|
{
|
||||||
"ApiId": "api/sys/user",
|
"ApiId": "api/sys/user",
|
||||||
"RoleId": 371729946431493
|
"RoleId": 371729946431493
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/site.msg/unread.count",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/site.msg",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/site.msg/get.mine",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/site.msg/paged.query.mine",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/site.msg/set.site.msg.status",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/user/get.session.user.app.config",
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ApiId": "api/sys/user/set.session.user.app.config",
|
||||||
|
"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,
|
||||||
}
|
}
|
||||||
]
|
]
|
@ -1,11 +1,9 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"Id": 396423792566281,
|
|
||||||
"MenuId": 373837717815301,
|
"MenuId": 373837717815301,
|
||||||
"RoleId": 371729946431493
|
"RoleId": 371729946431493
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Id": 396423792566282,
|
|
||||||
"MenuId": 374967228141573,
|
"MenuId": 374967228141573,
|
||||||
"RoleId": 371729946431493
|
"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 后台管理系统",
|
||||||
}
|
}
|
||||||
]
|
]
|
@ -6,5 +6,13 @@
|
|||||||
"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,
|
||||||
|
"Enabled": true,
|
||||||
|
"Id": 560217289236492,
|
||||||
|
"Password": "A8E87D23-49BC-25A1-1C7C-59186BEF5D15",
|
||||||
|
"Token": "4208EA97-B32F-4E39-A290-4C0D27B61EBF",
|
||||||
|
"UserName": "user"
|
||||||
}
|
}
|
||||||
]
|
]
|
@ -1,5 +1,10 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"Id": 370942943322181
|
"Id": 370942943322181,
|
||||||
|
"AppConfig": "[]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Id": 560217289236492,
|
||||||
|
"AppConfig": "[]"
|
||||||
}
|
}
|
||||||
]
|
]
|
@ -2,5 +2,9 @@
|
|||||||
{
|
{
|
||||||
"RoleId": 370943613149253,
|
"RoleId": 370943613149253,
|
||||||
"UserId": 370942943322181
|
"UserId": 370942943322181
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"RoleId": 371729946431493,
|
||||||
|
"UserId": 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.10.12-preview">
|
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.2-alpha">
|
||||||
<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.2">
|
<PackageReference Include="Roslynator.Analyzers" Version="4.13.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>
|
||||||
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.24.0.89429">
|
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.8.0.113526">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@ -9,22 +9,4 @@
|
|||||||
Command="dotnet t4 ./gen.cs.tt -o ../dist/backend/$(ProjectName)/Ln.cs"
|
Command="dotnet t4 ./gen.cs.tt -o ../dist/backend/$(ProjectName)/Ln.cs"
|
||||||
StdOutEncoding="utf-8" />
|
StdOutEncoding="utf-8" />
|
||||||
</Target>
|
</Target>
|
||||||
<ItemGroup>
|
|
||||||
<None Include="$(SolutionDir)/assets/res/Statements.ln">
|
|
||||||
<Link>Languages/Statements.ln</Link>
|
|
||||||
</None>
|
|
||||||
<None Include="$(SolutionDir)/assets/res/Nations.ln">
|
|
||||||
<Link>Languages/Nations.ln</Link>
|
|
||||||
</None>
|
|
||||||
<None Include="$(SolutionDir)/assets/res/Enums.ln">
|
|
||||||
<Link>Languages/Enums.ln</Link>
|
|
||||||
</None>
|
|
||||||
<EmbeddedResource Include="$(SolutionDir)/assets/res/Ln.resx">
|
|
||||||
<Link>Languages/Ln.resx</Link>
|
|
||||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<Compile Include="$(SolutionDir)/dist/backend/$(ProjectName)/Ln.Designer.cs">
|
|
||||||
<Link>Languages/Ln.Designer.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
1
docker/README.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
docker
|
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 |
@ -3,7 +3,7 @@
|
|||||||
"isRoot": true,
|
"isRoot": true,
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet-t4": {
|
"dotnet-t4": {
|
||||||
"version": "2.3.1",
|
"version": "3.0.0",
|
||||||
"commands": [
|
"commands": [
|
||||||
"t4"
|
"t4"
|
||||||
]
|
]
|
||||||
|
10
package.json
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"version": "1.1.1",
|
"version": "2.3.1",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"cz-git": "^1.9.1",
|
"cz-git": "^1.11.1",
|
||||||
"commitizen": "^4.3.0",
|
"commitizen": "^4.3.1",
|
||||||
"prettier": "^3.2.5",
|
"prettier": "^3.5.3",
|
||||||
"standard-version": "^9.5.0"
|
"standard-version": "^9.5.0"
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
@ -11,4 +11,4 @@
|
|||||||
"path": "node_modules/cz-git"
|
"path": "node_modules/cz-git"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1 +0,0 @@
|
|||||||
Subproject commit 0f6c2b807db92d2ade000558faf3ad5fd9baa34c
|
|
@ -1 +0,0 @@
|
|||||||
Subproject commit d23c7cca552e9b1b1365349741139a012e2bc955
|
|
1
refs/Gurion
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit b16b1a35559281a9f53d6914f1195a204c9b4185
|
1
refs/NetAdmin.FreeSql
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 15717df4499d284ec77c624a281c199a29280a4e
|
@ -1 +1 @@
|
|||||||
Subproject commit 8c0dbcf1f4507af29517dccebff5289c42e9b477
|
Subproject commit 322cbc32df1363755d4b0588923ee7324676c3b6
|
@ -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', '主版本')
|
||||||
@ -20,8 +22,10 @@ git tag -d $tag
|
|||||||
git tag $tag
|
git tag $tag
|
||||||
git push --tags origin release
|
git push --tags origin release
|
||||||
Start-Process -FilePath "https://github.com/nsnail/NetAdmin/compare/main...release"
|
Start-Process -FilePath "https://github.com/nsnail/NetAdmin/compare/main...release"
|
||||||
Write-Host "按『Enter』回到主分支,『Ctrl+C』退出"
|
Write-Host "按『Enter』回到tk分支,『Ctrl+C』退出"
|
||||||
Pause
|
Pause
|
||||||
git checkout main
|
git checkout main
|
||||||
git pull
|
git pull
|
||||||
git branch -D release
|
git branch -D release
|
||||||
|
git branch -D tk
|
||||||
|
git checkout -b tk
|
@ -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
|
||||||
|
4
scripts/4.git.del.obsolete.tags.ps1
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
#!/usr/bin/env pwsh
|
||||||
|
|
||||||
|
git push origin :refs/tags/$(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 ../
|
@ -1,6 +1,7 @@
|
|||||||
<#@ template language="C#" #>
|
<#@ template language="C#" #>
|
||||||
<#@ output encoding="utf-8" extension="resx" #>
|
<#@ output encoding="utf-8" extension="resx" #>
|
||||||
<#@ import namespace="System.IO" #>
|
<#@ import namespace="System.IO" #>
|
||||||
|
<#@ import namespace="System.Linq" #>
|
||||||
<#@ import namespace="System.Text.RegularExpressions" #>
|
<#@ import namespace="System.Text.RegularExpressions" #>
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<root>
|
<root>
|
||||||
@ -28,14 +29,11 @@
|
|||||||
</resheader>
|
</resheader>
|
||||||
<#
|
<#
|
||||||
var regex = new Regex(@"^\d", RegexOptions.Compiled);
|
var regex = new Regex(@"^\d", RegexOptions.Compiled);
|
||||||
foreach (var file in Directory.GetFiles("../assets/res/", "*.ln"))
|
foreach (var line in Directory.GetFiles("../assets/res/", "*.ln").SelectMany(x => File.ReadLines(x)).Distinct())
|
||||||
{
|
{
|
||||||
foreach (var line in File.ReadLines(file))
|
|
||||||
{
|
|
||||||
#>
|
#>
|
||||||
<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>
|
||||||
<#
|
<#
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#>
|
#>
|
||||||
</root>
|
</root>
|
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.1.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.821-ns1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"packageName": "FreeSql.DbContext.NS",
|
|
||||||
"version": "3.2.821-ns1"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"solution": "NetAdmin.sln",
|
|
||||||
"mappings": {
|
|
||||||
"Furion.Pure.NS": "../refs/Furion/framework/Furion.Pure/Furion.Pure.csproj"
|
|
||||||
},
|
|
||||||
"restore": [
|
|
||||||
{
|
|
||||||
"name": "NetAdmin.Infrastructure",
|
|
||||||
"packages": [
|
|
||||||
{
|
|
||||||
"packageName": "Furion.Pure.NS",
|
|
||||||
"version": "4.9.2.31-ns3"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -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.1.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,63 +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}\"\\) = \"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);
|
39
scripts/wait.server.stop.sh
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# 检查是否提供了 URL 参数
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
echo "Usage: $0 <url>"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 获取外部传入的 URL 参数
|
||||||
|
URL="$1"
|
||||||
|
|
||||||
|
# 初始化返回值和时间限制
|
||||||
|
response=""
|
||||||
|
start_time=$(date +%s)
|
||||||
|
time_limit=600 # 10分钟的秒数
|
||||||
|
|
||||||
|
# 循环检查 API 返回值
|
||||||
|
while [ "$response" != "1" ]; do
|
||||||
|
# 等待一段时间再进行下一次检查,避免频繁请求
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
# 使用 curl 请求 URL,并捕获返回值,忽略 SSL 证书错误
|
||||||
|
response=$(curl -sk "$URL")
|
||||||
|
|
||||||
|
# 打印返回值 (可选)
|
||||||
|
echo "$1: $response"
|
||||||
|
|
||||||
|
# 检查时间是否超过限制
|
||||||
|
current_time=$(date +%s)
|
||||||
|
elapsed_time=$((current_time - start_time))
|
||||||
|
|
||||||
|
if [ "$elapsed_time" -ge "$time_limit" ]; then
|
||||||
|
echo "Time limit exceeded. Continuing with the script..."
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# 无论是因为返回值为 "1" 还是超时,继续执行后续脚本
|
||||||
|
echo "Continuing with the script..."
|
@ -25,16 +25,15 @@ global using FreeSql;
|
|||||||
global using FreeSql.Aop;
|
global using FreeSql.Aop;
|
||||||
global using FreeSql.DataAnnotations;
|
global using FreeSql.DataAnnotations;
|
||||||
global using FreeSql.Internal.Model;
|
global using FreeSql.Internal.Model;
|
||||||
global using Furion;
|
global using Gurion;
|
||||||
global using Furion.Authorization;
|
global using Gurion.Authorization;
|
||||||
global using Furion.ConfigurableOptions;
|
global using Gurion.ConfigurableOptions;
|
||||||
global using Furion.DataEncryption;
|
global using Gurion.DataEncryption;
|
||||||
global using Furion.DataValidation;
|
global using Gurion.DataValidation;
|
||||||
global using Furion.DependencyInjection;
|
global using Gurion.DependencyInjection;
|
||||||
global using Furion.DynamicApiController;
|
global using Gurion.DynamicApiController;
|
||||||
global using Furion.EventBus;
|
global using Gurion.SpecificationDocument;
|
||||||
global using Furion.SpecificationDocument;
|
global using Gurion.UnifyResult;
|
||||||
global using Furion.UnifyResult;
|
|
||||||
global using Mapster;
|
global using Mapster;
|
||||||
global using Microsoft.AspNetCore.Authorization;
|
global using Microsoft.AspNetCore.Authorization;
|
||||||
global using Microsoft.AspNetCore.Builder;
|
global using Microsoft.AspNetCore.Builder;
|
||||||
@ -58,13 +57,10 @@ 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;
|
||||||
global using NetAdmin.Infrastructure.Utils;
|
global using NetAdmin.Infrastructure.Utils;
|
||||||
global using NSExt.Attributes;
|
global using NSExt.Attributes;
|
||||||
global using NSExt.Extensions;
|
global using NSExt.Extensions;
|
||||||
#if !INFRAS
|
|
||||||
global using DynamicFilterInfo = NetAdmin.Domain.Dto.Dependency.DynamicFilterInfo;
|
|
||||||
global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators;
|
|
||||||
#endif
|
|
@ -1,6 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<Import Project="$(SolutionDir)/build/code.quality.props"/>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj"/>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
@ -1,7 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<Import Project="$(SolutionDir)/build/code.quality.props"/>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj"/>
|
|
||||||
<ProjectReference Include="../NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj"/>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
@ -1,19 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
||||||
<Import Project="$(SolutionDir)/build/code.quality.props"/>
|
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="$(SolutionDir)/assets/captcha/**" LinkBase="Assets/Captcha"/>
|
|
||||||
<EmbeddedResource Include="$(SolutionDir)/CHANGELOG.md" LogicalName="CHANGELOG.md"/>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj"/>
|
|
||||||
<ProjectReference Include="../NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj"/>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Update="*.json">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup Condition="'$(Configuration)' != 'Debug'">
|
|
||||||
<EmbeddedResource Include="../../../dist/frontend/admin/**/*" LinkBase="UI"/>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
@ -1 +0,0 @@
|
|||||||
{}
|
|
@ -1 +0,0 @@
|
|||||||
{}
|
|
@ -1,45 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
|
|
||||||
"SpecificationDocumentSettings": {
|
|
||||||
"GroupOpenApiInfos": [
|
|
||||||
{
|
|
||||||
"Group": "Sys",
|
|
||||||
"Title": "系统组件",
|
|
||||||
"Description": "NetAdmin - 系统组件",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Group": "Adm",
|
|
||||||
"Title": "管理服务",
|
|
||||||
"Description": "NetAdmin - 管理服务",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Group": "Tpl",
|
|
||||||
"Visible": false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Group": "Probe",
|
|
||||||
"Visible": false,
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"SecurityDefinitions": [
|
|
||||||
{
|
|
||||||
"Id": "Bearer",
|
|
||||||
"Type": "ApiKey",
|
|
||||||
"Name": "Authorization",
|
|
||||||
"Description": "JWT Authorization header using the Bearer scheme.",
|
|
||||||
"BearerFormat": "JWT",
|
|
||||||
"Scheme": "bearer",
|
|
||||||
"In": "Header",
|
|
||||||
"Requirement": {
|
|
||||||
"Scheme": {
|
|
||||||
"Reference": {
|
|
||||||
"Id": "Bearer",
|
|
||||||
"Type": "SecurityScheme"
|
|
||||||
},
|
|
||||||
"Accesses": []
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,186 +0,0 @@
|
|||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.Net.Http.Json;
|
|
||||||
using Microsoft.AspNetCore.Mvc.Testing;
|
|
||||||
using NetAdmin.AdmServer.Host;
|
|
||||||
using NetAdmin.Application.Modules;
|
|
||||||
using NetAdmin.Domain.Dto.Dependency;
|
|
||||||
using NetAdmin.Domain.Dto.Sys.Api;
|
|
||||||
using NetAdmin.Domain.Dto.Sys.Cache;
|
|
||||||
using NetAdmin.Domain.Dto.Sys.Config;
|
|
||||||
using NetAdmin.Domain.Dto.Sys.Tool;
|
|
||||||
using NetAdmin.SysComponent.Application.Modules.Sys;
|
|
||||||
using NetAdmin.Tests;
|
|
||||||
using Xunit;
|
|
||||||
using Xunit.Abstractions;
|
|
||||||
|
|
||||||
namespace NetAdmin.AdmServer.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 所有测试
|
|
||||||
/// </summary>
|
|
||||||
[SuppressMessage("Usage", "xUnit1028:Test method must have valid return type")]
|
|
||||||
public class AllTests(WebApplicationFactory<Startup> factory, ITestOutputHelper testOutputHelper)
|
|
||||||
: WebApiTestBase<Startup>(factory, testOutputHelper), IToolsModule, ICacheModule, IApiModule, IConfigModule
|
|
||||||
|
|
||||||
{
|
|
||||||
/// <inheritdoc cref="ICrudModule{TCreateReq,TCreateRsp,TQueryReq,TQueryRsp,TUpdateReq,TUpdateRsp,TDelReq}.BulkDeleteAsync" />
|
|
||||||
public Task<int> BulkDeleteAsync(BulkReq<DelReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
[Fact]
|
|
||||||
public async Task<CacheStatisticsRsp> CacheStatisticsAsync()
|
|
||||||
{
|
|
||||||
var rsp = await PostAsync("/api/sys/cache/cache.statistics", null).ConfigureAwait(true);
|
|
||||||
Assert.Equal(HttpStatusCode.OK, rsp.StatusCode);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<long> CountAsync(QueryReq<QueryConfigReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<long> CountAsync(QueryReq<QueryApiReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryConfigRsp> CreateAsync(CreateConfigReq req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryApiRsp> CreateAsync(CreateApiReq req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc cref="ICrudModule{TCreateReq,TCreateRsp,TQueryReq,TQueryRsp,TUpdateReq,TUpdateRsp,TDelReq}.DeleteAsync" />
|
|
||||||
public Task<int> DeleteAsync(DelReq req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<bool> ExistAsync(QueryReq<QueryConfigReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<bool> ExistAsync(QueryReq<QueryApiReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
[InlineData(default)]
|
|
||||||
[Theory]
|
|
||||||
public async Task<PagedQueryRsp<GetAllEntriesRsp>> GetAllEntriesAsync(PagedQueryReq<GetAllEntriesReq> req)
|
|
||||||
{
|
|
||||||
var rsp = await PostAsync("/api/sys/cache/get.all.entries"
|
|
||||||
, JsonContent.Create(new PagedQueryReq<GetAllEntriesReq>()))
|
|
||||||
.ConfigureAwait(true);
|
|
||||||
Assert.Equal(HttpStatusCode.OK, rsp.StatusCode);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryConfigRsp> GetAsync(QueryConfigReq req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryApiRsp> GetAsync(QueryApiReq req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<string> GetChangeLogAsync()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryConfigRsp> GetLatestConfigAsync()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<IEnumerable<GetModulesRsp>> GetModulesAsync()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
[Fact]
|
|
||||||
public async Task<DateTime> GetServerUtcTimeAsync()
|
|
||||||
{
|
|
||||||
var response = await PostAsync("/api/sys/tools/get.server.utc.time", null).ConfigureAwait(true);
|
|
||||||
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
[Fact]
|
|
||||||
public async Task<string> GetVersionAsync()
|
|
||||||
{
|
|
||||||
var response = await PostAsync("/api/sys/tools/version", null).ConfigureAwait(true);
|
|
||||||
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<PagedQueryRsp<QueryConfigRsp>> PagedQueryAsync(PagedQueryReq<QueryConfigReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<PagedQueryRsp<QueryApiRsp>> PagedQueryAsync(PagedQueryReq<QueryApiReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<IEnumerable<QueryConfigRsp>> QueryAsync(QueryReq<QueryConfigReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<IEnumerable<QueryApiRsp>> QueryAsync(QueryReq<QueryApiReq> req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
[Fact]
|
|
||||||
public async Task SyncAsync()
|
|
||||||
{
|
|
||||||
var response = await PostAsync("/api/sys/api/sync", null).ConfigureAwait(true);
|
|
||||||
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<QueryConfigRsp> UpdateAsync(UpdateConfigReq req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<NopReq> UpdateAsync(NopReq req)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../NetAdmin.Tests/NetAdmin.Tests.csproj"/>
|
|
||||||
<ProjectReference Include="../NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj"/>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07"/>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
@ -1,17 +0,0 @@
|
|||||||
using NetAdmin.Domain.Contexts;
|
|
||||||
using NetAdmin.Domain.DbMaps.Dependency;
|
|
||||||
|
|
||||||
namespace NetAdmin.Application.Repositories;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 默认仓储
|
|
||||||
/// </summary>
|
|
||||||
public sealed class DefaultRepository<TEntity>(IFreeSql fSql, UnitOfWorkManager uowManger, ContextUserToken userToken)
|
|
||||||
: DefaultRepository<TEntity, long>(fSql, uowManger)
|
|
||||||
where TEntity : EntityBase
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 当前上下文关联的用户令牌
|
|
||||||
/// </summary>
|
|
||||||
public ContextUserToken UserToken => userToken;
|
|
||||||
}
|
|
@ -1,34 +0,0 @@
|
|||||||
using NetAdmin.Application.Repositories;
|
|
||||||
using NetAdmin.Domain.DbMaps.Dependency;
|
|
||||||
|
|
||||||
namespace NetAdmin.Application.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 仓储服务基类
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <typeparam name="TLogger">日志类型</typeparam>
|
|
||||||
public abstract class RepositoryService<TEntity, TLogger>(DefaultRepository<TEntity> rpo) : ServiceBase<TLogger>
|
|
||||||
where TEntity : EntityBase
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 默认仓储
|
|
||||||
/// </summary>
|
|
||||||
protected DefaultRepository<TEntity> Rpo => rpo;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 启用级联保存
|
|
||||||
/// </summary>
|
|
||||||
protected bool EnableCascadeSave {
|
|
||||||
get => Rpo.DbContextOptions.EnableCascadeSave;
|
|
||||||
set => Rpo.DbContextOptions.EnableCascadeSave = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 针对 Sqlite 数据的更新操作
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>
|
|
||||||
/// 非 Sqlite 数据库请删除
|
|
||||||
/// </returns>
|
|
||||||
protected abstract Task<TEntity> UpdateForSqliteAsync(TEntity req);
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
namespace NetAdmin.Domain.DbMaps.Dependency;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 数据库实体基类
|
|
||||||
/// </summary>
|
|
||||||
public abstract record EntityBase : DataAbstraction;
|
|
@ -1,22 +0,0 @@
|
|||||||
namespace NetAdmin.Domain.DbMaps.Dependency.Fields;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 创建者客户端字段接口
|
|
||||||
/// </summary>
|
|
||||||
public interface IFieldCreatedClient
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 创建者客户端IP
|
|
||||||
/// </summary>
|
|
||||||
int? CreatedClientIp { get; init; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 创建者来源地址
|
|
||||||
/// </summary>
|
|
||||||
string CreatedReferer { get; init; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 创建者客户端用户代理
|
|
||||||
/// </summary>
|
|
||||||
string CreatedUserAgent { get; init; }
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
namespace NetAdmin.Domain.DbMaps.Dependency.Fields;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 主键字段接口
|
|
||||||
/// </summary>
|
|
||||||
public interface IFieldPrimary<T>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 唯一编码
|
|
||||||
/// </summary>
|
|
||||||
T Id { get; init; }
|
|
||||||
}
|
|