From 730e1d1fe38405b4433b74b12d4761d5b5672875 Mon Sep 17 00:00:00 2001 From: zhontai <361243234@qq.com> Date: Fri, 17 Nov 2023 14:36:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E9=9B=86=E7=AD=BE=E5=90=8D=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC=E6=B2=A1=E6=9C=89=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=89=93=E5=8C=85=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/pkg_push.ps1 | 4 +- src/hosts/ZhonTai.Host/ZhonTai.Host.csproj | 28 ++++----- src/platform/Directory.Build.props | 13 ++-- .../ZhonTai.Admin/ZhonTai.Admin.csproj | 21 +++++-- src/platform/ZhonTai.Admin/key.snk | Bin 0 -> 596 bytes src/platform/ZhonTai.ApiUI/key.snk | Bin 0 -> 596 bytes .../ZhonTai.Common/ZhonTai.Common.csproj | 4 +- .../ZhonTai.Common/ZhonTai.Common.xml | 33 +++++++--- src/platform/ZhonTai.Common/key.snk | Bin 0 -> 596 bytes src/platform/ZhonTai.DynamicApi/key.snk | Bin 0 -> 596 bytes src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj | 20 +++--- templates/admin/content/MyApp.sln | 9 ++- .../admin/content/src/Directory.Build.props | 6 +- .../src/hosts/MyApp.Host/MyApp.Host.csproj | 8 +-- .../platform/Directory.Build.props} | 17 +++-- .../src/platform/MyApp.Api/MyApp.Api.csproj | 6 +- .../content/src/platform/MyApp.Api/key.snk | Bin 0 -> 596 bytes .../src/tests/MyApp.Tests/MyApp.Tests.csproj | 20 ++++-- .../src/tests/MyApp.Tests/MyApp.Tests.xml | 59 ++++++++++++++++++ 19 files changed, 183 insertions(+), 65 deletions(-) create mode 100644 src/platform/ZhonTai.Admin/key.snk create mode 100644 src/platform/ZhonTai.ApiUI/key.snk create mode 100644 src/platform/ZhonTai.Common/key.snk create mode 100644 src/platform/ZhonTai.DynamicApi/key.snk rename templates/admin/content/{build/pkg.props => src/platform/Directory.Build.props} (51%) create mode 100644 templates/admin/content/src/platform/MyApp.Api/key.snk create mode 100644 templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.xml diff --git a/build/pkg_push.ps1 b/build/pkg_push.ps1 index b1899ab6..a1ec4635 100644 --- a/build/pkg_push.ps1 +++ b/build/pkg_push.ps1 @@ -7,7 +7,7 @@ if ([System.String]::IsNullOrWhiteSpace($apiKey)) { $apiKey = $env:NUGET_KEY } -$sourceUrl = "http://localhost:5000/v3/index.json" +$sourceUrl = "https://api.nuget.org/v3/index.json" Write-Host "buildFolder:" $buildFolder Write-Host "rootFolder:" $rootFolder @@ -47,7 +47,7 @@ Write-Host "dotnet pack -- start" foreach($project in $projects) { $projectFolder = Join-Path $rootFolder $project Write-Host "projectFolder:" $projectFolder -dotnet pack $projectFolder -p:TargetFrameworks=net8.0 --no-build -c Release /p:SourceLinkCreate=true /p:SolutionDir=$rootFolder -o $nuGetOutputFolder; +dotnet pack $projectFolder --no-build -c Release /p:SourceLinkCreate=true /p:SolutionDir=$rootFolder -o $nuGetOutputFolder; } Write-Host "dotnet pack -- end" # pause diff --git a/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj b/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj index 7f600ef5..2e345b0d 100644 --- a/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj +++ b/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 中台接口宿主 Linux @@ -21,12 +21,19 @@ - - - - - - + + + + + + + + + + + + + @@ -38,13 +45,6 @@ - - - - - - - PreserveNewest diff --git a/src/platform/Directory.Build.props b/src/platform/Directory.Build.props index 9349228c..245da5f8 100644 --- a/src/platform/Directory.Build.props +++ b/src/platform/Directory.Build.props @@ -1,14 +1,13 @@ - 5.0.2 - Latest + 5.0.3 net7.0;net8.0 true true - true - false + $(MSBuildProjectName).xml + true xiaoxue - xiaoxue + zhontai true snupkg MIT @@ -18,6 +17,8 @@ ZhonTai AdminApi;WebApi;HttpApi; logo.png 1701;1702;1591 - $(MSBuildProjectName).xml + true + false + key.snk \ No newline at end of file diff --git a/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj b/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj index ebe87710..7b2f3b56 100644 --- a/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj +++ b/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj @@ -12,6 +12,10 @@ + + + + @@ -22,14 +26,13 @@ - + - + - @@ -40,10 +43,20 @@ - + + + + + + + + + + + diff --git a/src/platform/ZhonTai.Admin/key.snk b/src/platform/ZhonTai.Admin/key.snk new file mode 100644 index 0000000000000000000000000000000000000000..ec947d182bf0660e9eff1409c0b8aa06f7950517 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097@9*;gu_A^0(F!NoHqHHdzm(Vyi#NIaTz=JIsSSWf>(fU;T6I__fDxLmu)4G# z-r?WI&nKa@fJct4#g@KuoUkVcpsxySo4%u|Tbsyxp6ZRd`h4)KVIJ$h-EoO5p60wi zmj-T9XrBD3T8cTywef;c9u8?Fh}!zZK$4kli0uB)G7CS17!#}vM033qS7_SgjV0p+D-qEK%a67cWV_R3I}xO+XU*aZY)lOJx<~} z*D!Y46>-V$FNImyvtj5>EXJOhX|=>TX=z)i#fs_hrnll9`zFe~E&?#T;FfT8Rzcgp zFt3_LwqI*DpIzmc< z7m;uH?7J3yIpmT8B5U}a>I?DK7%hNoi;)B9`H#K^Twt%kG*WskFef5c3<gJT>`c1@i1C>7q#}I) literal 0 HcmV?d00001 diff --git a/src/platform/ZhonTai.ApiUI/key.snk b/src/platform/ZhonTai.ApiUI/key.snk new file mode 100644 index 0000000000000000000000000000000000000000..9f390084ada869445d214e487467b7919f50566f GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098S8Nw_FFSNgZeXcY*%xIkb)@m;?Bat-U z@jTQ+VZ#$DuMXN*ep;B2PZ8t~q_C--C9_%oNMB*)6?Il@#r^Ls&w0%IL>dT4FLpu= zZE3p{G7o)iH;Z-S7s_2|3s7@m8*seFa%B-%m8hYa_D>%;$&`UGd=;?B*|t^$SQ^mF z{-u8;pQhqd@3I9sVuuiy5-LgIO0^y$Y8h`k=q>-teE@e&Q^VZZZ?_YsGaqJvW=|R~ zB>%Lo3l06OS%LDeCuo{PGiA0GbTai@FO-@P4`)CuO8hXZu?^Ez_9*%#e|cDH+i2kw z5TTu-UVWpSlwj5bnGlP&aD42g=&swhF(U~MHXi0xBlW(;Y=AmU+hEgON%yh6i~YSc zWq>^f+sD;igIvxvNgu-h)jtD;3W4Co+1C42i%D8 zV3e_1@@+W2@RnBB8V3dHuvigT>d*u>h>bE*mcaQgXL1F6`d46Tvf8m?OBOLi7 za@~Zjld!#|sM8c@t-Z5;1y$&M1)HMf%LPB#-Jv1=>9LKcgs}q5`Ox>v iyCWj!Pl01jmh7N6XY4wOwZWPa{xmIYJ>^1;RKLPTH5~~6 literal 0 HcmV?d00001 diff --git a/src/platform/ZhonTai.Common/ZhonTai.Common.csproj b/src/platform/ZhonTai.Common/ZhonTai.Common.csproj index 785137e3..75faadd4 100644 --- a/src/platform/ZhonTai.Common/ZhonTai.Common.csproj +++ b/src/platform/ZhonTai.Common/ZhonTai.Common.csproj @@ -13,16 +13,18 @@ - + + + diff --git a/src/platform/ZhonTai.Common/ZhonTai.Common.xml b/src/platform/ZhonTai.Common/ZhonTai.Common.xml index 502ef6b6..0bef9d27 100644 --- a/src/platform/ZhonTai.Common/ZhonTai.Common.xml +++ b/src/platform/ZhonTai.Common/ZhonTai.Common.xml @@ -322,7 +322,9 @@ - Pattern explanation:
+ Pattern:
+ (\\d{3})\\d{4}(\\d{4})
+ Explanation:
○ 1st capture group.
○ Match a Unicode digit exactly 3 times.
@@ -334,7 +336,9 @@ - Pattern explanation:
+ Pattern:
+ (?<=.{2})[^@]+(?=.{2}@)
+ Explanation:
○ Zero-width positive lookbehind.
○ Match a character other than '\n' exactly 2 times right-to-left.
@@ -347,19 +351,21 @@ - Pattern explanation:
+ Pattern:
+ ([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})
+ Explanation:
○ 1st capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
○ Match '.'.
○ 2nd capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
○ Match '.'.
○ 3rd capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
○ Match '.'.
○ 4th capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
 @@ -566,7 +572,9 @@ - Pattern explanation:
