From d0f511187f781718790543ab6856d53087bc53d6 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Thu, 28 Jan 2021 14:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=A4=A9=E6=A2=AF=E4=BB=93=E5=BA=93=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mall-ebtp-cloud-apollo-starter/pom.xml | 7 +- mall-ebtp-cloud-attachment-sdk/bin/pom.xml | 64 ------- .../attachment/sdk/api/AttachmentClient.class | Bin 2466 -> 0 bytes .../sdk/api/DefaultAttachmentClient.class | Bin 8393 -> 0 bytes .../sdk/config/FeignSupportConfig.class | Bin 939 -> 0 bytes .../sdk/config/SDKAutoConfiguration.class | Bin 1381 -> 0 bytes .../sdk/convertor/FileConvertor.class | Bin 3177 -> 0 bytes .../sdk/fallback/QueryServiceFallback.class | Bin 3772 -> 0 bytes .../sdk/model/AttachmentDetail.class | Bin 1170 -> 0 bytes .../sdk/model/AttachmentEntity.class | Bin 5125 -> 0 bytes .../sdk/model/FeedbackMessage.class | Bin 4587 -> 0 bytes .../attachment/sdk/model/Snowflake.class | Bin 3077 -> 0 bytes .../attachment/sdk/model/UploadObject.class | Bin 3310 -> 0 bytes .../attachment/sdk/param/QueryParameter.class | Bin 4401 -> 0 bytes .../attachment/sdk/service/QueryService.class | Bin 3442 -> 0 bytes .../main/resources/META-INF/spring.factories | 3 - .../attachment-sdk-cofiguration.properties | 2 - mall-ebtp-cloud-attachment-sdk/pom.xml | 38 +--- .../attachment/sdk/api/AttachmentClient.java | 4 +- .../sdk/api/DefaultAttachmentClient.java | 172 ++++++++++-------- .../sdk/config/FeignSupportConfig.java | 8 - .../sdk/config/SDKAutoConfiguration.java | 20 ++ .../sdk/convertor/FileConvertor.java | 42 +++-- .../sdk/convertor/ModelConvertor.java | 97 ++++++++++ .../DocumentCenterServiceFallback.java | 28 +++ .../sdk/model/AttachmentDetail.java | 13 ++ .../sdk/service/DocumentCenterService.java | 51 ++++++ .../attachment/sdk/service/QueryService.java | 3 +- .../attachment/sdk/vo/down/DownStream.java | 13 ++ .../sdk/vo/down/DownStreamData.java | 10 + .../attachment/sdk/vo/down/SysStorageVO.java | 20 ++ .../attachment/sdk/vo/query/QueryData.java | 12 ++ .../attachment/sdk/vo/query/QueryResult.java | 12 ++ .../attachment-sdk-cofiguration.properties | 4 + mall-ebtp-cloud-eureka-starter/pom.xml | 7 +- .../resources/eureka-cofiguration.properties | 3 +- mall-ebtp-cloud-feign-starter/pom.xml | 5 +- .../resources/feign-configuration.properties | 4 +- mall-ebtp-cloud-fileupload-starter/pom.xml | 5 +- mall-ebtp-cloud-jpa-starter/pom.xml | 17 +- mall-ebtp-cloud-kafka-starter/pom.xml | 5 +- mall-ebtp-cloud-log-starter/pom.xml | 7 +- mall-ebtp-cloud-mvc-starter/pom.xml | 5 +- mall-ebtp-cloud-office-starter/pom.xml | 5 +- mall-ebtp-cloud-parent/pom.xml | 60 ++---- mall-ebtp-cloud-redis-starter/pom.xml | 5 +- mall-ebtp-cloud-seata-starter/pom.xml | 9 +- .../src/main/resources/file.conf | 5 +- .../src/main/resources/registry.conf | 14 +- mall-ebtp-cloud-security-starter/pom.xml | 4 +- .../starter/entity/AuthorityEntity.java | 14 ++ .../starter/entity/SecurityEntity.java | 25 +++ .../filter/TokenAuthenticationFilter.java | 26 ++- .../security-configuration.properties | 2 +- mall-ebtp-cloud-swagger-starter/pom.xml | 5 +- pom.xml | 62 ++++--- uboot-common/pom.xml | 136 +++++++------- .../common/base/entity/BaseCacheUser.java | 12 +- .../impl/BaseCacheUserServiceImpl.java | 67 +++---- .../mall/ebtp/common/config/FeignConfig.java | 7 +- .../mall/ebtp/common/config/WebConfig.java | 10 +- uboot-core/pom.xml | 35 +--- 62 files changed, 710 insertions(+), 474 deletions(-) delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/pom.xml delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/AttachmentClient.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/SDKAutoConfiguration.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/QueryServiceFallback.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentDetail.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentEntity.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/FeedbackMessage.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/Snowflake.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/UploadObject.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/param/QueryParameter.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/QueryService.class delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/META-INF/spring.factories delete mode 100644 mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/attachment-sdk-cofiguration.properties delete 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/convertor/ModelConvertor.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/DocumentCenterService.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStream.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStreamData.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/SysStorageVO.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryData.java create mode 100644 mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryResult.java create mode 100644 mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java create mode 100644 mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityEntity.java diff --git a/mall-ebtp-cloud-apollo-starter/pom.xml b/mall-ebtp-cloud-apollo-starter/pom.xml index 3ba6757..f4b48b1 100644 --- a/mall-ebtp-cloud-apollo-starter/pom.xml +++ b/mall-ebtp-cloud-apollo-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-apollo-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-apollo-stater @@ -25,5 +26,5 @@ mall-ebtp-cloud-mvc-starter - + diff --git a/mall-ebtp-cloud-attachment-sdk/bin/pom.xml b/mall-ebtp-cloud-attachment-sdk/bin/pom.xml deleted file mode 100644 index 3c48c2d..0000000 --- a/mall-ebtp-cloud-attachment-sdk/bin/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - 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 deleted file mode 100644 index 4a448ba2207bf431a757786378778dc206824641..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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)! 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 deleted file mode 100644 index 017c40533953290615d2961c359325e6a7c80bd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index 4b0c2e1af32268b6da9243e165abe1d04536f933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index 609f14dbed5612dc0a559d540c51cf210314a932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index 0dc8dd48bba1d5366b9118c73103ff93dff40858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5125 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 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 deleted file mode 100644 index fb762ac6bd5324cb08c08bfbf3caadc42dcc0168..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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- 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 deleted file mode 100644 index 9974aa12158468340a75bdea9ed5e7e7e2b017ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4401 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 VaBab%_sOFV>0|m7e_3DB-k+@OK`{UT 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 deleted file mode 100644 index f11530a..0000000 --- a/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# 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 deleted file mode 100644 index 580e33b..0000000 --- a/mall-ebtp-cloud-attachment-sdk/bin/src/main/resources/attachment-sdk-cofiguration.properties +++ /dev/null @@ -1,2 +0,0 @@ -ribbon.ReadTimeout=1800000 -ribbon.SocketTimeout=1800000 diff --git a/mall-ebtp-cloud-attachment-sdk/pom.xml b/mall-ebtp-cloud-attachment-sdk/pom.xml index 3c48c2d..6256e6f 100644 --- a/mall-ebtp-cloud-attachment-sdk/pom.xml +++ b/mall-ebtp-cloud-attachment-sdk/pom.xml @@ -5,17 +5,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - com.chinaunicom.ebtp - mall-ebtp-cloud-attachment-sdk - 0.0.1 - com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent + com.chinaunicom.ebtp + mall-ebtp-cloud-attachment-sdk + 0.0.1-SNAPSHOT + com.chinaunicom.ebtp @@ -25,14 +25,10 @@ org.springframework.cloud spring-cloud-starter-netflix-eureka-client - - org.springframework.cloud - spring-cloud-starter-openfeign - - - io.github.openfeign - feign-okhttp - + + org.springframework.cloud + spring-cloud-starter-openfeign + org.projectlombok lombok @@ -45,20 +41,4 @@ - - - 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/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 55acd69..633d83a 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 @@ -52,6 +52,7 @@ public interface AttachmentClient { * @return */ Optional downloadFileByObjectId(String objectId); + /** * 上传资源文件 @@ -61,7 +62,7 @@ public interface AttachmentClient { * @return */ Optional upload(String businessId, File file); - Optional upload(Long businessId, File file); + /** @@ -72,6 +73,5 @@ public interface AttachmentClient { * @return */ Optional upload(String businessId, String filename, byte[] array); - Optional upload(Long businessId, String filename, byte[] array); } 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 8258c35..a6582f0 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 @@ -1,22 +1,27 @@ package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.api; +import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.IOException; +import java.util.Arrays; import java.util.List; -import java.util.Objects; import java.util.Optional; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; 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.FeedbackMessage; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.Snowflake; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.UploadObject; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.param.QueryParameter; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.service.QueryService; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.service.DocumentCenterService; + +import cn.hutool.core.util.IdUtil; +import lombok.extern.slf4j.Slf4j; /** * 附件工具客户端默认实现 @@ -25,22 +30,50 @@ import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.service.QueryService; */ @Primary @Component +@Slf4j public class DefaultAttachmentClient implements AttachmentClient { /* 附件工具类服务 */ - private @Autowired QueryService queryService; + private @Autowired DocumentCenterService documentCenterService; + + /* 模型转换器 */ + private @Autowired ModelConvertor modelConvertor; + + /* 文件转换器 */ + private @Autowired FileConvertor fileConvertor; /** - * 获取业务ID + * 根据业务id列表查询详单 + * + * @param businessIdList + * @return + */ + @Override + public Optional findByBusinessId(List businessIdList) { + log.debug("query bids: {}", businessIdList); + String json = documentCenterService.fetchDetails(businessIdList); + log.debug("fetch content: {}", json); + + AttachmentDetail detail = new AttachmentDetail(); + + // 组织数据存储 + modelConvertor.toQueryResult(json).ifPresent(result -> { + result.getData().stream().forEach(data -> { + detail.add(new AttachmentEntity().setBid(data.getObjectId()).setId(data.getFileId()) + .setFilename(data.getOriginalName())); + }); + }); + return Optional.ofNullable(detail); + } + + /** + * 生成业务id + * + * @return */ @Override public Optional getBusinessId() { - Snowflake snowflake = queryService.getSnokflakId(); - - if (Objects.isNull(snowflake)) { - return Optional.empty(); - } - return Optional.of(snowflake.getId()); + return Optional.of(String.format("{\"id\":\"%s\"}", IdUtil.getSnowflake(23, 16).nextIdStr())); } /** @@ -51,90 +84,83 @@ public class DefaultAttachmentClient implements AttachmentClient { */ @Override public Optional findByObjectId(String objectId) { - AttachmentEntity entity = queryService.getObjectDetail(objectId); - return Optional.ofNullable(entity); + return modelConvertor.toAttachmentEntity(documentCenterService.getObjectDetail(objectId)); } /** - * 通过业务ID查找附件信息 + * 通过对象id下载附件 * - * @param businessIdList 业务ID列表 - * @return - */ - @Override - public Optional findByBusinessId(List businessIdList) { - QueryParameter param = new QueryParameter(businessIdList); - AttachmentDetail attachemtnDetail = queryService.getAttachmentDetails(param); - - return Optional.ofNullable(attachemtnDetail); - } - - /** - * 文件下载 - * - * @param businessId 业务id - * @return - */ - @Override - public Optional downloadFilesByBusinessId(String businessId) { - return Optional.ofNullable(queryService.downloadByBid(businessId)); - } - - /** - * 文件下载 - * - * @param objectId 对象id + * @param objectId * @return */ @Override public Optional downloadFileByObjectId(String objectId) { - return Optional.ofNullable(queryService.downloadByOid(objectId)); + return modelConvertor.toByteArray(documentCenterService.getObjectDetail(objectId)); } /** - * 上传附件 + * 根据业务id下载文件 * - * @param businessId 业务id - * @param file 文件 + * @param businessId + * @return + */ + @Override + public Optional downloadFilesByBusinessId(String businessId) { + Optional op = findByBusinessId(Arrays.asList(businessId)); + + if (op.isPresent()) { + List list = op.get().get(businessId); + + // 如果业务id下只包含单独一个文件，则直接返回该文件数据 + if (list.size() == 1) { + return downloadFileByObjectId(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.getId() + data.getFilename()));// 文件项名称 + zout.write(downloadFileByObjectId(data.getId()).get());// 文件数据流 + } catch (IOException e) { + log.error(e.getMessage()); + } + }); + } + return Optional.ofNullable(out.toByteArray()); + } catch (IOException e) { + log.error(e.getMessage()); + } + } + } + return Optional.empty(); + } + + /** + * 文件上传 + * + * @param businessId + * @param file * @return */ @Override public Optional upload(String businessId, File file) { - Objects.requireNonNull(businessId); - Objects.requireNonNull(file); + String res = documentCenterService.upload("ebtp-mall-cloud", businessId, fileConvertor.toMultipartFile(file)); - FeedbackMessage feedback = queryService.handleFileUpload(businessId, FileConvertor.toMultipartFile(file)); + log.debug(res); - return Optional.ofNullable(new UploadObject().setId(feedback.getOid())); + return Optional.empty(); } - @Override - public Optional upload(Long businessId, File file) { - return upload(businessId.toString(), file); - } - - /** - * 上传附件 - * - * @param businessId 业务ID - * @param filename 文件名称 - * @param array 文件字节组 - * @return - */ @Override public Optional upload(String businessId, String filename, byte[] array) { - Objects.requireNonNull(businessId); - Objects.requireNonNull(array); + String res = documentCenterService.upload("ebtp-mall-cloud", businessId, + fileConvertor.toMultipartFile(filename, array)); - FeedbackMessage feedback = queryService.handleFileUpload(businessId, - FileConvertor.toMultipartFile(filename, array)); + log.debug(res); - return Optional.ofNullable(new UploadObject().setId(feedback.getOid())); - } - - @Override - public Optional upload(Long businessId, String filename, byte[] array) { - return upload(businessId.toString(), filename, array); + return Optional.empty(); } } 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 deleted file mode 100644 index c44c3d9..0000000 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/FeignSupportConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -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/config/SDKAutoConfiguration.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/SDKAutoConfiguration.java index d22aca1..52b6ee7 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/SDKAutoConfiguration.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/config/SDKAutoConfiguration.java @@ -1,14 +1,34 @@ package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.config; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor.FileConvertor; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor.ModelConvertor; + @Configuration @EnableFeignClients(basePackages = "com.chinaunicom.ebtp.mall.cloud.attachment.sdk") @ComponentScan(basePackages = "com.chinaunicom.ebtp.mall.cloud.attachment.sdk") @PropertySource("classpath:attachment-sdk-cofiguration.properties") public class SDKAutoConfiguration { + + /** + * @return 数据模型转换器 + */ + @Bean + public ModelConvertor modelConvertor() { + return new ModelConvertor(); + } + + /** + * @return 文件转换器 + */ + @Bean + public FileConvertor fileConvertor() { + return new FileConvertor(); + } } diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.java index 0d25bab..be41ae9 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/FileConvertor.java @@ -1,21 +1,23 @@ package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.io.FileUtils; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; +import lombok.extern.slf4j.Slf4j; + /** * 文件转换器 * * @author Ajaxfan */ +@Slf4j public final class FileConvertor { /** @@ -24,21 +26,13 @@ public final class FileConvertor { * @param file 原始文件对象 * @return */ - public static MultipartFile toMultipartFile(File file) { - FileItemFactory factory = new DiskFileItemFactory(16, null); - FileItem item = factory.createItem("file", "text/plain", true, file.getName()); + public MultipartFile toMultipartFile(File file) { + FileItem item = createFileItem(file.getName()); - int bytesRead = 0; - byte[] buffer = new byte[8192]; - - try (FileInputStream fis = new FileInputStream(file)) { - try (OutputStream os = item.getOutputStream()) { - while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) { - os.write(buffer, 0, bytesRead); - } - } + try { + FileUtils.copyFile(file, item.getOutputStream()); } catch (IOException e) { - e.printStackTrace(); + log.error(e.getMessage()); } return new CommonsMultipartFile(item); } @@ -50,16 +44,26 @@ public final class FileConvertor { * @param array 文件字节组 * @return */ - public static MultipartFile toMultipartFile(String filename, byte[] array) { - FileItemFactory factory = new DiskFileItemFactory(16, null); - FileItem item = factory.createItem("file", "text/plain", true, filename); + public MultipartFile toMultipartFile(String filename, byte[] array) { + FileItem item = createFileItem(filename); try (OutputStream os = item.getOutputStream()) { os.write(array); } catch (IOException e) { - e.printStackTrace(); + log.error(e.getMessage()); } return new CommonsMultipartFile(item); } + /////////////////////////////////////////////////////////////////////////// private + /////////////////////////////////////////////////////////////////////////// Method + + /** + * @param filename + * @return + */ + private FileItem createFileItem(String filename) { + return new DiskFileItemFactory(16, null).createItem("file", "text/plain", true, filename); + } + } 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 new file mode 100644 index 0000000..0ba21df --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java @@ -0,0 +1,97 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor; + +import java.util.Optional; + +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; +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.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import lombok.extern.slf4j.Slf4j; + +/** + * 山分数据模型转换为吉林数据模型 + * + * @author Ajaxfan + */ +@Slf4j +public class ModelConvertor { + + private ObjectMapper objectMapper; + + public ModelConvertor() { + objectMapper = new ObjectMapper(); + /** 实体中存在未定义的属性是不报出错误 */ + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + } + + /** + * 山分接口返回的json数据包转换为吉林实体模型 + * + * @param json + * @return + */ + public Optional toAttachmentEntity(String json) { + AttachmentEntity entity = null; + + try { + SysStorageVO vo = toSysStorageVO(json); + log.debug("convert to model: {}", vo); + + entity = new AttachmentEntity(); + entity.setId(vo.getFileId()).setFilename(vo.getOriginalName()).setBid(vo.getObjectId()); + } catch (JsonProcessingException e) { + log.error(e.getMessage()); + } + return Optional.ofNullable(entity); + } + + /** + * @param json + * @return + */ + public Optional toQueryResult(String json) { + QueryResult result = null; + try { + result = objectMapper.readValue(json, QueryResult.class); + } catch (JsonProcessingException e) { + log.error(e.getMessage()); + } + return Optional.ofNullable(result); + } + + /** + * @param json + * @return + */ + public Optional toByteArray(String json) { + byte[] array = null; + + try { + array = toSysStorageVO(json).getFileStream(); + } catch (JsonProcessingException e) { + log.error(e.getMessage()); + } + return Optional.ofNullable(array); + } + + /////////////////////////////////////////////////////////////////////////// private + /////////////////////////////////////////////////////////////////////////// method + /** + * Json转换为业务实体 + * + * @param json + * @return + * @throws JsonMappingException + * @throws JsonProcessingException + */ + private SysStorageVO toSysStorageVO(String json) throws JsonMappingException, JsonProcessingException { + log.debug("current convertor json is: {}", json); + return objectMapper.readValue(json, DownStream.class).getData().getSysStorageVO(); + } + +} 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 new file mode 100644 index 0000000..e207c3b --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java @@ -0,0 +1,28 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.fallback; + +import java.util.List; + +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.service.DocumentCenterService; + +@Component +public class DocumentCenterServiceFallback implements DocumentCenterService { + + @Override + public String getObjectDetail(String fileId) { + return null; + } + + @Override + public String fetchDetails(List bids) { + return null; + } + + @Override + public String upload(String appCode, String objectId, MultipartFile multipartFiles) { + return null; + } + +} diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentDetail.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentDetail.java index c2b6799..8732134 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentDetail.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/AttachmentDetail.java @@ -1,5 +1,6 @@ package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model; +import java.util.ArrayList; import java.util.Hashtable; import java.util.List; @@ -11,4 +12,16 @@ import java.util.List; public class AttachmentDetail extends Hashtable> { private static final long serialVersionUID = -6579549900874220624L; + /** + * 清单项入库操作 + * + * @param entity + */ + public void add(AttachmentEntity entity) { + String bid = entity.getBid(); + List list = containsKey(bid) ? get(bid) : new ArrayList<>(); + list.add(entity); + put(bid, list); + } + } 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 new file mode 100644 index 0000000..ad63675 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/service/DocumentCenterService.java @@ -0,0 +1,51 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.service; + +import java.util.List; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.fallback.DocumentCenterServiceFallback; + +/** + * 连接山分的文档中心服务 + * + * @author Ajaxfan + */ +@FeignClient(name = "DocumentCenterService", url = "${document.center.ip-address}", fallback = DocumentCenterServiceFallback.class) +public interface DocumentCenterService { + + /** + * 通过附件id查询明细 + * + * @param fileId + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadAllStream") + String getObjectDetail(@RequestParam("fileId") String fileId); + + /** + * 通过业务id列表获取明细 + * + * @param bids + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/queryReturn") + String fetchDetails(@RequestBody List bids); + + /** + * 上传文件 + * + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/v1.0/files/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + String upload(@RequestPart("appCode") String appCode, @RequestPart("objectId") String objectId, + @RequestPart("multipartFiles") MultipartFile multipartFiles); + +} 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 caf06a4..b3eedb9 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,7 +10,6 @@ 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; @@ -18,7 +17,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", configuration = FeignSupportConfig.class, fallback = QueryServiceFallback.class) +@FeignClient(value = "core-service-ebtp-updownload", 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/DownStream.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStream.java new file mode 100644 index 0000000..df61c5b --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStream.java @@ -0,0 +1,13 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down; + +import lombok.Data; + +@Data +public class DownStream { + + private Integer code; + private Boolean success; + private String message; + private DownStreamData 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 new file mode 100644 index 0000000..2449d26 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/DownStreamData.java @@ -0,0 +1,10 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down; + +import lombok.Data; + +@Data +public class DownStreamData { + + private SysStorageVO sysStorageVO; + +} 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/down/SysStorageVO.java new file mode 100644 index 0000000..8b76485 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/down/SysStorageVO.java @@ -0,0 +1,20 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down; + +import lombok.Data; + +@Data +public class SysStorageVO { + + /* 文件原始名称 */ + private String originalName; + + /* 附件id */ + private String fileId; + + /* 业务id */ + private String objectId; + + /* 文件流 */ + private byte[] fileStream; + +} diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryData.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryData.java new file mode 100644 index 0000000..29305e1 --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryData.java @@ -0,0 +1,12 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.query; + +import lombok.Data; + +@Data +public class QueryData { + + private String fileId; + private String objectId; + private String originalName; + +} diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryResult.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryResult.java new file mode 100644 index 0000000..08c549b --- /dev/null +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/query/QueryResult.java @@ -0,0 +1,12 @@ +package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.query; + +import java.util.List; + +import lombok.Data; + +@Data +public class QueryResult { + + private List data; + +} diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties b/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties index 580e33b..89e51e3 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties +++ b/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties @@ -1,2 +1,6 @@ ribbon.ReadTimeout=1800000 ribbon.SocketTimeout=1800000 + +# document center id +document.center.service.id=core-service-document-center +document.center.ip-address=http://10.242.31.158:8801/ \ No newline at end of file diff --git a/mall-ebtp-cloud-eureka-starter/pom.xml b/mall-ebtp-cloud-eureka-starter/pom.xml index f357e8f..ce93e07 100644 --- a/mall-ebtp-cloud-eureka-starter/pom.xml +++ b/mall-ebtp-cloud-eureka-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-eureka-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-eureka-starter @@ -25,5 +26,5 @@ mall-ebtp-cloud-mvc-starter - + diff --git a/mall-ebtp-cloud-eureka-starter/src/main/resources/eureka-cofiguration.properties b/mall-ebtp-cloud-eureka-starter/src/main/resources/eureka-cofiguration.properties index 9b3b66a..83b68ed 100644 --- a/mall-ebtp-cloud-eureka-starter/src/main/resources/eureka-cofiguration.properties +++ b/mall-ebtp-cloud-eureka-starter/src/main/resources/eureka-cofiguration.properties @@ -1,5 +1,4 @@ # 胜智云eureka 统一配置 -# eureka.client.service-url.defaultZone=http://192.168.40.17:12093/eureka/,http://192.168.40.17:18126/eureka/,http://192.168.40.17:28641/eureka/ -eureka.client.service-url.defaultZone=http://192.168.1.103:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka eureka.instance.prefer-ip-address=true eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} diff --git a/mall-ebtp-cloud-feign-starter/pom.xml b/mall-ebtp-cloud-feign-starter/pom.xml index 705a374..64b8386 100644 --- a/mall-ebtp-cloud-feign-starter/pom.xml +++ b/mall-ebtp-cloud-feign-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-feign-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-feign-starter diff --git a/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties b/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties index 9135922..f9ce372 100644 --- a/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties +++ b/mall-ebtp-cloud-feign-starter/src/main/resources/feign-configuration.properties @@ -1,4 +1,4 @@ # 默认开启熔断 feign.hystrix.enabled=true -feign.client.config.default.connectTimeout=5000 -feign.client.config.default.readTimeout=10000 \ No newline at end of file +feign.client.config.default.connectTimeout=50000 +feign.client.config.default.readTimeout=50000 \ No newline at end of file diff --git a/mall-ebtp-cloud-fileupload-starter/pom.xml b/mall-ebtp-cloud-fileupload-starter/pom.xml index 63df3a1..5cdfb4a 100644 --- a/mall-ebtp-cloud-fileupload-starter/pom.xml +++ b/mall-ebtp-cloud-fileupload-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-fileupload-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-fileupload-starter diff --git a/mall-ebtp-cloud-jpa-starter/pom.xml b/mall-ebtp-cloud-jpa-starter/pom.xml index 174d97c..028e252 100644 --- a/mall-ebtp-cloud-jpa-starter/pom.xml +++ b/mall-ebtp-cloud-jpa-starter/pom.xml @@ -4,26 +4,27 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-jpa-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-jpa-starter - + com.baomidou mybatis-plus-boot-starter - - com.alibaba - druid-spring-boot-starter - + + com.alibaba + druid-spring-boot-starter + - + diff --git a/mall-ebtp-cloud-kafka-starter/pom.xml b/mall-ebtp-cloud-kafka-starter/pom.xml index fa77eb8..84de136 100644 --- a/mall-ebtp-cloud-kafka-starter/pom.xml +++ b/mall-ebtp-cloud-kafka-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-kafka-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-kafka-starter diff --git a/mall-ebtp-cloud-log-starter/pom.xml b/mall-ebtp-cloud-log-starter/pom.xml index 289d880..8c41cae 100644 --- a/mall-ebtp-cloud-log-starter/pom.xml +++ b/mall-ebtp-cloud-log-starter/pom.xml @@ -4,17 +4,18 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-log-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-log-starter - + org.springframework.boot diff --git a/mall-ebtp-cloud-mvc-starter/pom.xml b/mall-ebtp-cloud-mvc-starter/pom.xml index 236f7c9..63d0646 100644 --- a/mall-ebtp-cloud-mvc-starter/pom.xml +++ b/mall-ebtp-cloud-mvc-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-mvc-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-mvc-starter diff --git a/mall-ebtp-cloud-office-starter/pom.xml b/mall-ebtp-cloud-office-starter/pom.xml index f20d8f9..30096c9 100644 --- a/mall-ebtp-cloud-office-starter/pom.xml +++ b/mall-ebtp-cloud-office-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-office-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-office-starter diff --git a/mall-ebtp-cloud-parent/pom.xml b/mall-ebtp-cloud-parent/pom.xml index a2fcca2..d525ae5 100644 --- a/mall-ebtp-cloud-parent/pom.xml +++ b/mall-ebtp-cloud-parent/pom.xml @@ -6,82 +6,81 @@ com.chinaunicom.ebtp mall-ebtp-cloud - 0.0.1 - .. + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + + 0.0.1-SNAPSHOT pom mall-ebtp-cloud-parent - http://maven.apache.org com.chinaunicom.ebtp mall-ebtp-cloud-mvc-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-eureka-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-apollo-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-security-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-jpa-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-office-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-swagger-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-fileupload-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-redis-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-kafka-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-feign-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-seata-starter - 0.0.1 + 0.0.1-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-attachment-sdk - 0.0.1 + 0.0.1-SNAPSHOT @@ -99,18 +98,6 @@ - - - repo_group_seal - Nexus Snapshot Repository - http://192.168.30.126:31233/repository/eshop-grouppath-45c07c6e-maven-group/ - - false - - - false - - aliyun-repos https://maven.aliyun.com/repository/public @@ -119,18 +106,5 @@ - - - - repo_group_seal - Nexus Snapshot Repository - http://192.168.30.126:31233/repository/eshop-grouppath-45c07c6e-maven-group/ - - true - - - true - - - + diff --git a/mall-ebtp-cloud-redis-starter/pom.xml b/mall-ebtp-cloud-redis-starter/pom.xml index f455206..32af5e3 100644 --- a/mall-ebtp-cloud-redis-starter/pom.xml +++ b/mall-ebtp-cloud-redis-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-redis-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-redis-starter diff --git a/mall-ebtp-cloud-seata-starter/pom.xml b/mall-ebtp-cloud-seata-starter/pom.xml index 4add5a8..5ac523e 100644 --- a/mall-ebtp-cloud-seata-starter/pom.xml +++ b/mall-ebtp-cloud-seata-starter/pom.xml @@ -4,21 +4,22 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-seata-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-seata-starter - + 1.3.0 - + com.chinaunicom.ebtp 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 a37e3e2..7de3b26 100644 --- a/mall-ebtp-cloud-seata-starter/src/main/resources/file.conf +++ b/mall-ebtp-cloud-seata-starter/src/main/resources/file.conf @@ -28,11 +28,12 @@ transport { serialization = "seata" compressor = "none" } + service { #transaction service group mapping - vgroupMapping.test_tx_group = "default" + vgroupMapping.biz-service-ebtp-archive-fescar-service-group = "default" #only support when registry.type=file, please don't set multiple addresses - default.grouplist = "127.0.0.1:8091" + default.grouplist = "10.242.31.158:18035" #degrade, current not support enableDegrade = false #disable seata diff --git a/mall-ebtp-cloud-seata-starter/src/main/resources/registry.conf b/mall-ebtp-cloud-seata-starter/src/main/resources/registry.conf index d291bc7..0a4eb4c 100644 --- a/mall-ebtp-cloud-seata-starter/src/main/resources/registry.conf +++ b/mall-ebtp-cloud-seata-starter/src/main/resources/registry.conf @@ -1,17 +1,15 @@ registry { - type = "eureka" - - eureka { - serviceUrl = "http://192.168.1.103:8761/eureka/" - application = "default" - weight = "1" + type = "file" + + file { + name = "file.conf" } } config { type = "file" - + file { name = "file.conf" } -} +} \ No newline at end of file diff --git a/mall-ebtp-cloud-security-starter/pom.xml b/mall-ebtp-cloud-security-starter/pom.xml index 84a46c7..931b060 100644 --- a/mall-ebtp-cloud-security-starter/pom.xml +++ b/mall-ebtp-cloud-security-starter/pom.xml @@ -8,13 +8,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-security-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-security-starter diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java new file mode 100644 index 0000000..e7e36a6 --- /dev/null +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/AuthorityEntity.java @@ -0,0 +1,14 @@ +package com.chinaunicom.mall.ebtp.cloud.security.starter.entity; + +import java.util.List; + +import lombok.Data; + +@Data +public class AuthorityEntity { + + private String roleName; + private String roleCode; + private List authorities; + +} diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityEntity.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityEntity.java new file mode 100644 index 0000000..499a4ee --- /dev/null +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/entity/SecurityEntity.java @@ -0,0 +1,25 @@ +package com.chinaunicom.mall.ebtp.cloud.security.starter.entity; + +import java.util.List; + +import lombok.Data; + +@Data +public class SecurityEntity { + + private String city; + private String ou; + private String staffType; + private List authorityList; + private String userid; + private List authorities; + private String orgId; + private String ouName; + private String province; + private String staffOrgId; + private String staffName; + private String tenantId; + private String staffId; + private String username; + +} diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java index 4fde9e3..d34dec0 100644 --- a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java @@ -1,7 +1,6 @@ package com.chinaunicom.mall.ebtp.cloud.security.starter.filter; import java.io.IOException; -import java.util.Map; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -20,12 +19,16 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.filter.OncePerRequestFilter; import com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants; +import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityEntity; + +import lombok.extern.slf4j.Slf4j; /** * 请求Token拦截 * * @author Ajaxfan */ +@Slf4j public class TokenAuthenticationFilter extends OncePerRequestFilter { private @Autowired RestTemplate restTemplate; @@ -41,31 +44,42 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(final HttpServletRequest request, final HttpServletResponse response, final FilterChain filterChain) throws ServletException, IOException { + // 清空上下文中的缓存信息， 防止二次请求时数据异常 (如此， 每次有新的请求进入，都会进行token的验证) + SecurityContextHolder.getContext().setAuthentication(null); + // 提取request头信息 final String header = request.getHeader(Constants.AUTHORIZATION_HEADER); // 检查请求头是否包含 Bearer 前缀 if (StringUtils.startsWith(header, Constants.TOKEN_PREFIX)) { - // 提取 token 信息 + // 移除header的前缀，提取出token字串 String authToken = RegExUtils.replaceAll(header, Constants.TOKEN_PREFIX, ""); - // 通过token读取用户信息 - SecurityContextHolder.getContext().setAuthentication(getAuthentication(authToken)); + try {// 通过token读取用户信息 + SecurityContextHolder.getContext().setAuthentication(getAuthentication(authToken)); + } catch (Exception e) { + log.error(e.getMessage()); + } } filterChain.doFilter(request, response); } /** + * 调用山分的认证中心接口，获取该token的绑定信息 + * * @param token * @return */ private Authentication getAuthentication(String token) { - ResponseEntity entity = restTemplate.getForEntity(createRequestUri(token), Map.class); - + ResponseEntity entity = restTemplate.getForEntity(createRequestUri(token), + SecurityEntity.class); + return new UsernamePasswordAuthenticationToken(entity.getBody(), token); } /** + * 生成山分认证中心请求接口地址 + * * @param token * @return */ diff --git a/mall-ebtp-cloud-security-starter/src/main/resources/security-configuration.properties b/mall-ebtp-cloud-security-starter/src/main/resources/security-configuration.properties index 11301af..d8b2a30 100644 --- a/mall-ebtp-cloud-security-starter/src/main/resources/security-configuration.properties +++ b/mall-ebtp-cloud-security-starter/src/main/resources/security-configuration.properties @@ -1 +1 @@ -user.auth.resource.token-info-uri=http://125.32.114.204:18091/oauth/check_token \ No newline at end of file +user.auth.resource.token-info-uri=http://10.242.31.158:8100/mall-auth/oauth/check_token \ No newline at end of file diff --git a/mall-ebtp-cloud-swagger-starter/pom.xml b/mall-ebtp-cloud-swagger-starter/pom.xml index 817c38e..2f3308b 100644 --- a/mall-ebtp-cloud-swagger-starter/pom.xml +++ b/mall-ebtp-cloud-swagger-starter/pom.xml @@ -4,15 +4,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-swagger-starter - 0.0.1 + 0.0.1-SNAPSHOT mall-ebtp-cloud-swagger-starter diff --git a/pom.xml b/pom.xml index 149aa9a..a2bc4ec 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -9,7 +11,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud - 0.0.1 + 0.0.1-SNAPSHOT pom mall-ebtp-cloud @@ -24,7 +26,7 @@ UTF-8 Hoxton.SR7 2.2.3.RELEASE - 3.2.0 + 3.4.0 2.6.0-SNAPSHOT 1.5.21 1.3.3 @@ -348,17 +350,22 @@ - + META-INF/spring.handlers - + META-INF/spring.factories - + META-INF/spring.schemas - - + + ${start-class} @@ -387,27 +394,32 @@ mall-ebtp-cloud-seata-starter uboot-common uboot-core - mall-ebtp-cloud-attachment-sdk - - - - China Unicom - http://www.chinaunicom.com - - - - ajaxfan - ajaxfan@gmail.com - ChinaUnicom - - + mall-ebtp-cloud-attachment-sdk + + + + China Unicom + http://www.chinaunicom.com + + + + ajaxfan + ajaxfan@gmail.com + ChinaUnicom + + - ettp-host-release - Install to ettp center - http://zentao.jlcucc.com:60000/repository/ettp-releases/ + tianti-maven-release-local + user release resp + http://ccp.tianti.tg.unicom.local/artifactory/tianti-maven-release-local/ + + tianti-maven-snapshot-local + user snapshot + http://ccp.tianti.tg.unicom.local/artifactory/tianti-maven-snapshot-local/ + \ No newline at end of file diff --git a/uboot-common/pom.xml b/uboot-common/pom.xml index cc43ca1..196f29f 100644 --- a/uboot-common/pom.xml +++ b/uboot-common/pom.xml @@ -1,78 +1,88 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - - com.chinaunicom.ebtp - mall-ebtp-cloud-parent - 0.0.1 - ../mall-ebtp-cloud-parent - + + com.chinaunicom.ebtp + mall-ebtp-cloud-parent + 0.0.1-SNAPSHOT + ../mall-ebtp-cloud-parent + + com.chinaunicom.mall.ebtp + uboot-common + 0.0.1-SNAPSHOT + uboot-common - com.chinaunicom.mall.ebtp - uboot-common - 0.0.1 - uboot-common + + + com.chinaunicom.ebtp + mall-ebtp-cloud-mvc-starter + - - - com.chinaunicom.ebtp - mall-ebtp-cloud-mvc-starter - + + com.chinaunicom.ebtp + mall-ebtp-cloud-jpa-starter + - - com.chinaunicom.ebtp - mall-ebtp-cloud-jpa-starter - + + com.chinaunicom.ebtp + mall-ebtp-cloud-eureka-starter + - - com.chinaunicom.ebtp - mall-ebtp-cloud-eureka-starter - + + com.chinaunicom.ebtp + mall-ebtp-cloud-feign-starter + - - com.chinaunicom.ebtp - mall-ebtp-cloud-feign-starter - + + com.chinaunicom.ebtp + mall-ebtp-cloud-swagger-starter + - - com.chinaunicom.ebtp - mall-ebtp-cloud-swagger-starter - + + com.chinaunicom.ebtp + mall-ebtp-cloud-redis-starter + - - com.chinaunicom.ebtp - mall-ebtp-cloud-redis-starter - - com.chinaunicom.ebtp mall-ebtp-cloud-security-starter - - org.apache.poi - poi-ooxml - - + + + + org.springframework.boot + spring-boot-starter-actuator + + + io.micrometer + micrometer-registry-prometheus + + + + org.apache.poi + poi-ooxml + + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - src/main/resources - true - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + src/main/resources + true + + + diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/BaseCacheUser.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/BaseCacheUser.java index 6a8e5b8..03da1e6 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/BaseCacheUser.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/BaseCacheUser.java @@ -1,10 +1,13 @@ package com.chinaunicom.mall.ebtp.common.base.entity; +import java.util.Date; +import java.util.List; + +import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity; + import lombok.Data; import lombok.experimental.Accessors; -import java.util.Date; - /** * 缓存用户实体映射类 * @@ -143,4 +146,9 @@ public class BaseCacheUser { */ private Integer positionId; + /** + * 用户角色列表 + */ + private List authorityList; + } 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 9e5c847..3bee414 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 @@ -7,6 +7,7 @@ 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; @@ -29,14 +30,17 @@ public class BaseCacheUserServiceImpl implements IBaseCacheUserService { @Override public BaseCacheUser getCacheUser() { - Map map = (Map) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + try { + SecurityEntity securityEntity = (SecurityEntity) SecurityContextHolder.getContext().getAuthentication() + .getPrincipal(); - log.debug("Current user principal: " + map); + log.debug("Current user principal: " + securityEntity); - return new BaseCacheUser().setUserId(getUserId((String) map.get("staffId"))) - .setFullName((String) map.get("staffName")).setLoginName((String) map.get("username")) - .setRoleIds((String) map.get("staffId")).setOrganizationId((String) map.get("ou")) - .setOrganizationName((String) map.get("ouName")); + return convertToBusinessModel(securityEntity); + } catch (Exception e) { + log.error(e.getMessage()); + } + return new BaseCacheUser(); } @Override @@ -44,54 +48,31 @@ public class BaseCacheUserServiceImpl implements IBaseCacheUserService { return USERS.values(); } + /** + * 构建用户对象模型 + * + * @param rawObject + * @return + */ + private BaseCacheUser convertToBusinessModel(SecurityEntity raw) { + return new BaseCacheUser().setUserId(getUserId(raw.getStaffId())).setFullName(raw.getStaffName()) + .setLastName(raw.getUsername()).setRoleIds(raw.getStaffId()).setOrganizationId(raw.getOu()) + .setOrganizationName(raw.getOuName()).setAuthorityList(raw.getAuthorityList()); + } + /** * @param string * @return */ // TODO: 山东框架使用未使用雪花ID存放字符串，暂时使用该方法进行id转换 - private Long getUserId(String rawUid) { + private String getUserId(String rawUid) { long id = ID_SEED; byte[] bytes = rawUid.getBytes(); for (byte b : bytes) { id += b; } - return id; + return String.valueOf(id); } - static { - BaseCacheUser user = new BaseCacheUser().setUserId(1L).setFullName("采购经理").setLoginName("caigou") - .setRoleIds("caigou").setOrganizationId("100").setOrganizationName("中国联通吉林分公司"); - USERS.put(String.valueOf(user.getUserId()), user); - - BaseCacheUser user0 = new BaseCacheUser().setUserId(2L).setFullName("代理机构管理员").setLoginName("daili-admin") - .setRoleIds("daili-admin").setOrganizationId("100100").setOrganizationName("中兴代理公司"); - USERS.put(String.valueOf(user0.getUserId()), user0); - - BaseCacheUser user1 = new BaseCacheUser().setUserId(3L).setFullName("代理机构子管理员").setLoginName("daili-subadmin") - .setRoleIds("daili-subadmin").setOrganizationId("100100").setOrganizationName("中兴代理公司"); - USERS.put(String.valueOf(user1.getUserId()), user1); - - BaseCacheUser user2 = new BaseCacheUser().setUserId(4L).setFullName("项目经理1").setLoginName("daili1") - .setRoleIds("daili").setOrganizationId("100100").setOrganizationName("中兴代理公司"); - USERS.put(String.valueOf(user2.getUserId()), user2); - - BaseCacheUser user3 = new BaseCacheUser().setUserId(5L).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(6L + 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(11L + 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 ddef51d..ab0d973 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 @@ -13,11 +13,14 @@ import feign.RequestInterceptor; import feign.RequestTemplate; /** - * fegin调用时 header中添加JwtToken + * 通过拦截器来为header注入token */ @Configuration public class FeignConfig implements RequestInterceptor { + /** + * @param template + */ @Override public void apply(RequestTemplate template) { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); @@ -29,7 +32,7 @@ public class FeignConfig implements RequestInterceptor { 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)); + template.header(AUTHORIZATION_HEADER, String.format("%s%s", TOKEN_PREFIX, authToken)); } } } diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java index f54f7fd..cbe40c1 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java @@ -1,10 +1,8 @@ package com.chinaunicom.mall.ebtp.common.config; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import java.util.List; + import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.ResourceHttpMessageConverter; @@ -13,7 +11,9 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; -import java.util.List; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; /** * @author dino diff --git a/uboot-core/pom.xml b/uboot-core/pom.xml index 801f8e5..071b678 100644 --- a/uboot-core/pom.xml +++ b/uboot-core/pom.xml @@ -6,13 +6,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 0.0.1 + 0.0.1-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.mall.ebtp uboot-core - 0.0.1 + 0.0.1-SNAPSHOT uboot-core @@ -20,38 +20,12 @@ com.chinaunicom.mall.ebtp uboot-common - 0.0.1 - + 0.0.1-SNAPSHOT com.chinaunicom.ebtp - mall-ebtp-cloud-jpa-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-eureka-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-feign-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-swagger-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-redis-starter - - - - io.seata - seata-spring-boot-starter + mall-ebtp-cloud-seata-starter @@ -61,7 +35,6 @@ -