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`imgl1sy~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
zcmeI2{Zkx88po$+VcCUccX(%6-WT#lNcM$g*^QV4LP*FfIlUM!%0(b=l8~^FKr}Al
zPCb*;fKgi`2}aF%-itA!!H^fMRC#s3Txr!^l|Ol&b?!n+tGxHBd(CxEPxtgrv;RTz
zL#QwP`A+xqOn1-I!wi3vKKxPos0-{ED{clmE`R@mBh#KL$+mAL+qd?Z-7{%dzO}-ic77Tz
zry23h7|p?G0aEHeg#It|dxZKtK3}aTRO<_r`#fQfH|z~A^Ll(iUqeG@r_a}OsB8W1
z9qSGUx2@^(?%vzJE!x~49O`d)v}@0In~n`e0`-q{w)YHqx3{+(+}zdHcBFepWOHxd
zrVX3xRyS|iy=&|GwINTWuAz3zq4oz_*WXv)+P8OCdvj;s{dHTrf?JLq2p#QeuOH~F
z8)(|o*y#27y}pq`*@*-6OU;G=&1lq0LWGxI%sx|6QW^Dy{r+Y3zB-@B@9po7^sheF
zv)(*^}V92*?pl$n>Jx31@ggToC
z@9XdkZt3n1wy*7v4Ar$hux(fCfuo-Gt-*u)ckerR?9slX2R7~P^n16qg*F9xckN$&
z|Ka^>_iR7f*cd-^qjZg${O3m$(|hHgJG_}Rzb2c>4CsB4GfZYH7N=xI%0xFpcAS(P
zA3IJuawqK`v!e?A>Kn5e-CK(!A#SMhmLjX>TMD}f+;vvYTTtgg>}3N>m|F_=suMwF
zqjjE;oNiWGWXk*O?>oPiwd--$-e@_$<%bEM&b&|uFDcND;$v$ECX4fxKy(Xl{l
zkj{MCk;@t;|J3mxN3LdJNk@L^y+auvfyL0~0i#p@J}V!W-3>H6G}%zbtDBUdnmsKu
zW3uAFSuAu11+d-#+6h=MfB^%TNx*;r))_z>0qX=1r%+7@{)xtzK|sF%`V3$?0eu4K
zHGozEdIiv904)Uc2;g!9m`1?m0=UconhCf}0Ba3kDgkQ+aH#=IA>dL0tTBKl0@euN
z5(6j`aESmeHh_SDiv@6z0h9>1NB|e|;3%5JD(G4$fOsk4Ng=@#FU#ew1p-jbfa?fw
zR|`ND1@KQat=wcxRRZWXfR$uSZUL;MAUyC2>atP*Dkz|JSx&mF5WsQ+SVp=m7r-(K
z!qT%S4P^pQ%77gRaF+@|2?g*^l!ju`Rfzx=QxJZFyDAm{7X#8?MP0cBpojumS5DGZ
zkpMa=2#3*?TuuQfWWY7tRiOYBP(bS{pLA6qfcX@J-f`4bz5wJgpa%i&JORk1fYw!x
z+Lb$30CNmrHW^cn0A^DVmYhRfW(z|(q)zaDh5#7-W36K7(i`%cL<=}0BYO2
zT>w#4Ko%(eiRP8Iy=Mxb%>ZiKyG;Ny44}5XX9!@r0o1nlbOBWB6TFFNW7M{Hs{pD6
z4+m=7yF~!g3|(v6dzt{64WPEYn*}h{0BYNNssN@KKy7(vwk)hp3F;_aQUrW(S5`fwd8la@@~SqZXiQBtC8+N_n8xL(<~
zi4z+(a-wYmC)T%dV%>U9w65dC+Ez}qtmVX-7Mm%m7PGk5<~3YXQ!^)4H*sRsYEGaShk!KwaYlMw3ZV!OF6Nmh7*gIaAMJ7PAptRL{zO%7cAtOsuysgs+tq-
zDo#|oIZ;u`iSi0gl$CR$w2TuarAS2aw8po;xP)tR6?3A<#R+E-CkmaMC@ADaegP-)
z@;Q;4$BCTWD5tV>IFXgj2_=gY4uunT2PZP^oUmnbBE!as^bB1@6>GY#6pNJ;X%Rf8=0r*=Crl}vkm+F&Cm7Ik3l>sl$}Y(+|3jLxYz3hTeCR=2N;O<}7*xW8ugEU5
zHxTT4XaTejfC8tFZUss(f=b@Z+;5K768o773vL
z@xF+RBmgMex)BC{>%tI9>cWop5ddl<2KH
zi`4N|lLQyW-h*G=cs4$9aqiOVa%3pd-+dr_s5jCdK0MIfHv~~lSFHAT;s_|JA)W%_
znSJNN?C4XxrDtEHAK!_@AU;3Bg2;yjM_KaKnk!cw@%IYg0euGL!6Qdm{yFNwd^Ij@
z6uGy5@YCDyr}3BGjlF)Jj=Zb;P=9z=SC=*)h*=%KeURlV2QD9E_k=@wbR-)-J2>AB
z`Sl?1FC$sVnmaund-lcHk6yd|%A2(R1KkG)!hPKbdXIE#Lr{w{GR0O6u_2%;afpRT
z5OV9X_*>_IH;331(8p1M|+)3uTb2anAc;^Z+9
z(n7S&z4iRuGw&sa*w@?Bofx88s*w=AkAb44BtIF%{MF1m@fWVr{HW&cu6^n>K`Vl@
zK8LK@Tu+CW9%FG6M9t353_flv%y^u|O(-?)Bk2ioy9{w#;J(M_i~G&TLA}<08vOEc
zHci#qjYL;=oDI@8LhZi@nU4lzozlhNmi?LZ<&!2GS`l-J}fzytvLiKq-%K|K_Xjy=To0bLYUQWvbEGlSOfJHei
z3$Q4oWdRnYv@F1)gq8(Z6r-|$RE1c%Xjyi$Yo!U{OHJ0xa@rS%5_z
zEeo*7rDXvYIkYUmB0HL^Jw>s~qGbUV3M~t;aL}><3p*_fu*jrk0Twn|7GRM<%K|LY
zX<2}Um6ipAV^Oq#Xjy=p(r8(Lg_)KGSftXj0E-k_7GPnbWdRm4Eeo)qZ${O7EYY$+
zoecOLa=LBXRN5$b*rraeCdCSS#z8TC7uo<{7zaMB$pU{f4hr?AKkH3taLGB|we1{p
znc=B(ph$OJMon3G#x*Ia=&92&)E((K*h^1I#!NeE8)nYEQxK`+Fbh*wfcLa7ah?
zB19XL30^o4och&&r8mj&&Uy62)L!>Cz(o_xg^pbld?ZimO%l90p)aq7sV^tM8xD1a
zpxo$psYx&1@JLzlh6O9$)EM=Sb^Jpf+
znybLA#Z~Wx4_*c8du-H{1D{T4x^k85f2b)Nets2IY$O}VWtnEKEEt&Po4!BITnc=8
zn(yn1?sC9C(xxTedT&?!mv6*A{BZWredzhVOOtls?S1nb(=n)VxvFVtW6jc
z?7yx7^~EY;GIS>X@}(U*v*kK)YZ*?5L)Sr-o~yU7vxHdTr`JKX-UM#2CJS7Igx+-D
z4VK|Fcp{rE#3WkQo}29y_(
znS&qS9Rrc>zK%%uV0`>%D3?Ax0S_UtfPjDpV;3jAI`#7z^7KNfl;9^bz{SQl^^X~F
zM}3%}Hg@pBGd729ut>0T7j9waE-cu&3k!Dc!h)T|E4TZdXKqEYJ44m1RMq{QRr
zcBK&%*`L7nOc$OmBZ_tI{nukBFOW(e7tH8)>MO8ZkGJ06)nv7st0hURU;$aJBZ?*V
z;Ye(JI;qPtuPbeCW_0%2`w1@fEt=L>+Pp6FJR{^?=6PMI_|M>%UQF6o>b$O$dE(;x
zN}1PXntkns*y*u(`tsu(wwUbZ8Zn1*{PM)y#hLi|J6
z9+k+$t+x?=y^ZkeZG>NMBm8>fCncU)Y*HejPf9#CT+qCgqR5A)Qby%oOZ1!g$Fj09
z@3U{>`)}btS$`9M^p;Yc_=dDD5cUU_1%m$2CjND;YTaP4Rwc7;6s&E?8s)onC-ZI)
zyz33!RwlEy3D$MIHHxCGNakHHcw2cdvZ7Bq*w-E2hOnNfb%J%R!CIzTqvXqw1aGV0
zZ83ODlXbgRu&yy!OA@V7eaJ0>x7pw=PW0;5HG;LtV09(2MnlblceTM=l*Aiq60EBX
zR%bHnYRwu&Z{e^9ErOK>Z(%a;DxuqZ4c3BW)|EzURB1GL^OJe+HF}kM4A#74)<(g)
zLbKx6&FYfRP3FBv@P-ZD<|MPO5Ue4CH9MNj8y36`25(j}Ye=x74^9&HH-%a4fpUKB
zO?AI4KO?_1ERWy)c!fOG(Bl%nAHVzYiuwux7leiGyC1LMa{cbdE82_iyC1J;=N4_R
qxcl)+!q$2B;}yJD-2HeZVN#&7E8#;W^6`qBeF~iX;}!e}D)>KV0R@5p
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);
}
}