From 02a7973f4291900ea44100b7ee71e3759d4b128b Mon Sep 17 00:00:00 2001 From: walon Date: Wed, 30 Jun 2021 09:33:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E5=8F=AF?= =?UTF-8?q?=E7=A9=BAbean=E7=9A=84=E6=A0=87=E8=AF=86=E4=B8=B2=E7=94=B1{null?= =?UTF-8?q?}=E6=94=B9=E6=88=90null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/Datas/test/test_null.xlsx | Bin 9188 -> 9180 bytes .../Source/DataCreators/ExcelDataCreator.cs | 2 +- .../DataCreators/ExcelNamedRowDataCreator.cs | 2 +- src/Luban.Job.Cfg/Source/Defs/DefBean.cs | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/Datas/test/test_null.xlsx b/config/Datas/test/test_null.xlsx index 3e79a4e7076849342cf12266c5f28760a9c99b88..df6a02752660dbe0894fbd2f23a07f43739b6598 100644 GIT binary patch delta 2233 zcmZ9OXEYlO7so?FL#)=`6}zHhwpOY(RXZuFEj6lUt=iJq>qQb5^V$%X=VTd0DF`G06hQz@O75( zar1C`>gMKj)7QoM9rC`x5}cu>vW~>}Ls>w7e@rvK*d>M~`VpViqA^ut^sL$a&39X) z&@MF5eWp%D0_L1NQ{CeiEWO{2P@Xj{IM6P58X^qNY3R*UVw7JR0G+ogzd!9Y&e(mO z6fyxqD;tFmM-bbxD#9&?!p+P9ACV!{$9RuDWl}Y z(t{oEVv%-xf8iiHD}oIz?U;J(ZrE-xU-Up6+!z|!j|O*Q zSkscP#~GEBEUQmMFK~D@>~EB1I8_UW1HvDE`NyDBAiRS-2va$Vg9&+hYj|19*60~> zjObl0&9L=C$$570u0@!7>wJP0#E8o$tGsAWfeU36r$@jCAFroyvG&~&NwpQ?qU*95 z@H@Rg$f-Q)&QhqXt6MmSwuI5lp%b-wS&N~>eyQaWWzwBkp(_}!_) zp5PH4dZ=^Jm{o@U`Q*;QTh`8`K0Rv|-0C(FpI5T?EZ?^S@ z>mW9Ek?U3vr>$+@)Fz*V$5)~1Qy9M;rJz;QOKaZd`H%13a0Zol&4!+^jRGaKu!_4b zJ~I&KwmSfS#AxQvl3TP;iQci>@MFm@YG-%o`Uv1}+w+nz2=t&_V4B*s%&Ccuks@S9 z0Tg&Qf!nF*)bS@P9t&iu1yf6tQ+XpC5F(d{V})0z5kp^Z3&k+hyh%hhnNNN|wzMeP zgHeIG1W%JsqImi1teG7okRBy#_>XK9{o)h4f^4`iE@1N@A ztLd(3G8{KND7CU#bM6c!bZ=W;SpW(+Jird0w&qXn(J^^q*Y7T+em46{>E>2S(>%FT zx0>#_Og!4NG;MTQRb-2wW`YpX*}vODz9qo`!TG%=dgu8($oQ79z*O5D#Ov|aU)?#3 z=|V|W=Z$aUyra#uX5NkoPLk&}3?bTzFB_a{GcgW%xTLqiFEBAMcytJ{Fzj~A4Q4cB`#bqjByPAD@28B&N=ojWz(AERZMk55fuskP=(w8FK>YxeFIkpo{o z!3OaX=G?4)Ms2pF-ly~64~y+ctK9NlDbX+Txv|G-IYjdK?MK|cgk!R64Ob?$wc%Z! zHiNEH4c(|X^;@oNQE>t8uUHdnpq27MXCuWJLF&=Wj?w5p!fWeXC%@k(@3NwlZSL6aE1@m>txG(Z_>uq$*?vu z+TU0?bPe5h#&un8h4o(1nNH8jS}!#Hno&67H^RQPZBTSC+JI|sq5RbZAK&l*y%QjX{n?_fSy0%Re?AWe!c0a2?iVYf;eUVL#o$sP7paP54+f4c^yB;WU{%#$y9jcq zxP3d3a;}-U{jL{nCAvtshR@3ZyQg~M$wpPlw?4C+m;EdG<#E0UQXT~b42N%zo!ELYIo@9XwXtx zp{V7{3ge|Mnf}LePX}ucJ6jVkkLRw>JbwW_f4p56D9J#%(7d1+wmxk?8>6jboUgIF za+mk|rhYTVw#MGRKqJtH|Bz}>k`Zx{ZaujDI`5>bgAX76sRkH6xym=%*Ks<#KgTb^ zVi1~;KH5RS{&M@U8y<@;O_}Ntk#ebD3GQ0R@f;NND;e<^S7QDLm=J}_d+ak8 zs*hkOMvMr^`T!jZcO{oDEY?1<(+x*GgvGHuE396*xAr7f!5){|uBzdY?r4&9lwP6s z>ZK;B{|6p&?uTwJfJ z)bel%k)e(5b;6m#i4-KYzJSd9@RHmu6*~hukRlUN)#E*Lri{RtD`~!N&e0C>(|1Sy zc)Kxmc_7p=Pok>A)f?lWY6!BZtNGka?ox^jjD@Z?rhIrV%d`fj6CcF&X6sm$J7aj(fa z>go@ZGeWRGJL*49b3|Rh4NuXus*gcV1CID5^XZ(5#o@}%Zok*Cg55YAONy zxt;`u{owqKx;P#^Al1J=0)CNCpX?Y9hl+Fli@z%X0NbV4{sau~3)LWt!M8$H$k_2D x=ylHj_vN47b-V(oB8=EHTiyN{{={H4GsVR delta 2207 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 diff --git a/src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs index 769afe8..a121ebc 100644 --- a/src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs @@ -354,7 +354,7 @@ namespace Luban.Job.Cfg.DataCreators } else if (subType != DefBean.BEAN_NOT_NULL_STR) { - throw new Exception($"type:{type.Bean.FullName} 可空标识 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})"); + throw new Exception($"type:{type.Bean.FullName} 可空标识:{subType} 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})"); } } return new DBean(originBean, originBean, CreateBeanFields(originBean, x, ass)); diff --git a/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs index c8f93f0..576ccd6 100644 --- a/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs @@ -210,7 +210,7 @@ namespace Luban.Job.Cfg.DataCreators } else if (subType != DefBean.BEAN_NOT_NULL_STR) { - throw new Exception($"type:{type.Bean.FullName} {DefBean.TYPE_NAME_KEY} 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})"); + throw new Exception($"type:{type.Bean.FullName} {DefBean.TYPE_NAME_KEY}:{subType} 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})"); } } diff --git a/src/Luban.Job.Cfg/Source/Defs/DefBean.cs b/src/Luban.Job.Cfg/Source/Defs/DefBean.cs index 0f2fd48..8413894 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefBean.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefBean.cs @@ -12,7 +12,7 @@ namespace Luban.Job.Cfg.Defs { public const string TYPE_NAME_KEY = "__type__"; - public const string BEAN_NULL_STR = "{null}"; + public const string BEAN_NULL_STR = "null"; public const string BEAN_NOT_NULL_STR = "{}";