+ Pattern:
+ ^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z\\d!@#$%^&.*]{6,16}$
+ Explanation:
○ Match if at the beginning of the string.
○ Zero-width positive lookahead.
@@ -808,5 +816,14 @@ Whether is non-infinite. + + Finds the next index of any character that matches a Unicode digit. + + + Supports searching for characters in or not in "\0\u0001\u0002\u0003\u0004\u0005\u0006\a\b\t\n\v\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007f". + + + Supports searching for characters in or not in "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz". + diff --git a/src/platform/ZhonTai.Common/key.snk b/src/platform/ZhonTai.Common/key.snk new file mode 100644 index 0000000000000000000000000000000000000000..5f909c0805380a8e4fbee567d6188e504cfd9329 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098;DoHa8c@?w)@2b{1O;ISUbcKDo=y2aO zF~Si=>)|y*y_SH~vXehg5ZJ!s!X8_PNgnMH44f2P+W2#8!Zepp3R8bubaYqb?=lF5 z;B}Ao^VC~aNU0g2l_k0#DAVadQSk|OO3TKZgvS_XkNvga{fUJuz|UgVb~Al_GD}~ zgrP%Cn7Oot4_xWfCPZ2mB0}a1btMw?8y;;ak@@ibfdG(5ZJR=u^v>FuPad#rC;L1C&AEw894jI&g(cmviI(U1I*ftK*W0=)tkG z7=We>k5xeL^Y&CFLRDxPK>Bl-V@5rs#*@x-`um{0czYY4nn=@@91Nw8(#7Hv6SR&t zgLM~>!)t&JKRy{NM>bxEE)3tYc z+k~Ynv$Bbi(d$ZHu0a0bcs%G&ZJ)rJ_?+J)hSrsBQ z;GHTKU_wn8>-mdAKTJF*fCSo2Wa^D0hzSxAYMPJx)*CKuJ)(8iPgxr#;WX#(_7&bi z*e5l2nD(0k^}W>SOFigN%uTm^=TNjP_^eY)m1@P+N}(v9JgZ58Sq#L8Q+YYog>j`T zH~v?@hvs`7kC+HV5U4_>hN_TrR59};cV|*8T`Y+^A0!T+JQhKuq0JxE!Xq0bC_5ue zxy^`-Fw__C>gCd_j4!wz@2XegU}vS|!7)`Lvk3EYtCNWCf$j_B(to!gt;eJ2ZYfzP zz=m(Gn-u1BOv#T;QQ-9`x^11$7SqV5S{}f<2?7lJm|kh|hGsCK=||cT`^&&ge`vh9 zj5_jCx9~-bLCuG+<9>LpG51!R+ltwJRIn;U=e$^x_@*PxvQM64da^?)&5fRnHKP>c zXwCq{+~kzx#ah*u z7P}vae?AR^$dB6j_LH4H$Hq|QcbeIe1j*89(BU$+IF_w+Y)arSVm*ygMwGCVEO8UT zxYJBW&(GsWDyiXK&nHPnG@I{(r?;JZ zn)`x9_QG%e*B~0rnQNED-sGxP&rRGj8%m^uiHc9Ki-TB7SGK3o08)*7yX0o4K46a) in9CG+xG-XIv&QIAn9vM2+VLidBlA{2&q&liiUyJdX)KNa literal 0 HcmV?d00001 diff --git a/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj b/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj index c3a68811..47f2ef12 100644 --- a/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj +++ b/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj @@ -4,16 +4,6 @@ 中台测试库 false - - - - - - - - - - @@ -24,6 +14,16 @@ + + + + + + + + + + diff --git a/templates/admin/content/MyApp.sln b/templates/admin/content/MyApp.sln index 6d4542aa..9ea39420 100644 --- a/templates/admin/content/MyApp.sln +++ b/templates/admin/content/MyApp.sln @@ -15,9 +15,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{0600A063 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A1F23C8-24A6-4571-B3DE-D27D024A051D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A6C50476-5236-4FD3-8C29-6449494846C0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02.build", "02.build", "{A6C50476-5236-4FD3-8C29-6449494846C0}" ProjectSection(SolutionItems) = preProject - build\pkg.props = build\pkg.props + src\platform\Directory.Build.props = src\platform\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01.sln", "01.sln", "{B5DE2B4F-A7DB-433D-8E98-5C352EFAE88B}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props EndProjectSection EndProject Global diff --git a/templates/admin/content/src/Directory.Build.props b/templates/admin/content/src/Directory.Build.props index f3896c05..b0a99993 100644 --- a/templates/admin/content/src/Directory.Build.props +++ b/templates/admin/content/src/Directory.Build.props @@ -1,3 +1,7 @@ - + + net8.0 + 5.0.3 + 3.2.805 + \ No newline at end of file diff --git a/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj b/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj index e65aaa71..3a9a38eb 100644 --- a/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj +++ b/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 MyApp接口宿主 @@ -17,8 +17,8 @@ - - + + @@ -44,7 +44,7 @@ - + diff --git a/templates/admin/content/build/pkg.props b/templates/admin/content/src/platform/Directory.Build.props similarity index 51% rename from templates/admin/content/build/pkg.props rename to templates/admin/content/src/platform/Directory.Build.props index c9aa09a7..bfb905f2 100644 --- a/templates/admin/content/build/pkg.props +++ b/templates/admin/content/src/platform/Directory.Build.props @@ -1,18 +1,23 @@ - - 3.7.1 - net7.0 - false + + 5.0.0 + net7.0;net8.0 + true true + $(MSBuildProjectName).xml + true xiaoxue zhontai - 3.7.1 - 3.2.700 + true + snupkg MIT https://admin.zhontai.net https://github.com/zhontai/Admin.Core git ZhonTai Admin Api;MVC;WebApi;HttpApi;Api; 1701;1702;1591 + true + false + key.snk \ No newline at end of file diff --git a/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj b/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj index 019d6e03..028c8607 100644 --- a/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj +++ b/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj @@ -1,10 +1,10 @@  MyApp接口库 + false - MyApp.Api.xml 1701;1702;1591 @@ -18,6 +18,10 @@ + + + + diff --git a/templates/admin/content/src/platform/MyApp.Api/key.snk b/templates/admin/content/src/platform/MyApp.Api/key.snk new file mode 100644 index 0000000000000000000000000000000000000000..b284523774f040eb3e99fc0879b242d38953cac5 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa500988mu4*VawxbIw6KOuUEe{$V}K3kU_s0& zracw!0$QbWaDd@5Pq*ptv0V0=P4>yBnY;8R^S5I?8EnwVCXKk4>#@i+G&sOUsaRUa z23Z_Y75?R<*6aYipJ}rS{0??3!Ab4z9@`rOJUQj}ZgSp#Lt2KwsZrAH4Aj>j?7zih z!lJWlg`cc}mbz)&@ab3v`Zx`5inDffmZ6I3#IRESRQJ@(6_tM8YMIjKq2?$5>zW%D z5Ckbp1_mU~IW3(VOxu?bgt5&dCaX%-O2&`vk8FXn6nWPQZCTF77ifcDe zo}kh=o{qhB?9Q5C34=QEY^L#5Qo=kD-nU>^-V~{9Qw`DrjD1n(L3~M=hdjPsHe~_^ zZaw^U-C$y8+uJ!6%zzchbvKYEU_Pt>DpAzhS6#R+%O(c^ literal 0 HcmV?d00001 diff --git a/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj index 5a29abd1..ffee999a 100644 --- a/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj +++ b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj @@ -1,21 +1,29 @@  MyApp测试库 - net7.0 + net8.0 false - - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + diff --git a/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.xml b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.xml new file mode 100644 index 00000000..f1490cea --- /dev/null +++ b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.xml @@ -0,0 +1,59 @@ + + + + MyApp.Tests + + + + + Api测试基础 + + + + + 测试基础 + + + + + 模块Api测试 + + + + + 模块仓储测试 + + + + + 返回结果 + + + + + + 是否成功标记 + + + + + 状态码 + + + + + 消息 + + + + + 数据 + + + + + 模块服务测试 + + + +