From 8106a8ab7e3c30d2deddc842f128e0020ad64d33 Mon Sep 17 00:00:00 2001 From: super <2903208875@qq.com> Date: Thu, 26 Mar 2026 16:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E7=AB=AF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + backend-java/sdk-java-5.0.6.jar | Bin 0 -> 75581 bytes .../config/ModuleCleanupProperties.java | 15 + .../aiimage/config/PropertiesConfig.java | 2 +- .../aiimage/config/ZiniaoProperties.java | 8 +- .../brand/controller/BrandTaskController.java | 23 +- .../brand/service/BrandTaskService.java | 51 ++- .../controller/ConvertRunController.java | 28 +- .../convert/model/dto/ConvertRunRequest.java | 7 + .../convert/service/ConvertRunService.java | 17 +- .../controller/DedupeRunController.java | 28 +- .../dedupe/model/dto/DedupeRunRequest.java | 7 + .../dedupe/service/DedupeRunService.java | 17 +- .../controller/DeleteBrandRunController.java | 60 +++ .../model/dto/DeleteBrandRunRequest.java | 24 ++ .../model/dto/DeleteBrandSourceFileDto.java | 17 + .../model/vo/DeleteBrandHistoryVo.java | 14 + .../model/vo/DeleteBrandPreviewRowVo.java | 20 + .../model/vo/DeleteBrandResultItemVo.java | 47 +++ .../model/vo/DeleteBrandRunVo.java | 23 ++ .../service/DeleteBrandRunService.java | 291 +++++++++++++++ .../split/controller/SplitRunController.java | 28 +- .../split/model/dto/SplitRunRequest.java | 7 + .../split/service/SplitRunService.java | 16 +- .../task/model/entity/FileResultEntity.java | 1 + .../task/model/entity/FileTaskEntity.java | 1 + .../service/ModuleHistoryCleanupService.java | 52 +++ .../modules/ziniao/client/ZiniaoClient.java | 11 +- .../ziniao/client/ZiniaoClientImpl.java | 278 ++++++++++++-- .../controller/ZiniaoAuthController.java | 78 ++-- .../model/cache/ZiniaoSessionCacheDto.java | 2 + .../model/dto/ZiniaoOpenShopRequest.java | 17 + .../model/dto/ZiniaoSwitchShopRequest.java | 4 + .../ziniao/model/vo/ZiniaoOpenShopVo.java | 23 ++ .../ziniao/model/vo/ZiniaoSessionVo.java | 17 +- .../ziniao/model/vo/ZiniaoStaffItemVo.java | 17 + .../ziniao/model/vo/ZiniaoStaffListVo.java | 14 + .../ziniao/service/ZiniaoAuthService.java | 255 +++++++------ .../service/ZiniaoSessionCacheService.java | 17 + .../resources/application-local.example.yml | 12 +- .../src/main/resources/application.yml | 14 +- frontend-vue/delete-brand.html | 12 + frontend-vue/src/delete-brand-main.ts | 7 + .../brand/components/BrandDeleteBrandTab.vue | 346 ++++++++++++++++++ .../pages/brand/components/BrandTopBar.vue | 3 +- frontend-vue/src/shared/api/brand.ts | 23 +- frontend-vue/src/shared/api/java-modules.ts | 118 +++++- frontend-vue/vite.config.ts | 1 + 48 files changed, 1788 insertions(+), 286 deletions(-) create mode 100644 backend-java/sdk-java-5.0.6.jar create mode 100644 backend-java/src/main/java/com/nanri/aiimage/config/ModuleCleanupProperties.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandRunRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandSourceFileDto.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandHistoryVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandPreviewRowVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandResultItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandRunVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ModuleHistoryCleanupService.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoOpenShopRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoOpenShopVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffListVo.java create mode 100644 frontend-vue/delete-brand.html create mode 100644 frontend-vue/src/delete-brand-main.ts create mode 100644 frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue diff --git a/.gitignore b/.gitignore index d865f33..0c8527a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ backend-java/*.iml # desktop app desktop/ +ERP-Demo/ diff --git a/backend-java/sdk-java-5.0.6.jar b/backend-java/sdk-java-5.0.6.jar new file mode 100644 index 0000000000000000000000000000000000000000..6af6a20988108cb3d841105623a7884444a73b84 GIT binary patch literal 75581 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

EuqNeE}W7Sl#|R!^IwhQr}^3-@;4J=KIHx{ zM6j@@2v}ddcPT0hYbd)ZQb zz%yf$?1?6AX(lyr`QHYgL{s`&a`9Wj5OqG5en3s1AAO7MGdjk$p?F{kHN8i_3)2JJ za+>sS@G$F+Ja-!zE;Q~*(V-+0AR;sK0*L``69Dz6WSBCb;i7&26dh_Z0WvZxJ;%00 zZ((WrYajyEvjr8`F`2qFXi5^)o}xoWCO|`$;tpB>+&Tdq(^7Ou$OIV3)ZIZ%fLl1g zEjoiobK+}$qRt7~k`#zR3Z$y%C@C#330lx|)R4}O16pZbtv^=?A|%-K<7`$K31junZo#fj_tWGzx4ilTi} z29LVL*W|?YT{4Cw;8rs5$P;t{xa9%d@-noENDna}z<6}Kl`l$ywnE&PB1gzQL+V9Z z6JD|(YgH%d8(1JRknuaPykl9h*#noK_}U5ultEdxpe&u+#{=L>n)Ick%;hd{D@CUK z^RuhWYtttI;n4=V(GDv$J*kTVN93g{aPU>8s^Pow2C22EeR0gem z4mf}Wl4VZQq&F{U2g#)0;=hwQ(Tpj@Z$WtmuRBjPl_VIOY z!yG|WpJ$vTcP7ZZx9QX~D}y@Lfo=|wq_s5 z_Ibuda%YCjyCl74M%n(?mi@2v&r6P=&!4fmm)sd9^R7X!nNqgjWef6Z+xKz=DHa2v zH-OM>`wIKO9a%D@HZr8oO9VVpNbR;b7!?EW^R6T}hsi$F=vNZU_Q7pI(5?HQ_dJm% z&3~Ni9Vg@aBgGn|a$Bo?%b4=Y)3(1ZOBUNo7HbdcNs*ZxQ@JH-*%#5d6?uZzM46aU z0s5-$NfI0Y1%hI&LFYNSIdI!NE6ARBubLD%o1u_ly;nRl*WYQ6VZ+F`y*EYedsi88 zSSoJ3;>?V@;KYUntyt^HxBHBT#EJ!E+1IX>u#QxgsYt5zvUzS{t)ykH#5t);TC_pE9F!kYx+tJvW?wp= z!{mY_zYY=i3>f`qStG~V`u9+%aRDyw21p!<-4htC*T5y)JZN4l)BH<@9ru&fGo2|( zo9g&ptG`_1>PRPe&*U9=1K4tS;(DM`JmUfT_~pa@?HRF`0okM%cFW~j;n(Z*0d9~! z@n|TKKGG{oJ|5PcOK;B)z>a?n%sYk>{rXi!ke>*;Ka4*8D^EVJd;d|;hhSl^*J#)^ zjp*}rz%BnPMLrnRsMHgKXb7#g2gWw{}%je+>#o!yjpQ z-=Naq!Nfn;RQUk*>dMe9VrnDkB&a8NB`%)I@jmEl7?oP}B;VZ{h=CP zl%ko3+BFFB(?(saA?J`6s2>}+lVi=39TOL7!9*L9I8tLVh|>!?!E@?=OFt+9dH&U(r51+jX+_0Vs(#C`T_fbv;BicZ2mX{?nMJTpM0yIF(`?|@_{e(5fD%s zg3Y=2T+1%;hJe0bOO+$6iI@@bq4GebvdsAS!8ZRCTS3xx;uDpj_x;U4?YsbUhexoZ zFvpeW%8qS)t#oTe{OzgF8@MX&C%;Dd#<%dU8umb5tRR$C5>y4(u=-@GiEWMln@kvi z9WN+z2&Q$voV{DjRO$B!DoPT&B9C#pFTpJjkstHCrRkkwGuo(p==XFk-o(9NM_?Yi z@&VBTOc`jJm?b65F-y^wxp5i(TJbjwBrq>>f|p>_N!SB4jjFsyGy!7)ng+1sgxzK- z`Z70;({AU1QK-bhH)VwIsvHNyCgdHM#)SpSQ>MbZq>AyX><32x^Dv4hMcUD36Y`Qw znUFAe@^+2QlQjE8$mB~&v9)ZHZxzeXsO3TzQ%!hP4ueO5dGZaJVWU}!9?bJ5YS)S( zXyw~Pr-gEZLT7l5n?ksF^B1`U^lMf)I*azk2-<4h7RGBKwA5QAcxI}vvZw0VKj%=W zkQE6`7QE+D%g#+$o{H-v!|QOmEp)2y>(jjFe$imoX?0titCug+c3a>LAGoq_v38H~ zn>sxe-zYzTs||BR>o;I(@Y�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�Iz`rsj&%EOY6z6VL zDUox-8h<3i+J<|E3r6gNSr$C}wz#mKMR>5?*DaV;{y>Ee9ta@(9V;A_g}41h)!4$# zl-KUCYvuX*>;>sd&2?!wEW38;t}XZ@&az=?hq6hFKI3^voz(OGt4`KIdPdv4VRb9M z-+o%7Q$f`}ctWu_A^iqHz>73Z%ar}JF7_KyX1GEig|GsZ8E|CzX6C5v`~r_f1=^Gr zdr`RPV2wB0m>pF~IR4M{05RA1H0oEAS}pUR*I`;?)^Xpg$l4gxiyFHmfSoMqgNFhj zCJ5-+tn?eN_;3~OG^LWm_;kyi+o;yeL|w6bViXvDl*Nh48L}rud1G=H+Lsg-T<)}0 zuzA90&zF0q#u(Y`!P{tRQoC2VHxHqd!#`TX;dRmqn54L^S9@Ox{+8xl76c%6-Hj?6 zxO=yeLvhNs8W&o5|++mvCDl3Z9rsxJM$L*uVrQCD%p1qwSF z>;yXN2ZWJ(h_ur$lvOcv!C92sx_e8Tn1h>k& z&WT(Q=YA3fcC+id)EiX{C1oFdHssejA- zM>6gEqQ`$skz|Ry=`Ui^GOBm&WT#|cWdPXH&%a3C$_!{*>sHXDo0R=Gh4Tj~;_DY* zbi?y~MMOohWLJXh;m3*bnk@leF!yK)m&DpdLF`A%R{j2VK{h@m(4kWR=G*kZ`|;-# zFidDC)mLOU3D!Ry2VH# z>i=5Ei)H>!PjDP=RC_051HAE@M`HZIua2T1naDmDwWu=AP#?apKcyr>8RdH;N-s(r zIwkxYCt@TXy4a10VK`pEG;>(thgnQt;FSQyxWsc(|~vxdeGT)n%9wR0ieG{@cL#OL$t8Mu#Yo)QcJ zMh{?t(jbh=El*D*7_SkM>CB@HKcCQ#9W+)6q}W$S7!Q}qtw7J8pvfX*Kn82mK4@?@ zab9{$+u&BXv=#ls+)|Vd+Q><##L|HN$@f5vW@(#|k)qhoU=+s9RwEJ~*g`Z9%Lp5 zgwa#M*j9wJd$^KKee#e3)DKmLsT(6;ajAkzB4%ZINOz;6ts~#qNt7k|x@wx;FVRFm zDgCe-{YNh`rGe6kui{kRH>&<*N+R%U5FKKVB8Nf^njjq6d2^3mhE!~eR8sR2Q%E~; zUGnv$$WQ1nBcM1KMYF**q-~QcTpa(vqV{Ub#K>O(c*ohQ)YK465>nl5w_yP!(F%%fHJ``IsYTrWf7V6BcIpUMWWeYdtVKjJV5nSON-q9W10z-~&`etnn~ z4$rKD+24x~r=|bGHq)x&lcco}LqEVDHe)d91;ZwQIT-0r{`^OzlJZ;YiBx3z-5z#yMIPnl>EV6+?CsCX{hj6zJp_*L+b_}EXs*&p92#5CUZPb*Z6xceo@O{r(QhGvp6OguQ&!;`wQ7P>+)5< zN}J5AXw9^*@p9O8IKSsjiIp6)UOxA1IUn)BR`5?4pEYX?@;2~vd#-#I+^GAE++D_4 zK4rL8)ht}R>de$vBp7{8#0(}#9>_rt+o|RNn2zqSIR#i0@sYN2RQIoy@1C02Iyn-s zy31R{Z#xI1>~tBsUJ;Smbx3isrlb3hT^2p4@7OS!(odUjZ0A3H^;?(nx5a`6{Z`K6 z*oS)KpE!doD#}1RILU$u9L#D{oa z>AYV$5t&>ut_WvTV~QU(_y0I>wH_FNBF!0QB&C(O5!TwfkiG9(cHNMsaPe?rM005~ zE{J$JbO=PO%5X!erMFDrLaFB@o<}A>E>TWHC8br%7{#0Z<9mF-{slkzpen!@Z!l}p zrdS7%&BMIkF*K^I!C!fFBj_bc=HIB5s4q9dUSpEvXUrw+=|i0WBPqus5Ig7%ceDY~ zmOc^?=~hGcY_%F3v}Gz3&-Ql!PEMwz9ocxOZ9ejihu0+qC!6N>(p^3EW~jI95)|z3 zmp!ZRyhT&8z!#R;x&59haZf-B8|_EH(6xpS0Q2VjoK21Wno?x1p^N$_OzBNOHEks@ z@gVe58r?baN%W5$zdb;*ZSq05ifANFfPqTQnA)GK@&0j9l%rw@NBA%3@bZAR0_)d6 zR?Pm6+I;=Aui@e)2}|X;eQahI!t}3LBiE5{qH30c^7_>ywe`D^NXtVt!BJcCoQ7J6 zy!o0UNn>ZKB&tl>X7ZGH+RZ>6Y`$+JD$fS7zo!;j-2EKC_l$EaH*IGX;|wNhg9y2e znh+Ti0<`?@{pu(|5dsYO!oa0`+EjzEHGLZCci`5SoqUr%{V7|H=nNUi`UCn?^5 zC#7Xx3h^XeEIJzLaY%5RR_;X1SpT_W!PpaMj{B+n=%32}PbQ!Lsr;WV`9qKVze-KsgK#bcB0s17ua0Yc@tjj&82k(7KFjlwaT{2VZ*_7JlAHY z9*bXC&thTCzB=z@11Q`hJKku?K3gw%L(4~!ui9NYXR3<5#=Ek$)B4@nveSCPL1)my zR=tPl#a<3ZLq;{PY5CS=LU*h4#B0NGLTALKI!5uDfFa{=v$dYSCghXNFXuFUr@C$@@)FRohfxzf=Ia{GY&mLJ zF}EF&K?hY5$_|>!jfm^mRQE(N8{17ST@uQ-x4dQqw@m+=HqHYFVR@HvI0@JP3-M>n#4P!IMQH*O)Z zT72;y|Eh31Y!2`7A?KKQ%ccMoDlWg*bQvJBcG5z8oqdbpFD{)DZf3->5E^o9$=H;4 z&~aJAqsMP$+JW}IRZ9XWb(cs4;bjVB-(Uy2$#!z08mjKFm-6_=%iT-1nd#A5ci9hN z>luboh_E%T;w3Z7KLfF|i{1M~#66)Yt5je9LvIH8aQ{`{G!E(tlD-BWI^I!+FZwCR zOFRksAsr(O=OD*a@_zx3F{eY*Oxfem&=r4~0J0AwlG9Pi%6iAh)0iM1p`lZSbQals z1Q&9keh+8GAbt<~UAiYIAN7q8^Fo*gi6(4q`-)Y<=vi2`{JuIp`om3I7aCXlQ{H%L ze8t*gsukxBFCgz-{u5j)ZL$lBafC;#g7G0? zs0Km`agB00^;Hu5L3!x#`xuF#p2DN`N14%gKEnkKV$ZJVxx9T!q)Q`BL0h5e>;k>9 zg$E0tABJNxQm!l^g+qbQEZY!Qo!|e+5*5H?_Q3clZ`X!ifj-OInO*#3p-6gT>R z$DwS+4H+bPWNlN91&nb&6hPt1u!3g+jNfjBKZ0urh%!LtIkHffqQYXuQbofL$lOl= z?>&B`>L0O6G{a?XpUown8bL` zMm2SE`2Q)c$JK#BDNdXwp@=b^M|#yADywLA}z0|kzI{BB+D5xF7EbmUyT7zhYtY)a`ddM@c; zs=!?C?i#eA-1qVX?xPE|yGbt;X*Ql5A~o*2Mju;MP*ZE`d7jwREtG)#zi`B(`z-wr z&{exbbe(EC6CS&_v}7a!NL>s^hiHjGr$0vcq_X-5klyJ`_VX6!N9#1mmQ=B9iiy+N z7qbbwm%h8gCEKL@Fpw6|iLA4Uk=nEif9D^2N;gd)E7R%)`1axZ!T|~o6qhKHdE|Jy zHIjoCr+fn3r9=ei=iJSv_5G4gTRv+FlQrm zm!|x%Gsj!vGkCp1_h4v&bT=!wWt5?&%F9^&c;$mi7c=OEx3@`Zrbs6~fv|2cnov@> zsI<-(+h+4Ilow;zOILBg##;zul*Omiu80s9x!3hdj9~Q@h*`ZAF$@N4E6<3aFxVU= z@)U4QdF0kWS2`UEQj`$Pu!l9aX?gmW^b!1_e7ml(dbUg@in(F*PWynZw2UHOmnVp( zA2;|uw1%=Dl0OfAA1=4$IwCHTaZ9J@LW*Fbn5Vz(1<+eCob=5&5m}HlmK2QR#q!;u zWc}SZScmMN^~N-PFJkkfqCkfM0ATyy*4w{z*ZBk}>?Zwu7zsZ|jVCz9I?D ziV|x90QsWg*#OW;n#CT9-;^tlW&#Vuo7!>uMz6bUgJe8+!ruTGCg)MpVrg?2qP@FO zzKLO-t}9IKSyDJ@-p^|%t?!rDwz-nuZzric0N8`sTE_O#e@v-)RBwfo zmM^HCLTVaPOzVdS^y~xSmQj!k!VVfD2y0oDt!_0G>dOnN3I;kWA~d@)AgKYhnJ4H< z@7)I*QYf)R)cFjaOMEnEk{|CqZ01-ZkDlxS5e{UU%`lgt0fV4`_AguXHt`kvA1>&k z&v4`>$uBBN3@c2~N-C5AxuxYz$6M-c(vVen)Tz;~6oCfL_D}%#*TysW*{4t^hX1S| zSLoB)!%vqdtVmLIs2_HlB3}u_Q?jvS)><9gY<6pQDN>zKDtEMLOsZRAu}c(dP-u$S zq$fBxXx&mfIU8)%rG7Twh{J&^*CMo(vq+?9%pQQ6T?vq>qh(+rnC>j=Jhp5$EJO#P z#3|Tza1&iCdrj9tB{#coEwaLF(3K-)EG3kr_4M`OQqjpy@>m$%I2cql6QZnkJj8*Bqjc$~E1#R(lH0g^;uryZ2J32$IE3wa!rx$yCa zU!uBz6IaZ#cyGe-Szhk)$2iM?M#aKpn@#m_OtuB)k>I*Hg!L{ZWaY<50ereb*SC&u z2~JPEd;0B5j>$7X0fS-0ELG?7iybD^-7~1U&`orZ`WWQ$N%kyVqrPca3$8_2`dx!L zzh5N!E&j~bX|jHcbe`e!Ygk&YlHpUjnn*B9D>L(?%~u>7#!`(x1>nn^`1+BOSznru zh;{DXPd!G&Kk@5>kmYU-64vaV`jdNZ=Dz_2V?VaCNmTP_;)W4kcFUyrf z6XYfDJ@kMqEVZ zz#Drhe-`_7?2-5AIQ_Q~0yr*Vw^jmoAxr`|HUe1?Q;KVrLq5k8V42bSUFzbk5NxYy zhgk^rm_&Z{@lKdA+dPE(Jfs93X&W(pP(nhdMwQ#`qzK;&)APn>ZrlOouq zwFJcWGy-~3lW!qW39p#zk=X`{`j}Iefs%>tuAYh_)>NHe8RkWzZ_lWw;liiY4a@SR=gwSl1a z*v6u8wI63YzVv{y))13911^00iJ0Oo{JVV)6AGTf5H$zNlPzMJyMIvt)T1tn!SA}6 zB_f(Pmrhy5PT?=F~9n;S-KRMjQf84&ii(a3AN5n4c=t(^7lE>`t>JK6URncqR zUZ?BB0%MtO5x{rQq$YrvV-+4OAP%T39!NM+?a&^If`6$Fj=<7@hYx{f_{8hXx>Iu) zQO~EkhFd*`ay%nyCkinp+QZ#TGK2|*;L8mX{Q6BXG|e*-MZV^qW`El~7(3Zh=qIAhyzVaV}G=qht8Fy9U?rok#ViiYVDF z`jO-Ly|;dfSE4c6_L2(oI5Q`V{S{aPgb>$^{d;s)G>x?S4|AgvTOFV zZyg?EvwE_rp77gX3f*9Gt?m+#-^&Gd-{Xd?y#l#IFR;(-?lG7JWs2O21$y8AaF5Lb zN7~G(W0%-hbc{6HS#enWY%Q!`*YFRIAp|QeR?za8EgUTJg&{ z$N(z60kV{tk-cKjntxIa?flpBNUJTRNCr^mdLW^A8}sZoc34o64Ks&4BnF(iHSH%i)UG z|AgMsGYDk8uMRKH6(SG3*13?B}bk1eQ1SXUrAHNC87N)3|959;9GTVh5vqu3M` z(1ss|Xpr=m8Ph6SRG?nF7^cPVG#N*F;6m~uO~Neo5vqmW9IK*F>Tz09eQ|pZD4Wx{ z2hsBY~_n3;V}NioY&2GRKV`q{DZ z_d?$TsxO!GO zWkH=VDrdJw)}aL{sTNY8#~4)s~C7la>#hQkT02B%9 zzB%y$BOkV*d)=@I3&`gEQOfp-LX(f3c4->k+fo#qB z9ZU$zL=$whp1`3AOouJDiFv+B31%X)on3tH+18}NEV;dn8V0(1DPU0V%zsHkg*^gt zU=>)kjsis+E(FxMJY-l-zk#yd)h>@XqlHynoCa0OlO1!O&>Jq)l783%s_3z2Xvl_Z z4nqqyhM;G5zGu==b(wEz{`*7V7#RFRAR$G9jU54h?Zqz15PiZv+tuyWVmo|uXRy<) zHT2~cJnp+xmi%hP?KSY@Cr170R;MS%TnI11m~izQ8O}GYRy2Qpko7iN;r-V_6CmC; z06lCXZcjMxdA{JIIXORU9V#%b%KZg;U{Rm8NWB1$}IZLxwzCEW@$xgBc*r%sil$#YUKPD^L*d4rON`(pr{oPw zO9(SVZ%)9uywYmxr}?l9<$^7KTB1{ixtua| z^f0qWVIf(-1+I1-*fA$F110JM3voRXd1$hAfhLxw#C-k~WN&Ohx$Ks~a4XBC(SHs= zfKrBsJ|-j0S`QQi+wq~8pzECG?}THtQ4#i=k-^sSdrg*;OP5QR*I~mRE2hx~ol{9H zU>zxlzzgx$k~d2fQd&u;6(%T~l@~0c?!#~Wz9{i|E_y~a;IfkEo~rbCMes>7x9Wvm z92|Lt!u=xj9UF}8zkZ!)Qe|3#F*S3)J4ZIeFt8{SRh%DRwpvHELc!Z0QXz66z1YV~ z7kPHpkbLdhCVSA)RX`*`i?OBzfu_kyNg&IExa&{N;7|(P*dQpt?mzOO{=JY|hV8%G z=4Wv(=Nw%`yHt?B#qT_*5_y8E&RSc?!i<{1rgudV+^xy@6DTdbnlW{PYcR4l@P*TK z?m`ces_D;1{3}+gv6~UBDFn^tl!z71$pG^ZlLVt7WSfDw5t;~9tQ*v;qq3sp$SQV^p9K$7gcVI+^Q!@3(J!XVLv#>U5R96Xj=EW}j|jlEm2bL_%#e-DS01Pyn~ ziJ$eTx|1ie*41uhjWe>t{FPqpNRBfd;&1qIBL5Ln7An9tOQ)PA!HK%m#p0Pw_VwHu0PsztlB9=3qzw3- zXhwzaJ$1_XE%U@j#Qu)?V{`gK}?ZXFWE3eEnbfjdlp4+>wzFvr8ns zrXHd>MFFUBdLQ-~b^)Zzo@Cj1V@I&LzzVYcE+x2m{XC&~I34A6kq+{-*Cpm<*fqb9I|M=M6QZ+mgT~OMKF%`*8mZN<$Kc?uSg5~jgeROZii8In`YV7r*{;s5huT4m zziq_d)yg`=xXn1UtqwT~I8d!_H=}d|!*U5_PM6aP-1iA^;nL>@?&3wp*M(Jw2Veyb z_}=aJ3BT(Fz=#c&CQ3ILn0GD+`PE!^;@F=ns9W@V@1mF@V%3t$ptd@!n<64jEanUO zZnXlC;$Y&Hx}_7wGD6<{gUrmuJKVgrg}wttAUCuMt`t2lv?IAUK|w$umLwl34M!F1 z6=LH=@*BzR1+jutn0%qWuYAHf^hoVlGp4xh6!aDT4>%c~p#Jpv4^{(AXE8M^ul?x{ znYj)W6Gw06c;Y~;0`)s0pAU2#9@%dbyx{hcIYo+0iV`xKw#d0JrlE&|6~-`X%x#@F zN+n~@MC=w;`2rSy_(x(LSqi1xW}JgKGxeB*7b2*;Pu zVw(fA25%h8@Jk7G@BpXu!I?~B{g$1d<8$UFov3t$uhd8Xa;<&=p?g5aJYO(n>jZFT zfjRc_Q=J*N?b;elnhVw4kguW|3`qzHgqy*7(WoFyi8r1Zpv(mgzEg)F_Zg=nSaWFW z3pW{IZ#X*lNFN+vaqO+qUw?v*#jMlQi(AV8OcrO-%GH?sdKvK*`eFmp<*-19JKaj&d_Q4STdW?bqBbjII8VZ^T-XL zIcpbrIce9q+-vWtA@&_h_<*IRZW@=3$3{k&%jPMakynBqX=c-Y1v~G6 z<=uR7CfRk^l7yLaB%OLw`2&&yi@0>dNwgX6O1y%#+%ss^VnD=dNT^-nP{@F=JICmT z_nwxyI?be16rP#4IB;S-SUtyOg2$(Z&Z0lh6XWI-)ctHZd5u8 zTW>-k>K0sRNjp(m8!2zHHkn}VJPM|&PO^(lM?@u47&vzbO?RR4c3zlAq@r*tAr6-D z4NpeqAW0Pxn3ZN0oxs6R>@#*l7T0&b|JZX}ZFi*+&?JOV;z@fDKe5jf;*rCYMY{#L zzaysHrC>@fou|$bN!F60Y7aVh>&X7e{l*MqLlhSO$WjVbY#??|aK5as-!e4p z92s_r4X(!L;J?3C=kT79df_^(Tj=Idu)PRMjBsuF7@!BJGX3zZrv+Yi^moRn%Ymz! z@OK8S)A?0}26#cz=Rr|d1Gqf#^=4+)?Y**G?inx&=!xXaPk zfXNr}8#L_*wy5EW253IR#)3^GJQ6v1f}!AdEg%m}pD~T}E@{T_6a^~h%Czx`Mtc>~ zXhypg?fn+soUcF~L{e#khNy4*W$alm_3yV5XU>Jg7oDU@zR&Gump{zU04Q&fhxp5G zarcVtvqlbk1{3dx?67eoCzL5QQzKqAMgxq1r6l_@R@ao6e-Oq`$Wa`kD%{DcceR}m z7@C6yjy&-9Vl(5=(Eum8>bbT3d;bbU%?kzLCFq2fwLWdVdTASE{6Dzi?sK;F(JUjwL{)!OeX9juEMs zVL({AS5Fk`&d%z#Kv%E9tX=?ECda|cLv8}Iu?s|atnfq#qG2=}|K|bCOo}02b%7 zgm>3^it@#heRNYdy>rz6!To&yvNpo2WVJ43L#J19Ujjx`$l@VQzmMX!rC0${Opy{t zsjekBwvQ>H^6WQnD^-*K$nldj!<*$3DYRYunj|{iYK|TQZM(oDcP{PFD{Nh}J@h6F zSw95x4fb72rRo9(4wNXDsuzYurA+p#xD;N37cJlB`HcIQF>$Dti6c?6oJWEjGf!cg z&}3^h7bm-vIVY#~MhEK;th%{rkyX=H^4-&T*i9fKN5LpBt-UI~#p*X{uA_RZEUS3w z3%+*HFu**ofVD5snVr{Oub-1I=-C(8{3lM4CsL6oRFNlEk!NVlp6i(oHVz<#SWO zthxGQ(Q)1h6Iu4M)}v+?-ggxSm(;}ZTt+6D1-n*}yIV@g5Fgf1@;bcmfXw0Q3jQp_ zUIYICPDBtGtXw3ufxsLKM5Q&N$_8;&i@2I~V%<7n{?B>|O^s#}IxQ<*xcdUZaV=V~ zui7TVnVNiY4WE#^5~(5){bV#x&0l)jjwdsVJOp*X!ep=&+)9XWj?b^*Cz1E;fUYsb zYVt5{&rvopN^XD9au?a~Rw~>U+=rW|%N;zKWDFVVEbr#(q>@+NQAT3Q$v&F!>Bwx+ zy*cK3iF;jUD7?5lC^(5hQc}txDz0V%Hr_cw$)9>-@li7*^nh7 z54Tio@3Nt_ZHU73u}M_@1#+?c^P$YFlY5DQpb$= zkh>RY&$=q$o&DwuY&<)7>^*mI;n@=NEn@p62b%E-(KKHUR`?BP4K^QFx#S&z^_CO% z@FpL3M@5m^W_p?R5aq4MmFN)eNoCwi+Ht z2cf+d_C6)oL*$Y3&ju6jl7<&2RSRd_#=DWkdx`Yw2K7MC-1{>RznW=6UAxai(roZT zxt)r`=9gKgKzHbTGu*g5zgxsTUwC9qMEh1m`!|<0(dYa#yT^7(HDr?pj#(#WQ#G*l z1^)(fo;9%a5^X{Hx(4M6rg{7_$heMFWs|c~ZL?fsOAgRFScF;Xob$R!hj3?r%>vM) zcy%(YrS)R5b;(I{^0do$!_e{Qd8Uj!3KXn!57N@e-SE z>8-)MYt4v`-$imSFqs{;tF7<0MT##1Pw#`esit|?h2~wEX);@)jB>6~e z9C)H0@#%hw^6%C|U$wKEIcez~xuA*v`XqU|ILPlA%7a|lva1NtH+#qV?wjIhwKQ3C zrRi)L&YOLTQ7zmJ|M6*Y2sYHUjl@BEg0<3Uc3Ck$2X{`qTmVKW5_rf6&az9Cd;m`v z(zQ~_40?HbS>ZHWEto@QveGP6_ONnSnq(T6s+0D*D~F@rXPa}z zrJxq2$bqyBVqj@pdZaSsC>fD@wPdXBa)JIQjcH+iQi5@WZW-#M$#|)9V96d2?o`&T z>VV*$BZR(yC=wy0_*(;F@RnUrRb@}wq8d>vD+*0vPU-QSX9q$tEx*^z&*z(%)DAQ- zk7ka--|}&;jXw*fOTzWht>M5)gJ5Q~G@51gB=3?#J({bGOIR8S`Ai>ylwMc|NJ=pn zWR-BdD2O?tm<6#L{y^@On7~0_9fY6|OQ72RzN%^YlP%sq^aWSyPtoShW^>&Jh)0FpLrkwlS)d+*k_huGML z{MSR8AVBxsa8g=kCGP{tGl;soO1tH({cV^XVJtGnUFe#3Q_e~T@d79ke#G$}kR z^OnQS+73%17DGg6sCyn?W~Dp&?5tsYKYjerZncI+K#^}%07Y+~>AGEu+R1f)i$Byb z-H1Q*FyWoHRUJh5p%T~kg$IK#3r;uzJ5q$di+5p%#w>MG$2|dgO6ys{zfk)wX=%9c zuF@O+rK-6Z#)DA0c(=`M9|TzmY$1}=J>#zFCOyUPNdRTC)P^MRuT)JdjQY1wP`ObC`& zW!v#%scnJ==XW@pg|qU~b3hn;@DV z9bX8qg$k~*VfJqj>JIg4QB~+oHKDi z3}t(^LQ32tqQlffQuQa%5aV@?1689N+OIKw&h~IE#|t#*Ei0R;ue%^Br;60#;kyjX zW^Fzk5moh)35ILhy=Ln?OwwD9${zZ#?p;FZk)m08(2NCN#+l40$mUvz+vsn4uJV41uIDj7rBXUy%a7E#l#G)g`xm3g(JJIw>zY*m$1;(}2Sp=c8At*F z{|0O&ZB9W^KLn zZ$tl0&iJYl{2-dw-vr5?ggYtz-{2R2Rv45*`sZIn+*@rh-=L}+Hk&M@D~**9KQRkXZWdQ)b8S8-9Hy__9`=Wq*I{VP^zn*O4CgY zCO8G^_pO8xvSy+Vvin+s8Smv)Em3DDq}KnLZ7fsoG&zdbP<>&RtW*R_|3;Ga2QRW> zZf$M$2p{LiUWY?IKIY;se>Yjk3o{^*q`9G~VD3+e5)YvoiBVx{E?A27<|@BHjv8$# z)gGgActl6M8A6Pg$YjT0T;z|A!8xQ5rFzIF&%V&pldP<$PgLLbs7bD#hVQRX-#)N* z9ta|k;z(A$@?(>FQzbp4CyKYZj8lK^tvFSFYKFBGS*x0DXC{C7nl_(<>bcc+mM6k6 z?j8S|5tSo%0q~hk-s%c+$=Rx$l(1Hn+T1lA+Vbv(OV;j#j7E?B2V9I%i~9(FqD&}X zUvpRnxpTJtFVoR*@Qm@Ly?*lBVUk_Aj4dl}rdkxa3I8DTp(1c5c8&3U@v!m(^rw%J z&>c)zdCqf9;Y&$m*JTeK`hGRaZ3RXS1myiWL(nkGNg`^i($}mSv6m7#YB^6*;EZY8*7hfr%-2> zgrqG#P9~MWrYPMf(0*2R2#5%v{TsY0giF*k|9YaBy;(RipK42L)4`Fb0>oSndWuiL zrYA(>U~fpO0#Yr)W*WqopPL6E9lTfc>_qSPApwZcFSJp1@+Wu_y!;?TVw@tq8aY&= z{gHq^CqW4|g1ZGaa|t7RT%JUM;XM;4w8swTq9OHwuhHtQmZq0 ztfrhyE(#awoS|AFB2VlC^o8Zovs6TgxcfO9+uU^CsQ(^?o_pe45tp2C)gFW7krVu*bWx zt3BRYyx;9HpYR>yjKZv+k+HtT%y!y`HAa@-MKXmQ)Xup^;h|B+B9!<-*;hgGrdlzM z!0|>$s#>6%-a_Ce96>BQ%19t046n$R>t%_EAlxCy|FgwXlkx4+{e%PPzybi!{x4dr zxsB<+Myh{jmqe>-+aaBxa9?Pflc*2y;s??|2#NEh9OZ)TFAtN00{@AIX&MF-%rv2? zzG7}E5~BiY3jUZSKI9EDB9+n%6Ab0K!QzBjEc2yna z8-kuRdwK7E$?}}(w)|>%4CMr9**gGW*((JUx-H;}0w9f#Z?2M(PL~0_rIETwgXsG$ z`dN1v|D>-njjih6OY?9CcU$iz8w?bKnVM?sDnmOnK}5FD1qYhmMVwd=lh9?2V~i&g zHkW#2&)|nHbH-MEU<%m1g)(xiCnnA#%_}#-Cv*x46%7AdQL>y~kdM-)xbE zVMH`a095fH%zWms5j?tp-gez2{`Es8Tx+r**?s8De@vaxkW*&qvMF09o5kVO1 z9jYZq*n=BOSnHk4kJgVoj9v=lj`o@E)n1(ge#p};mkyVin2txT&fM6WJoSe#N4^1G z;&L?6ZdEQJ-v7o=lsd6tA3|a?pl5T% zCLPRtnGCc(R-S@xQ5vUGi(OSA%|Ap|;!fmLmh*#j za(`kM#E~TId0nt-s@U=z`qR;iV{1g-8~rY@cn@pq7(1A;RWaO&<{O(kbR zJZKYfVWgZb|3QYwr&hLu_1~R!=TTD$t*X#zQxF27xjuC$7CoYUq4t~_7WSINS@_+* zGEN9WNXrPeXxZ~59=Fy#SZ*6z-oxqc0=k0ohbvC0X|0eB!KR?EEL@s^U#dOKJ+7qR z)T_U?8h_o`jb!7K`B}iVf#LtIoo#J3+UK3lpY&aq|{pl~MX| zqIAeiwLvzeHMoPiQLLSMg8|m>w67ocIJ@RX?i^R;izWC@k6_(Asb1c&=efBkiZI<&s0TT^cUt^LgJNp7?PWO3R;rVqu=Wi+mq z1~jYyu@v;L(tTu$mK>paBxjo~XBQcPPnhOEOb_R(u1co3lSXs~Rz;a%;x~B)uwBZA z+@C3~#X`9DG0f+Y&7TfDi%yR%;J0h#Yt1BQoi7!Vj6=q#h)hcyb(e2PHL|JC%Mw9t zRM<+hKdwnhQy)MH;q_g%LVWj0fd<7xm7@lb(`ogbLy4w^7x7$z*XqM|qbVm?$P5Z^ z_u!eCLsX&^;|-;@g_8FIEiMg+g`#;pzIllD7@!NL$7bUk&@68Rw=VcT`BBalgd^O` z^N->8s^6fuk7uLbXP2BN|9p5ch>UU;M1M`JVp>CMiI_IgJ7H)RMBmNq#j>z!2@|hx zogU*pD^k4*&DIv3fEB1 zgShOun`nTz*Aa>hjD#WiJF|W8fv^mqRcHp}(gQp!14gqa`O&#PJ>`5?E1iZRq54cw z>i>nQmQeF35=h2EfZ%7rd1uC2idIv^E=r9OveloW392PPKd1{fUFOLcB&<$iqfFd^ zIKDKl8ZM_yg>Uqz8^{CabwVFK6_pWKROHD%X5IQ>K$`NDnv;vI4b-0&55 z-^SYBA#ieB47uFknL|T84`+z;1VX;0wH(~tW#9fHuKp;bO>HmkZcZ?Aw z>e@t4@d) z16#f1ewjYJ{kHmZcRgp?f0@L#I^UP)jY3SaY}-bqwj5{ns6DcF$83YGSdT@SOdb)L zvUFKTCyG#kFdSETy-tcS+*d`6pWY+lzQenXHurPvINwx*jyCU>9yyY6~@f*L#q!rVeQ@>L{zp)2n(Z6%{l|y{>Uc&>w z=N%s29!}fuF$OQ7c%2t!(@t`;9zj-pXKtAWGogCz<}^ROH>D%hZhT!9dfUn~X6z4X z+wWANZonpLt*xxj&1}?m=j&=}%6syA3R}9H`Qyxxk`z&+i4wlW90GZ>7O3m0wdL?% zFc~*ij8Ce}D>SEpr~*b{q1(zfDa@RWSgKKrtjmM3sH>ST{{7y_ zOytn8v{>bf`D}Tz!^2q8{L0qHZqCb5 zo&*mi@QB2D82uVI!)lD)Ns;5_*d7roG^m9U78oxMpfYY`0c%*v2j!^h|8y?jk>R#s zIH?W?`P_&8b_=^ODP&$plmN?UCV{)EKKpkA`&3MTJfDVhH!6S}z84dr#DG*&_C)$v z;ciVv)1TBZ-4#QK4BPtJ*@w>pnPB;3B+Il0W$*b^gd=;~CW3QnBD``Ie{BS7L~XgH zP-)`Gf2W4v5f!|7y?b5@_CdIfOg-*Kwh*1{ppo$17t{QmhOok436CA1l`o{}VO|zB zd=24||jp0Y7AGP~-Cy-7A&{iMp*^=F2WI_tCAH?$k*`}B!dq?wj_u* zTgZjNw*p2sQuj840k#W4I7hBBwgAvv+MA*6bSquLamqO49x*8@-Bjm`!ErSuJBYoh zc_IB;yT0THfh^k3Cw%K)yPOAOF}#5kHIr7_9mR7%C3qbt}^T$rZ_Xdl-HOIh`$`*%9(*oa>7&|gklE~C4BDA{Hin? z1ML1bk`=Zt+q^U^4J+Rsr4nqfQYVy^pWNhB7Bs1)J(-pknTFt05s((AV9rjnY+;W# zIvh`N!_%&kwF~R#*3ZggA48O260sPl$MGfYjA-P5V^K`(B+iHceMH8eVJ{3_7`I9p z7sLb`Nqh4g2@h47x5z;>0{i4aj2?D-?ZnX-ZCqvi40(1tYjsM^BNy~sMT5E6{N4M+j_X#gGbC1gD*REDz-|%+OpH zI6eQ9`s@J=a0b&6y01f2MCCIW*mfvcHKGy=CxF#sfu0-gAH+F7Edk?F=D(+g8}~x(I5w#d zuBBOr=S3d=LlFmOSnuEu5*YAq8e|w&QNgnq)AgdufZO|nDJa8f?R=wH)&TGwwfCrp zIYFl(!m5E2c$a-Rr8`g)4`--@*x59%MQMcdSMvzgkN9i{f_Iw1&5Z#g!G%3X66lhj86 zR_EkxoqK?s6zIpnQ%g3~fh0`mta{L@Ls%3A8Wn{6Pi5vye(w=g@62VjQx&WWz%$Wg zsP+YNyUi!A*>Bbp7`syLS(0)yhe2gM)F-IqqTZWJt!R#MM}C>FZvpKAwHrK>c;U9> zH7A+o@E>}7m>se2moW$Tsbl)+ zc$#nP{0^@svpFRJ02KG^ZL)cWehwiNJWv>>&^bkS zJqtib9tk8+abMyTT;jr2y~5|c0VB5{KreH^`o#$Ph2{e?JpP)UcJhgKhhbR4*aL#_ z@si;588%4nPLXJmt>Iqp1!Q@I23-x?Tx2(bP-jbjJqMxCDRHLN?#j%CY3do($}o>j z9CAVz)#IbU0YYlwPQ{HdthW48EE+h-jGE?=Vk?oGAM`LSmgNNauM}d48zn<3txK^@ z@R-v4@$?G`)K1_X)Ii59*i-1EvOj`ZDY1&mVIZvtsa@GwLdYmaRvh6BQA*xBs zUjJlOJ^I);%~^1Z52M&nvIms0^B0587e9x*cpMmDzDQRzRN}`{IQCzU;BJ-!_lm!6 zbK`LZqiw~^XI9&Vic@jU-fz4gH*hCcr=B@Kmg@*E4v3x&M~+DMxcxg?0eJsM3|9Pc zf1%y7$|98!Oi06h3?)52G^~V-S~o+UQBq*=&dzKc(xBDD9Tv{G)(~pW!aB`XRq>W0 zFxaAXB1gX>&#Ys?Csn7kes5h28!@l`;U6s*souJ7NLqdrkb0zOU9m6K)D|kIsQvVk)$fbs?QpUz{sGmh$s4I9%GjG*Wj-;0;PGRnsn!| z#(RTVL1964WwZ8*)<2InAZU%jcTe!11mwvq`*y zo=4-Db%k&kV${tvdTN}XFZQO0=~#3iCROuvEO6HfSK-=WOK4;yyq1cKU#Yj|yW0QIH8C5VehG7^3|>~?2O zuiQmeF)V42{u-l3ts}DKrMg9+1K&zuf`i06;r30^5pEMy%CVn03guhM{z&)vMWW>l zarSp{mzU1d`qIvPR&@N)D@p3VE+JgL6wwatP^`TJb`M{653*+P6dO`pX1oRAsSX~f zU+^^8D$Y2nddxdknKw++Tq*6@=%Kfm>Y;VfHYzV#4+XA_ZZ`6w$GDk;KSJ9ecW2DC zKA6*qJ`V9+?*JKcPGG!*ctkwH$s0haZ120%8qN&cAcMccaqL!|$@?kg2bSXT>f1kt z-IY?(S#w2Jz{WgN1Nzhuc1n+>`#t6z8LNvlbk+*g==;~TE@onE!giBh# znZQ^)kxxv?u%;DL1`bg}POc&q?j(tudKmmw$LdDc@nbz~0o7H6YZgzZ>;GUnMu{{G zdLpoT3?{+et!F%7i=Pe`zNaK1W06m`Z0~n0?{y4&!f!Vy#xuP$C_)%tOt{0e&`nau zr-*y{EYB-lJfbhAoqLRG9&kR#{cYz$Pcv_*vQ}KN#(7_$);A?V%xC^YpA`I+VL@7I$o-ofEjC*{ImARMLbH##a?-))Q&YE5}H^Ry41LvW?{x^=L9MJe}8_OU*|X zjV8*JJgOO~JXEXz)L2}n*~EGwPxK0gNh2x$9iC$bzi#Bo%34%604Dl!0 z>=vJ+z?6C(0Cotj!?=pgZ^xGQ^0)qxxUb7%Y%1H1U}|xTOMyD&%p6V?3~hXaq3i)Y z3mb3UfvUXgNlk0);J*3Cui*hRG`V0twAQHQT<;NFwedox`oX^fad@ZUH8-V*Hz`f) zj3mkamg{~3#kOOTJMJ9 zE6ts9dZ6Sk)V}YP0eyPtJ5VJ&1zX101%2VGoqfAK5w=mP)E~PqYn}zSp3<?}t9PdmxDuz9FjKUc&UyMyniJDApSpNy~+q{b=^SE8DWV-1~Qo z#msYL-6o#B`by>8#yf(_q1~cvKV)OYC9}%Xx^?n>#U<3r%-VGVx%z5>rWSzXNFq;> z1yI`od5&5YNOYW;FIEe3D*nQ+y#bs}g9WI#3x!Rj2J~bcWlwD#0*iFh@67?Ij?V@- zCN(Y5f#?~x?p{ZL8g#%C`L3Bh9vqagIn{73d!|~ z3c7IgZ09M6nYLm9+$l8sQod8q`@tY@^9gys*AOEb{=Ojoo zpsrDg0@WrXwCThEw2X1-RboL}B_8@=8u8c_QvI<>IP|Y$uxq3Ow$Y!jF*Qwr!hX5Lqq1#_9q=m*b^ zh?Z>JmzMRni~rrv9{C+y9Y%_RR%(2`FIx=c$|3dsoacD4GgONK zk`esPU^OHXw6$?Ec60ile1u;+_C-0kZyC)D1fc4zu0v#U5h)HlM z^0~iV1qK+Zp7dds6v4J&PKv|STPSBS5uIu9XE}5)%2Nmae6Ydkh$NK+p`s8ubY?2! z_p4gAo->CeK$D2Zu8NRQcM5XV4zc(R@y1~+TO@%3^AnK%1zXh#Hre^TSZ+A3p8>~q z=nDUAi0gm^?mSZr-x`Z#WUCm49BhIaiGm&I%Tn7~4N|NOKpdM*^B-ADIzW>_+%W&F`xj}*)!Q@x=d+$!*D^#RbKMeU{f z8KDu$%+QAG0!}ed>WlV?WXRp{b#yGy2I@lKvE=Kh&;$p~`>{|@g2puFZy_onR?r@Q ztf-!vN4(k5Li%fZBoa0OnZpO#XJZ971~m4!8Yd{xTMWF|Xmrlm#0R$n3obB4aK8}=fC(WPiFRUsToEV(>0k!w42 zwu@@E#DCO3MfUf&Ous#b?|icWtdH=%xc`8An2o{lW;8xFVJ_gpz9Ht9PRIE$dGS(v z2jOhk(q$1kMRO7ECcXha%ZJP+Di>Sf&~pv{70}QOqAwa})EJa<>+>8kwsOQv`1ciJ zMxXH(wPyN=Hmr7nctA}iQXeW;5Uf*(Mq1QjH%3Mg#57I}_S8IQi=;@9m1HC_q-aeB z9QxNve{b*x1GJ1oFWrLqjDxZa?s};MeFdYR*qoG}=0+HC#86A<0QJ8wp>JVjf4*ND zPZ0Y5Wv}a*K)jIjAiwx9urnee1ZltoV2GuV z%yH=7cCXZFzhotHcr&bKu9+F6grzxi%PUy8pZrIh#qP37rOR7s?6S-H@^W)WinaPe z_iVQ#OMkuKWfL6Gx)@ukVU}#s_fIe(9&hY^~O^n^0G)>R& z@FC7re``D2#IUQ|rfatwpsa&sTx4n2D^AaBjHR<3h>c7W?opq*j!}9RVt>{T)N#D?qEynJ~G}P&KaO1v0CQ=N)3#zX40Y zns+y<>KhrzGU@uXoT^xh@}wMuI@T&{BsginMKf`V>fr^}pn*7G`UkIz--Sz{OSOrYOvAnLI0JLBq1b_U^`-!uooB@6&gXoJ%XH<nlhY-;RADOZ2U-IiHufD&gOq*D4QzWEvFa>iF0O_`XnWz19vvvoirG* zH)fHS%YPwAVB8Di({`#xTZ%pZMhteRuf?!%=My(OaiwFcaBN_vf+t~M7{89pbt&TwqtYE=f&O>W340t=r ziNA=9RRvG)yXiX5?sUg*r>i-0<&QQA6>%(g7jh)V2vuG*CGAW&3>G!!3Cq5Wbgsg0 z@Nid?ns;hi)EYjyrzh#mJ_{LahMi0wL0X$rcNGdtiX|gK2eqh5R}BDu?YZFL+0~;8dy_XTq6S7)HU?hN ztiAa}7oNi=)N!D_xgJZJe$R3Va{q*`)%fL;=Y0H1)uoCpZNi3BN(*sYN&Gl0#> z-iu+u$~deOeWi{m^H8N4DRS7!(o%i6bd)&-v$20h(Cie%14B-YAZc7&D?Q;2(-I~q z6Z_BGBWegG?uHeOoI11er~ng;(tFY1okq|{w8IpgGVj+N?@sLyFw*>M$=!OP&>_9@ z%!CjFOaMEQS&2=tM9bABOIa$(0VmnZCN!8G3*#j z%g2ATya4@53rh)ppqT=rUTFA9t7^X>JQ5`5mApgwGpdvKv;a|4`!zU1_du0`$*H^z zJ=bM_mBJ@*Rk;gbK#j?y7#RqVS;gbIlp$P*slfGP(Vo|^!r}>Y<~p|M)2aE5nKySX zB@=z$R+-4IGNRU?G=jS=S;mtqlB-8`Z{xv&uE4Yl#FtC_swyp1P3mbB3Vg+_~Z)OKkCW< zbx2RP4PSDKoe-b(ffzUvM$?2kpg8V3?I#BOypH>(Ja#q!IVHSjA+ltGu1f8pEj8^q-u4(cFq*AjC#~rww%L-GheL@fbm?l^}igyz|+ z2#BvK4U7(YdWR%G!!@{lY4>AQBi6NF;B{yywaPs=iz^7 zlWQ`cNUyW>Fi7RaCR*{N!2xkcFX-*Dm1H}>_G1$Lj2#MaN3?Ts{yXD7w%JeVUZ4RL zq2pE?mn?UjV)&=fR{lx&Hk?ZbBilZLVcFRYoUU>rvW*rpAP_hm^vSz@9z>-;wZmPD;8sN_E(>XSle?jAFMB-0+#|q?3=lC4r9}c! zFNCC@Og3U6A8;`&Wxh-Ss3;Zg!nr;$UOL!NE2uzYWEqNHfE|{BzkzS9QZ!AG#7Okm zYuF=mPA27YlSgaefM=_o7+7{55hANNK?_D~=%%V^2FI-wWie(yKLr4#`{ zh2W3%q8-&XwR)njq;UsF3K!tD&)BpqHtk}r=zeRAggw-hNVcPNhAA>0>AxpQR`7H9 zI>eR=r#eWSVi=+pj~I1~Vtgz{VC+$ZJ>;Pgkhklp4kr#y5SUGZNI4C)2M#R031))B z$;vRCfhCM184ucdw4SEmDqh}6t7WknEV*q6?-D7lhK$JK_eq~&f?b%u0MK!4R`$qd zf}3cRLZ6P}PkgCc5D5lVDCShCbe2Zia*S8r5T|quCmyPn#EYExn384o05*ZX$d;+7 zxZyP^lxaIH?sb{2`d8PVlg$Gz25+6kbdiq6931$ne}3ZdR&j8Ixim@fdWA2!J7VOra;fcrv18k?Xp zqH3tCjDy7;Fu_;Xb;5RnEu_BwN1_bT4JK#M$uxO2N{`3h1b538Rdlu|KdLxaL1y0| zt>FUf?e;;9OlFQ8Mlr;@zo0L~V!+sF5+gDS<1tgc8N_uyaHNg-o-J@=2yh~Q<#=8; z)IF7J&il0s+$R}5K*sXna;otCfyN*w57hW&l4U6EVe8rng1$2&y zV<2^MVdZ6Wge*C4fO|4eamh-5(JNLc`H(k^f#n|uT0A@n3f+5@0OjDcNR z^EZZT`nz4hvuHAG;;fiz30Bp4ABya+csS)6!L+Lv$3oqQe+}1#3%?p*f$vf(APDs+ zH(cTa+@i-^q~xE8_774KWAJW))1le@|qzKXEL=+eRnm$$6YZ z^ga22hc@b&fWsoSL>_gq{;JaTTNpsHtyPSWpMKz5(EwOXxZRG#L>V+ie&t>$kU1&m zdQrK)iMO@lmOV0e6I6?_dhaOxU%vl+D-vDHS5W>Nt#uB_Lo^qH*|rfopqfUHX& z4LPwbI19g)V4ryMk(%F&8Lu8qm0s6)^*Fs}Y=VO1DA9KuXFPp#U${+ue@;(B|7^rV z;058JcLOBlk^234AG&VCBL!wx55Z?N}(q+9E;WG6#*>kOLqXiYr!=Q z{w~8c6!^%By8B~cuQS5QKti-sCQh8lUW{H+6QeC|=^epQEnbGzRpeDQWF;v(5|ZRp z8q^@qtxuL>t>956w{eV<7!e;9tx;k_#PPu9O~9ur>1xW_{o3Iq*xEsyBvNpQz~x=u zhA7S2r0;2>z&M&TPQ<<(NUkg%Ls>#I!(K9)vBHQz5NKgR!otj2I=dl4mAnE)Ts_Kg zH)$gv)8)8Dzx5ns61`zQeMwoRAfRYu7?BM$Pk@3bLs`NwSe75@uArDHVNrpM*i&}I z$~;LQSLcj~t7E{$I;zZiuu%nU?nhGb=e@~Acu4~|H^@O0XVyI#F=PLv`>?mMjCv?) z3d@E$(^*hpxU9G=b)8pKdgQN6LR2IJ0RkYYi88hIIXNNWp*Fa(ULOy!)C)ujrRaem`B%CkF`+I>Pn*hG}Hli7w!<~ zs~nt#Y=j~90K*dA0bFAfz89RLn3x$=h;=oZw@hT`*-Eu#b~ChO?)-|~9vPczv47!Q zox|zI#PY1l39q|@q5jk2<-e=rAHR5g2m z$>C(h#y2ixJQh3#ocikc@|`5>Ax8H+JBDigfidz(Ay!PI+ys*tdvNP`1N(a6nt7%z zbac0zHQVBxWI6d;j5}+6nIUrC97sO?F09CK#cWxiQ$FV%h~;ia=f6)@ZI+uXlp(Mh z)ZR~JDb+;52C?aNrc8qct#(B3S)fH%z7E@JUgjGn!J(}69{m~Iz^+)GZ}8xEfrFgn zH1Mn0T*-Q<678qbMAmquBgzN=tkr{@Hs#l)|2d}VcL`uPAXN8iK9jy<6D|GiWf85Wvp z@_>YPd|pl_a;gif&=trL1*6fg41%#`JMwnJc6g=u_ds2_D#(GdbL&3}My2PPlb~mE zr{FA|W7?3W7AjkWeow8hNj?+m)v6Xd+MkD+T;%yCZf$&JZ8pLqbcca&If{=p^mlbgi_Cg?6@ZJ}uJi6@|+auD4F_uq+2D<3K zjPx=x83EG8;Ikrup30N;Q!yA?0O)mfhf=7DmMj!iLC4>CxA< z-v17HX!29jUcZpn{wtiM{69gSh`E*Ve;}Tcq#~9v68A3GnfPLyKOb1^*pQf8a5`Eb z2AB{C8a6iGez9K!HzPC?)V85)Y+RfD;ec>O6B(+SvAMdjF(#{CI58*cH`{?uIdA9qT~CTfET19 zB_#v0Ao}*$Nn?T_PzT>Kf#D({nP9qVJ(3`GEOyt{iH@oC_g ziiPvOwZPang;#-^a{d^t;E&GZO1sq{meqmDqNb)miT05us!F$em{?2AdUD&TK-fT* z6=tFn-ee$2;&GX@QMx?)U!PrsSh6uK=PV>&CAop5NRBk~7b?h&r3q!RDurAfYT<>L(w(O)*O@d#H z6uxCCBw^PvQTMTTJj=++55H1R!s#IiNAKs#PuV$1uGl>!j0;{|bLg?B^MBaA%3Dzn z1Z%Vzz?Yn}{vycx;sCJ}+vz3h95T=Hx_ShrXKB;fMeF9E_*{9J4JdaF)rwcTM&9~V zUw$)uayxjsEEHaDmIhd<9V6=KfB>R^sCR?DPbkU@Z932_{+jQywBFL)=bh&XTBu zSw3E&T|Ctmj&qIgQGlbKOucOo6$>xzhTNKd!%R@I$H}MGkDZ^_3RAm?bh~FOb|2s_ zv9(KOkD9wkjsCgS95}~<s0`YbnY)3i~6t+eP>&oVU#W8os-Ir~w3L+3?P zb&b>#`ri0GIr<&q9ltS{%x-c!Ie1+LK@PxBhQR1I7Od#Ker< z{sY4lwG}aqk$iTH25BY<;GmKNTEwW|@PZH|c=O1_`3ZEX!IuJ1X~tRBSuPJu4(D{( zbRJDVC#IR6Vkc~}(QltPURlhwk z`=8xwKPWOPvSwS9oO!k=W}}=ko~BM-+nmeg(QU<4UUVgv>Za+d{ORf!}q> zCz-E2hVP4}3T#tus?$6H1Y?wk8~9!#j#sxPpcffksdw+!>ayt&t53Y|RKtmg^xS5x zi+N%lw45i)-2w*p{WNooC@Dsip&-wULnLity2aUZWb5L|9%iY!&se$}n)N2n z(X0ET#O;8**@*4_=@yl%(bq*VPtena{JzQe>{K|1%^t}LG?F}mpFgw}Mq6-#Kdk-c z9;RFT19~rAe0CR`^Z9*pyVm#nXMjJo6{F9TiS=oX^79Xh2Yq7BpG5EoIy6Y1YKA? zENNcPXyHeCEuf;g+`$bQJbXfL2p$v_IDDPS5|STuL_HkuOsI3Ta7v{ot1qLC;a7(&XZg4SWf`EV0Zvw0(lB?WN`>mo4XO7D3N^9-nx1V$V}`e!;d~ zXxD;Sm{d$0Me7anzn47wdn=3CykW>>4Z!53qG5;miN*1wI4REba7I(4ciG2vTsd7o<5i1YuUpafEmJf>j71t; z2Gi$XqT6mOt@!u*M{Me!lsj(_!&f#S>_~K~eZ;4htO07{DzjIn;8}*b+xCWDxmacB zRz zBc4{E{2&`?xdw$#dWY z{UQ>hNoy;|*w$bq9D7+Lm=(~IA($2Prm(nwJMmjy8i(0p9vmI&TKRJ>f%_ZmVYE|y zjYswJh&{8J27?w5x(GT2I9NCgbQ9P&`&3ZtF(NSEz}uXJr~S@Ep|q!f%+z`#P?kHr-Lm=($`1W zswWo&v>Vv&U3q0a^YX&dqd;6mRX>cl(3>1R!-UwJYs+<|hPvaJ*m9JEo~S#b{)E*n zXF3$mH)blR@UR!MLFBrQ*|FjJY90FwN$s-Gn3Pah#tNTkc9|jEJDqf=WtGFY@1H+3 z2-c1jVhrfLu6$oT9fJp$9k{)qpYk8sIwd>FT38i&pD8(<~iQE$Y)H5ED7xRC^({k4WOLy&cA9qe3 znuDU<2k60N7SX={VSeP0a;)OUSz_w++r6nr`SS<-w-Wd@dNHy#rm;3ERTebya4mp{Yp?GkkWIlsNU9h|4o zUS0V4#aGGay}YZ_tmYE^V>0|^Tp~!W_3UYU``m3o!2bBsZB3@q_47Vf|hn)ue(1k}WG zA|McH0s%Xku>+*W^R>a>u8`WmO=wmgcMsoRQ?%1UgUkmVs?qqq!m~l_%uuRJkbFnPQR*!Pw!Mcr#_>w%Q>9Ml zNy*GHF;#&H63yl6Wz*kTW$Uifd{wa|GT!22DnKg-Ms@BR-0#CTvu>X|LE#q2HnF zD5TnG=f1`!K3l9JXl?pI1eL)AFj@+y?%YJRM6W)h&o7{ET@*L2Cw-{d)m~!IohKod zJ7w`}EVZ;4NO0EuvIPa>&n+NxSPrIDU7TsITiWjpNlR(j`pZrLh~|4{UkV2 z?~t82H6DNV%-~mH)ltd0YW$s&1|*1{fR%x|G<>sgPr|}xn-a%4bFIk;(rMFKsJs7| z1S*;p)=uyG3(20=^N>e+Nn(^BKRf}Mq%YR(;l*A8wBuLEO9efu=l1}$L~FkxUD*h))e6tGcPd90ZcGfmPOkbxHVhX(}S zB$yW}>aHflu)Q#|j1&?Zv>T@S_KheFvwEB6kSo16C~@&kEF?#UAv`o6|D4qpaV=~D zVqf240z0(OrHLfQJ`mmYhzqJEaLoqg)J#XN&Qa8`QgZa(N$VB2d4C63szGWS%^yN$ zrzF5u@q@164JU_;#ec{WD!aC-s|LBOS6FGN)bX>mmjL;r8K*J}%h%u|EgI^Yq`hBkV*B;m!zzyGLSd?+|lN%)X7*beHYpW`rZq(VjibvS2g*`wRiDCsNv#`fCDOZ-wMqh7=?sYz@VG4G_wrue*Lu zoz{v!1MDm2vUcg#UA=Fb#)FE)T!En_kR6J8;GAME&yl~ua=xBtPa8;Op`|p^-rqxDXoL3Lq^ydvtbdA~!aBGEO zm0Gw?zUoz*r$FRuduLw+SlXE(cUC(lkjl)tTV>LszAM(#>K;5e-DGwBQb~v%}q}aANn- za3t*jsC;Sb_1p#K<7g6DO-OEX))A^|M>+gP(uR4|-1ukBnX2efK6SNC+9UaSUzNv@ zY1DJ}e)4eF?0r7*N-s7j-PaeBtHnq1?d!Sy3)`qUa$fOxQqVAGhYae?h!8I>;Sklr z>~QpakG)E1uCmaJ9^P}@O(!SM?)N+BThCh@9rgc`P(80#zJo^XV_5>m@KB$)3xf+l ztRSFXR@i3qni*kC!JZ6oAFjCaaAht*k0Q$k$uc%zIa+D|)L3qfu3K_#mVbAto8EwX z=d20)z#ePv$di{>G;riezanp&04EOo{70xZUhuI>dcsQt+3%Jk@V7MK`YlbQg_ZcJ z#brcjt@T}uZD>QnJe*=+hf0HEj?aXN%jV!4x^j-96?S7wf zv$pD1+x|7CgY$(!_z4V$vvoBk^(Wc401wYgf%ONgcGKRip2f^{t?l%z2l^*SNhZ+L zgz%-X%p<4KEL*I+tbmOFjeZdHQ_%Qwyv_M>fV9DSb8Tzl)5yrmXvunD1?ky9j}fHQ z)xMUxyXpx+P8 z7FpQ(#S*qga1aEd9RuPv=C*rHN1{zCN@O=gd`=)cz#*&&VdRgfWnfdBp)DFnY_ORI zd0X0TM7v4(yc`{gY5MC-K)NeKhZVZ_$kG#FG;7YfWtg%IhJG>B^4+0GNbgp45MH001{ zcSB&a?9ycaSiH_-;ufZ6>!R?_b!B&On?V-sa(-;^sCW^<4iBPmW`yt|LmeAp{D^zq z(i)d%zq6AXiWrQRKM=|}GKGqZO^b1DM@)U9UV~Q)Cq1~gW?h=6TcF33s?|=r%M4(- zMpVAAFc8>WpGkd`0lVa)lvaVXB(bMRg;d~KgU*;iFPnR0G*RL6$?~$m0`XIA^*R4Kix*f3t3;wdGZr~MR0UK~Tq187KvT7_M zyRj31!T|!QhlAgA#&y3TkIpZ8&l6NylB@W8weapjggHZ#<%Ce3Gd0eLXp zPbVpYT|(?B@`SYsxhPaWMTv2TnqnCBqG7#Kppc-GzKo7~b5W0)Ko%qWOUqG;>C9xI zTtKN0;VRXnV&+bBYkR0>h8iUddLe$lc9FZHZeXm*4~$+KOm%dB{A)9$RV6PAdSmMH z_+kufW1#{7!umoCzZ`|qOXk&btfDVDs3x)iA8*3yB(gqkERl>sJLn2ZX?F3=be-kJ z?>{cyQr!h}l{;k^Ki`L>hr2ve82KPu;wvV(h&RJ?q=#cB-ozbNE-r!J_sxyzRr2=4OPkpkJ&-C;{>m3X?tRtww~QO2jlh>7XO z!qSi)2Lq!={5UPdD0r#gJWQ0#$|i(-V<6Zowfbp5CJI5c_RBiyGYC;uh`1ljQjJ~c zyFd0Xi=v0LH&M7e9Bhtx#wN}MA?_h{aK%z2$GS@$0K2}8OrI(=%A4s(0Y*5J6B1~G z3t>{O2W#7)ow&O=zE7v$iMubkyXZgmwm)~M?V;^_9dtlR+!za}LM5$7)%!N@6>#*U z+5`2;5=z)A(3Rh`<}T~jP#}vSW3dtKbEc_Ji}ljSUzs1 z3F~d%pCvqIy|6OHAM8*$q5vt%YAv~gcIF-3-Ioeh3saa2YQH+<)O z~Li`zyCSkch33Fy?Y+p>zdmwE)D0# z3`S;7^WWl{u;IAD=LhFe)%UA1!%kIQZ0@@M=uBZ*>SbRazlSBtmhE#*t{cx5XZ$xJ zYgb_X1KqyF!XGn}l23NdZa#ceOCq^Ms;?a^^dsc z*R-_tSX1sAZ?_#w0=CAk&An+(F(-t$Tx-kS6L7?T;?K4J){X7GzU!_&NnWMuS=_X5 zx_?F7wx;@-rCpnsOji6FqE!5$SoW~tn*3?Rh8xcu9*#@k;aIgPy)zjiPZE4$pCNlppuOZjF-TGM4qQb2Oo?WCYzf@WY9e%;+Y`?It0#Z`CiP4RSh zH+6aK@44+|zB9#B)vvGK@9B|$r@L);kN4eOeR>(>RrZ4W2zLx~a>7t<)2kY;uYp{C z0w4G-b(xLmmWrOK(P@eC^A}|WrpA+m(Llhg1S$#KpqByU<%&Is{t|8}f@3lQgzbNb ze!@4SwhJY@1osf9gM?DROm>G9{k9ag$S#OZKussTl{Npegqlo-v=A}^G9_t3qB@ckat^EAe8In7P|4>q6e^;{74Q{GLlGfKXxXI0ZR6Z9Y%CavS&>G@ zi3(ZUmsYc)AfMY#33>9~ZYV`Gc%13&yd|P=o2TQodNnuw$gGO`m%!5#1aKGSN2`$ajnQf_v^%6u#PY4N|i>SNW3YOXiC1IAr zW0M2{yDvxyz9GeLVIBD`AhL6aNccy?7vULNWOO?Jg%;<(4gO#@i=4_~i*S1*{*9xC z8{q1EC=0V^-MdwSgtgCGhzq&naeU022Cz~q6oMIfEZZa~Boer~IIC30)AxDbjQMsu z&_4z`vsqu*DS-}Ihw#jgkC_lw<_&lc7&%5TTEqd91UzbXC^9Figl!bs+8?iho@4wN z3=3z-c?%ZoH+plGG-8Jui;m5JZ4Er7~rLT9$GlU4iW5Ao9v}9 z8*@%bgNwu<_6a$(K-wuW0jcNZunWaLrGwUtJR@0?+g|M5>1p)m=f%;?z3SQ7X74^r zvwbZ5Z0qALdoNlxn!R5Ljc$Z)gzr&`LUZjN!j@p~r$9@L>XamY$rwE$0 zT8f=%_A&&Tyy=k$nYk!|4Q5XbrokzLB4EZuVK$dNiIC=&JrUtDrW87Ixh62t+{H2( zJ)Oxh8P}JKbh5rtGWKf~sAkf?YIIcMdWlRc6}vu%68%a!BY7l53k-{be@>nlHfbEh GR_uS5L)k3= literal 0 HcmV?d00001 diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/ModuleCleanupProperties.java b/backend-java/src/main/java/com/nanri/aiimage/config/ModuleCleanupProperties.java new file mode 100644 index 0000000..ae09b7c --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/config/ModuleCleanupProperties.java @@ -0,0 +1,15 @@ +package com.nanri.aiimage.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.util.ArrayList; +import java.util.List; + +@Data +@ConfigurationProperties(prefix = "aiimage.module-cleanup") +public class ModuleCleanupProperties { + private boolean enabled = true; + private String cron = "0 0 0 * * *"; + private List moduleTypes = new ArrayList<>(List.of("DEDUPE", "SPLIT", "CONVERT", "DELETE_BRAND")); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/PropertiesConfig.java b/backend-java/src/main/java/com/nanri/aiimage/config/PropertiesConfig.java index f6c596d..f2de092 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/PropertiesConfig.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/PropertiesConfig.java @@ -4,6 +4,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Configuration; @Configuration -@EnableConfigurationProperties({OssProperties.class, StorageProperties.class, BrandProgressProperties.class, ZiniaoProperties.class}) +@EnableConfigurationProperties({OssProperties.class, StorageProperties.class, BrandProgressProperties.class, ZiniaoProperties.class, ModuleCleanupProperties.class}) public class PropertiesConfig { } diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/ZiniaoProperties.java b/backend-java/src/main/java/com/nanri/aiimage/config/ZiniaoProperties.java index 4f54a38..9243bf3 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/ZiniaoProperties.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/ZiniaoProperties.java @@ -9,9 +9,13 @@ public class ZiniaoProperties { private boolean enabled; private String baseUrl; private String apiKey; + private String appId; + private String appSecret; private Long companyId; - private String shopsPath; - private String switchShopPath; + private String appTokenPath; + private String staffListPath; + private String userStoresPath; + private String userLoginTokenPath; private String openStoreScheme; private String openStoreUserId; private String openStoreLaunchUrl; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java index b4ad774..6639ea9 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/controller/BrandTaskController.java @@ -124,8 +124,9 @@ public class BrandTaskController { @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "任务不存在") }) public ApiResponse getTask( - @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) { - return ApiResponse.success(brandTaskService.getTaskDetailLegacy(taskId)); + @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, + @Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { + return ApiResponse.success(brandTaskService.getTaskDetailLegacy(taskId, userId)); } @PostMapping("/tasks/{taskId}/result") @@ -153,8 +154,9 @@ public class BrandTaskController { }) public ApiResponse submitResult( @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, + @Parameter(description = "用户 ID", required = true) @RequestParam Long userId, @Valid @RequestBody BrandCrawlResultRequest request) { - brandTaskService.submitCrawlResult(taskId, request); + brandTaskService.submitCrawlResult(taskId, userId, request); return ApiResponse.success(new BrandSimpleVo(true)); } @@ -168,8 +170,9 @@ public class BrandTaskController { @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "任务不存在或当前状态不可取消") }) public ApiResponse cancelTask( - @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) { - brandTaskService.cancelTask(taskId); + @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, + @Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { + brandTaskService.cancelTask(taskId, userId); return ApiResponse.success(new BrandSimpleVo(true)); } @@ -183,8 +186,9 @@ public class BrandTaskController { @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "任务不存在或正在执行中不可删除") }) public ApiResponse deleteTask( - @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) { - brandTaskService.deleteTask(taskId); + @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, + @Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { + brandTaskService.deleteTask(taskId, userId); return ApiResponse.success(new BrandSimpleVo(true)); } @@ -198,8 +202,9 @@ public class BrandTaskController { @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "任务不存在或无结果可下载") }) public ResponseEntity download( - @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) { - String url = brandTaskService.resolveDownloadUrl(taskId); + @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, + @Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { + String url = brandTaskService.resolveDownloadUrl(taskId, userId); return ResponseEntity.status(302) .header(HttpHeaders.LOCATION, url) .build(); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java index db1f4ff..1ab7e99 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java @@ -133,8 +133,14 @@ public class BrandTaskService { return vo; } - public LegacyBrandTaskDetailVo getTaskDetailLegacy(Long taskId) { - BrandCrawlTaskEntity task = requireTask(taskId); + public BrandTaskDetailVo getTaskDetail(Long taskId, Long userId) { + BrandTaskDetailVo vo = new BrandTaskDetailVo(); + vo.setTask(toTaskItem(requireTask(taskId, userId))); + return vo; + } + + public LegacyBrandTaskDetailVo getTaskDetailLegacy(Long taskId, Long userId) { + BrandCrawlTaskEntity task = requireTask(taskId, userId); LegacyBrandTaskDetailVo vo = new LegacyBrandTaskDetailVo(); vo.setTask(toLegacyTaskItem(task)); vo.setLine_progress(buildLineProgress(taskId)); @@ -198,8 +204,8 @@ public class BrandTaskService { return vo; } - public void submitCrawlResult(Long taskId, BrandCrawlResultRequest request) { - BrandCrawlTaskEntity task = requireTask(taskId); + public void submitCrawlResult(Long taskId, Long userId, BrandCrawlResultRequest request) { + BrandCrawlTaskEntity task = requireTask(taskId, userId); if (STATUS_CANCELLED.equalsIgnoreCase(blankToDefault(task.getStatus(), STATUS_PENDING))) { throw new BusinessException("任务已取消"); } @@ -304,9 +310,11 @@ public class BrandTaskService { } } - public void cancelTask(Long taskId) { + public void cancelTask(Long taskId, Long userId) { + requireTask(taskId, userId); int updated = brandCrawlTaskMapper.update(null, new LambdaUpdateWrapper() .eq(BrandCrawlTaskEntity::getId, taskId) + .eq(BrandCrawlTaskEntity::getUserId, userId) .in(BrandCrawlTaskEntity::getStatus, STATUS_PENDING, STATUS_RUNNING) .set(BrandCrawlTaskEntity::getStatus, STATUS_CANCELLED)); if (updated == 0) { @@ -315,17 +323,19 @@ public class BrandTaskService { brandTaskProgressCacheService.delete(taskId); } - public void deleteTask(Long taskId) { + public void deleteTask(Long taskId, Long userId) { + requireTask(taskId, userId); int deleted = brandCrawlTaskMapper.delete(new LambdaQueryWrapper() .eq(BrandCrawlTaskEntity::getId, taskId) + .eq(BrandCrawlTaskEntity::getUserId, userId) .ne(BrandCrawlTaskEntity::getStatus, STATUS_RUNNING)); if (deleted == 0) { throw new BusinessException("任务不存在或正在执行中无法删除"); } } - public String resolveDownloadUrl(Long taskId) { - BrandCrawlTaskEntity task = requireTask(taskId); + public String resolveDownloadUrl(Long taskId, Long userId) { + BrandCrawlTaskEntity task = requireTask(taskId, userId); Object raw = parseJsonValue(task.getResultPaths()); if (!(raw instanceof Map map)) { throw new BusinessException("无结果可下载"); @@ -600,6 +610,17 @@ public class BrandTaskService { return entity; } + private BrandCrawlTaskEntity requireTask(Long taskId, Long userId) { + if (userId == null || userId <= 0) { + throw new BusinessException("userId 不合法"); + } + BrandCrawlTaskEntity entity = brandCrawlTaskMapper.selectById(taskId); + if (entity == null || !userId.equals(entity.getUserId())) { + throw new BusinessException("任务不存在"); + } + return entity; + } + private File resolveSourceFile(BrandSourceFileDto sourceFile) { String fileUrl = sourceFile.getFileUrl(); if (fileUrl == null || fileUrl.isBlank()) { @@ -661,11 +682,15 @@ public class BrandTaskService { String value = index == null ? "" : normalizeCellText(formatter.formatCellValue(row.getCell(index))); rowData.put(column, value); } - rowData.put("__rowIndex", rowNum + 1); - rows.add(rowData); - String brand = normalizeCellText(Objects.toString(rowData.getOrDefault("品牌", ""), "")); - if (!brand.isBlank()) { - uniqueBrands.add(brand); + String brand = normalizeCellText(Objects.toString(rowData.getOrDefault("\u54c1\u724c", ""), "")); + if (brand.isBlank()) { + rowData.put("__rowIndex", rowNum + 1); + rows.add(rowData); + continue; + } + if (uniqueBrands.add(brand)) { + rowData.put("__rowIndex", rowNum + 1); + rows.add(rowData); } } return new ParsedBrandFile(sheet.getSheetName(), columns, rows, new ArrayList<>(uniqueBrands)); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/controller/ConvertRunController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/controller/ConvertRunController.java index babd8f6..2ffc659 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/controller/ConvertRunController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/controller/ConvertRunController.java @@ -7,6 +7,7 @@ import com.nanri.aiimage.modules.convert.model.vo.ConvertRunVo; import com.nanri.aiimage.modules.convert.service.ConvertRunService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponses; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.io.File; @@ -66,35 +68,43 @@ public class ConvertRunController { } @GetMapping("/history") - @Operation(summary = "查询格式转换历史", description = "查询最近的格式转换成功记录，用于页面右侧历史下载列表展示。") + @Operation(summary = "查询格式转换历史", description = "查询当前用户最近的格式转换成功记录，用于页面右侧历史下载列表展示。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功", content = @Content(schema = @Schema(implementation = ConvertHistoryVo.class))) }) - public ApiResponse history() { + public ApiResponse history( + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { ConvertHistoryVo vo = new ConvertHistoryVo(); - vo.setItems(convertRunService.listHistory()); + vo.setItems(convertRunService.listHistory(userId)); return ApiResponse.success(vo); } @DeleteMapping("/history/{resultId}") - @Operation(summary = "删除格式转换历史", description = "删除一条格式转换历史记录。") + @Operation(summary = "删除格式转换历史", description = "删除当前用户的一条格式转换历史记录。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "删除成功"), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "结果记录不存在") }) - public ApiResponse deleteHistory(@Parameter(description = "格式转换结果记录 ID", required = true) @PathVariable Long resultId) { - convertRunService.deleteHistory(resultId); + public ApiResponse deleteHistory( + @Parameter(description = "格式转换结果记录 ID", required = true) @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + convertRunService.deleteHistory(resultId, userId); return ApiResponse.success(null); } @GetMapping("/results/{resultId}/download") - @Operation(summary = "下载格式转换结果", description = "根据结果记录 ID 下载已生成的转换结果文件。桌面端前端可继续通过 save_file_from_url 选择保存位置。") + @Operation(summary = "下载格式转换结果", description = "根据结果记录 ID 下载当前用户的转换结果文件。桌面端前端可继续通过 save_file_from_url 选择保存位置。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "返回结果文件流"), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "结果文件不存在") }) - public ResponseEntity download(@Parameter(description = "格式转换结果记录 ID", required = true) @PathVariable Long resultId) { - File resultFile = convertRunService.getResultFile(resultId); + public ResponseEntity download( + @Parameter(description = "格式转换结果记录 ID", required = true) @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + File resultFile = convertRunService.getResultFile(resultId, userId); String encodedFilename = URLEncoder.encode(resultFile.getName(), StandardCharsets.UTF_8).replaceAll("\\+", "%20"); return ResponseEntity.ok() .contentType(MediaType.APPLICATION_OCTET_STREAM) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/model/dto/ConvertRunRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/model/dto/ConvertRunRequest.java index bad0cbc..858b53c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/model/dto/ConvertRunRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/model/dto/ConvertRunRequest.java @@ -1,9 +1,11 @@ package com.nanri.aiimage.modules.convert.model.dto; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.List; @@ -23,4 +25,9 @@ public class ConvertRunRequest { @Schema(description = "文件夹上传场景下的总压缩包名称（不含扩展名）") private String archiveName; + + @NotNull(message = "user_id 不能为空") + @JsonProperty("user_id") + @Schema(description = "当前登录用户 ID") + private Long userId; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java index 50445f8..97962c2 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java @@ -71,7 +71,8 @@ public class ConvertRunService { task.setTaskMode("IMMEDIATE"); task.setStatus("SUCCESS"); task.setSourceFileCount(request.getFiles().size()); - task.setCreatedBy("system"); + task.setCreatedBy("user:" + request.getUserId()); + task.setUserId(request.getUserId()); task.setRequestJson(JSONUtil.toJsonStr(request)); task.setCreatedAt(LocalDateTime.now()); task.setUpdatedAt(LocalDateTime.now()); @@ -130,6 +131,7 @@ public class ConvertRunService { resultEntity.setResultFileSize(packagedResultFile.length()); resultEntity.setResultContentType(contentType); resultEntity.setSuccess(1); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); item.setResultId(resultEntity.getId()); @@ -150,6 +152,7 @@ public class ConvertRunService { resultEntity.setSourceFilename(sourceFile.getOriginalFilename()); resultEntity.setSuccess(0); resultEntity.setErrorMessage(ex.getMessage()); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); } @@ -175,6 +178,7 @@ public class ConvertRunService { resultEntity.setResultFileSize(zipFile.length()); resultEntity.setResultContentType("application/zip"); resultEntity.setSuccess(1); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); item.setResultId(resultEntity.getId()); @@ -195,9 +199,10 @@ public class ConvertRunService { return vo; } - public List listHistory() { + public List listHistory(Long userId) { return fileResultMapper.selectList(new LambdaQueryWrapper() .eq(FileResultEntity::getModuleType, MODULE_TYPE) + .eq(FileResultEntity::getUserId, userId) .orderByDesc(FileResultEntity::getCreatedAt) .last("limit 200")) .stream() @@ -214,17 +219,17 @@ public class ConvertRunService { .toList(); } - public void deleteHistory(Long resultId) { + public void deleteHistory(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); - if (entity == null || !MODULE_TYPE.equals(entity.getModuleType())) { + if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { throw new BusinessException("Convert result record does not exist."); } fileResultMapper.deleteById(resultId); } - public File getResultFile(Long resultId) { + public File getResultFile(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); - if (entity == null || entity.getResultFileUrl() == null || !MODULE_TYPE.equals(entity.getModuleType())) { + if (entity == null || entity.getResultFileUrl() == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { throw new BusinessException("Convert result file does not exist."); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeRunController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeRunController.java index 26f2571..d953d7e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeRunController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeRunController.java @@ -7,6 +7,7 @@ import com.nanri.aiimage.modules.dedupe.model.vo.DedupeRunVo; import com.nanri.aiimage.modules.dedupe.service.DedupeRunService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponses; @@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -60,35 +62,43 @@ public class DedupeRunController { } @GetMapping("/history") - @Operation(summary = "查询去重历史", description = "查询最近的去重成功记录，用于页面右侧历史下载列表展示。") + @Operation(summary = "查询去重历史", description = "查询当前用户最近的去重成功记录，用于页面右侧历史下载列表展示。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功", content = @Content(schema = @Schema(implementation = DedupeHistoryVo.class))) }) - public ApiResponse history() { + public ApiResponse history( + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { DedupeHistoryVo vo = new DedupeHistoryVo(); - vo.setItems(dedupeRunService.listHistory()); + vo.setItems(dedupeRunService.listHistory(userId)); return ApiResponse.success(vo); } @DeleteMapping("/history/{resultId}") - @Operation(summary = "删除去重历史", description = "删除一条去重历史记录。") + @Operation(summary = "删除去重历史", description = "删除当前用户的一条去重历史记录。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "删除成功"), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "结果记录不存在") }) - public ApiResponse deleteHistory(@Parameter(description = "去重结果记录 ID", required = true) @PathVariable Long resultId) { - dedupeRunService.deleteHistory(resultId); + public ApiResponse deleteHistory( + @Parameter(description = "去重结果记录 ID", required = true) @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + dedupeRunService.deleteHistory(resultId, userId); return ApiResponse.success(null); } @GetMapping("/results/{resultId}/download") - @Operation(summary = "下载数据去重结果", description = "根据结果记录 ID 下载清洗后的 Excel 文件。") + @Operation(summary = "下载数据去重结果", description = "根据结果记录 ID 下载当前用户的清洗后 Excel 文件。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "返回结果文件流"), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "结果文件不存在") }) - public ResponseEntity download(@Parameter(description = "去重结果记录 ID", required = true) @PathVariable Long resultId) { - Resource resource = dedupeRunService.getResultFile(resultId); + public ResponseEntity download( + @Parameter(description = "去重结果记录 ID", required = true) @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + Resource resource = dedupeRunService.getResultFile(resultId, userId); return ResponseEntity.ok() .contentType(MediaType.APPLICATION_OCTET_STREAM) .header(HttpHeaders.CONTENT_DISPOSITION, "attachment") diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/model/dto/DedupeRunRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/model/dto/DedupeRunRequest.java index c141275..41386c5 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/model/dto/DedupeRunRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/model/dto/DedupeRunRequest.java @@ -1,8 +1,10 @@ package com.nanri.aiimage.modules.dedupe.model.dto; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.List; @@ -31,4 +33,9 @@ public class DedupeRunRequest { @Schema(description = "文件夹上传场景下的总压缩包名称（不含扩展名）") private String archiveName; + + @NotNull(message = "user_id 不能为空") + @JsonProperty("user_id") + @Schema(description = "当前登录用户 ID") + private Long userId; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java index 2c44bca..8953a1f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java @@ -62,7 +62,8 @@ public class DedupeRunService { task.setTaskMode("IMMEDIATE"); task.setStatus("SUCCESS"); task.setSourceFileCount(request.getFiles().size()); - task.setCreatedBy("system"); + task.setCreatedBy("user:" + request.getUserId()); + task.setUserId(request.getUserId()); task.setRequestJson(JSONUtil.toJsonStr(request)); task.setCreatedAt(LocalDateTime.now()); task.setUpdatedAt(LocalDateTime.now()); @@ -123,6 +124,7 @@ public class DedupeRunService { resultEntity.setResultFileSize(outputFile.length()); resultEntity.setResultContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); resultEntity.setSuccess(1); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); } catch (Exception ex) { @@ -136,6 +138,7 @@ public class DedupeRunService { resultEntity.setSourceFilename(sourceFile.getOriginalFilename()); resultEntity.setSuccess(0); resultEntity.setErrorMessage(ex.getMessage()); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); } @@ -162,6 +165,7 @@ public class DedupeRunService { resultEntity.setResultFileSize(zipFile.length()); resultEntity.setResultContentType("application/zip"); resultEntity.setSuccess(1); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); item.setResultId(resultEntity.getId()); @@ -182,9 +186,10 @@ public class DedupeRunService { return vo; } - public List listHistory() { + public List listHistory(Long userId) { return fileResultMapper.selectList(new LambdaQueryWrapper() .eq(FileResultEntity::getModuleType, "DEDUPE") + .eq(FileResultEntity::getUserId, userId) .orderByDesc(FileResultEntity::getCreatedAt) .last("limit 50")) .stream() @@ -201,17 +206,17 @@ public class DedupeRunService { .toList(); } - public void deleteHistory(Long resultId) { + public void deleteHistory(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); - if (entity == null || !"DEDUPE".equals(entity.getModuleType())) { + if (entity == null || !"DEDUPE".equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { throw new BusinessException("记录不存在"); } fileResultMapper.deleteById(resultId); } - public Resource getResultFile(Long resultId) { + public Resource getResultFile(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); - if (entity == null || entity.getResultFileUrl() == null || !"DEDUPE".equals(entity.getModuleType())) { + if (entity == null || entity.getResultFileUrl() == null || !"DEDUPE".equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { throw new BusinessException("结果文件不存在"); } File file = new File(entity.getResultFileUrl()); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java new file mode 100644 index 0000000..a6e98a3 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java @@ -0,0 +1,60 @@ +package com.nanri.aiimage.modules.deletebrand.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.modules.deletebrand.model.dto.DeleteBrandRunRequest; +import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandHistoryVo; +import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandRunVo; +import com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/delete-brand") +@Tag(name = "删除品牌", description = "按每个上传 Excel 的文件名匹配紫鸟店铺，并解析删除品牌表格预览。") +public class DeleteBrandRunController { + + private final DeleteBrandRunService deleteBrandRunService; + + @PostMapping("/run") + @Operation(summary = "执行删除品牌解析", description = "读取上传的删除品牌 Excel，按每个 Excel 文件名匹配紫鸟店铺，并返回受限预览数据和紫鸟店铺打开链接。") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "执行成功", content = @Content(schema = @Schema(implementation = DeleteBrandRunVo.class))) + }) + public ApiResponse run(@Valid @RequestBody DeleteBrandRunRequest request) { + return ApiResponse.success(deleteBrandRunService.run(request)); + } + + @GetMapping("/history") + @Operation(summary = "查询删除品牌历史", description = "按 user_id 查询删除品牌历史。") + public ApiResponse history( + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + return ApiResponse.success(deleteBrandRunService.listHistory(userId)); + } + + @DeleteMapping("/history/{resultId}") + @Operation(summary = "删除删除品牌历史", description = "按 user_id 删除一条删除品牌历史。") + public ApiResponse deleteHistory( + @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + deleteBrandRunService.deleteHistory(resultId, userId); + return ApiResponse.success(null); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandRunRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandRunRequest.java new file mode 100644 index 0000000..9ce0482 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandRunRequest.java @@ -0,0 +1,24 @@ +package com.nanri.aiimage.modules.deletebrand.model.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +@Data +@Schema(description = "删除品牌执行请求") +public class DeleteBrandRunRequest { + @Valid + @NotEmpty(message = "请先上传待处理文件") + @Schema(description = "已上传源文件列表") + private List files; + + @NotNull(message = "user_id 不能为空") + @JsonProperty("user_id") + @Schema(description = "当前登录用户 ID") + private Long userId; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandSourceFileDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandSourceFileDto.java new file mode 100644 index 0000000..58ef71f --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/dto/DeleteBrandSourceFileDto.java @@ -0,0 +1,17 @@ +package com.nanri.aiimage.modules.deletebrand.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "删除品牌源文件") +public class DeleteBrandSourceFileDto { + @Schema(description = "上传文件 key") + private String fileKey; + + @Schema(description = "原始文件名") + private String originalFilename; + + @Schema(description = "相对路径，仅用于批量上传展示和定位，不参与店铺匹配") + private String relativePath; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandHistoryVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandHistoryVo.java new file mode 100644 index 0000000..9e2c054 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandHistoryVo.java @@ -0,0 +1,14 @@ +package com.nanri.aiimage.modules.deletebrand.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "删除品牌历史") +public class DeleteBrandHistoryVo { + @Schema(description = "历史列表") + private List items = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandPreviewRowVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandPreviewRowVo.java new file mode 100644 index 0000000..25b1058 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandPreviewRowVo.java @@ -0,0 +1,20 @@ +package com.nanri.aiimage.modules.deletebrand.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "删除品牌预览行") +public class DeleteBrandPreviewRowVo { + @Schema(description = "行号") + private Integer rowIndex; + + @Schema(description = "国家") + private String country; + + @Schema(description = "删除ASIN") + private String asin; + + @Schema(description = "状态") + private String status; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandResultItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandResultItemVo.java new file mode 100644 index 0000000..7c162cd --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandResultItemVo.java @@ -0,0 +1,47 @@ +package com.nanri.aiimage.modules.deletebrand.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "删除品牌结果项") +public class DeleteBrandResultItemVo { + @Schema(description = "结果记录ID") + private Long resultId; + + @Schema(description = "源文件名") + private String sourceFilename; + + @Schema(description = "按 Excel 文件名解析出的店铺名") + private String shopName; + + @Schema(description = "是否匹配到紫鸟店铺") + private boolean matched; + + @Schema(description = "紫鸟店铺ID") + private String shopId; + + @Schema(description = "紫鸟店铺平台") + private String platform; + + @Schema(description = "紫鸟打开链接") + private String openStoreUrl; + + @Schema(description = "总行数") + private Integer totalRows; + + @Schema(description = "是否已截断") + private boolean truncated; + + @Schema(description = "预览行") + private List previewRows = new ArrayList<>(); + + @Schema(description = "是否成功") + private boolean success; + + @Schema(description = "错误信息") + private String error; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandRunVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandRunVo.java new file mode 100644 index 0000000..dc22b20 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandRunVo.java @@ -0,0 +1,23 @@ +package com.nanri.aiimage.modules.deletebrand.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "删除品牌执行结果") +public class DeleteBrandRunVo { + @Schema(description = "处理文件总数") + private Integer total; + + @Schema(description = "成功文件数") + private Integer successCount; + + @Schema(description = "失败文件数") + private Integer failedCount; + + @Schema(description = "结果列表") + private List items = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java new file mode 100644 index 0000000..f32f2f7 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java @@ -0,0 +1,291 @@ +package com.nanri.aiimage.modules.deletebrand.service; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.deletebrand.model.dto.DeleteBrandRunRequest; +import com.nanri.aiimage.modules.deletebrand.model.dto.DeleteBrandSourceFileDto; +import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandHistoryVo; +import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandPreviewRowVo; +import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandResultItemVo; +import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandRunVo; +import com.nanri.aiimage.modules.file.service.LocalFileStorageService; +import com.nanri.aiimage.modules.task.mapper.FileResultMapper; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.model.entity.FileResultEntity; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import com.nanri.aiimage.modules.ziniao.model.cache.ZiniaoShopCacheDto; +import com.nanri.aiimage.modules.ziniao.service.ZiniaoAuthService; +import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.DataFormatter; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.FileInputStream; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +@Service +@RequiredArgsConstructor +public class DeleteBrandRunService { + + private static final String MODULE_TYPE = "DELETE_BRAND"; + private static final int PREVIEW_LIMIT = 200; + + private final FileTaskMapper fileTaskMapper; + private final FileResultMapper fileResultMapper; + private final LocalFileStorageService localFileStorageService; + private final ZiniaoAuthService ziniaoAuthService; + + public DeleteBrandRunVo run(DeleteBrandRunRequest request) { + if (request.getUserId() == null || request.getUserId() <= 0) { + throw new BusinessException("user_id 不合法"); + } + + FileTaskEntity task = new FileTaskEntity(); + task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr()); + task.setModuleType(MODULE_TYPE); + task.setTaskMode("IMMEDIATE"); + task.setStatus("SUCCESS"); + task.setSourceFileCount(request.getFiles().size()); + task.setCreatedBy("user:" + request.getUserId()); + task.setUserId(request.getUserId()); + task.setRequestJson(JSONUtil.toJsonStr(request)); + task.setCreatedAt(LocalDateTime.now()); + task.setUpdatedAt(LocalDateTime.now()); + task.setFinishedAt(LocalDateTime.now()); + fileTaskMapper.insert(task); + + List shops = ziniaoAuthService.listShopsForConfiguredUser(); + List items = new ArrayList<>(); + int successCount = 0; + int failedCount = 0; + + for (DeleteBrandSourceFileDto sourceFile : request.getFiles()) { + DeleteBrandResultItemVo item = new DeleteBrandResultItemVo(); + item.setSourceFilename(sourceFile.getOriginalFilename()); + item.setShopName(resolveShopName(sourceFile)); + try { + File inputFile = localFileStorageService.findLocalSourceFile(sourceFile.getFileKey()); + if (inputFile == null || !inputFile.exists()) { + throw new BusinessException("上传文件不存在，请重新上传"); + } + ParsedDeleteBrandFile parsed = parseDeleteBrandFile(inputFile); + item.setTotalRows(parsed.totalRows()); + item.setTruncated(parsed.truncated()); + item.setPreviewRows(parsed.previewRows()); + + ZiniaoShopCacheDto matchedShop = matchShop(item.getShopName(), shops); + if (matchedShop != null) { + item.setMatched(true); + item.setShopId(matchedShop.getShopId()); + item.setPlatform(matchedShop.getPlatform()); + item.setOpenStoreUrl(ziniaoAuthService.buildOpenStoreUrlForShop(matchedShop)); + } else { + item.setMatched(false); + } + + item.setSuccess(true); + successCount++; + + FileResultEntity resultEntity = new FileResultEntity(); + resultEntity.setTaskId(task.getId()); + resultEntity.setModuleType(MODULE_TYPE); + resultEntity.setSourceFilename(item.getSourceFilename()); + resultEntity.setResultFilename(item.getShopName()); + resultEntity.setResultFileUrl(null); + resultEntity.setResultFileSize(0L); + resultEntity.setResultContentType("application/json"); + resultEntity.setSuccess(1); + resultEntity.setUserId(request.getUserId()); + resultEntity.setCreatedAt(LocalDateTime.now()); + fileResultMapper.insert(resultEntity); + item.setResultId(resultEntity.getId()); + } catch (Exception ex) { + item.setSuccess(false); + item.setError(ex.getMessage()); + failedCount++; + + FileResultEntity resultEntity = new FileResultEntity(); + resultEntity.setTaskId(task.getId()); + resultEntity.setModuleType(MODULE_TYPE); + resultEntity.setSourceFilename(sourceFile.getOriginalFilename()); + resultEntity.setSuccess(0); + resultEntity.setErrorMessage(ex.getMessage()); + resultEntity.setUserId(request.getUserId()); + resultEntity.setCreatedAt(LocalDateTime.now()); + fileResultMapper.insert(resultEntity); + item.setResultId(resultEntity.getId()); + } + items.add(item); + } + + task.setSuccessFileCount(successCount); + task.setFailedFileCount(failedCount); + task.setResultJson(JSONUtil.toJsonStr(items)); + task.setUpdatedAt(LocalDateTime.now()); + fileTaskMapper.updateById(task); + + DeleteBrandRunVo vo = new DeleteBrandRunVo(); + vo.setTotal(request.getFiles().size()); + vo.setSuccessCount(successCount); + vo.setFailedCount(failedCount); + vo.setItems(items); + return vo; + } + + public DeleteBrandHistoryVo listHistory(Long userId) { + DeleteBrandHistoryVo vo = new DeleteBrandHistoryVo(); + vo.setItems(fileResultMapper.selectList(new LambdaQueryWrapper() + .eq(FileResultEntity::getModuleType, MODULE_TYPE) + .eq(FileResultEntity::getUserId, userId) + .orderByDesc(FileResultEntity::getCreatedAt) + .last("limit 100")) + .stream() + .map(entity -> { + DeleteBrandResultItemVo item = new DeleteBrandResultItemVo(); + item.setResultId(entity.getId()); + item.setSourceFilename(entity.getSourceFilename()); + item.setShopName(entity.getResultFilename()); + item.setSuccess(entity.getSuccess() != null && entity.getSuccess() == 1); + item.setError(entity.getErrorMessage()); + return item; + }) + .toList()); + return vo; + } + + public void deleteHistory(Long resultId, Long userId) { + FileResultEntity entity = fileResultMapper.selectById(resultId); + if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { + throw new BusinessException("记录不存在"); + } + fileResultMapper.deleteById(resultId); + } + + private ParsedDeleteBrandFile parseDeleteBrandFile(File inputFile) { + DataFormatter formatter = new DataFormatter(); + try (FileInputStream fis = new FileInputStream(inputFile); Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(fis)) { + Sheet sheet = workbook.getSheetAt(0); + Row titleRow = sheet.getRow(0); + Row headerRow = sheet.getRow(1); + if (titleRow == null || headerRow == null) { + throw new BusinessException("Excel 表头不完整"); + } + + List pairs = resolveCountryPairs(titleRow, headerRow, formatter); + if (pairs.isEmpty()) { + throw new BusinessException("未识别到删除品牌表头"); + } + + List previewRows = new ArrayList<>(); + int totalRows = 0; + boolean truncated = false; + for (int rowNum = 2; rowNum <= sheet.getLastRowNum(); rowNum++) { + Row row = sheet.getRow(rowNum); + if (row == null) { + continue; + } + for (CountryColumnPair pair : pairs) { + String asin = normalizeCellText(formatter.formatCellValue(row.getCell(pair.asinColumnIndex()))); + String status = normalizeCellText(formatter.formatCellValue(row.getCell(pair.statusColumnIndex()))); + if (asin.isBlank() && status.isBlank()) { + continue; + } + totalRows++; + if (previewRows.size() < PREVIEW_LIMIT) { + DeleteBrandPreviewRowVo item = new DeleteBrandPreviewRowVo(); + item.setRowIndex(rowNum + 1); + item.setCountry(pair.country()); + item.setAsin(asin); + item.setStatus(status); + previewRows.add(item); + } else { + truncated = true; + } + } + } + return new ParsedDeleteBrandFile(totalRows, truncated, previewRows); + } catch (BusinessException ex) { + throw ex; + } catch (Exception ex) { + throw new BusinessException("读取删除品牌 Excel 失败"); + } + } + + private List resolveCountryPairs(Row titleRow, Row headerRow, DataFormatter formatter) { + List pairs = new ArrayList<>(); + int lastCellNum = Math.max(titleRow.getLastCellNum(), headerRow.getLastCellNum()); + for (int i = 0; i < lastCellNum; i++) { + String title = normalizeCellText(formatter.formatCellValue(titleRow.getCell(i))); + String firstHeader = normalizeCellText(formatter.formatCellValue(headerRow.getCell(i))); + String secondHeader = normalizeCellText(formatter.formatCellValue(headerRow.getCell(i + 1))); + if (title.isBlank()) { + continue; + } + if ("删除ASIN".equals(firstHeader) && "状态".equals(secondHeader)) { + pairs.add(new CountryColumnPair(title, i, i + 1)); + i++; + } + } + return pairs; + } + + private ZiniaoShopCacheDto matchShop(String shopName, List shops) { + if (shopName == null || shopName.isBlank() || shops == null || shops.isEmpty()) { + return null; + } + String normalized = normalizeShopName(shopName); + for (ZiniaoShopCacheDto shop : shops) { + if (normalized.equals(normalizeShopName(shop.getShopName()))) { + return shop; + } + } + return null; + } + + private String resolveShopName(DeleteBrandSourceFileDto sourceFile) { + String name = sourceFile.getOriginalFilename(); + if (name == null || name.isBlank()) { + return ""; + } + return FileUtil.mainName(name).trim(); + } + + private String normalizeShopName(String value) { + if (value == null) { + return ""; + } + return value.replace("\u3000", " ") + .replace(" ", "") + .trim() + .toLowerCase(Locale.ROOT); + } + + private String normalizeCellText(String value) { + if (value == null) { + return ""; + } + return value.replace("\ufeff", "") + .replace("\u3000", " ") + .replace("\r\n", " ") + .replace("\r", " ") + .replace("\n", " ") + .replace("\t", " ") + .trim() + .replaceAll("\\s+", " "); + } + + private record CountryColumnPair(String country, int asinColumnIndex, int statusColumnIndex) { + } + + private record ParsedDeleteBrandFile(int totalRows, boolean truncated, List previewRows) { + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/split/controller/SplitRunController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/split/controller/SplitRunController.java index 879dd69..bb0fc3d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/split/controller/SplitRunController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/split/controller/SplitRunController.java @@ -7,6 +7,7 @@ import com.nanri.aiimage.modules.split.model.vo.SplitRunVo; import com.nanri.aiimage.modules.split.service.SplitRunService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponses; @@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -59,35 +61,43 @@ public class SplitRunController { } @GetMapping("/history") - @Operation(summary = "查询数据拆分历史", description = "查询最近的数据拆分成功记录，用于页面右侧历史下载列表展示。") + @Operation(summary = "查询数据拆分历史", description = "查询当前用户最近的数据拆分成功记录，用于页面右侧历史下载列表展示。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功", content = @Content(schema = @Schema(implementation = SplitHistoryVo.class))) }) - public ApiResponse history() { + public ApiResponse history( + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { SplitHistoryVo vo = new SplitHistoryVo(); - vo.setItems(splitRunService.listHistory()); + vo.setItems(splitRunService.listHistory(userId)); return ApiResponse.success(vo); } @DeleteMapping("/history/{resultId}") - @Operation(summary = "删除数据拆分历史", description = "删除一条数据拆分历史记录。") + @Operation(summary = "删除数据拆分历史", description = "删除当前用户的一条数据拆分历史记录。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "删除成功"), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "结果记录不存在") }) - public ApiResponse deleteHistory(@Parameter(description = "数据拆分结果记录 ID", required = true) @PathVariable Long resultId) { - splitRunService.deleteHistory(resultId); + public ApiResponse deleteHistory( + @Parameter(description = "数据拆分结果记录 ID", required = true) @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + splitRunService.deleteHistory(resultId, userId); return ApiResponse.success(null); } @GetMapping("/results/{resultId}/download") - @Operation(summary = "下载数据拆分结果", description = "根据结果记录 ID 下载拆分后的 Excel 文件。") + @Operation(summary = "下载数据拆分结果", description = "根据结果记录 ID 下载当前用户的拆分结果文件。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "返回结果文件流"), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "结果文件不存在") }) - public ResponseEntity download(@Parameter(description = "数据拆分结果记录 ID", required = true) @PathVariable Long resultId) { - Resource resource = splitRunService.getResultFile(resultId); + public ResponseEntity download( + @Parameter(description = "数据拆分结果记录 ID", required = true) @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY) + @RequestParam("user_id") Long userId) { + Resource resource = splitRunService.getResultFile(resultId, userId); return ResponseEntity.ok() .contentType(MediaType.APPLICATION_OCTET_STREAM) .header(HttpHeaders.CONTENT_DISPOSITION, "attachment") diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/split/model/dto/SplitRunRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/split/model/dto/SplitRunRequest.java index 97dbcb9..6726991 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/split/model/dto/SplitRunRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/split/model/dto/SplitRunRequest.java @@ -1,9 +1,11 @@ package com.nanri.aiimage.modules.split.model.dto; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.List; @@ -33,4 +35,9 @@ public class SplitRunRequest { @Schema(description = "文件夹上传场景下的总压缩包名称（不含扩展名）") private String archiveName; + + @NotNull(message = "user_id 不能为空") + @JsonProperty("user_id") + @Schema(description = "当前登录用户 ID") + private Long userId; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java index 53015a0..a05f420 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java @@ -67,7 +67,8 @@ public class SplitRunService { task.setTaskMode("IMMEDIATE"); task.setStatus("SUCCESS"); task.setSourceFileCount(request.getFiles().size()); - task.setCreatedBy("system"); + task.setCreatedBy("user:" + request.getUserId()); + task.setUserId(request.getUserId()); task.setRequestJson(JSONUtil.toJsonStr(request)); task.setCreatedAt(LocalDateTime.now()); task.setUpdatedAt(LocalDateTime.now()); @@ -113,6 +114,7 @@ public class SplitRunService { resultEntity.setSourceFilename(sourceFile.getOriginalFilename()); resultEntity.setSuccess(0); resultEntity.setErrorMessage(ex.getMessage()); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); } @@ -144,6 +146,7 @@ public class SplitRunService { resultEntity.setResultContentType(ZIP_CONTENT_TYPE); resultEntity.setRowCount(item.getRowCount()); resultEntity.setSuccess(1); + resultEntity.setUserId(request.getUserId()); resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); item.setResultId(resultEntity.getId()); @@ -164,9 +167,10 @@ public class SplitRunService { return vo; } - public List listHistory() { + public List listHistory(Long userId) { return fileResultMapper.selectList(new LambdaQueryWrapper() .eq(FileResultEntity::getModuleType, MODULE_TYPE) + .eq(FileResultEntity::getUserId, userId) .orderByDesc(FileResultEntity::getCreatedAt) .last("limit 100")) .stream() @@ -186,17 +190,17 @@ public class SplitRunService { .toList(); } - public void deleteHistory(Long resultId) { + public void deleteHistory(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); - if (entity == null || !MODULE_TYPE.equals(entity.getModuleType())) { + if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { throw new BusinessException("Split result record does not exist."); } fileResultMapper.deleteById(resultId); } - public Resource getResultFile(Long resultId) { + public Resource getResultFile(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); - if (entity == null || entity.getResultFileUrl() == null || !MODULE_TYPE.equals(entity.getModuleType())) { + if (entity == null || entity.getResultFileUrl() == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { throw new BusinessException("Split result file does not exist."); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileResultEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileResultEntity.java index e6c8359..aed5a5c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileResultEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileResultEntity.java @@ -24,5 +24,6 @@ public class FileResultEntity { private Integer rowCount; private Integer success; private String errorMessage; + private Long userId; private LocalDateTime createdAt; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileTaskEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileTaskEntity.java index ae3fdc1..15f574d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileTaskEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/model/entity/FileTaskEntity.java @@ -24,6 +24,7 @@ public class FileTaskEntity { private String resultJson; private String errorMessage; private String createdBy; + private Long userId; private LocalDateTime createdAt; private LocalDateTime updatedAt; private LocalDateTime finishedAt; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ModuleHistoryCleanupService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ModuleHistoryCleanupService.java new file mode 100644 index 0000000..ee9471f --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ModuleHistoryCleanupService.java @@ -0,0 +1,52 @@ +package com.nanri.aiimage.modules.task.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.nanri.aiimage.config.ModuleCleanupProperties; +import com.nanri.aiimage.modules.task.mapper.FileResultMapper; +import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.model.entity.FileResultEntity; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class ModuleHistoryCleanupService { + + private final ModuleCleanupProperties moduleCleanupProperties; + private final FileTaskMapper fileTaskMapper; + private final FileResultMapper fileResultMapper; + + @Transactional + @Scheduled(cron = "${aiimage.module-cleanup.cron:0 0 0 * * *}") + public void cleanupConfiguredModules() { + if (!moduleCleanupProperties.isEnabled()) { + return; + } + List moduleTypes = moduleCleanupProperties.getModuleTypes(); + if (moduleTypes == null || moduleTypes.isEmpty()) { + return; + } + + int deletedResults = fileResultMapper.delete(new LambdaQueryWrapper() + .in(FileResultEntity::getModuleType, moduleTypes)); + + int resetTasks = fileTaskMapper.update(null, new LambdaUpdateWrapper() + .in(FileTaskEntity::getModuleType, moduleTypes) + .set(FileTaskEntity::getResultJson, null) + .set(FileTaskEntity::getRequestJson, null) + .set(FileTaskEntity::getErrorMessage, null)); + + int deletedTasks = fileTaskMapper.delete(new LambdaQueryWrapper() + .in(FileTaskEntity::getModuleType, moduleTypes)); + + log.info("模块历史清理完成: moduleTypes={}, deletedResults={}, resetTasks={}, deletedTasks={}", moduleTypes, deletedResults, resetTasks, deletedTasks); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClient.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClient.java index 2c2a1c2..6aedaff 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClient.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClient.java @@ -1,9 +1,18 @@ package com.nanri.aiimage.modules.ziniao.client; import com.nanri.aiimage.modules.ziniao.model.cache.ZiniaoShopCacheDto; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoStaffItemVo; import java.util.List; public interface ZiniaoClient { - List listShops(); + String getAppToken(); + + Long getCompanyIdByApiKey(); + + List listStaff(Long companyId); + + List listUserStores(Long companyId, Long userId, String userToken); + + String getUserLoginToken(Long companyId, Long userId); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java index 3ff2bc1..beb321b 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.config.ZiniaoProperties; import com.nanri.aiimage.modules.ziniao.model.cache.ZiniaoShopCacheDto; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoStaffItemVo; +import com.nanri.aiimage.modules.ziniao.service.ZiniaoSessionCacheService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.http.client.SimpleClientHttpRequestFactory; @@ -13,6 +15,7 @@ import org.springframework.web.client.RestClient; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; @Component @@ -21,22 +24,222 @@ public class ZiniaoClientImpl implements ZiniaoClient { private final ZiniaoProperties ziniaoProperties; private final ObjectMapper objectMapper; + private final ZiniaoSessionCacheService ziniaoSessionCacheService; @Override - public List listShops() { - if (ziniaoProperties.getCompanyId() == null || ziniaoProperties.getCompanyId() <= 0) { - throw new BusinessException("紫鸟 companyId 未配置"); + public String getAppToken() { + String cachedToken = ziniaoSessionCacheService.getAppToken(); + if (cachedToken != null && !cachedToken.isBlank()) { + return cachedToken; } - String raw = getRestClient().post() - .uri(joinUrl(ziniaoProperties.getBaseUrl(), ziniaoProperties.getShopsPath())) - .headers(headers -> { - headers.setBearerAuth(ziniaoProperties.getApiKey()); - headers.setContentType(MediaType.APPLICATION_JSON); - }) - .body(java.util.Map.of("companyId", ziniaoProperties.getCompanyId())) + String raw = postWithApiKeyEmptyJsonBody(ziniaoProperties.getAppTokenPath(), "获取 appToken"); + try { + JsonNode root = objectMapper.readTree(raw); + JsonNode data = firstNonNull(root.get("data"), root.get("result"), root); + String token = text(firstNonNull( + data == null ? null : data.get("appAuthToken"), + data == null ? null : data.get("appToken"), + root.get("appAuthToken"), + root.get("appToken") + )); + if (token == null || token.isBlank()) { + throw new BusinessException("紫鸟 appToken 响应缺少 token"); + } + ziniaoSessionCacheService.saveAppToken(token); + return token; + } catch (BusinessException ex) { + throw ex; + } catch (Exception ex) { + throw new BusinessException("解析紫鸟 appToken 响应失败"); + } + } + + @Override + public Long getCompanyIdByApiKey() { + String raw = getWithApiKey("/app/builtin/company", "获取 companyId"); + try { + JsonNode root = objectMapper.readTree(raw); + JsonNode data = firstNonNull(root.get("data"), root.get("result"), root); + Long companyId = longValue(firstNonNull(data == null ? null : data.get("companyId"), root.get("companyId"))); + if (companyId == null || companyId <= 0) { + throw new BusinessException("紫鸟 companyId 响应缺少 companyId"); + } + return companyId; + } catch (BusinessException ex) { + throw ex; + } catch (Exception ex) { + throw new BusinessException("解析紫鸟 companyId 响应失败"); + } + } + + @Override + public List listStaff(Long companyId) { + String raw = postWithApiKey(ziniaoProperties.getStaffListPath(), Map.of( + "companyId", String.valueOf(companyId), + "level", "", + "isAccurate", "", + "limit", "100", + "page", "1", + "departmentIds", List.of(), + "delflag", "", + "name", "", + "username", "" + ), "获取员工列表"); + try { + JsonNode root = objectMapper.readTree(raw); + JsonNode dataNode = firstNonNull(root.get("data"), root.get("result")); + JsonNode itemsNode = dataNode == null ? null : firstNonNull(dataNode.get("data"), dataNode.get("items"), dataNode); + List items = new ArrayList<>(); + if (itemsNode != null && itemsNode.isArray()) { + for (JsonNode itemNode : itemsNode) { + addStaffItem(items, itemNode); + } + } else if (itemsNode != null && itemsNode.isObject()) { + addStaffItem(items, itemsNode); + } + return items; + } catch (Exception ex) { + throw new BusinessException("解析紫鸟员工列表失败"); + } + } + + @Override + public List listUserStores(Long companyId, Long userId, String userToken) { + String raw = postWithAuthorization(ziniaoProperties.getUserStoresPath(), userToken, Map.of( + "companyId", companyId, + "userId", userId, + "storeName", "", + "isAccurate", 1, + "page", 1, + "limit", 10 + ), "获取员工店铺列表"); + return parseUserStores(raw); + } + + @Override + public String getUserLoginToken(Long companyId, Long userId) { + String raw = postWithApiKey(ziniaoProperties.getUserLoginTokenPath(), Map.of( + "companyId", String.valueOf(companyId), + "userId", String.valueOf(userId) + ), "获取员工登录 token"); + try { + JsonNode root = objectMapper.readTree(raw); + if (!success(root)) { + throw new BusinessException("获取紫鸟员工登录 token 失败: " + Objects.toString(text(root.get("msg")), "未知错误")); + } + JsonNode data = firstNonNull(root.get("data"), root.get("result")); + String token = text(firstNonNull( + data == null ? null : data.get("token"), + data == null ? null : data.get("loginToken"), + root.get("token"), + root.get("loginToken") + )); + if (token == null || token.isBlank()) { + throw new BusinessException("紫鸟员工登录 token 响应缺少 token"); + } + return token; + } catch (BusinessException ex) { + throw ex; + } catch (Exception ex) { + throw new BusinessException("解析紫鸟员工登录 token 响应失败"); + } + } + + + private String getWithApiKey(String path, String action) { + String apiKey = requireText(ziniaoProperties.getApiKey(), "紫鸟 apiKey 未配置"); + String raw = getRestClient().get() + .uri(joinUrl(ziniaoProperties.getBaseUrl(), path)) + .headers(headers -> headers.setBearerAuth(apiKey)) .retrieve() .body(String.class); - return parseShops(raw); + validateSuccess(raw, action, path); + return raw; + } + + private String postWithApiKeyEmptyJsonBody(String path, String action) { + String apiKey = requireText(ziniaoProperties.getApiKey(), "紫鸟 apiKey 未配置"); + String raw = getRestClient().post() + .uri(joinUrl(ziniaoProperties.getBaseUrl(), path)) + .headers(headers -> { + headers.setBearerAuth(apiKey); + headers.setContentType(MediaType.APPLICATION_JSON); + }) + .body("") + .retrieve() + .body(String.class); + validateSuccess(raw, action, path); + return raw; + } + + private String postWithApiKey(String path, Map body, String action) { + String apiKey = requireText(ziniaoProperties.getApiKey(), "紫鸟 apiKey 未配置"); + RestClient.RequestBodySpec request = getRestClient().post() + .uri(joinUrl(ziniaoProperties.getBaseUrl(), path)) + .headers(headers -> { + headers.setBearerAuth(apiKey); + headers.setContentType(MediaType.APPLICATION_JSON); + }); + if (body != null) { + request.body(body); + } + String raw = request + .retrieve() + .body(String.class); + validateSuccess(raw, action, path); + return raw; + } + + private String postWithAuthorization(String path, String authorization, Map body, String action) { + String token = requireText(authorization, "紫鸟授权 token 未配置"); + RestClient.RequestBodySpec request = getRestClient().post() + .uri(joinUrl(ziniaoProperties.getBaseUrl(), path)) + .headers(headers -> { + headers.set("Authorization", token); + headers.setContentType(MediaType.APPLICATION_JSON); + }); + if (body != null) { + request.body(body); + } + String raw = request + .retrieve() + .body(String.class); + validateSuccess(raw, action, path); + return raw; + } + + private void validateSuccess(String raw, String action, String path) { + try { + JsonNode root = objectMapper.readTree(raw); + if (!success(root)) { + throw new BusinessException("紫鸟接口返回失败(" + action + ", " + path + "): " + Objects.toString(text(root.get("msg")), "未知错误")); + } + } catch (BusinessException ex) { + throw ex; + } catch (Exception ex) { + throw new BusinessException("解析紫鸟接口响应失败(" + action + ", " + path + ")"); + } + } + + private boolean success(JsonNode root) { + String code = text(root.get("code")); + if (code != null && !"0".equals(code)) { + return false; + } + String status = text(root.get("status")); + Long ret = longValue(root.get("ret")); + if ((ret != null && ret != 0L) || (status != null && !"success".equalsIgnoreCase(status))) { + return false; + } + JsonNode wrapper = root.get("data"); + if (wrapper != null && wrapper.isObject()) { + String wrapperStatus = text(wrapper.get("status")); + Long wrapperRet = longValue(wrapper.get("ret")); + if ((wrapperRet != null && wrapperRet != 0L) || (wrapperStatus != null && !"success".equalsIgnoreCase(wrapperStatus))) { + return false; + } + } + return true; } private RestClient getRestClient() { @@ -46,21 +249,20 @@ public class ZiniaoClientImpl implements ZiniaoClient { return RestClient.builder().requestFactory(requestFactory).build(); } + private void addStaffItem(List items, JsonNode itemNode) { + ZiniaoStaffItemVo item = new ZiniaoStaffItemVo(); + item.setUserId(longValue(firstNonNull(itemNode.get("userId"), itemNode.get("user_id")))); + item.setUsername(text(firstNonNull(itemNode.get("username"), itemNode.get("userName")))); + item.setName(text(itemNode.get("name"))); + if (item.getUserId() != null) { + items.add(item); + } + } + private List parseShops(String raw) { try { JsonNode root = objectMapper.readTree(raw); - String code = text(root.get("code")); - if (code != null && !"0".equals(code)) { - throw new BusinessException("紫鸟店铺接口返回失败: " + Objects.toString(text(root.get("msg")), "未知错误")); - } JsonNode wrapper = root.get("data"); - if (wrapper != null && wrapper.isObject()) { - String status = text(wrapper.get("status")); - Long ret = longValue(wrapper.get("ret")); - if ((ret != null && ret != 0L) || (status != null && !"success".equalsIgnoreCase(status))) { - throw new BusinessException("紫鸟店铺接口业务失败: " + Objects.toString(status, "unknown")); - } - } JsonNode itemsNode = wrapper == null ? null : wrapper.get("data"); List items = new ArrayList<>(); if (itemsNode != null && itemsNode.isArray()) { @@ -75,12 +277,33 @@ public class ZiniaoClientImpl implements ZiniaoClient { } } return items; - } catch (BusinessException ex) { - throw ex; } catch (Exception ex) { throw new BusinessException("解析紫鸟店铺列表失败"); } } + private List parseUserStores(String raw) { + try { + JsonNode root = objectMapper.readTree(raw); + JsonNode itemsNode = firstNonNull(root.get("data"), root.get("result")); + List items = new ArrayList<>(); + if (itemsNode != null && itemsNode.isArray()) { + for (JsonNode itemNode : itemsNode) { + ZiniaoShopCacheDto item = new ZiniaoShopCacheDto(); + item.setShopId(text(firstNonNull(itemNode.get("id"), itemNode.get("shopId"), itemNode.get("accountId"), itemNode.get("account_id")))); + item.setShopName(text(firstNonNull(itemNode.get("name"), itemNode.get("shopName"), itemNode.get("accountName"), itemNode.get("account_name")))); + item.setPlatform(text(firstNonNull(itemNode.get("platform"), itemNode.get("platformName"), itemNode.get("site"), itemNode.get("siteName")))); + if (item.getShopId() != null && !item.getShopId().isBlank()) { + items.add(item); + } + } + } + return items; + } catch (Exception ex) { + throw new BusinessException("解析紫鸟员工店铺列表失败"); + } + } + + private String joinUrl(String baseUrl, String path) { String base = Objects.toString(baseUrl, "").trim(); @@ -121,4 +344,11 @@ public class ZiniaoClientImpl implements ZiniaoClient { return null; } } + + private String requireText(String value, String message) { + if (value == null || value.isBlank() || "change-me".equalsIgnoreCase(value.trim())) { + throw new BusinessException(message); + } + return value.trim(); + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/controller/ZiniaoAuthController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/controller/ZiniaoAuthController.java index 9164249..5e0bd17 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/controller/ZiniaoAuthController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/controller/ZiniaoAuthController.java @@ -1,12 +1,11 @@ package com.nanri.aiimage.modules.ziniao.controller; import com.nanri.aiimage.common.api.ApiResponse; -import com.nanri.aiimage.modules.ziniao.model.dto.ZiniaoSwitchShopRequest; -import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoCurrentShopVo; -import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoLoginUrlVo; +import com.nanri.aiimage.modules.ziniao.model.dto.ZiniaoOpenShopRequest; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoOpenShopVo; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoSessionVo; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopListVo; -import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoSwitchShopVo; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoStaffListVo; import com.nanri.aiimage.modules.ziniao.service.ZiniaoAuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -15,8 +14,6 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpHeaders; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -27,71 +24,44 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor @RequestMapping("/api/ziniao") -@Tag(name = "紫鸟接入", description = "紫鸟 ApiKey 模式下的配置状态、店铺列表、当前店铺与切换店铺接口") +@Tag(name = "紫鸟接入", description = "基于 API Key 直连紫鸟接口，获取 appToken、员工、店铺并生成打开店铺链接") public class ZiniaoAuthController { private final ZiniaoAuthService ziniaoAuthService; - @GetMapping("/login-url") - @Operation(summary = "获取紫鸟接入信息", description = "兼容保留接口，返回当前 ApiKey 模式的接入信息和 sessionId。") - @ApiResponses({ - @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "获取成功", content = @Content(schema = @Schema(implementation = ZiniaoLoginUrlVo.class))) - }) - public ApiResponse getLoginUrl() { - return ApiResponse.success(ziniaoAuthService.getLoginUrl()); - } - - @GetMapping("/callback") - @Operation(summary = "兼容保留回调接口", description = "ApiKey 模式下无真实登录回调，该接口仅兼容旧调用并返回 302。") - @ApiResponses({ - @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "302", description = "重定向到兼容地址") - }) - public ResponseEntity callback(@RequestParam(required = false) String code, @RequestParam(required = false) String state) { - try { - String redirectUrl = ziniaoAuthService.handleCallback(code, state); - return ResponseEntity.status(302) - .header(HttpHeaders.LOCATION, redirectUrl) - .build(); - } catch (Exception ex) { - return ResponseEntity.status(302) - .header(HttpHeaders.LOCATION, ziniaoAuthService.buildFailureRedirect(ex.getMessage())) - .build(); - } - } - @GetMapping("/session") - @Operation(summary = "获取紫鸟接入状态", description = "根据 sessionId 获取当前 ApiKey 模式会话与当前店铺信息。") + @Operation(summary = "获取紫鸟会话状态", description = "自动获取或复用 appToken，并返回 companyId、当前员工 userId、脱敏 token 和当前店铺信息。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "获取成功", content = @Content(schema = @Schema(implementation = ZiniaoSessionVo.class))) }) - public ApiResponse getSession(@RequestParam String sessionId) { - return ApiResponse.success(ziniaoAuthService.getSession(sessionId)); + public ApiResponse getSession(@RequestParam(required = false) String sessionId, @RequestParam(required = false) Long userId) { + return ApiResponse.success(ziniaoAuthService.getSession(sessionId, userId)); + } + + @GetMapping("/staff") + @Operation(summary = "获取紫鸟员工列表", description = "使用 API Key 直连紫鸟接口，查询当前 companyId 下的员工列表，供前端绑定 employee userId。") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "获取成功", content = @Content(schema = @Schema(implementation = ZiniaoStaffListVo.class))) + }) + public ApiResponse listStaff() { + return ApiResponse.success(ziniaoAuthService.listStaff()); } @GetMapping("/shops") - @Operation(summary = "获取紫鸟店铺列表", description = "根据 sessionId 使用配置的 ApiKey 与 companyId 拉取最新店铺列表。") + @Operation(summary = "获取员工可见店铺列表", description = "先通过 API Key 获取 companyId，再按员工 userId 查询该员工有权限的店铺列表，并缓存到当前 session。") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "获取成功", content = @Content(schema = @Schema(implementation = ZiniaoShopListVo.class))) }) - public ApiResponse listShops(@RequestParam String sessionId) { - return ApiResponse.success(ziniaoAuthService.listShops(sessionId)); + public ApiResponse listShops(@RequestParam String sessionId, @RequestParam Long userId) { + return ApiResponse.success(ziniaoAuthService.listShops(sessionId, userId)); } - @GetMapping("/shops/current") - @Operation(summary = "获取当前紫鸟店铺", description = "根据 sessionId 获取当前已选中的店铺。") + @PostMapping("/shops/open") + @Operation(summary = "生成店铺打开链接", description = "按指定员工 userId 和 shopId 获取员工登录 token，并返回可直接拉起紫鸟客户端的 openStoreUrl。") @ApiResponses({ - @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "获取成功", content = @Content(schema = @Schema(implementation = ZiniaoCurrentShopVo.class))) + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "打开链接生成成功", content = @Content(schema = @Schema(implementation = ZiniaoOpenShopVo.class))) }) - public ApiResponse getCurrentShop(@RequestParam String sessionId) { - return ApiResponse.success(ziniaoAuthService.getCurrentShop(sessionId)); - } - - @PostMapping("/shops/switch") - @Operation(summary = "切换当前紫鸟店铺", description = "根据 sessionId 和 shopId 切换当前选中的店铺。") - @ApiResponses({ - @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "切换成功", content = @Content(schema = @Schema(implementation = ZiniaoSwitchShopVo.class))) - }) - public ApiResponse switchShop(@Valid @RequestBody ZiniaoSwitchShopRequest request) { - return ApiResponse.success(ziniaoAuthService.switchShop(request)); + public ApiResponse openShop(@Valid @RequestBody ZiniaoOpenShopRequest request) { + return ApiResponse.success(ziniaoAuthService.openShop(request)); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/cache/ZiniaoSessionCacheDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/cache/ZiniaoSessionCacheDto.java index cfc72e7..df01a7e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/cache/ZiniaoSessionCacheDto.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/cache/ZiniaoSessionCacheDto.java @@ -11,5 +11,7 @@ public class ZiniaoSessionCacheDto { private Long expireAt; private String ziniaoUserId; private String nickname; + private Long companyId; + private Long currentUserId; private String defaultShopId; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoOpenShopRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoOpenShopRequest.java new file mode 100644 index 0000000..225a998 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoOpenShopRequest.java @@ -0,0 +1,17 @@ +package com.nanri.aiimage.modules.ziniao.model.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class ZiniaoOpenShopRequest { + @NotBlank(message = "sessionId 不能为空") + private String sessionId; + + @NotNull(message = "userId 不能为空") + private Long userId; + + @NotBlank(message = "shopId 不能为空") + private String shopId; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoSwitchShopRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoSwitchShopRequest.java index eddeffd..0d2cd0c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoSwitchShopRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/dto/ZiniaoSwitchShopRequest.java @@ -1,6 +1,7 @@ package com.nanri.aiimage.modules.ziniao.model.dto; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data @@ -8,6 +9,9 @@ public class ZiniaoSwitchShopRequest { @NotBlank(message = "sessionId 不能为空") private String sessionId; + @NotNull(message = "userId 不能为空") + private Long userId; + @NotBlank(message = "shopId 不能为空") private String shopId; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoOpenShopVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoOpenShopVo.java new file mode 100644 index 0000000..81d14b3 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoOpenShopVo.java @@ -0,0 +1,23 @@ +package com.nanri.aiimage.modules.ziniao.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "紫鸟打开店铺结果") +public class ZiniaoOpenShopVo { + @Schema(description = "店铺ID") + private String shopId; + + @Schema(description = "店铺名称") + private String shopName; + + @Schema(description = "员工用户ID") + private Long userId; + + @Schema(description = "通过 API Key 调用接口获取的员工登录 token") + private String loginToken; + + @Schema(description = "打开店铺URL") + private String openStoreUrl; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoSessionVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoSessionVo.java index 05ed620..7e30639 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoSessionVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoSessionVo.java @@ -9,15 +9,30 @@ public class ZiniaoSessionVo { @Schema(description = "会话 ID") private String sessionId; - @Schema(description = "是否已认证") + @Schema(description = "是否已启用") + private Boolean enabled; + + @Schema(description = "是否已获取应用 token") private Boolean authenticated; + @Schema(description = "公司 ID") + private Long companyId; + + @Schema(description = "当前员工 userId") + private Long currentUserId; + @Schema(description = "紫鸟用户 ID") private String ziniaoUserId; @Schema(description = "紫鸟昵称") private String nickname; + @Schema(description = "脱敏后的 appToken") + private String appToken; + + @Schema(description = "token 类型") + private String tokenType; + @Schema(description = "会话过期时间戳（毫秒）") private Long expireAt; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffItemVo.java new file mode 100644 index 0000000..f047713 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffItemVo.java @@ -0,0 +1,17 @@ +package com.nanri.aiimage.modules.ziniao.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "紫鸟员工") +public class ZiniaoStaffItemVo { + @Schema(description = "员工用户ID") + private Long userId; + + @Schema(description = "员工账号") + private String username; + + @Schema(description = "员工姓名") + private String name; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffListVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffListVo.java new file mode 100644 index 0000000..a0568a1 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/model/vo/ZiniaoStaffListVo.java @@ -0,0 +1,14 @@ +package com.nanri.aiimage.modules.ziniao.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "紫鸟员工列表") +public class ZiniaoStaffListVo { + @Schema(description = "员工列表") + private List items = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java index 9535f15..e3e28a0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java @@ -5,22 +5,22 @@ import com.nanri.aiimage.config.ZiniaoProperties; import com.nanri.aiimage.modules.ziniao.client.ZiniaoClient; import com.nanri.aiimage.modules.ziniao.model.cache.ZiniaoSessionCacheDto; import com.nanri.aiimage.modules.ziniao.model.cache.ZiniaoShopCacheDto; -import com.nanri.aiimage.modules.ziniao.model.dto.ZiniaoSwitchShopRequest; -import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoCurrentShopVo; -import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoLoginUrlVo; +import com.nanri.aiimage.modules.ziniao.model.dto.ZiniaoOpenShopRequest; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoOpenShopVo; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoSessionVo; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopItemVo; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopListVo; -import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoSwitchShopVo; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoStaffItemVo; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoStaffListVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.util.UriComponentsBuilder; import java.nio.charset.StandardCharsets; import java.time.Instant; +import java.util.Base64; import java.util.List; import java.util.UUID; -import java.util.Base64; @Service @RequiredArgsConstructor @@ -30,163 +30,150 @@ public class ZiniaoAuthService { private final ZiniaoClient ziniaoClient; private final ZiniaoSessionCacheService ziniaoSessionCacheService; - public ZiniaoLoginUrlVo getLoginUrl() { + public ZiniaoSessionVo getSession(String sessionId, Long userId) { ensureEnabled(); - String sessionId = ensureSession(); - ZiniaoLoginUrlVo vo = new ZiniaoLoginUrlVo(); - vo.setState(sessionId); - vo.setExpireAt(Instant.now().plusSeconds(ziniaoProperties.getSessionTtlHours() * 3600).toEpochMilli()); - vo.setLoginUrl(ziniaoProperties.getBaseUrl()); - return vo; - } - - public String handleCallback(String code, String state) { - ensureEnabled(); - String sessionId = ensureSession(); - return ziniaoProperties.getBaseUrl() + "?sessionId=" + sessionId; - } - - public ZiniaoSessionVo getSession(String sessionId) { - ZiniaoSessionCacheDto session = requireSession(sessionId); - List shops = ziniaoSessionCacheService.getShops(sessionId); - ZiniaoShopCacheDto currentShop = getOrInitCurrentShop(sessionId, shops); + ZiniaoSessionCacheDto session = sessionId == null || sessionId.isBlank() ? initSession(userId) : requireOrInitSession(sessionId, userId); ZiniaoSessionVo vo = new ZiniaoSessionVo(); vo.setSessionId(session.getSessionId()); - vo.setAuthenticated(true); + vo.setEnabled(ziniaoProperties.isEnabled()); + vo.setAuthenticated(session.getAccessToken() != null && !session.getAccessToken().isBlank()); + vo.setCompanyId(session.getCompanyId()); + vo.setCurrentUserId(session.getCurrentUserId()); vo.setZiniaoUserId(session.getZiniaoUserId()); vo.setNickname(session.getNickname()); + vo.setAppToken(session.getAccessToken()); + vo.setTokenType(session.getTokenType()); vo.setExpireAt(session.getExpireAt()); - vo.setShopCount(shops.size()); - if (currentShop != null) { - vo.setCurrentShopId(currentShop.getShopId()); - vo.setCurrentShopName(currentShop.getShopName()); - } + vo.setShopCount(ziniaoSessionCacheService.getShops(session.getSessionId()).size()); + vo.setCurrentShopId(session.getDefaultShopId()); + vo.setCurrentShopName(resolveCurrentShopName(session.getSessionId(), session.getDefaultShopId())); return vo; } - public ZiniaoShopListVo listShops(String sessionId) { - requireSession(sessionId); - List shops = ziniaoClient.listShops(); - ziniaoSessionCacheService.saveShops(sessionId, shops); - ZiniaoShopCacheDto currentShop = getOrInitCurrentShop(sessionId, shops); + public ZiniaoStaffListVo listStaff() { + ensureEnabled(); + ZiniaoStaffListVo vo = new ZiniaoStaffListVo(); + Long companyId = resolveCompanyIdForStaff(); + vo.getItems().addAll(ziniaoClient.listStaff(companyId)); + return vo; + } + + public ZiniaoShopListVo listShops(String sessionId, Long userId) { + ZiniaoSessionCacheDto session = requireOrInitSession(sessionId, userId); + Long currentUserId = requireUserId(session.getCurrentUserId()); + String userToken = ziniaoClient.getUserLoginToken(resolveCompanyId(), currentUserId); + List shops = ziniaoClient.listUserStores(resolveCompanyId(), currentUserId, userToken); + ziniaoSessionCacheService.saveShops(session.getSessionId(), shops); + if (!shops.isEmpty() && (session.getDefaultShopId() == null || session.getDefaultShopId().isBlank())) { + session.setDefaultShopId(shops.get(0).getShopId()); + ziniaoSessionCacheService.saveSession(session); + } ZiniaoShopListVo vo = new ZiniaoShopListVo(); for (ZiniaoShopCacheDto shop : shops) { ZiniaoShopItemVo item = new ZiniaoShopItemVo(); item.setShopId(shop.getShopId()); item.setShopName(shop.getShopName()); item.setPlatform(shop.getPlatform()); - item.setSelected(currentShop != null && shop.getShopId().equals(currentShop.getShopId())); + item.setSelected(shop.getShopId() != null && shop.getShopId().equals(session.getDefaultShopId())); vo.getItems().add(item); } return vo; } - public ZiniaoCurrentShopVo getCurrentShop(String sessionId) { - requireSession(sessionId); - ZiniaoShopCacheDto currentShop = getOrInitCurrentShop(sessionId, ziniaoSessionCacheService.getShops(sessionId)); - if (currentShop == null) { - throw new BusinessException("当前会话没有可用店铺"); + public ZiniaoOpenShopVo openShop(ZiniaoOpenShopRequest request) { + ZiniaoSessionCacheDto session = requireOrInitSession(request.getSessionId(), request.getUserId()); + Long currentUserId = requireUserId(request.getUserId() != null ? request.getUserId() : session.getCurrentUserId()); + String userToken = ziniaoClient.getUserLoginToken(resolveCompanyId(), currentUserId); + List shops = ziniaoSessionCacheService.getShops(session.getSessionId()); + if (shops.isEmpty()) { + shops = ziniaoClient.listUserStores(resolveCompanyId(), currentUserId, userToken); + ziniaoSessionCacheService.saveShops(session.getSessionId(), shops); } - ZiniaoCurrentShopVo vo = new ZiniaoCurrentShopVo(); - vo.setShopId(currentShop.getShopId()); - vo.setShopName(currentShop.getShopName()); - vo.setPlatform(currentShop.getPlatform()); - vo.setSelectedAt(currentShop.getSelectedAt()); - return vo; - } - - public ZiniaoSwitchShopVo switchShop(ZiniaoSwitchShopRequest request) { - requireSession(request.getSessionId()); - List shops = ziniaoSessionCacheService.getShops(request.getSessionId()); ZiniaoShopCacheDto targetShop = shops.stream() .filter(item -> item.getShopId() != null && item.getShopId().equals(request.getShopId())) .findFirst() - .orElseThrow(() -> new BusinessException("店铺不存在或不属于当前会话")); - targetShop.setSelectedAt(Instant.now().toEpochMilli()); - ziniaoSessionCacheService.saveCurrentShop(request.getSessionId(), targetShop); - ZiniaoSwitchShopVo vo = new ZiniaoSwitchShopVo(); - vo.setSuccess(true); - vo.setCurrentShopId(targetShop.getShopId()); - vo.setCurrentShopName(targetShop.getShopName()); - vo.setOpenStoreUrl(buildOpenStoreUrl(targetShop)); + .orElseThrow(() -> new BusinessException("店铺不存在或不属于当前员工")); + session.setCurrentUserId(currentUserId); + session.setDefaultShopId(targetShop.getShopId()); + ziniaoSessionCacheService.saveSession(session); + ziniaoSessionCacheService.saveCurrentShop(session.getSessionId(), targetShop); + + ZiniaoOpenShopVo vo = new ZiniaoOpenShopVo(); + vo.setUserId(currentUserId); + vo.setShopId(targetShop.getShopId()); + vo.setShopName(targetShop.getShopName()); + vo.setLoginToken(userToken); + vo.setOpenStoreUrl(buildOpenStoreUrl(targetShop.getShopId(), currentUserId, userToken)); return vo; } - public String buildFailureRedirect(String message) { - return ziniaoProperties.getBaseUrl() + "?message=" + (message == null || message.isBlank() ? "紫鸟授权失败" : message); + public List listShopsForConfiguredUser() { + ensureEnabled(); + Long userId = parseConfiguredOpenStoreUserId(); + String userToken = ziniaoClient.getUserLoginToken(resolveCompanyId(), userId); + return ziniaoClient.listUserStores(resolveCompanyId(), userId, userToken); } - private String ensureSession() { + public String buildOpenStoreUrlForShop(ZiniaoShopCacheDto shop) { + ensureEnabled(); + if (shop == null || shop.getShopId() == null || shop.getShopId().isBlank()) { + throw new BusinessException("店铺不存在"); + } + Long userId = parseConfiguredOpenStoreUserId(); + String loginToken = ziniaoClient.getUserLoginToken(resolveCompanyId(), userId); + return buildOpenStoreUrl(shop.getShopId(), userId, loginToken); + } + + private ZiniaoSessionCacheDto initSession(Long userId) { String sessionId = "ziniao_" + UUID.randomUUID().toString().replace("-", ""); ZiniaoSessionCacheDto session = new ZiniaoSessionCacheDto(); session.setSessionId(sessionId); - session.setAccessToken(maskApiKey(ziniaoProperties.getApiKey())); + String appToken = ziniaoClient.getAppToken(); + session.setAccessToken(maskToken(appToken)); session.setTokenType("Bearer"); session.setExpireAt(Instant.now().plusSeconds(ziniaoProperties.getSessionTtlHours() * 3600).toEpochMilli()); - session.setZiniaoUserId(String.valueOf(defaultCompanyId())); - session.setNickname("ApiKey模式"); + session.setCompanyId(resolveCompanyId()); + session.setCurrentUserId(userId); + session.setZiniaoUserId(String.valueOf(userId == null ? 0L : userId)); + session.setNickname("API Key模式"); ziniaoSessionCacheService.saveSession(session); - return sessionId; + return session; } - private ZiniaoSessionCacheDto requireSession(String sessionId) { - ensureEnabled(); + private ZiniaoSessionCacheDto requireOrInitSession(String sessionId, Long userId) { if (sessionId == null || sessionId.isBlank()) { - throw new BusinessException("sessionId 不能为空"); + return initSession(userId); } ZiniaoSessionCacheDto session = ziniaoSessionCacheService.getSession(sessionId); if (session == null) { - throw new BusinessException("当前会话不存在或已过期"); + return initSession(userId); + } + if (userId != null && userId > 0) { + session.setCurrentUserId(userId); + session.setZiniaoUserId(String.valueOf(userId)); + ziniaoSessionCacheService.saveSession(session); } return session; } - private ZiniaoShopCacheDto getOrInitCurrentShop(String sessionId, List shops) { - ZiniaoShopCacheDto current = ziniaoSessionCacheService.getCurrentShop(sessionId); - if (current != null) { - return current; - } - if (shops == null || shops.isEmpty()) { + private String resolveCurrentShopName(String sessionId, String currentShopId) { + if (currentShopId == null || currentShopId.isBlank()) { return null; } - ZiniaoShopCacheDto first = shops.get(0); - first.setSelectedAt(Instant.now().toEpochMilli()); - ziniaoSessionCacheService.saveCurrentShop(sessionId, first); - return first; + return ziniaoSessionCacheService.getShops(sessionId).stream() + .filter(item -> currentShopId.equals(item.getShopId())) + .map(ZiniaoShopCacheDto::getShopName) + .findFirst() + .orElse(null); } - private void ensureEnabled() { - if (!ziniaoProperties.isEnabled()) { - throw new BusinessException("紫鸟集成未启用，请先配置环境变量"); - } - if (ziniaoProperties.getApiKey() == null || ziniaoProperties.getApiKey().isBlank() || "change-me".equalsIgnoreCase(ziniaoProperties.getApiKey())) { - throw new BusinessException("紫鸟 ApiKey 未配置"); - } - } - - private long defaultCompanyId() { - return ziniaoProperties.getCompanyId() == null ? 0L : ziniaoProperties.getCompanyId(); - } - - private String maskApiKey(String apiKey) { - if (apiKey == null || apiKey.isBlank()) { - return ""; - } - if (apiKey.length() <= 8) { - return apiKey; - } - return apiKey.substring(0, 4) + "****" + apiKey.substring(apiKey.length() - 4); - } - - private String buildOpenStoreUrl(ZiniaoShopCacheDto shop) { + private String buildOpenStoreUrl(String storeId, Long userId, String loginToken) { String scheme = requireText(ziniaoProperties.getOpenStoreScheme(), "紫鸟 open-store-scheme 未配置"); - String userId = requireText(ziniaoProperties.getOpenStoreUserId(), "紫鸟 open-store-user-id 未配置"); - String apiKey = requireText(ziniaoProperties.getApiKey(), "紫鸟 ApiKey 未配置"); String launchUrl = requireText(ziniaoProperties.getOpenStoreLaunchUrl(), "紫鸟 open-store-launch-url 未配置"); String encodedLaunchUrl = Base64.getEncoder().encodeToString(launchUrl.getBytes(StandardCharsets.UTF_8)); UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(scheme) - .queryParam("storeId", shop.getShopId()) - .queryParam("openapiToken", apiKey) + .queryParam("storeId", storeId) + .queryParam("openapiToken", loginToken) .queryParam("userId", userId) .queryParam("lanuchUrl", encodedLaunchUrl) .queryParam("autoopen", Boolean.TRUE.equals(ziniaoProperties.getOpenStoreAutoOpen())) @@ -202,8 +189,56 @@ public class ZiniaoAuthService { return builder.build(true).toUriString(); } + private void ensureEnabled() { + if (!ziniaoProperties.isEnabled()) { + throw new BusinessException("紫鸟集成未启用，请先配置环境变量"); + } + requireText(ziniaoProperties.getApiKey(), "紫鸟 apiKey 未配置"); + } + + private Long resolveCompanyIdForStaff() { + return resolveCompanyId(); + } + + private Long requireUserId(Long userId) { + if (userId == null || userId <= 0) { + throw new BusinessException("请先选择紫鸟员工"); + } + return userId; + } + + private Long resolveCompanyId() { + if (ziniaoProperties.getCompanyId() != null && ziniaoProperties.getCompanyId() > 0) { + return ziniaoProperties.getCompanyId(); + } + return ziniaoClient.getCompanyIdByApiKey(); + } + + private Long requireCompanyId() { + return resolveCompanyId(); + } + + private Long parseConfiguredOpenStoreUserId() { + String configured = requireText(ziniaoProperties.getOpenStoreUserId(), "紫鸟 open-store-user-id 未配置"); + try { + return Long.parseLong(configured); + } catch (Exception ex) { + throw new BusinessException("紫鸟 open-store-user-id 配置不合法"); + } + } + + private String maskToken(String token) { + if (token == null || token.isBlank()) { + return ""; + } + if (token.length() <= 8) { + return token; + } + return token.substring(0, 4) + "****" + token.substring(token.length() - 4); + } + private String requireText(String value, String message) { - if (value == null || value.isBlank()) { + if (value == null || value.isBlank() || "change-me".equalsIgnoreCase(value.trim())) { throw new BusinessException(message); } return value.trim(); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoSessionCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoSessionCacheService.java index 61b4a51..d99a37d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoSessionCacheService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoSessionCacheService.java @@ -17,10 +17,27 @@ import java.util.List; @RequiredArgsConstructor public class ZiniaoSessionCacheService { + private static final String APP_TOKEN_KEY = "ziniao:app-token"; + private final StringRedisTemplate stringRedisTemplate; private final ObjectMapper objectMapper; private final ZiniaoProperties ziniaoProperties; + public void saveAppToken(String appToken) { + if (appToken == null || appToken.isBlank()) { + return; + } + stringRedisTemplate.opsForValue().set(APP_TOKEN_KEY, appToken.trim(), Duration.ofHours(ziniaoProperties.getSessionTtlHours())); + } + + public String getAppToken() { + String value = stringRedisTemplate.opsForValue().get(APP_TOKEN_KEY); + if (value == null || value.isBlank()) { + return null; + } + return value.trim(); + } + public void saveSession(ZiniaoSessionCacheDto session) { try { stringRedisTemplate.opsForValue().set(buildSessionKey(session.getSessionId()), objectMapper.writeValueAsString(session), Duration.ofHours(ziniaoProperties.getSessionTtlHours())); diff --git a/backend-java/src/main/resources/application-local.example.yml b/backend-java/src/main/resources/application-local.example.yml index 7642af0..8b41c59 100644 --- a/backend-java/src/main/resources/application-local.example.yml +++ b/backend-java/src/main/resources/application-local.example.yml @@ -15,12 +15,20 @@ AIIMAGE_OSS_ACCESS_KEY_SECRET=bQSZnFH455i8tzyOgeahJmUzwmhynz AIIMAGE_STORAGE_LOCAL_TEMP_DIR=F:/project/crawler-plugin/backend-java/data/tmp +AIIMAGE_MODULE_CLEANUP_ENABLED=true +AIIMAGE_MODULE_CLEANUP_CRON=0 0 0 * * * +AIIMAGE_MODULE_CLEANUP_MODULE_TYPES=DEDUPE,SPLIT,CONVERT,DELETE_BRAND + AIIMAGE_ZINIAO_ENABLED=false AIIMAGE_ZINIAO_BASE_URL=https://sbappstoreapi.ziniao.com/openapi-router AIIMAGE_ZINIAO_API_KEY=change-me +AIIMAGE_ZINIAO_APP_ID=change-me +AIIMAGE_ZINIAO_APP_SECRET=change-me AIIMAGE_ZINIAO_COMPANY_ID=0 -AIIMAGE_ZINIAO_SHOPS_PATH=/superbrowser/rest/v1/erp/shop/list -AIIMAGE_ZINIAO_SWITCH_SHOP_PATH= +AIIMAGE_ZINIAO_APP_TOKEN_PATH=/auth/get_app_token +AIIMAGE_ZINIAO_STAFF_LIST_PATH=/superbrowser/rest/v1/erp/staff/list +AIIMAGE_ZINIAO_USER_STORES_PATH=/superbrowser/rest/v1/erp/user/stores +AIIMAGE_ZINIAO_USER_LOGIN_TOKEN_PATH=/superbrowser/rest/v1/token/user-login AIIMAGE_ZINIAO_OPEN_STORE_SCHEME=superbrowser://OpenStrore AIIMAGE_ZINIAO_OPEN_STORE_USER_ID= AIIMAGE_ZINIAO_OPEN_STORE_LAUNCH_URL=https://www.baidu.com diff --git a/backend-java/src/main/resources/application.yml b/backend-java/src/main/resources/application.yml index dbee479..250819e 100644 --- a/backend-java/src/main/resources/application.yml +++ b/backend-java/src/main/resources/application.yml @@ -72,13 +72,21 @@ aiimage: failed-ttl-hours: ${AIIMAGE_BRAND_PROGRESS_FAILED_TTL_HOURS:2} heartbeat-timeout-minutes: ${AIIMAGE_BRAND_PROGRESS_HEARTBEAT_TIMEOUT_MINUTES:15} stale-check-cron: ${AIIMAGE_BRAND_PROGRESS_STALE_CHECK_CRON:0 */2 * * * *} + module-cleanup: + enabled: ${AIIMAGE_MODULE_CLEANUP_ENABLED:true} + cron: ${AIIMAGE_MODULE_CLEANUP_CRON:0 0 0 * * *} + module-types: ${AIIMAGE_MODULE_CLEANUP_MODULE_TYPES:DEDUPE,SPLIT,CONVERT,DELETE_BRAND} ziniao: enabled: ${AIIMAGE_ZINIAO_ENABLED:false} base-url: ${AIIMAGE_ZINIAO_BASE_URL:https://sbappstoreapi.ziniao.com/openapi-router} - api-key: ${AIIMAGE_ZINIAO_API_KEY:change-me} + api-key: ${AIIMAGE_ZINIAO_API_KEY:} + app-id: ${AIIMAGE_ZINIAO_APP_ID:change-me} + app-secret: ${AIIMAGE_ZINIAO_APP_SECRET:change-me} company-id: ${AIIMAGE_ZINIAO_COMPANY_ID:0} - shops-path: ${AIIMAGE_ZINIAO_SHOPS_PATH:/superbrowser/rest/v1/erp/shop/list} - switch-shop-path: ${AIIMAGE_ZINIAO_SWITCH_SHOP_PATH:} + app-token-path: ${AIIMAGE_ZINIAO_APP_TOKEN_PATH:/auth/get_app_token} + staff-list-path: ${AIIMAGE_ZINIAO_STAFF_LIST_PATH:/superbrowser/rest/v1/erp/staff/list} + user-stores-path: ${AIIMAGE_ZINIAO_USER_STORES_PATH:/superbrowser/rest/v1/erp/user/stores} + user-login-token-path: ${AIIMAGE_ZINIAO_USER_LOGIN_TOKEN_PATH:/superbrowser/rest/v1/token/user-login} open-store-scheme: ${AIIMAGE_ZINIAO_OPEN_STORE_SCHEME:superbrowser://OpenStrore} open-store-user-id: ${AIIMAGE_ZINIAO_OPEN_STORE_USER_ID:} open-store-launch-url: ${AIIMAGE_ZINIAO_OPEN_STORE_LAUNCH_URL:https://www.baidu.com} diff --git a/frontend-vue/delete-brand.html b/frontend-vue/delete-brand.html new file mode 100644 index 0000000..985a883 --- /dev/null +++ b/frontend-vue/delete-brand.html @@ -0,0 +1,12 @@ + + + + + + 删除品牌 - 数富AI + + +

+ + + diff --git a/frontend-vue/src/delete-brand-main.ts b/frontend-vue/src/delete-brand-main.ts new file mode 100644 index 0000000..7c3a7f4 --- /dev/null +++ b/frontend-vue/src/delete-brand-main.ts @@ -0,0 +1,7 @@ +import { createApp } from 'vue' +import ElementPlus from 'element-plus' +import 'element-plus/dist/index.css' +import '@/styles/main.css' +import BrandDeleteBrandTab from '@/pages/brand/components/BrandDeleteBrandTab.vue' + +createApp(BrandDeleteBrandTab).use(ElementPlus).mount('#app') diff --git a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue new file mode 100644 index 0000000..caea652 --- /dev/null +++ b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/frontend-vue/src/pages/brand/components/BrandTopBar.vue b/frontend-vue/src/pages/brand/components/BrandTopBar.vue index fdc74fe..ccfda6b 100644 --- a/frontend-vue/src/pages/brand/components/BrandTopBar.vue +++ b/frontend-vue/src/pages/brand/components/BrandTopBar.vue @@ -20,7 +20,7 @@ diff --git a/frontend-vue/src/shared/api/brand.ts b/frontend-vue/src/shared/api/brand.ts index 12a0288..073a977 100644 --- a/frontend-vue/src/shared/api/brand.ts +++ b/frontend-vue/src/shared/api/brand.ts @@ -1,5 +1,14 @@ import { requestDeleteJson, requestGetJson, requestPostJson } from '@/shared/api/http' +function getCurrentUserId() { + const raw = typeof window === 'undefined' ? '' : window.localStorage.getItem('uid') || '' + const value = Number(raw) + if (!Number.isFinite(value) || value <= 0) { + throw new Error('未获取到用户ID') + } + return value +} + export interface BrandExpandFolderItem { absolutePath: string relativePath: string @@ -47,11 +56,11 @@ export interface BrandTaskMutationResponse { const API_PREFIX = '' export function getBrandTaskEventsUrl(taskId: string | number) { - return `${API_PREFIX}/api/brand/tasks/${taskId}/events` + return `${API_PREFIX}/api/brand/tasks/${taskId}/events?user_id=${encodeURIComponent(String(getCurrentUserId()))}` } export function getBrandTaskDownloadUrl(taskId: string | number) { - return `${API_PREFIX}/api/brand/download/${taskId}` + return `${API_PREFIX}/api/brand/tasks/${taskId}/download?user_id=${encodeURIComponent(String(getCurrentUserId()))}` } export function getBrandTemplateXlsxUrl() { @@ -75,23 +84,23 @@ export function runBrandNow(paths: string[], strategy: string) { } export function createBrandTask(paths: string[], strategy: string) { - return requestPostJson(`${API_PREFIX}/api/brand/tasks`, { paths, strategy }) + return requestPostJson(`${API_PREFIX}/api/brand/tasks?userId=${encodeURIComponent(String(getCurrentUserId()))}`, { paths, strategy }) } export function getBrandTasks() { - return requestGetJson(`${API_PREFIX}/api/brand/tasks`) + return requestGetJson(`${API_PREFIX}/api/brand/tasks?userId=${encodeURIComponent(String(getCurrentUserId()))}`) } export function getBrandTask(taskId: string | number) { - return requestGetJson(`${API_PREFIX}/api/brand/tasks/${taskId}`) + return requestGetJson(`${API_PREFIX}/api/brand/tasks/${taskId}?userId=${encodeURIComponent(String(getCurrentUserId()))}`) } export function cancelBrandTask(taskId: string | number) { - return requestPostJson(`${API_PREFIX}/api/brand/tasks/${taskId}/cancel`) + return requestPostJson(`${API_PREFIX}/api/brand/tasks/${taskId}/cancel?userId=${encodeURIComponent(String(getCurrentUserId()))}`) } export function deleteBrandTask(taskId: string | number) { - return requestDeleteJson(`${API_PREFIX}/api/brand/tasks/${taskId}`) + return requestDeleteJson(`${API_PREFIX}/api/brand/tasks/${taskId}?userId=${encodeURIComponent(String(getCurrentUserId()))}`) } export function createBrandTaskEvents(taskId: string | number) { diff --git a/frontend-vue/src/shared/api/java-modules.ts b/frontend-vue/src/shared/api/java-modules.ts index a8f85e5..d7f34fd 100644 --- a/frontend-vue/src/shared/api/java-modules.ts +++ b/frontend-vue/src/shared/api/java-modules.ts @@ -2,6 +2,15 @@ import { del, get, http, post, type JavaApiResponse, unwrapJavaResponse } from ' const JAVA_API_PREFIX = '/newApi/api' +function getCurrentUserId() { + const raw = typeof window === 'undefined' ? '' : window.localStorage.getItem('uid') || '' + const value = Number(raw) + if (!Number.isFinite(value) || value <= 0) { + throw new Error('未获取到用户ID') + } + return value +} + export interface UploadedFileRef { fileKey: string originalFilename?: string @@ -43,6 +52,7 @@ export interface DedupeRunRequest { keepUnderscoreIds: boolean keepIntegerMainIdsWhenNoSubIds: boolean archiveName?: string + user_id: number } export interface SplitArchiveEntry { @@ -80,6 +90,7 @@ export interface SplitRunRequest { rowsPerFile?: number parts?: number archiveName?: string + user_id: number } export interface ConvertResultItem { @@ -106,6 +117,45 @@ export interface ConvertRunRequest { files: UploadedFileRef[] templateId: string archiveName?: string + user_id: number +} + +export interface DeleteBrandPreviewRow { + rowIndex: number + country: string + asin: string + status: string +} + +export interface DeleteBrandResultItem { + resultId?: number + sourceFilename: string + shopName?: string + matched: boolean + shopId?: string + platform?: string + openStoreUrl?: string + totalRows?: number + truncated?: boolean + previewRows?: DeleteBrandPreviewRow[] + success: boolean + error?: string +} + +export interface DeleteBrandRunVo { + total: number + successCount: number + failedCount: number + items: DeleteBrandResultItem[] +} + +export interface DeleteBrandHistoryVo { + items: DeleteBrandResultItem[] +} + +export interface DeleteBrandRunRequest { + files: UploadedFileRef[] + user_id: number } export interface ConvertTemplateVo { @@ -133,28 +183,42 @@ export function getExcelInfo(fileKey: string) { })) } -export function runDedupe(request: DedupeRunRequest) { - return unwrapJavaResponse(post, DedupeRunRequest>(`${JAVA_API_PREFIX}/dedupe/run`, request)) +export function runDedupe(request: Omit | DedupeRunRequest) { + return unwrapJavaResponse(post, DedupeRunRequest>(`${JAVA_API_PREFIX}/dedupe/run`, { + ...request, + user_id: getCurrentUserId(), + })) } export function getDedupeHistory() { - return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/dedupe/history`)) + return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/dedupe/history`, { + params: { user_id: getCurrentUserId() }, + })) } export function deleteDedupeHistory(resultId: number) { - return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/dedupe/history/${resultId}`)) + return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/dedupe/history/${resultId}`, { + params: { user_id: getCurrentUserId() }, + })) } -export function runSplit(request: SplitRunRequest) { - return unwrapJavaResponse(post, SplitRunRequest>(`${JAVA_API_PREFIX}/split/run`, request)) +export function runSplit(request: Omit | SplitRunRequest) { + return unwrapJavaResponse(post, SplitRunRequest>(`${JAVA_API_PREFIX}/split/run`, { + ...request, + user_id: getCurrentUserId(), + })) } export function getSplitHistory() { - return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/split/history`)) + return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/split/history`, { + params: { user_id: getCurrentUserId() }, + })) } export function deleteSplitHistory(resultId: number) { - return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/split/history/${resultId}`)) + return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/split/history/${resultId}`, { + params: { user_id: getCurrentUserId() }, + })) } export function getConvertTemplates() { @@ -175,20 +239,48 @@ export function deleteConvertTemplate(templateCode: string) { return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/convert/templates/${templateCode}`)) } -export function runConvert(request: ConvertRunRequest) { - return unwrapJavaResponse(post, ConvertRunRequest>(`${JAVA_API_PREFIX}/convert/run`, request)) +export function runConvert(request: Omit | ConvertRunRequest) { + return unwrapJavaResponse(post, ConvertRunRequest>(`${JAVA_API_PREFIX}/convert/run`, { + ...request, + user_id: getCurrentUserId(), + })) } export function getConvertHistory() { - return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/convert/history`)) + return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/convert/history`, { + params: { user_id: getCurrentUserId() }, + })) } export function deleteConvertHistory(resultId: number) { - return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/convert/history/${resultId}`)) + return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/convert/history/${resultId}`, { + params: { user_id: getCurrentUserId() }, + })) +} + +export function runDeleteBrand(request: Omit | DeleteBrandRunRequest) { + return unwrapJavaResponse(post, DeleteBrandRunRequest>(`${JAVA_API_PREFIX}/delete-brand/run`, { + ...request, + user_id: getCurrentUserId(), + })) +} + +export function getDeleteBrandHistory() { + return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/delete-brand/history`, { + params: { user_id: getCurrentUserId() }, + })) +} + +export function deleteDeleteBrandHistory(resultId: number) { + return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/delete-brand/history/${resultId}`, { + params: { user_id: getCurrentUserId() }, + })) } export function getJavaDownloadUrl(path: string) { - return path.startsWith('http://') || path.startsWith('https://') ? path : `${JAVA_API_PREFIX}${path}` + const raw = path.startsWith('http://') || path.startsWith('https://') ? path : `${JAVA_API_PREFIX}${path}` + const separator = raw.includes('?') ? '&' : '?' + return `${raw}${separator}user_id=${encodeURIComponent(String(getCurrentUserId()))}` } export { JAVA_API_PREFIX, http } diff --git a/frontend-vue/vite.config.ts b/frontend-vue/vite.config.ts index 06f4957..92fc6cc 100644 --- a/frontend-vue/vite.config.ts +++ b/frontend-vue/vite.config.ts @@ -45,6 +45,7 @@ export default defineConfig({ dedupe: resolve(__dirname, 'dedupe.html'), convert: resolve(__dirname, 'convert.html'), split: resolve(__dirname, 'split.html'), + 'delete-brand': resolve(__dirname, 'delete-brand.html'), }, output: { entryFileNames: 'assets/[name].js',