From 6a31e888555e9bac3adc31f91d3175e760bad8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sun, 25 Sep 2022 20:41:55 +0800 Subject: [PATCH] =?UTF-8?q?swagger=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/SwaggerDoc.xml | 24 ++++++++++ .../Controllers/TestController.cs | 32 +++++++++++++ .../yi-sqlsugar-dev.db | Bin 172032 -> 172032 bytes .../Yi.Framework.Common/Models/Result.cs | 2 + .../DbExtend/DbSeedExtend.cs | 45 ++++++++++++------ 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index 9a2993e4..d1495d5a 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -376,6 +376,12 @@ 测试控制器 + + + swagger跳转 + + + 仓储上下文对象测试 @@ -436,6 +442,24 @@ + + + 授权测试 + + + + + + 清空数据库 + + + + + + 种子数据 + + + 用户管理 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs index c2f7fdf3..c2bb50e6 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs @@ -16,6 +16,7 @@ using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; using Yi.Framework.WebCore.AuthorizationPolicy; +using Yi.Framework.WebCore.DbExtend; namespace Yi.Framework.ApiMicroservice.Controllers { @@ -39,6 +40,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers _quartzInvoker = quartzInvoker; } + /// + /// swagger跳转 + /// + /// + [HttpGet] + [Route("/")] + public IActionResult Swagger() + { + return Redirect("/Swagger"); + } + /// /// 仓储上下文对象测试 /// @@ -198,6 +210,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers return Result.Success().SetData(treeData); } + /// + /// 授权测试 + /// + /// [Authorize] [HttpGet] public Result AuthorizeTest() @@ -205,6 +221,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers return Result.Success(); } + /// + /// 清空数据库 + /// + /// [HttpGet] public async Task ClearDb() { @@ -224,5 +244,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers })); } + + + /// + /// 种子数据 + /// + /// + [HttpGet] + public Result SeedDb() + { + var rep = _iUserService._repository; + return Result.Success().SetStatus(DbSeedExtend.Invoer(rep._Db)); + } } } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 503721e86ad6e1ffa5b0bfa0390d7e4bd386da40..1b1873d2a08cc24d6a49e1abcecb5e7cc417b98e 100644 GIT binary patch literal 172032 zcmeI53v?UTdFKZp2?8X5p+rIuB~gMXQ4}SS#Nb5$dXgX|f$x_nk+wsD1V}=BKmtHf zR5u%&mL12BNNVlcj$J!;?buBlzhpa(l{AU7uI-$p?P<5`=G9GGla$Zab$U)W-ENP2 z_TIUe!JQdgiB6n7mhwR&f$z@zzq#}KW-jjBZ|<2(86T04x@3jdE#|$ZKbH6Tyw4-o|IKc*>F$iBBO_C>BdJ&t|L8-#Esgyxj{e4` z_7+DaE~?yaDXI)dD;-mbnQ=#FSHGk4NPD}ZyEoj?*gNQGYZ-LxLThwJrel?k(~;!p zL?pRgaMqC3#AS`+XiFhqr4)IoU?3lzrtZsKCm6}T=k<;wX-c!mY(lWk|2!M?woB_IdQut45R7uJ;)+RMvz=Xfy~q?G(#tqcSyTwxf< z%F1IkZDWzd$JDTZf14IYR~6!B>5dwaA}+%}MkPU9v_gJ()vM9N z%lqd~YT74U9!f;1CQV7bJCcm$Y%;Ega5R<}>__TZ;pjVwPL1}&_^`|A5}fGYu%Ibg zwJ^aK+Ux6e=RPL}O0$BdphOu$&2l-OBk^(Zt3ql&)n7EIX4m+JAm(F&s_1T@hi zMa2sfCPuW#3RJX6K@l@rWI05O6|HK+)w&V5-$r_Gg$qRmVmIRUIk{(yml~AhaghxB z>Q^^-)vI+Q=j8;9JM`sDUrQCA{P`j_4!xp_u@+&LQeWru&_0c zTvx0Y=}G0%d%lvQRQxeW=D2{sUUC$Fnz>f%uXZ#ZL097T&FI&f5)1mRw-#``&RSsI zRX9lgneeqgynp}@00KY&2mpbPPr&$$0g2pP$jI4m3+(0W)f~5l<0=fcw?FGL>q|H^ zhT*Dp25JSjLkI+&PV`?@2oOfV)Hav9V>`+gCSD)+PvGIl;_vzOD(Bw$l zSa>|`9-Ve|rRT=RJOd*;56vBHojx5&F`h(TA+4Va0tGj;8N|dKj;kv z-GRCWzuVmq@Zb#$C7Z*Yt%7rWtpCtqVRov$zoDsTpmlQm?7*S)*{vj zY3%K6JeC|ke0H=coIKmz6^KRWx~DrEdQvBc`bVR4hucq%wYvtwU7oq#xoGR**&)GtIXk<3soN7K=+ulDo z9hz;OJ$hpDgg1U-*ge#8DthMF!N`RblVs@zS@R{b2`)u#wLx%?^ zr~15!6D{50_+TJ%>g?gRw!|1_89j5>_1ZCjwiKfNc?st^q*=> zoto?&8W?ZxY)OQ?tqo_IS`&w-=TCI?o@zZdUE4h0)I2cRb#O8{pFo_O#|IBZCL2>- zz25He(7~fe1_y=SN#STZbkf%&9&BgNxM_BNm){k*Z8+baIXp6r<$82JZ9?Z0+O;*f ztyJt9YCD9WN2qfOE}zqhTBJ-nN}83-BER437LN}1*mM)G(`__t!Wm25Ui>an#6jZF zQC+^JO5ea4ZSQ_~<{q@E#iyQG`lE*zzjmQaa_sWrBT{jMIC^Ao!a1WFu~_ zNF_a9k6Unioz6_Fwe-U+Ej{{$D=*yk;Wr=8TV6VU{>rysSbFIB z_b%W1-Z$=Ay!a$4zHMG#j;ZYCF!3xElYprFt?tzQ3ne;C<&}G`JpX_k34{RcKWfrk z&N^>EJes=Z#)d|YHk}*}9}C1!&9$8wI5IHe?K|e1nQsk+j!w6GUEKp6abHu)HQPEl zad3XRuW@`boEB!!9BPdR4)q=FPCBQWo1C@H$=Z0+z?gshh;O`qdj6Dm>V&^>qNlAj z9SuzNH#tYpiAd_h0N@QM0W95h@xyQ4hJG)-^aSETIG~c-{);ZV@9HCh?0fDbg5LMh z(biDMbpKc^ea1aJJK50Un`w_v`%jFgqg|8D-Lf00e*l5C8%| z;5Sd;CVCS?Qr4glm3G)NBkFj-@qjesjPJ8|O9N*3PW^3Y@TTi$O(k5OInSVzMsoDU zc?MI);BfvwpD*M1H~G8yF21bz`K$dyE5i#200AHX1b_e#00KY&2mpcqe+2S-3Dod{ zcxUcNBDWuTU3{7TWtCKCGu-si3+U3~+R}NIl(QKIPY=9-DxUj3C~B+wC~0wMfvT|j zjv{mmm2~@%-{VCU&QnRV6~2~K_qHg-_wu}X@$^?I!q~ojL3tmOE9iCyUA{WOs$e}uiO(VDZSNeNXHCDbPS7xFMRhOo3h8Sc5CP^52qV# z&8?EiWEqmcrXqt_LFr7v$7<%lyT+Lk$j?Y|1<@@4k1v$uWv-W{cb&9V`X&gUI}pgz zNc9=1^v;y(HB#x4UD~P~4E0uZ8mU-ubl--wRhAUz|MU4DO8NgET0gqlKeRHufB+Bx z0zd!=00AHX1b_e#00KY&2wZ;zba~P!8lDdSOEe-Sj*D$X#$RL%T?I1U$QaxPWW0h5 zaWo1|QsJJ>7`k=HcqC)s>0sO!rQsu-V;|2LoEaHIwl~QTPcbr3E?+b_d?|ha8R9Su zn%0AI`NY5jB`BBwCK)Qh`Tz2a!IAv`yB}EMXb{C9W%==dMLuQd<@`TdqLcIg$Pn}Y zdOpta-{9lcQR^s==Ip@>2mk>f00e*l5C8%|00;m9AOHkzOaj*LaKoFp5PD7xSE{p{ zr27t*pL=5Y!kvp3AChw2g7^ptr#t9Hw*a{OKDX1Cdr<&A4Z$})H6M*cr{go|28BN; z=R%F>lD5=XVY0n>`QJuSGM>!drycl%Zgf*apw8>@1zdqZ?nMoLp#eRKg{VhU$oYXy zoI6u@BctxZuBG%Zj}i= z1R-O)>xf zhx`xu@7$QjIP4V=00KY&2mk>f00e*l5C8%|00;nq>zsha_U1R6{3w@C=Kp7gSIGST z%+w$`|Bq$_*8+P|Aa&*^JK4<_JaA3cR`{dYNqK&{}abqeBR4$zYhoF^iq zlL5i&X+TdWAWs(X)VkbwF?!^I*H`Bf+&+&F=l^y5zoO^=e|mNhY61j+01yBIKmZ5; z0U!VbfB+Bx0zd!={Q3ln^9&|w;DF@+U*Px`eto~-0SEvAAOHk_01yBIKmZ5;0U!Vb zfB+EqWC(PM$^ROT3z6jivv1(!zYAslHOYU$EujBym*1T${qOd81y_R?^8cSqT)+zu z00KY&2mk>f00e*l5C8%|00;nqPa6R#|BuHGNdEstj(_pfR!gW45C8%|00;m9AOHk_ z01yBIKmZ5;f!|^R9pViD)$$Dhe?)EoaOSuHz~^u9xSUR(pOydj_!}Vq|66=4!L9=V zAOHk_01yBIKmZ5;0U!VbfWQq+K+6B)p#zfte~IH?x}kR&b`A&t0U!VbfB+Bx0zd!= z00AHX1c1PGMxb4K{D0;N0AFnqp8z1_c>KTH>koMSP9HP>AAsloUuV&W>H+~E00e*l z5C8%|00;m9AOHk_01#Ly0V)5FM-FiQpDS6Z64nC(KmZ5;0U!VbfB+Bx0zd!=00AHX z1g=K{c>X_J|6h-hgE|8NAOHk_01yBIKmZ5;0U!VbfB+C!Ie`MSs*e8;EZD*S2VZ9W zk@Yd_sCB#L1ItU6Im;f4&irTQd(7QtTk(&JA1{s;*A)G8(WRm@MSF|%rngM@ntDuY zj6X4c*%&kKDEzSS<-+;GeT8|3w+;6hdJXo1pB6k(FjlZL{}=hMe6rf+anmk?vPXH?XApHPU@5 z>3WuQpGLY@C0)mo?$t>5sHEjA=^l-Aw@SK}CEcx&231l!OB&Qj11jknmNcM|`c+aJ zOX}B18&uLVmb5`5^{J$#EU8Z;^{S++SyHb?>QPBov7{c2)UA@1u%vE{)TNU0EU8N) z6;x6yODbrjPLRT_delN%L9KYK?STMyk)e?_f!{X{1#u zX$?zSrIBt`Nw>44TQ$-xDrq%Kxq#ISzN|tn^Mp~hgZe~d&i&Ro(=ch;`HL0Y`&W}kWHL9e{&W}+eEmTRFou5LD z)S!|wJ3j`Ev_K_gc76&p(tMSa+4;%WNTrKUsYAf*{N!n*l0?f@)`+#=ddM2I)><9bQmeu8 z@0NeE{7=hYS>Cj~X8B{wW0s4Sb7(Z-gyj}Xw;+=AW4V-27eh z%jRdyUozikzSW#EkC_L}?dJVvm$}Nk7F7;jKmZ5;0U!VbfB+Bx0zd!=e9{EWc?R)< z1LfR0Iw_;QgEHFMDWkQGGQzEtaX3sFhYnN5!9$eMa*#5bTPP#cOc_lf%4lq&j0267 zvHt*N?AuQnd-qYsp1qW@dkRg|%1D`iw} zp^VLyl;PM+8JirGv2hb+RBWV-4HcBJegkE!TTdC~>nLMwIc3<_QpOrPW!TnGMwyK= zO3Nr?btz@6T1^=xt0;pnp$sce85S#Lm@Sl1Y^IE&V#+WTQHIe(8HGm5FceZofq^pe z3n(KmpEC4$l%dm$^Z!Y5owMXeIII4bT>fqRyVe)1pEF*tgp2>K_>m%~>4U;5!$0VM zY2BlH$;xxL=lyB^2l*c`8y#Jmx#$`T@+10`y`n;QZf80&G8OAhOvO54GqcirS*W+A zvA@O9-`LdN;;590E4N#UD#OuA$5diw+|k+9@8~?z-tOq`4R@?v83czR**&g@#$ElBZ^i^qfca$#9<;DADhpq><||*mElx# zY$}$Hp%|jmWoNwd5Eh*DA>4@JiSdz{(!5AhqFTf}aS4#${3(x{F}#%=JEn+y zcO;dXOC-^OBb~qaSXUh$eUYhjb_MYSmz_A!=@K4I%p4cnRAh9`cFC$mLly~b!Xi4NCnF|G_+vwI>j6U&y8mBTaXWFk5{nvUbGOVvkzyA~@}az>-o znqwzXV=33YFLp+30%{tq2K$kE9T%U8#?GWpp))-;9GOigM0=P%lb!g~A6A_FViCVE zVPQ2F;tCokR_W*_N3Ui%G#5F)^-y!MFjOEm2Y1-T<^X?v;~#?(C@zv2Ub_RJJafc@ zUUib^Jd1w=4I)05vkg4e-r#dD+n~rtG2YQoBC0uIR(eiE(viN=#7U$_tzJ!|d8Ma< zOM5DaMV5t$V%Di3u0S8^Vu4v1In8o8jMDd!)EudMa=&%ooam<1l{H*KKoc!eRJ<@@ zVnmCqKt+QT6fvVkmP52y4Og|nVBc+Hea+zWcv!%{3(?ik_i=~k_PI}C3%9e(VBcTP z+6&Th4GZMGw6SD`2Po-OE5BLAe)g*Re1kny!P*{fl?gfNQ^CU4yh8C}alPDK#A`^) z^OeW1R4gC1*Z!_hU2jR9uN=j{ZqJd~vCMgheXMVenri*kjz)}SSiryYEXEPeqOant z-z;d)udt@f5wpMOGetG}Dq~fl*|1nJuX{ePj|=Bj@_)_$b&e}}>r?1fee}xf)Bgwu z=8keXFx`n%8gB%@Z`B3{7q2id*h`KGU=KNpf8D^~t!b|Rf0fH0X3X#c=__1)K|(HA zvwd{Zi5L4Tj+(qaoj6u%hXp(%8on7zm%7hs`ON?TsDu**goTNs&J$;jNt z`tn?eZzdNyUh$m5O&R{#s62l@MjMG&#g_`%lR|mc;N`!`3!zVOt6AkR*aM}kUIrfc z6VNZy!kSHm_R><_xl%DCs0jTxDguHE9H=ohg`W2toUm=%&SLB~L2Z|HDiFPbxe22Ie4($|Y4 z+$jpl*NVKFI2wa1-PPIG-`j{*LLLtdceg1<(6@)9HI|~9-5U+|t{N6U+}NUVo6Oh2 zu%NUntWW9Q!e1VDhTzL1#_aQD4~b7{&%?dJU_Z3^+Q$GL|Mj;YU0-P5yjgeWyejtD zV`QD;{1U&p$-xAj1=N)1$TZ1Kg1YA-H4Tab2#+fv*tp?Wf9Fdr#PO?SN{Cwg-cZPE zs@Goa0t2Vlh6Vh){2Xr=zvu4KiH86#!#``4VaG+4xMg)Xv`IbGoS|a8ist((yNGlc z(I^)w>W(F+g-EOJ|kdu7-~_f*iC&W9Y>`A(MeEyTGp=%Vv%$eF%x-h_QK z52(tFZ$-#O-*mv4-cuWqcax08W)lNmF9m!v@xJ`r6U!Iw%miF?zJhS$^~9e{u<_?i zs4MU;$w!&`9Cs|f^x%8nx=$JEljy2i8S0!fUd2#v!0zRJQoG+o+$%#Zx~D?TbUw5m zJ7YNqd-*J0nxP*-GpD?%;$rbEs2o+?M)*`eM*yemR2I$uGk@p|}2 zI3nDn zcFqiSIdQHGwdgz>YNqd-ZP+(6)N3=o6`>Y=)1hX1Pn99>>`>c@cSWd0=PL+xIvI=M zb)`__&zVq{;$32fdd-#dk1pQ#fHKt6sN1Owbas9p=SENxdi)WhPpK4TM=r}HyvuG_jw+9&xU%lssUe3yemR2I$vR^ zYsHI6tdIhZKW74N#XH6f_^K<<{O*-6yrc|x5?ysD1DsS%f22_3&m`25{56IOBf9Vs9}mab!zLrT3XreC3J2p$Pu#im*sHl7 zuYzJZJ{yn5CerDXsbGEmIJylmRyUfMt{)wpiJ|^~GFCqyA8N}(`<2~<&2Cg|!mxbl z^77@!7r*}W;vHXSY$lyZOx5FGBRzVBv-K59X9dLB@*@|QzW5Bo*>qwio=zm|Gw-8a zI)%&f^-7od8JA+enBg+h?ImwfJpaGiYWRfb|0AdH0s=q)2mk>f00e*l5C8%|00;nq zPay$mdN_Ju+zxsEKQe0M`Txk+F39~oQZ`TxkM zl;{5=W3xQ}9~lmL{y#D{$@Bk_u~DA?kBka={y#D{$n*b^v0k44kBoKl{C{MW%k%${ zu~we{j|{s!{~sA^ki9bT25I?%$HChynp}@00KY&2mk>f00e*l5C8&KB`{o6 zVyMS!kSwiEkp3cy2c;Z`QN|VJGKW*?NP0HK$WTU?AHKZ!tp}Fxes$^A+ZOM7@X8a< zX7ZY1$xWsbLv^kVxbX(i!!DA;X*7G3<$US)?tAZBk1oG>dGWD(h;zDR*vP283p<}l zq~oKpYt;VzTfemY_|tUl>5^LtOAI@6)n1@BaJBkpoKf|sOO6>z44ZSgcVhSRF}x2f zG6eF{L(eZ>_zI1kl-yLnz+R6%pGb@hk0%qeCt1$lyL@@^?k5)Sx^wyRIpUlyxjDbY zP?M|Lb&~U|A2Gxi&73Ydo>yWJa(S;M%#+iRso`img&#l1sy~6V_|01v@3=(6Atg8I z8E|&tEu_#~i{S}$_W{d!=58qJfTv4_bR~wWT-D!+o#Xo>hEuUKEZ>c$4q~0zd!=00AHX1b_e#00KY&2mk>f00e$*0@RHc9y|8;c!zn0Gb@1pbnJ8}NsW?IGZuka`Ma_d{xS?fB>>y~l! z7YtrC51UJhFBeZ2Zz_7HXu4><>3gPWv?{!S01yBIKmZ5;0U&T=5g4+e1YkLzNnh%! z%B5$Hbl_x*B7M2|)QeYMep+B8UPj4cl9P%?X2xU5{xYR+dFpDr#`n@)7Z&e++{y4A zUHaM|F242}@jXzAa!;wpce@zz8YPR{ ztqgAmRo+NOmldlhS=?tqsoqlgNZl#ZY{A}0suyK)J6Uxi8O`@EKXm1}r_g%j5bZE4 zoyt4hoOO!w!GjE^QQ9e5??^E|h7dOKW&j<^VrCx36vFQ0q%l$T4fgf7bTB-RW)iSs z0(k)4V^CebUhB3=;g;-MbIZZTBklbRztIc;(eF`oYe7vm+}V@AQSwXD&`V!hSiJ2~ zR(wX$GL&_t&!rx8TLJA@=5RpeSUj&+bTWMg-AEvmqle>V(8}T8k6q3r=%hBOP&zrw z%0TC+@*ujCKq$A%{^cs~)A}c8)L3LH#oBS|B*L$&RIa~hzmo8j+@H~?; zSxge;-RS;-oF4ZmJT5)-r^`>h&c-V)CLX)cJp)y_>bM(wl#=dCkA4;1>%lthM@WvH ztQ1DK2vlWH*G=+H2Wf|kPhVp0F!6@g2;&<9a=8l7u9olrI(tvWf00e*l5C8%|00?~Q2~Y|54toB7 zJ3arujh_GCO3(if)ARoi)ARoi(ewWg()0gY==uN6^!)!2J^#On&i^;k`TqlS{(nE6 z|KCUF|M$}Q|2=g6e>a`~57PPn0M7sC^CcYrXZ+oKC;9*{AOHk_01yBIKmZ5;0U!Vb zfB+Bx0@oP<-L}$lE`_>EY+leK(62A3{(6m&7iw!{rPL-k?kTOJdPrp4qTUt!|h|zW4g; zi+4YA<&|?wuU}wl^*OY@RP6mHzOnqsbIX^{qd#@U()x8~L+K_}t-YhM#FdMG_}=UH zy#K(rSxTJ$&*y(A=l`#>5JPo=01yBIKmZ5;0U!VbfB+Bx0zd!={Pq!`Zf@|?`Tqtw z|L>#o|6cL=|CWOs{{kQ9E3JQL{gQRSy4v#Rmb+0Qynp}@00KY&2mk>f00e*l5C8%| zKt-Ub$cmrPZct@lk6wBCN%YYB_iump{Rf}TJouoSm5FUK<@7PI_}aqaqpz>fhcTy* zBUiqCVfpgQ3Ljm}dKBjL(Vt^q*ggz7ee^B8a?h3LA6Q{M3Ud1B&B23RkNliIdX~R@ z|KjFX~pK6+`z zZaQ^nk5-i%rKdhfn_c>&hZnzgVfmShOLyNo7$+7h!i!&7SiErG(id)By7%+&{D0M{ z3?>i&0zd!=00AHX1b_e#00KY&2mpako&c4xKT6O4AE4*|AED>}_tW$L`{?=qz4ZM5 z9y%G=aYl-ErEcbu%y9*wH01yBIKmZ5; z0U!VbfB+Bx0zg1T;QtuJ=kDWDgY5@{k%gv`Je%RBk6vgh;iR;#;ByH6ptm9D@zr@e zF5BDx^{szeDB<>)ECz*o=m!ril<0G*13{-d==ImRD77({T6b;r<>PqUg}Kz+HPn`$ zzk2DJD97zFsMLM8{C*Rv`J0#jZB(=0ZXxIj)OmdZ+HbP$f?R6dHPz$4mv{r!JU^G3 zyM|h>d7fI`xgFQM^zVPxs8>e})m(7bHF&c%*XL5}uBpz{T$fADT|+I^9OwT{{Jrx0 zfBrlCCH^b?!~DJc=Tyfem_Pss00AHX1b_e#00KY&2mk>f00e-*uS~!rjqi~B{}0G; z4axr#Lr3!e#NbH&{|97jgyjE;p(FW!VsIq?|ARhpAcExoiJ>F;e`0WC{{Lef|2_Ur zKFph~e_{Py>k;c(%TFwi{mQ!pLLdMHfB+Bx0zd!=00AHX1b_e#_?QHC7nuzxnZKLJ zZ0~+xnR)}ImEZlRr7@IN#_v=5k|ODb0Q59^bVGp0haN~@CwM)(O*zCmmDtP@8*_-o zEmB*yu*8K5@jE|_e14%sSN5OY@69ftYQH@)^K&{Y?!gbycYA^!XI+Eav)hnE%u(V& z;SDOKt`NI-7bwJUfA)zta322c&$`SQSmuuaNY%#A{zvyfxNtr`;B)Op&;F-q6S0mG zE32&%qeuU1#Au81mX+03iP5wF72@Kf00e*l5cv26#QFc3VI7kHCx(vX z|B1no{C{Q`h2;Nztgj^zK}{;W8xK=S{@5cB_B3CHnI^RIpU z>VpCZ00AHX1b_e#00KY&2mk>f00e-*4MgDgOUui7F2r$0PFG?3o1=Ocx&z_VT#Wjk z9F%SslCNfNeU~sTZ$^f(Mm^rChh3#>UVS=X>WIQ_l7$fdj}nDErX6- zXa%xvXJk57={Oxpj!s09+ugnzvNE+sTWmhNg5Y#&*BFRQ%~DQsuG2q%Qn8A{OEMNo z$Bv|8$x6pmVrHDKg1D$Zjw=~OE2YsVYH>#*8Xud_sU(Y-%5bVVHWf?95T%hgqJ#;F zJKZ0fiOi%iJylh@lF?YQb9Op|RTlKdrX$J8oQNDX_1g{hPz5W_xZ>T3RC-vDK28R!M5*>n*>1MSBB-gz zwg}3l-H~K0X9IKNhPI}<@@lapO(6cg319z*xbqzUCVw~I#g|!sWPQv!YTa)6!19u1 z&a%g%Gyj?S9&@+ZR{Z1Q$BU!IHAVkibgAe}(cU7x=`GW}rXJH8<4=rVHpYxQ3O_7- zxp2O4Utyl%ZNq(rUW2{hrv*ipXr~}kL!2o z{zdny?ss$tbOqe^Q8fagqRg`ljGXOnb*H|(P|}3o?_WTF|AM@4l5daj;^#&P-k{4_ z=kvG&O&V#VO1hCHZPZ8)sH7Dv=>d&&ze>7+CEc%)?o&zEv!wep(!DC_I+k>=M!H8O zEoVvhXr#MU(zPt&QEa^^-bcae> z$dc~RNNZG514~+?k#1K>3s}1K`8p^|Q8NgW#LCY5vxOS(xT-KdgQ zvZNa|(h8MyGfP^bk#0~)QMbkAs&xix(F3~_r}_qsbiGQ-?EI|PNY|;P%+Aj`jkH`P zWp;kbHPW>zDYNslRwK2mq|DBbT_atik}^9#Ycx`uO3Li~*fi2Im6X}}Dbq+xRZ?c> zr&J?dt&%c3KdUv;RVpd7^Rr4LEm29Cou3kolvhcaogZE!wW_4d&W}|iwWy@b&W}YS zHLIk|&W~9mEmldHou6Wjv`8goc7BR9Qj00KY&2mk>f@JSO0bW;73cR!r3YAWflz5C&r z^KYPs9HaM(`VxBR06*N=7xV7fIK zv_&IrR!Qlh1BJ9%BMqsf^w5DqN~f2|f!L&y(nALdDV<&-(ngh(9y(A+>GTqj9#Bc? zp#z1KPA?JZewCCSI#5XI^b(QoQ%UKe1BH}MFA?cpm6RSjP)Of{_=`Rji`u_l}@J%29 delta 11989 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 diff --git a/Yi.Framework.Net6/Yi.Framework.Common/Models/Result.cs b/Yi.Framework.Net6/Yi.Framework.Common/Models/Result.cs index 8551c4a0..345f657d 100644 --- a/Yi.Framework.Net6/Yi.Framework.Common/Models/Result.cs +++ b/Yi.Framework.Net6/Yi.Framework.Common/Models/Result.cs @@ -38,10 +38,12 @@ namespace Yi.Framework.Common.Models { if (_status) { + this.code = ResultCodeEnum.Success; this.message = "操作成功"; } else { + this.code = code = ResultCodeEnum.NotSuccess; this.message = "操作失败"; } this.status = _status; diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs index 65462da3..e8b1270d 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs @@ -13,20 +13,20 @@ namespace Yi.Framework.WebCore.DbExtend { public static class DbSeedExtend { - public static void UseDbSeedInitService(this IApplicationBuilder app) + public static bool Invoer(ISqlSugarClient _Db) { - - if (Appsettings.appBool("DbSeed_Enabled")) + bool res = false; + var users = SeedFactory.GetUserSeed(); + var roles = SeedFactory.GetRoleSeed(); + var menus = SeedFactory.GetMenuSeed(); + var dicts = SeedFactory.GetDictionarySeed(); + var posts = SeedFactory.GetPostSeed(); + var dictinfos = SeedFactory.GetDictionaryInfoSeed(); + var depts = SeedFactory.GetDeptSeed(); + try { - - var _Db = app.ApplicationServices.GetService(); - var users = SeedFactory.GetUserSeed(); - var roles = SeedFactory.GetRoleSeed(); - var menus = SeedFactory.GetMenuSeed(); - var dicts= SeedFactory.GetDictionarySeed(); - var posts = SeedFactory.GetPostSeed(); - var dictinfos= SeedFactory.GetDictionaryInfoSeed(); - var depts = SeedFactory.GetDeptSeed(); + _Db.AsTenant().BeginTran(); + if (!_Db.Queryable().Any()) { _Db.Insertable(users).ExecuteCommand(); @@ -54,8 +54,6 @@ namespace Yi.Framework.WebCore.DbExtend { _Db.Insertable(dictinfos).ExecuteCommand(); } - - if (!_Db.Queryable().Any()) { _Db.Insertable(depts).ExecuteCommand(); @@ -70,8 +68,27 @@ namespace Yi.Framework.WebCore.DbExtend { _Db.Insertable(SeedFactory.GetRoleMenuSeed(roles, menus)).ExecuteCommand(); } + _Db.AsTenant().CommitTran(); + res = true; + } + catch (Exception ex) + { + _Db.AsTenant().RollbackTran();//数据回滚 + Console.WriteLine(ex); + + } + return res; + } + + public static void UseDbSeedInitService(this IApplicationBuilder app) + { + if (Appsettings.appBool("DbSeed_Enabled")) + { + + var _Db = app.ApplicationServices.GetService(); + Invoer(_Db); } }