From 8b88f7314eba1937b37d6fd4aeecf75dcb4f2009 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Mon, 8 Feb 2021 11:58:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=20AttachmentSDK=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E6=96=B0=E7=9A=84=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=202.=20Seata=20starter=20=E8=B0=83=E6=95=B4=E4=BA=86=20seata?= =?UTF-8?q?=E5=8C=85=E7=89=88=E6=9C=AC=EF=BC=8C=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mall-ebtp-cloud-attachment-sdk/bin/pom.xml | 64 ++++++++ .../attachment/sdk/api/AttachmentClient.class | Bin 0 -> 2466 bytes .../sdk/api/DefaultAttachmentClient.class | Bin 0 -> 8393 bytes .../sdk/config/FeignSupportConfig.class | Bin 0 -> 939 bytes .../sdk/config/SDKAutoConfiguration.class | Bin 0 -> 1381 bytes .../sdk/convertor/FileConvertor.class | Bin 0 -> 3177 bytes .../sdk/fallback/QueryServiceFallback.class | Bin 0 -> 3772 bytes .../sdk/model/AttachmentDetail.class | Bin 0 -> 1170 bytes .../sdk/model/AttachmentEntity.class | Bin 0 -> 5125 bytes .../sdk/model/FeedbackMessage.class | Bin 0 -> 4587 bytes .../attachment/sdk/model/Snowflake.class | Bin 0 -> 3077 bytes .../attachment/sdk/model/UploadObject.class | Bin 0 -> 3310 bytes .../attachment/sdk/param/QueryParameter.class | Bin 0 -> 4401 bytes .../attachment/sdk/service/QueryService.class | Bin 0 -> 3442 bytes .../main/resources/META-INF/spring.factories | 3 + .../attachment-sdk-cofiguration.properties | 2 + .../attachment/sdk/api/AttachmentClient.java | 35 +++- .../sdk/api/DefaultAttachmentClient.java | 91 +++++++++-- .../sdk/config/FeignSupportConfig.java | 8 + .../sdk/convertor/ModelConvertor.java | 47 +++++- .../DocumentCenterServiceFallback.java | 5 + .../attachment/sdk/model/DownloadEntity.java | 13 ++ .../sdk/service/DocumentCenterService.java | 11 +- .../attachment/sdk/service/QueryService.java | 3 +- .../sdk/vo/{down => }/SysStorageVO.java | 2 +- .../sdk/vo/down/DownStreamData.java | 2 + .../sdk/vo/upload/UploadStream.java | 15 ++ .../sdk/vo/upload/UploadStreamData.java | 12 ++ mall-ebtp-cloud-redis-starter/pom.xml | 6 - mall-ebtp-cloud-seata-starter/pom.xml | 18 +-- .../src/main/resources/file.conf | 7 +- .../resources/seata-configuration.properties | 5 + .../security/starter/entity/SecurityUser.java | 152 ++++++++++++++++++ .../mall/ebtp/common/base/package-info.java | 1 + .../impl/BaseCacheUserServiceImpl.java | 117 +++++++++----- .../mall/ebtp/common/config/FeignConfig.java | 19 +-- uboot-core/pom.xml | 6 +- uboot-core/src/main/resources/file.conf | 66 -------- uboot-core/src/main/resources/seata.conf | 21 --- 39 files changed, 540 insertions(+), 191 deletions(-) create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/pom.xml create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/SDKAutoConfiguration.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/QueryServiceFallback.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentDetail.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentEntity.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/FeedbackMessage.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/Snowflake.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/UploadObject.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/param/QueryParameter.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/QueryService.class create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/META-INF/spring.factories create mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/attachment-sdk-cofiguration.properties create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/DownloadEntity.java rename mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/{down => }/SysStorageVO.java (79%) create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStream.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStreamData.java create mode 100644 mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityUser.java create mode 100644 uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/package-info.java delete mode 100644 uboot-core/src/main/resources/file.conf delete mode 100644 uboot-core/src/main/resources/seata.conf diff --git a/mall-ebtp-cloud-attachment-sdk/bin/pom.xml b/mall-ebtp-cloud-attachment-sdk/bin/pom.xml new file mode 100644 index 0000000..3c48c2d --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/bin/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + com.chinaunicom.ebtp + mall-ebtp-cloud-attachment-sdk + 0.0.1 + + + com.chinaunicom.ebtp + mall-ebtp-cloud-parent + 0.0.1 + ../mall-ebtp-cloud-parent + + + + + com.chinaunicom.ebtp + mall-ebtp-cloud-mvc-starter + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + io.github.openfeign + feign-okhttp + + + org.projectlombok + lombok + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + nexus-aliyun + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public + + + + + + ettp-host-release + Install to ettp center + http://zentao.jlcucc.com:60000/repository/ettp-releases/ + + + + diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.class b/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.class new file mode 100644 index 0000000000000000000000000000000000000000..4a448ba2207bf431a757786378778dc206824641 GIT binary patch literal 2466 zcmcguTTj$L6h2j;%gW6a5ENy^+oIUwl|(iqE@DDbC5B64c$#g8-GS~*ZKvq|G80Yo z-5+H<)9$5?|k#knalSdpT7dY3aprL&VaX3=-PG4g?&hmsqM~#-2@;qHe9ugt8;=$fg0eU$kB8KF5Fw0|rbaXg(EHd#iHDTxCG6 z7TJ_DB6ZsQB~!GgPFYlkN9vTq+bZP!XSX2~SB?Kzx}VeN zC)RG@OX~ghIOtle)4Svq9tEd}dd5cTFR!yGmWLdSj=&g<8!%LAp21T^r*rD2D69HZ z9(TB4Z{m7|g*y}vS_2A>bg92bL$2+nbF|7-IgT(liZ(q1Mv9A0OMq1ahPQcDP!)$b zelim(IeJH~u3^f=0iML=Mi!({bo9Pi?SfiPoh7G9axD`sIVZPe0zH;Or)#g-O%_|D zyP%6b+*!zUFC~z(p8OzmL+M6{x@ph!g4r+YNls^nl^Y#KLvhlc2H@aC5=R4PriO!& zUe8d;$@Wk}Z?2Wv6luTQHPNL%gnOXnw`Cli7ajf%w$wDd2HLvS74trk3@%+%OFs+%>Y;mb8f%~w++M=?=*IDT4`R>S~ zCveCeU zW9+gqb~!S3xo7M$8oP|fK1W@j2NY*cTTDAms!=ijp^cVJDn|RF9wEzSzU6-b6VF(* z+P=~>QX+inFk>=W=d`ol-D05@-slB=)yM+f9}zTV7SPipa#M*GQ(Gwpq1va6>a8{} z78Wrje2E1iL(Zg#`3K#jp3qhpXo?|;Ic2n&$QQE7l`x^t>Va0w!L;DI>AQ4ifhdP< z&u4DQ_GRM&UDHaK-};v3_rIHs!+2ES*M-NQJf!PyO0!~vwy+f!-(|NHuY9!d!NS%; z7zoLOV1zSR7t-wmwnd<8@%rbUya8hP-F9Eb02YqWGzi;VVZ)FZxS^wcMPuR8EENF_ zrOQzTM)o?6;I(P7N$E0OG5HWnQ6^0nh!rPP77N|BmXUqQZkZvvy1|taF3%Eco8HRO zx-$=qFRCNdljJAvc2?=bH!Q^MSDKOEOhfhPvv+K+vRvByRS4E)iPH-iCS4w$YvwI96=6dME33!8$>d4);b0!&H z&Q*7Y)Hw_f7{EI5^l|4N5L3Ej8$MX=%cqO+!&=8-bBW=kZ(?>9`Q~jxe*O=AlZz)l zBfhD-&mw`BlBXkm#}fojr6uV71(T3v0)LI%>A5m&Kus=Shv+YqlrqF~d(+Lk(0vy)^e%AZSw{5f({CTEdR*K%~PXJmQj>wpAHAaJG=4BK7s z{z6~Py)a-nC0;%zp!IhlrV!WP;F@|#S%+IG_T*`s*CcM?fC}m*GreIvnf$>ga z9Tze%-c7-{kprXhm>BnRU|fXvy0&^hbsdMg{`eqe9XuDthh2=1QZdH67?)EpHZw5} n!6&F;46a1li+EMV`x<^$@iT)@KZVa=9v0ymd=AU-6|DRNvL1)! literal 0 HcmV?d00001 diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.class b/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..017c40533953290615d2961c359325e6a7c80bd6 GIT binary patch literal 939 zcmcIj!EO^V5FMA$BugMAP$hlL~wMx&SqM#z4F>o`zQPf z5=e08qY&d=P=b0x;xhJl-agNJH} zajzD>qO#VR)HdXq@LtGOsf^F+{F2~iiA8p*urRYwRo3~F=BNuD273*q7N*GFE-sYx z40fNRLH~lmt?|*ELFdHgstbJv!wvS8bJq3X4r8C*8>eck*DB}KO@&%`w1!vCF0?A^ zXFTbjuN2Rf)WQ*{67o_MiXRd>-O`ap9ck2&HagOcj+Atyt&T&UTUB#oJuiiqEAEL~ zT~*ZiHa9s&RA|!JGJX0lH?@6Z86D%+6jLg{4N-er8+ZftdSag87I$!8dRr)&p?6eA|$_b3ip6x@eVQ-9FJhp literal 0 HcmV?d00001 diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/SDKAutoConfiguration.class b/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/SDKAutoConfiguration.class new file mode 100644 index 0000000000000000000000000000000000000000..4b0c2e1af32268b6da9243e165abe1d04536f933 GIT binary patch literal 1381 zcmcgsO-~d-5UoaFVO&{UK|}P=a)Qgug~UXR30WZ_j!Il4>aDk@cekOZd+d*m`^!u; z(Yyb~KVYn$!LURU5)(a4e^kAGT~qa{zyJLF6#yQ=gBHvYc#4CQHYe zt81Ao?`wt?J`i%GdrG3<+%*S!C=a6%*vGP8gFUjQ64p=qCRi@60Uwr?l3aS~0v-dNg*dTTpMD(FHCrH(Q}53X5Ieioh57s2`HK@`OpvE&W$3}uqQ65MLT0;~{N z-^wqVqS5qjY?@Av3@<}D5cW7`i9k0uoT(FLW!#?|=lxhZ0`K#G)#JMak|u=**dzot zu6hV+`4YJQI%qFTai}NKNepr?_GaD97-J{Dqzxoq%l}jWn%e{B#8K0J=jUe1j)2wt za&ghLFkvbPcnJ9D;L`^?U!7*YYeig@dgM!=8 Wt^IfEaShgSUO|q#IN!r>1K<~%^S*Te literal 0 HcmV?d00001 diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.class b/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.class new file mode 100644 index 0000000000000000000000000000000000000000..609f14dbed5612dc0a559d540c51cf210314a932 GIT binary patch literal 3177 zcmeHJ&rcLF6n!8v4vy7Ib4St#86zgv&jyt0|7w)=HP)3YlDdCp9-J+T$TbUlI{9 zE0m;(R_%z#<^`>kTU}1=LBgpc@Z4fvtE<%~h6oxkDV3#dPJ28aZCEM{6*3eWU5XBH zs>3yx0WQ+fD#rfD6z4+f1ralbcJRkczEH?<$W0|I*k#+CE}>gqpIn}k%X4y}G0No~ z%jKb5-jQ5OG*sMB=UvQf(4`jtgYPHkQa?TJ4YCR8WqLJ2iQob!h% zy?vTr=MHJaNhAVcsYw&AF)*dEIt?%fXddRZWfx(o40%UL7gace-z<%6KiZ?~sj+Sb zQItuy{W)`|TFqH}rs$2-j!N9vSlthJl2w(H#iC!@6&1(0)8p*MI9QZH$YHVH??X@9bKblE zMBfUOV5$n2;VOZ-TJ!h-$+fJz17^C3x%D=U+g!KYi9lessR9;lF)dvGaB#wQg(0xj z{1<0o9o?{MAQ%YD*P3oO>&wl7iFyfc67p+=b8oENPS27P0p<>jPB2LFxT$3rv=v;Y40$6o;O5o}p7L*R#0`EJC7 zbRV)dbNx7S{g#j{lfr!SrcQ7<3|&8rv%qCqGrtvasogXOqUsfcqg+D3qW+?1IqzAy?jlNJrD?2=sL!N1 zxyfmd^^=OADrG3og2-L;bu2N^3dm3$Q$}?s;dXT=NN30V|&!!~~6qrc>uiLm78t|`A^ibY%-&pj6T=TKpr z^S~6OU7n_<2%HV-#ii7DF-%0ll-?F$8Qg?s+MlAyC&99z0+;4t4lWZ|sdQ&aUhK2*0aL<^PbOz|OQZyT@}AzU(I9Z?h-=J>W0Ms-0gh{R zub(Bje(k#qLp$O-vMo}9+HIPe*}WD}Ios>`p;3XC2>d+31=8D55-)uv&XyyvHm>0T z)~XRL7m#CKpYmKGaI?rY-gr7Ar&kF4Iz3L~2b@iPo{KDILgktTrLh*9iPGJ)&dy zC61hK?ZYGu;z!b0V5_qw&RmK8yIC&!ymbSnAHb0L!>@ zftc0PPCyt^ipEFgOIR!nISdXK+2&^yLEVl?kw4g|$*_T7Z3Z0_=6T zaSFDve6IIK0ruJi*f-(zQ?Lg%sTE*voPuqmy^VKsi@$MB^!fzov+yRKGXrn+qvdTJ dJNN)>;O?Q`!n45C{~-j-8Wp&$-t(U%q}k0)R(wKY|*8uCqKXnAGVm+h-{^ zMapxjS*2xo7DHd+Yo$`IOf^cG_l)O-&^~pey|geRq0*-(n;XJ2sUoNon4j<|rpM{4 z;jZ8wx16w&se!Og8r|RCAV8iIXssLVJkx%_R3&EKA09n^XWkqVm|c}x`ZWUQmLCiV z)Ymau1Q!UjPq{a(HMRlsguLx*E1XgLVnk7TDHZb=hL+Y0l_=a38qf7|K}UisW)V~} zzQ@LbE+INOV>$_@lVCcTm`+YjCulmEm|mhIBOKMn(}H=PQ;*c*b%{pLQe$?JN$Mmh zPW~#;RJANhV?CYFR9-5|nGV5+f_``X2f!`na?da=KcS)CP)7YhDdM@Vw^EOP1IncH zzlOxnf=&}+xI|!KIXkW1lz$~ux1C8XURK3W*j`XZppzMnr-k8}!S(TG-RIH~=x6`o z+^!IayQZ>SJd;7d!jA`gQbhuDT{+gwR~9igJIUp0c5EjL8Cm_e3OBWv{$OPdFBG<| zIra=j!A9JY!ZOSAg9z@Rwi7uKQ0$o?C4wbvrl~jr%@@)+tZEM{>|hbFz3_iP;0DaV zEY1%Qa1ZYWGTw%}u=owKvSpkA literal 0 HcmV?d00001 diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentEntity.class b/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..0dc8dd48bba1d5366b9118c73103ff93dff40858 GIT binary patch literal 5125 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 literal 0 HcmV?d00001 diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/UploadObject.class b/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/UploadObject.class new file mode 100644 index 0000000000000000000000000000000000000000..fb762ac6bd5324cb08c08bfbf3caadc42dcc0168 GIT binary patch literal 3310 zcmeHJTW{P%6h5;_b~j5(+cf3YLZ;!i3&Q3B35g=43W^jdC4#0w@HT5t;%V#|Gc#V% z-@p$-0tqA@`B8{(?4;|UCAHE>dFjJ?=X!2)&i9?a|M~3?BKnj*9#D_buCqy82&Lo4 zVkY9m6mgO%Eh??TSWbP3?L3c@+*D~SycbDUNbO^n9>s-8Wgb5&b0gB->0_Dr0WCAS zR?EtTK8%}HMm?1>THl#(JoHxS!@G=D4yE75=EiukX#3W8mG-KT+j^#)n&$GJ*2W93 zjCPD}x35%XX{B@D3#%d81=%x^SCY~4moRidFEhG2x8T0D#t!KkTlwXY#zm9QWXj=n zsq$JrFRg*X!hOa^tKl9`L{QGBl0QA~4Hw)$DdmeJmmZfUr=Iajoep()?M`w!9qOQL zFO$5GJ~K#Aq3{1xiG19Y)`TBeQ*e(1Aq#oC7?Gt1(mIYD4f}<14u#R2Yi@T++LrRV zR>$Yn*+k=Vbhezxgv$aTzz=h~maC!!3;^^{>aHrKts~vM$EADY zO%v7&@@5;pszmw5QNW>g-d2f67@CxU9_4tYQ+c4YOe6jvgiHS1T+5$urDx_yasi~w zq-{$Wt$ro^Gf;FyS7?2WZqNp!{^v?7{{^F)<2KGW%rV&qn(x4bZ>nM{?VbQs2Z}L? z$oGX+VSc>0>@x+j_;%-l$qo#&`Coe4LlK^$s1?`nn_T3>g)E(SO}Ji#9fPYQ|A(s;6sg_B&Y7xstrK4X8KZA;Cqt=ha8 zfC&OqndHKP(MypWi9^Y^K> zNRjMlb=snlSdgT26tFxxm!i>Xuo_TftmnBYrsik?lXX3HFGvC%ZxDk0P_#=i}CAYzC<7W3-m_BM*si- literal 0 HcmV?d00001 diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/param/QueryParameter.class b/mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/param/QueryParameter.class new file mode 100644 index 0000000000000000000000000000000000000000..9974aa12158468340a75bdea9ed5e7e7e2b017ee GIT binary patch literal 4401 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 VaBab%_sOFV>0|m7e_3DB-k+@OK`{UT literal 0 HcmV?d00001 diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..f11530a --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.ebtp.mall.cloud.attachment.sdk.config.SDKAutoConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/attachment-sdk-cofiguration.properties b/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/attachment-sdk-cofiguration.properties new file mode 100644 index 0000000..580e33b --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/attachment-sdk-cofiguration.properties @@ -0,0 +1,2 @@ +ribbon.ReadTimeout=1800000 +ribbon.SocketTimeout=1800000 diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.java index 633d83a..409e954 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.java @@ -6,6 +6,7 @@ import java.util.Optional; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentDetail; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.DownloadEntity; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.UploadObject; /** @@ -44,6 +45,14 @@ public interface AttachmentClient { */ Optional downloadFilesByBusinessId(String businessId); + /** + * 下载业务ID下的所有资源 + * + * @param bid + * @return + */ + Optional downloadOriginalFilesByBusinessId(String businessId); + /** * 下载指定的资源数据 * @@ -52,7 +61,15 @@ public interface AttachmentClient { * @return */ Optional downloadFileByObjectId(String objectId); - + + /** + * 下载指定的资源数据 + * + * @param bid + * @param oid + * @return + */ + Optional downloadOriginalFileByObjectId(String objectId); /** * 上传资源文件 @@ -62,8 +79,6 @@ public interface AttachmentClient { * @return */ Optional upload(String businessId, File file); - - /** * 上传资源文件 @@ -74,4 +89,18 @@ public interface AttachmentClient { */ Optional upload(String businessId, String filename, byte[] array); + /** + * 根据业务id删除附件 + * + * @param businessId + */ + boolean deleteByBid(String businessId); + + /** + * 根据对象id删除附件 + * + * @param objectId + */ + String deleteByOid(String objectId); + } diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java index a6582f0..2728137 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Optional; +import java.util.UUID; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -17,6 +18,7 @@ import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor.FileConvertor; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor.ModelConvertor; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentDetail; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.DownloadEntity; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.UploadObject; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.service.DocumentCenterService; @@ -42,6 +44,16 @@ public class DefaultAttachmentClient implements AttachmentClient { /* 文件转换器 */ private @Autowired FileConvertor fileConvertor; + /** + * 生成业务id + * + * @return + */ + @Override + public Optional getBusinessId() { + return Optional.of(String.format("{\"id\":\"%s\"}", IdUtil.getSnowflake(23, 16).nextIdStr())); + } + /** * 根据业务id列表查询详单 * @@ -66,16 +78,6 @@ public class DefaultAttachmentClient implements AttachmentClient { return Optional.ofNullable(detail); } - /** - * 生成业务id - * - * @return - */ - @Override - public Optional getBusinessId() { - return Optional.of(String.format("{\"id\":\"%s\"}", IdUtil.getSnowflake(23, 16).nextIdStr())); - } - /** * 查询指定Id文件的详细信息 * @@ -121,7 +123,7 @@ public class DefaultAttachmentClient implements AttachmentClient { try (ZipOutputStream zout = new ZipOutputStream(out)) { list.stream().forEach(data -> { try { - zout.putNextEntry(new ZipEntry(data.getId() + data.getFilename()));// 文件项名称 + zout.putNextEntry(new ZipEntry(data.getFilename()));// 文件项名称 zout.write(downloadFileByObjectId(data.getId()).get());// 文件数据流 } catch (IOException e) { log.error(e.getMessage()); @@ -137,6 +139,45 @@ public class DefaultAttachmentClient implements AttachmentClient { return Optional.empty(); } + @Override + public Optional downloadOriginalFilesByBusinessId(String businessId) { + Optional op = findByBusinessId(Arrays.asList(businessId)); + + if (op.isPresent()) { + List list = op.get().get(businessId); + + // 如果业务id下只包含单独一个文件，则直接返回该文件数据 + if (list.size() == 1) { + return downloadOriginalFileByObjectId(list.get(0).getId()); + } + // 如果大于1个则下载返回压缩包数据流 + else if (list.size() > 1) { + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + try (ZipOutputStream zout = new ZipOutputStream(out)) { + list.stream().forEach(data -> { + try { + zout.putNextEntry(new ZipEntry(data.getFilename()));// 文件项名称 + zout.write(downloadFileByObjectId(data.getId()).get());// 文件数据流 + } catch (IOException e) { + log.error(e.getMessage()); + } + }); + } + return Optional.ofNullable(new DownloadEntity() + .setFilename(String.format("%s.zip", UUID.randomUUID())).setStream(out.toByteArray())); + } catch (IOException e) { + log.error(e.getMessage()); + } + } + } + return Optional.empty(); + } + + @Override + public Optional downloadOriginalFileByObjectId(String objectId) { + return modelConvertor.toDownloadEntity(documentCenterService.getObjectDetail(objectId)); + } + /** * 文件上传 * @@ -150,7 +191,7 @@ public class DefaultAttachmentClient implements AttachmentClient { log.debug(res); - return Optional.empty(); + return modelConvertor.toUploadObject(res); } @Override @@ -160,7 +201,31 @@ public class DefaultAttachmentClient implements AttachmentClient { log.debug(res); - return Optional.empty(); + return modelConvertor.toUploadObject(res); + } + + @Override + public boolean deleteByBid(String businessId) { + Optional op = findByBusinessId(Arrays.asList(businessId)); + + /* + * AttachmentDetail 是一个Map类型对象， key 业务id， value： List + */ + op.ifPresent(attachmentDetail -> { + attachmentDetail.keySet().stream().forEach(key -> { + List list = attachmentDetail.get(key); + + list.stream().forEach(attachmentEntity -> { + documentCenterService.deleteByOid(attachmentEntity.getId()); + }); + }); + }); + return op.isPresent(); + } + + @Override + public String deleteByOid(String objectId) { + return documentCenterService.deleteByOid(objectId); } } diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.java new file mode 100644 index 0000000..c44c3d9 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.java @@ -0,0 +1,8 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.config; + +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeignSupportConfig { + +} \ No newline at end of file diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java index 0ba21df..bc0c436 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java @@ -1,16 +1,23 @@ package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor; +import java.nio.charset.Charset; +import java.util.List; import java.util.Optional; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.DownloadEntity; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.UploadObject; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.SysStorageVO; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down.DownStream; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down.SysStorageVO; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.query.QueryResult; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.upload.UploadStream; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.upload.UploadStreamData; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; +import cn.hutool.core.net.URLEncoder; import lombok.extern.slf4j.Slf4j; /** @@ -39,7 +46,7 @@ public class ModelConvertor { AttachmentEntity entity = null; try { - SysStorageVO vo = toSysStorageVO(json); + SysStorageVO vo = tpDownPO(json); log.debug("convert to model: {}", vo); entity = new AttachmentEntity(); @@ -72,13 +79,36 @@ public class ModelConvertor { byte[] array = null; try { - array = toSysStorageVO(json).getFileStream(); + array = tpDownPO(json).getFileStream(); } catch (JsonProcessingException e) { log.error(e.getMessage()); } return Optional.ofNullable(array); } + public Optional toDownloadEntity(String json) { + DownloadEntity entity = new DownloadEntity(); + try { + SysStorageVO vo = tpDownPO(json); + entity.setFilename(URLEncoder.DEFAULT.encode(vo.getOriginalName(), Charset.forName("UTF-8"))) + .setStream(vo.getFileStream()); + } catch (JsonMappingException e) { + e.printStackTrace(); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return Optional.ofNullable(entity); + } + + public Optional toUploadObject(String json) { + try { + return Optional.ofNullable(new UploadObject().setId(toUploadPO(json).getFileId())); + } catch (JsonProcessingException e) { + log.error(e.getMessage()); + } + return Optional.empty(); + } + /////////////////////////////////////////////////////////////////////////// private /////////////////////////////////////////////////////////////////////////// method /** @@ -89,9 +119,18 @@ public class ModelConvertor { * @throws JsonMappingException * @throws JsonProcessingException */ - private SysStorageVO toSysStorageVO(String json) throws JsonMappingException, JsonProcessingException { + private SysStorageVO tpDownPO(String json) throws JsonMappingException, JsonProcessingException { log.debug("current convertor json is: {}", json); return objectMapper.readValue(json, DownStream.class).getData().getSysStorageVO(); } + private SysStorageVO toUploadPO(String json) throws JsonMappingException, JsonProcessingException { + log.debug("current convertor json is: {}", json); + List list = objectMapper.readValue(json, UploadStream.class).getData(); + + if (list.size() > 0) { + return list.get(0).getSysStorageVO(); + } + return null; + } } diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java index e207c3b..0946b94 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java @@ -25,4 +25,9 @@ public class DocumentCenterServiceFallback implements DocumentCenterService { return null; } + @Override + public String deleteByOid(String fileId) { + return null; + } + } diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/DownloadEntity.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/DownloadEntity.java new file mode 100644 index 0000000..4355c85 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/DownloadEntity.java @@ -0,0 +1,13 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class DownloadEntity { + + private String filename; + private byte[] stream; + +} diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/DocumentCenterService.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/DocumentCenterService.java index ad63675..bc175f8 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/DocumentCenterService.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/DocumentCenterService.java @@ -27,7 +27,7 @@ public interface DocumentCenterService { * @param fileId * @return */ - @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadAllStream") + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadFileAllStream") String getObjectDetail(@RequestParam("fileId") String fileId); /** @@ -48,4 +48,13 @@ public interface DocumentCenterService { String upload(@RequestPart("appCode") String appCode, @RequestPart("objectId") String objectId, @RequestPart("multipartFiles") MultipartFile multipartFiles); + /** + * 删除附件信息 + * + * @param fileId + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/disk") + String deleteByOid(@RequestParam("fileId") String fileId); + } diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/QueryService.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/QueryService.java index b3eedb9..caf06a4 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/QueryService.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/QueryService.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.config.FeignSupportConfig; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.fallback.QueryServiceFallback; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentDetail; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; @@ -17,7 +18,7 @@ import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.FeedbackMessage; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.Snowflake; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.param.QueryParameter; -@FeignClient(value = "core-service-ebtp-updownload", fallback = QueryServiceFallback.class) +@FeignClient(value = "core-service-ebtp-updownload", configuration = FeignSupportConfig.class, fallback = QueryServiceFallback.class) public interface QueryService { @RequestMapping(method = RequestMethod.GET, value = "v1/business/id") diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/SysStorageVO.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/SysStorageVO.java similarity index 79% rename from mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/SysStorageVO.java rename to mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/SysStorageVO.java index 8b76485..94ab1ec 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/SysStorageVO.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/SysStorageVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down; +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo; import lombok.Data; diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStreamData.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStreamData.java index 2449d26..1ef26ef 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStreamData.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStreamData.java @@ -1,5 +1,7 @@ package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.SysStorageVO; + import lombok.Data; @Data diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStream.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStream.java new file mode 100644 index 0000000..ca0b017 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStream.java @@ -0,0 +1,15 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.upload; + +import java.util.List; + +import lombok.Data; + +@Data +public class UploadStream { + + private Integer code; + private Boolean success; + private String message; + private List data; + +} diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStreamData.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStreamData.java new file mode 100644 index 0000000..85f6cb6 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/upload/UploadStreamData.java @@ -0,0 +1,12 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.upload; + +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.SysStorageVO; + +import lombok.Data; + +@Data +public class UploadStreamData { + + private SysStorageVO sysStorageVO; + +} diff --git a/mall-ebtp-cloud-redis-starter/pom.xml b/mall-ebtp-cloud-redis-starter/pom.xml index 32af5e3..8b3bd52 100644 --- a/mall-ebtp-cloud-redis-starter/pom.xml +++ b/mall-ebtp-cloud-redis-starter/pom.xml @@ -20,7 +20,6 @@ 2.7.0 3.1.0 3.11.4 - 4.6.10 @@ -47,10 +46,5 @@ org.apache.commons commons-pool2 - - cn.hutool - hutool-json - ${hutool-json.version} - diff --git a/mall-ebtp-cloud-seata-starter/pom.xml b/mall-ebtp-cloud-seata-starter/pom.xml index 5ac523e..e73cc8c 100644 --- a/mall-ebtp-cloud-seata-starter/pom.xml +++ b/mall-ebtp-cloud-seata-starter/pom.xml @@ -21,25 +21,9 @@ - - com.chinaunicom.ebtp - mall-ebtp-cloud-jpa-starter - - - com.alibaba.cloud - spring-cloud-alibaba-seata - 2.1.0.RELEASE - - - seata-all - io.seata - - - io.seata - seata-all - ${seata.version} + seata-spring-boot-starter diff --git a/mall-ebtp-cloud-seata-starter/src/main/resources/file.conf b/mall-ebtp-cloud-seata-starter/src/main/resources/file.conf index 7de3b26..e731bfb 100644 --- a/mall-ebtp-cloud-seata-starter/src/main/resources/file.conf +++ b/mall-ebtp-cloud-seata-starter/src/main/resources/file.conf @@ -31,7 +31,7 @@ transport { service { #transaction service group mapping - vgroupMapping.biz-service-ebtp-archive-fescar-service-group = "default" + vgroupMapping.biz-service-ebtp-project-service-group = "default" #only support when registry.type=file, please don't set multiple addresses default.grouplist = "10.242.31.158:18035" #degrade, current not support @@ -64,4 +64,9 @@ client { log { exceptionRate = 100 } + support { + spring { + datasource-autoproxy = true + } + } } \ No newline at end of file diff --git a/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties b/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties index e69de29..9b87cab 100644 --- a/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties +++ b/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties @@ -0,0 +1,5 @@ +seata.enabled=true +seata.application-id=${spring.application.name} +seata.tx-service-group=${spring.application.name}-service-group +seata.service.vgroup-mapping.eshop-service-group=default +seata.service.grouplist.default=10.242.31.158:18035 diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityUser.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityUser.java new file mode 100644 index 0000000..628fbf3 --- /dev/null +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityUser.java @@ -0,0 +1,152 @@ +package com.chinaunicom.mall.ebtp.cloud.security.starter.entity; + +import java.util.Date; +import java.util.List; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 缓存用户实体映射类 + * + * @author daixc + * @date 2020/10/16 + * @version 1.0 + */ +@Data +@Accessors(chain = true) +public class SecurityUser { + + /** + * PKID + */ + private String userId; + + /** + * 姓名 + */ + private String lastName; + /** + * 姓氏 + */ + private String firstName; + /** + * 全名 + */ + private String fullName; + + /** + * 电子邮件 + */ + private String emailAddress; + // + /** + * 用户名 + */ + private String loginName; + // + /** + * 手机号 + */ + private String mobilePhone; + /** + * 办公号 + */ + private String officePhone; + + /** + * 性别 + */ + private String sex; + + /** + * 员工类别 + */ + private String employeeCategory; + + /** + * 用户类型 + */ + private String userType; + + /** + * 出生日期 + */ + private Date dateOfBirth; + + /** + * 年龄 + */ + private Integer age; + + /** + * 员工编号 + */ + private String employeeNumber; + + /** + * 国籍ID + */ + private String nationalityId; + + /** + * 国籍 + */ + private String nationality; + + /** + * 身份证号码 + */ + private String nationalIdentifier; + + /** + * 主管ID + */ + private Integer supervisorId; + + /** + * 组织ID + */ + private String organizationId; + + /** + * 组织名称 + */ + private String organizationName; + // + /** + * 组织机构类别 + */ + private String orgCategory; + + /** + * 部门ID + */ + private String deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 角色ID + */ + private String roleIds; + + /** + * 业务组id + */ + private Integer bussiGroupId; + + /** + * 职位ID + */ + private Integer positionId; + + /** + * 用户角色列表 + */ + private List authorityList; + +} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/package-info.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/package-info.java new file mode 100644 index 0000000..29bc1ac --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/package-info.java @@ -0,0 +1 @@ +package com.chinaunicom.mall.ebtp.common.base; \ No newline at end of file diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java index 21dcf37..1cce8e8 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java @@ -1,18 +1,18 @@ package com.chinaunicom.mall.ebtp.common.base.service.impl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Service; - -import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityEntity; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; -import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; - -import lombok.extern.slf4j.Slf4j; - /** * 缓存用户service实现层 获取缓存用户信息 * @@ -23,41 +23,80 @@ import lombok.extern.slf4j.Slf4j; @Service @Slf4j public class BaseCacheUserServiceImpl implements IBaseCacheUserService { - // TODO 设置种子ID， 对其雪花ID长度 - private static final long ID_SEED = 1345977833027100000L; + // TODO 设置种子ID， 对其雪花ID长度 + private static final long ID_SEED = 1345977833027100000L; - private static final Map USERS = new ConcurrentHashMap<>(); + private static final Map USERS = new ConcurrentHashMap<>(); - @Override - public BaseCacheUser getCacheUser() { - try { - SecurityEntity securityEntity = (SecurityEntity) SecurityContextHolder.getContext().getAuthentication() - .getPrincipal(); - log.debug("Current user principal: " + securityEntity); + @Override + public BaseCacheUser getCacheUser() { + BaseCacheUser user = null; + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes != null) { + HttpServletRequest request = attributes.getRequest(); + String token = request.getHeader("JwtToken"); + if (token != null) { + user = USERS.get(token); + } + } + log.info(" --------------- 当前用户信息：" + JsonUtils.objectToJson(user) + " ------------------------------"); + return user; + } - return convertToBusinessModel(securityEntity); - } catch (Exception e) { - log.error(e.getMessage()); - } - return new BaseCacheUser(); - } + @Override + public Collection getUsers() { + return USERS.values(); + } - @Override - public Collection getUsers() { - return USERS.values(); - } + /** + * @param string + * @return + */ + // TODO: 山东框架使用未使用雪花ID存放字符串，暂时使用该方法进行id转换 + private Long getUserId(String rawUid) { + long id = ID_SEED; + byte[] bytes = rawUid.getBytes(); - /** - * 构建用户对象模型 - * - * @param rawObject - * @return - */ - private BaseCacheUser convertToBusinessModel(SecurityEntity raw) { - return new BaseCacheUser().setUserId(raw.getStaffId()).setFullName(raw.getStaffName()) - .setLoginName(raw.getUsername()).setRoleIds(raw.getStaffId()).setOrganizationId(raw.getOu()) - .setOrganizationName(raw.getOuName()).setAuthorityList(raw.getAuthorityList()); - } + for (byte b : bytes) { + id += b; + } + return id; + } + static { + BaseCacheUser user = new BaseCacheUser().setUserId("1").setFullName("采购经理").setLoginName("caigou") + .setRoleIds("caigou").setOrganizationId("100").setOrganizationName("中国联通吉林分公司"); + USERS.put(String.valueOf(user.getUserId()), user); + + BaseCacheUser user0 = new BaseCacheUser().setUserId("2").setFullName("代理机构管理员").setLoginName("daili-admin") + .setRoleIds("daili-admin").setOrganizationId("100100").setOrganizationName("中兴代理公司"); + USERS.put(String.valueOf(user0.getUserId()), user0); + + BaseCacheUser user1 = new BaseCacheUser().setUserId("3").setFullName("代理机构子管理员").setLoginName("daili-subadmin") + .setRoleIds("daili-subadmin").setOrganizationId("100100").setOrganizationName("中兴代理公司"); + USERS.put(String.valueOf(user1.getUserId()), user1); + + BaseCacheUser user2 = new BaseCacheUser().setUserId("4").setFullName("项目经理1").setLoginName("daili1") + .setRoleIds("daili").setOrganizationId("100100").setOrganizationName("中兴代理公司"); + USERS.put(String.valueOf(user2.getUserId()), user2); + + BaseCacheUser user3 = new BaseCacheUser().setUserId("5").setFullName("项目经理2").setLoginName("daili2") + .setRoleIds("daili").setOrganizationId("100100").setOrganizationName("中兴代理公司"); + USERS.put(String.valueOf(user3.getUserId()), user3); + + for (int i = 0; i < 5; i++) { + BaseCacheUser user4 = new BaseCacheUser().setUserId(String.valueOf(6 + i)).setFullName("专家" + (i + 1)) + .setLoginName("1300000000" + (i + 1)).setRoleIds("zhuanjia").setOrganizationId("666") + .setOrganizationName("专家公司"); + USERS.put(String.valueOf(user4.getUserId()), user4); + } + + for (int i = 0; i < 5; i++) { + BaseCacheUser user4 = new BaseCacheUser().setUserId(String.valueOf(11 + i)).setFullName("供应商" + (i + 1)) + .setLoginName("gys" + (i + 1)).setRoleIds("gys").setOrganizationId("200" + (i + 1)) + .setOrganizationName("供应商公司" + (i + 1)); + USERS.put(String.valueOf(user4.getUserId()), user4); + } + } } diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java index ab0d973..8546457 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java @@ -1,10 +1,7 @@ package com.chinaunicom.mall.ebtp.common.config; -import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.AUTHORIZATION_HEADER; -import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.TOKEN_PREFIX; +import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang3.RegExUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Configuration; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -18,22 +15,14 @@ import feign.RequestTemplate; @Configuration public class FeignConfig implements RequestInterceptor { - /** - * @param template - */ @Override public void apply(RequestTemplate template) { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); if (null != attributes) { - final String header = attributes.getRequest().getHeader(AUTHORIZATION_HEADER);// 提取request头信息 - - // 检查请求头是否包含 Bearer 前缀 - if (StringUtils.startsWith(header, TOKEN_PREFIX)) { - String authToken = RegExUtils.replaceAll(header, TOKEN_PREFIX, "");// 提取 token 信息 - - template.header(AUTHORIZATION_HEADER, String.format("%s%s", TOKEN_PREFIX, authToken)); - } + HttpServletRequest request = attributes.getRequest(); + String token = request.getHeader("JwtToken"); + template.header("JwtToken", token); } } diff --git a/uboot-core/pom.xml b/uboot-core/pom.xml index 071b678..7fc37da 100644 --- a/uboot-core/pom.xml +++ b/uboot-core/pom.xml @@ -12,7 +12,7 @@ com.chinaunicom.mall.ebtp uboot-core - 0.0.1-SNAPSHOT + 0.0.1-SNAPSHOT uboot-core @@ -20,9 +20,9 @@ com.chinaunicom.mall.ebtp uboot-common - 0.0.1-SNAPSHOT + 0.0.1-SNAPSHOT - + com.chinaunicom.ebtp mall-ebtp-cloud-seata-starter diff --git a/uboot-core/src/main/resources/file.conf b/uboot-core/src/main/resources/file.conf deleted file mode 100644 index 31954cf..0000000 --- a/uboot-core/src/main/resources/file.conf +++ /dev/null @@ -1,66 +0,0 @@ -transport { - # tcp udt unix-domain-socket - type = "TCP" - #NIO NATIVE - server = "NIO" - #enable heartbeat - heartbeat = true - # the client batch send request enable - enableClientBatchSendRequest = true - #thread factory for netty - threadFactory { - bossThreadPrefix = "NettyBoss" - workerThreadPrefix = "NettyServerNIOWorker" - serverExecutorThread-prefix = "NettyServerBizHandler" - shareBossWorker = false - clientSelectorThreadPrefix = "NettyClientSelector" - clientSelectorThreadSize = 1 - clientWorkerThreadPrefix = "NettyClientWorkerThread" - # netty boss thread size,will not be used for UDT - bossThreadSize = 1 - #auto default pin or 8 - workerThreadSize = "default" - } - shutdown { - # when destroy server, wait seconds - wait = 3 - } - serialization = "seata" - compressor = "none" -} -service { - #transaction service group mapping - vgroupMapping.uboot-core-fescar-service-group = "default" - #only support when registry.type=file, please don't set multiple addresses - default.grouplist = "127.0.0.1:8091" - #degrade, current not support - enableDegrade = false - #disable seata - disableGlobalTransaction = false -} - -client { - rm { - asyncCommitBufferLimit = 10000 - lock { - retryInterval = 10 - retryTimes = 30 - retryPolicyBranchRollbackOnConflict = true - } - reportRetryCount = 5 - tableMetaCheckEnable = false - reportSuccessEnable = false - } - tm { - commitRetryCount = 5 - rollbackRetryCount = 5 - } - undo { - dataValidation = true - logSerialization = "jackson" - logTable = "undo_log" - } - log { - exceptionRate = 100 - } -} \ No newline at end of file diff --git a/uboot-core/src/main/resources/seata.conf b/uboot-core/src/main/resources/seata.conf deleted file mode 100644 index 030b596..0000000 --- a/uboot-core/src/main/resources/seata.conf +++ /dev/null @@ -1,21 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -client { - application.id = uboot-core - transaction.service.group = uboot-core-fescar-service-group -}