From 7b8899abec88f20c17014152f2f1b532926e4641 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Tue, 7 Apr 2020 10:32:12 +0800
Subject: [PATCH 1/3] 3.1.1

---
 .../gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java
index eff18885..2e275d93 100644
--- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java
+++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java
@@ -130,7 +130,9 @@ public class IndexFilter implements WebFilter {
             validator.validate(apiParam);
             this.afterValidate(exchange, apiParam);
         } catch (ApiException e) {
-            log.error("验证失败，ip:{}, params:{}, errorMsg:{}", apiParam.fetchIp(), apiParam.toJSONString(), e.getMessage());
+            log.error("验证失败，url:{}, ip:{}, params:{}, errorMsg:{}",
+                    exchange.getRequest().getURI().toString(),
+                    apiParam.fetchIp(), apiParam.toJSONString(), e.getMessage());
             ServerWebExchangeUtil.setThrowable(exchange, e);
         }
     }

From 33b9c870bbfacb1e746197c2c77743e36de0b7ae Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Wed, 15 Apr 2020 15:58:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=9D=E5=AD=98=E5=90=8E=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=A0=B4=E6=8D=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gateway/filter/IndexFilter.java           |   9 ++++---
 .../controller/FileUploadDemoController.java  |  21 ++++++++++++++++
 sop-test/src/main/resources/img.png           | Bin 0 -> 14180 bytes
 .../java/com/gitee/sop/test/AllInOneTest.java |  23 ++++++++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 sop-test/src/main/resources/img.png

diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java
index 2e275d93..4e6f6654 100644
--- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java
+++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java
@@ -80,15 +80,16 @@ public class IndexFilter implements WebFilter {
             if (request.getMethod() == HttpMethod.POST) {
                 ServerRequest serverRequest = ServerWebExchangeUtil.createReadBodyRequest(exchange);
                 // 读取请求体中的内容
-                Mono<?> modifiedBody = serverRequest.bodyToMono(String.class)
-                        .flatMap(body -> {
+                Mono<?> modifiedBody = serverRequest.bodyToMono(byte[].class)
+                        .flatMap(data -> {
+                            String body = new String(data, SopConstants.CHARSET_UTF8);
                             // 构建ApiParam
                             ApiParam apiParam = ServerWebExchangeUtil.getApiParam(exchange, body);
                             // 签名验证
                             doValidate(exchange, apiParam);
-                            return Mono.just(body);
+                            return Mono.just(data);
                         });
-                BodyInserter bodyInserter = BodyInserters.fromPublisher(modifiedBody, (Class) String.class);
+                BodyInserter bodyInserter = BodyInserters.fromPublisher(modifiedBody, (Class)byte[].class);
                 HttpHeaders headers = new HttpHeaders();
                 headers.putAll(exchange.getRequest().getHeaders());
 
diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java
index e5854db1..e25608b9 100644
--- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java
+++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java
@@ -14,8 +14,10 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Optional;
 
 /**
  * 演示文件上传
@@ -70,6 +72,25 @@ public class FileUploadDemoController {
         return result;
     }
 
+    @ApiMapping(value = "demo.file.upload3")
+    public FileUploadResult file3(FileUploadParam2 param, HttpServletRequest request) {
+        System.out.println(param.getRemark());
+        FileUploadResult result = new FileUploadResult();
+        // 获取上传的文件
+        Collection<MultipartFile> uploadFiles = UploadUtil.getUploadFiles(request);
+        Optional<MultipartFile> first = uploadFiles.stream().findFirst();
+        if (first.isPresent()) {
+            MultipartFile multipartFile = first.get();
+            try {
+                String path = System.getProperty("user.dir");
+                multipartFile.transferTo(new File(path + "/img_"+System.currentTimeMillis()+".png"));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
     private FileUploadResult.FileMeta buildFileMeta(MultipartFile multipartFile) {
         // 文件名
         String fileName = multipartFile.getOriginalFilename();
diff --git a/sop-test/src/main/resources/img.png b/sop-test/src/main/resources/img.png
new file mode 100644
index 0000000000000000000000000000000000000000..821d3a66f17f1ea053caecb59cf24687fd00c41e
GIT binary patch
literal 14180
zcmV-qH=D?bP)<h;3K|Lk000e1NJLTq003A3002}71^@s623PP;000aqX+uL$Nkc;*
zP;zf(X>4Tx07!|Imj_r=$rga;mLw!3v_J%;gx&;^UZjQ=K|rctBP4-@5<@}|u_KEL
zt_2kfR&-UwwiZAZ8+K(8?ERq#in1;iY@obJ0_f`Z-uvFkH~0QIbLPxB=gyt)4gl)W
z9I-eH)c_z{lq-n|4P;JCN@kLt0u=sKfjMyHaHZma=;#OlW$6A-d4CHa^80mrxv!u5
z|Ep;7_);zaNHpYBo|Kyn`3L~G8&@pJ1%S{E^=312#gK_GN}w%)0YWyHbGni}<eaMH
z2!%~t3=47!04h`tN0JVJnmjIM9ycBOQCkYxQN$C9AU8nv<q9}F$o-H<WoJ)^tZoh2
zI`un0>HqMVI_#6fNgrlqE(%cz5=zBcoSFY;IsUg~XUT@<FoTUMkc7p^bC%aFb9%U(
zsgN&<QX``vYeBvt<SFds+$oTS#Shwl<VsnvW`F?zO675a!XX<#HWg(>MhxnG(}W>x
z$guWkoG_OiryPs&B-3LC{iFGOX>jZib0mtn<TfR;%=myopPL1I_K?r|0zq7&GETH5
zPnZx1Sq<_7X=ZHrpv{W{0V{IIMk0%m#|)o22GS%UF-jZEJX<=H7v?1pvLgpMB3BR>
zrW}h+<#H6U=|axnOD9GQ#mVCb1uOHy3i+b=!T7N<ac*GDp#2VUR`j4f*1*pSmFrC*
zH%s$khsO5g!o{Y{7YE|p=s0C;xON6-T(mL<+!jOt76<}NAcHLxOa~c2*xX&)4gV>7
zLI4LyKsw+9`$5gnh(tw?2wr1B0r(3NA4rGC1uA;^AP?%l3~QBFdyuB+%~OoX1f7tx
zK{&{Q|7D6%qT$&Rz*DFZ{xmxm#+n72yzeI+Q+-HB3?>E<!-ye78(bgv#l7(ec=d<P
z3HQJ~hvNEXPv|7H5}pul650rNrwI!sKSa(1<3SsYF=Q~i)bF#yEumLeJP`MR{-JN2
zf$IZ%+y%}QfcwF@U7_~-SY^W*f2-x7FR~*UC66HcldXS@K+RUob=Zr%Qs37?8CU9X
zwOGSFKjy*uu6{gt5C72;TZ|pXE?}pzOIQO|3z*nRtPX3!j>~y?Z9G-1jiK3M6!Bz2
zKf<5p;|$IzubR}c+Of;Af3Oea^7C`$FAHnBc&0>{F34pDz}=e9WQ({CqnJ*PPL2S`
z_kQKp@|L04(-FqyZ@QdQ0C<)_W%@TA2kt?~Isu@+|E4p01DE{@0FJkCWs*Fl4wqjD
zfCALvo1zDd;NE2oGjalMz#I63U@#6ufjE!^rouW4;5wCn8DKV80E$5=SOM064PXn{
z4t9fm;1H+<4d66553Ya~a1-2zYo!Cc1U=wA=tB^MgwPN=qK6nG7Kk0<gm@snNH7wC
z#2`sX3X+b95E(KXS%{P(Wyl6(8&ZY*jvPZyBbSg?<Sz0U=|bKhpHU2@qS~k-YKe|U
zJ<tF&9F0S#py_B1T7VXz%g}XbCAt@_K~JMs(3@x*`V#HM0H%sDFcZuk^T1eG6qbyo
zVG?XER)UpdmDql)9zN;oSR2-jeZq-29cSY9aJ`1%@i-UH!RO*j@eTNHyaqpuU&kNg
zJ@{7wjbK2qBX|+mgo%W7!VE$&p`5UjaFlQkzB?U+_e3I*L9`;e!*?%<m_eLHTuR(T
zJU~1}Y$di6dr2gc9?6d6Ly97CNV%k9(t6Tf(n-=aQU~dyimHmSijzu+O0tSbrBJ0@
zWsk}Um1`=`RQkvoWDBwvIf~39&m=D=?;zKcuaY~+eH2ZK6~%`VN6DZppsb_pr<|ia
zpuAO8RW()hRGpwIRGqK7PW7PbMb*cupQu_?TPlk>nJS|$qwb=fqTZ#xrO{}XG=Ew$
zEtj^8Rz*8Qdqn%FMptuCW2^Dh=BZVv)u>%ld!<fRw@?pIpQ>J<Uao#v{i=Gm23f;W
zgQdaIn5$8taZKa3Mz1DabBtz`X13;1%{`izG@omcv@ErPwRl=ZTHCeGXtmQZx*45C
z=h7F_chJw#JG6<~R@!Xs4DC|wecH|1Jvv%CE;<Q1`8pLk$938m7{ijmW@IszGY&Cs
zF+Ptl91$>rKVr#<{Uff8_@Fyd*I$>fTcUeF_onV=J*Hl;UZ&nky;{A8`nbNW{sjFQ
z`kVF7>35IR9_c-jJF;Ztp^^6tPy<_o7=u{`+YOowdJT;XLk-1->kZEsb{jE_{Eae<
zRvVo#>N2Jq`x*<4R~w%+e!<jX1~9Xj>zHSmJthVwVJ0$@Z6?hoeWq5X@ur2Q2TUKD
zQOrEd(#%$yHJbI98=H?epKV@ke$Rqz;b9@LSZi^?;)A7?WuoOG%Ua9lR=QSfs{*TP
zs|VIJYd`B8>q_ezHbff_n@pQcHZ8WOt*foTw!-$R9ct%hC$!sS*E)(Y%5#)xROP7K
z_Eh@-`#k$<`^OFphX{v4hgyeMqs>Prk6t<Y!sxG#u8vubI~?zi(Hb*uOyQXNF>jn~
zow!aFPB)xs&LPh8oa>xlyV$w#T{gSiaizPCcU|P#==#OY-A&@Q->u8t+&#s8qx)?S
zZI5V=r5+bO37&zT^E?|oKY6)%<$4|R`rF&yJJWlQ_w%t<WBFrujBWQZ_2Kwz^J(*C
z`lk49^=<Pr@#FYa`aSVC^XK{R^nVs$6Oa+GH{eyEW1uAPXy6By7i$jdR1g*v8dMV0
z9IO=_AG{&>QHW_sdPsFhPpE6?tk6?ogs||im0`EphHNgoirq8LecYUJXTz!CvEduS
zpG4S3NFwUTqvOYoUp4+gq(!7CvNj4tv7=T+J&d-B&WZkG0&zn0go+8BF=Jw8$6Sb|
z$4-mg6Z<|cFm8F={dntmS$t!Hdcx#{s)P@TL5XFFZ4*aNoHOxCl75mfsV<q6oRGXT
zxpz|Vq&1T|Cc929o_uSH)s*}xm!|4Z&6;|An))=(w8JTcl*E)hDgB%%P9>)|m7TgV
zwTH{%uI0Yu`SVuuy7)f)GXAqPpR}^H=jlG_tJ1p!eu8pAw~!^=Abgz>ma!${LuORw
zuFQd~#H<6^D%mO7$3$A9OwrltM$_}Bw~Fn=#p1RcubeeGJ(6(APAMXtBCX5Sh9B8Y
zGHcl{vd4M8c@=pdXC%xxoUfTL%5R!!J9Ej*X9Xbzzs<sDac4EoHkrL(_TxDLbGFSz
z=BCbVoM$$#XkN$s(D}O;P!?n^__NTlu&nUi!o-F3MTSN5i`st){iV8Ctyofgdy)5|
zEsOER!o|%?oR_R$^0kCla=Fy8w7j%`DR=4RU&s8q?$?23Y0H|IyDi_mg1ADo;?_#P
zmAlI{%L>ZcSB+m)vzocOWc9l>)7D%ncPZbpma<m1wryR+y1Mn|>sPGr-yqm<vm&tK
zz(#|OOE!Mk#M^Xjv;XG(TMW09Zuz`bxb@Dq&}}u9mX+n(iQDtGckW2oap5<Q->P=%
z?=0Q<WtV7I+wPd%XRF++s`eP{Sze7+%c{HfPTt$HFKA!ge*68~4loXs9s~zv2VeZ2
z^82kr;fERzdmP?>#Nx=tqx7RCHAv0Onx0xgZChPZUF)%N#~SOs>yQ57@W-wOlZJ}p
zI>(ovpqwZ=F>tcrWbY~QsqWM1r`sE+HQqln@yw006V5iD3qN=9e8~AT7XmJvyy$bW
z;gZ*-W0yTH*IseEQq$zxbo5WxKaV!MHP>8qzgpMg*;3y+w)Mm{ziX$j2VFmZgMH)5
z&B&Xrx8iTzxjp%I+a2DW=XbO2zP^`tukZf+2ZRSD4>cZ^KQee!`7fJ)9cXiFJN`K6
zanqC7C->XA?Ju87pZ0eYb<#S^pBX=^dhYbRp(~`T<;A2I9WTW%`?`z&()?@VE9+NB
z{`UX7sb^wO$7{*!fj3Lv>b>3d&gETWZ*=dY_u23JK9qda`?&j)$EORQ6F)!eo6%3|
zU-!l4Oa0gIuMY;Y2L{9(2}kiMfWd~Qr2+6}7XY**`0daF0A-T$Y^D%Id7e}d_)n}n
zzbV8GfL;Co#LovH0)C@xhRp&p72f5a;Bo!{b#@+ZgCb3Hc2fGH!V?SO<G{dMLjXwi
z0DO@Q4D@Xp82GXS274EPQ#r~rp<Lu=(5((~YUy|dew2R$9RhJf&q&T>00009a7bBm
z000&x000&x0ZCFM@BjcR;z>k7RCocMocWJk$#vh)TYF)X?B>3cvv5Wu&1P-Zc*gN~
zB3M#vBZ3nF36fs|<fkA&oWCM}M1C=lAOWn{kpkz31d;_S&|=9FWQ`WjNV9M_TxPg5
z*<>$o&-ZgqoqO+lBqv6y``)TLd!1TtRo%L;^=B7en@wzHv)Rlt%xr4FxTZDO(JkG%
z0CSNhHT8Su9q71Lp$JIefwfw}3B2u>Lz7GrLov{{XuFEJ;H&h@=Bel=;v$}wJX(-R
zKn{|euHZ=%u(?xcfz-5Mu?uL}1)b{<EFdlG$dIn6+O2jaCrTBx*wA%Bl7q53v|XIM
zUV$J+a1B9Gz@k8DUKA!w3+IJF#Z<QdNZ@b|A-HSl0WI<c20sx~Yk?&61Q4rL1C?xK
zP_Bu}0Y&O?6O@OZH21ax<rpt>skoA+f~m6F!86?Ie7co@^z;w-kShm=anOYkb&Ob8
zB;RWYeYK$oSPW1{VZcC(QP9x>kP}=%<GrJTfqQs>dRnx(J;<6PEqMVu4o7o_QU=ck
zU6VI@L_(T;VSf|jW%J6C9It7`u;@lbLW_priMR`XCP+FDhvc77UQbyYaJEDkt=%O<
z;vs~FQPgdi8uw5d_ke^xbOmk5N*O6LW3W>d0tuu$eh+Hy!JX8^(M28N4hfpTM8V;!
zD?IR2c$PnDU54L6KfWNOEnWukfo;pi^i`Inn?nOeLOk`m($0jS5a*Hb&}GP6DhoBC
z9GWnxRFZeIC`eRhatExYPM4*Y5~Dbpi`x*cuB}_NtEmHA;<MlsEL@#7McKo_p);Qo
z$q#+B_`0&8C!{RW;pBjJr!zWV4&ZXH=wS(Ghv=!AIAabW1cuPOr>ii2UQrlCw*^OK
z@-Pj)pk#a`1>P|vN(fjC4o)FP9xQMmD;`2&Z}K1`$`E>LZK8))GSHtD5Un_6r1G#Z
zWfG&02Ub`bbja`qsw}-K{NzNg1F8Oy6G%a(q;k^w!}&NAp`Frt!jz&wxcC>1ETy|M
z*23%Q0)rZp1LK;MCPX_7EO%*=5%Yyk-a;ioI12e0GKG$~uz++OH)#SBv|cP16!t@h
z9dNqy92X6QBzVeNH<W;-uCdc23kx*!aRyJSaLQ1?IyCF6h6aU1ingMLuXu*SyR0G?
z&M+XT(U}ecLVhkZfWZ;Y!00G+*hNdtK$3BqSwI6UXq_WfU!+1a_q=d!-R*@aA#Dt4
zQ5tN?awHv?v94&jirpEFBGNj1>Lf`_PYBIB$|rMm3qI9{n!@Ju=yXXI97^Vm`LGC%
zxM$sZA)+K%XH7D%Sf9H$^g<p}tRO`Xb~#*koRLFEQbgHHt`s2~4Sb6>0z(pZ;s^2_
zQMHwrE0b4pR8%(xZMt?i5+mF&wFU%mp_{QXgaU~WyqSX*ni$7{Qh=n+7+KKKQX&MT
zWGZ^{Nm1j%QNV+%DK+HgJ^0hXwezzvEIKcBfDf*D?O`!@oEw4ir5rHL7LBh6WekoC
z3^W-RqVYGx#T{Z)hrpl@2t`V#MMXf1sG2G$)8uRckR{DxntTp3E=+l^d{unPX~v|R
zveHdi2IOUcHhUSiEQa8H2ttGjMMm_1GNecleEj=!NHKWLBJ@C#HW&!RDTFv{EAdd!
z!7;q%D#Z{(@Cv8I)S2Re7yPx9kQ==MIkhaT2s@xoc*u2>>rOpkPZTDw!9(G)6*YO2
zCSx4E=;XRdB~`60A!#wR{NYFM(X)=vbiliVVfCgxXGN+IF#fAbh;c3)l`I*j@^DWW
z?gc=I6cR|KbR58y!&A~Yp>FBiDjy=;At4706|GR;JW1i2G>|+h;Ft(CM_39RST?js
zr=8*27#h-tv(m$8#aup%V379JoQu*;c?|TnN>lVSV5OyV0=<)k3fRbJPso-7oB$43
z7Q=xhj~>5DA+t3lZ8{lur37Rl6C7~#`eRc}Efs`<A(MY6RL)vqRmu-!+#$=JnoOye
zJlYr<qs&TpI&6rXs2b|f#Mp~ZeGG;a<`ACu$fL+-6S6F({EB5P&4@oY8%afhA|=Bp
zBxHaNTvQxTa^&lZ2^$>j_Jk9ICY|d%uu6Z_N$g~Gl<_~|Y8}#|JPpDo+N>GK-l444
zu2Jw7jfy-)SL*9xH6uv7r*e=iA-x2ya3;#j5nN2ureTAKd@sVO;PB>+a*?`(D1<-Q
zC_s@)3rPpT8>DG;r~ytYL$GoeUBS2%-GBx@s56~$%E%c0*!>D;MhjM23~qZdfxM06
zBsp}pG_}qNv)-~`II;+@bSN=ZyP56^rK_c><m9d#IaGdG{1T?&H45d1D_w;wQS{WD
zE>h9ji@@97p}g2Q6Y^%wd4U8ESa^hjuz|;uoe4gMhF<aN4<7P_st}Q_?!Yl7xB-{0
zT_}7`Dj{|E4Vt*8^o$D=+W6N6#^Zf6TRLgBd|nN7UH<J$qZg*ZEBeXEZ11+&a1)1`
zZNIJ7cvWTbZdL@sQrM79U}tUKM%Am3ET79X4WgJ{;A*bm4M|0w3-bz~c10164+r5W
zhJhRks!DOLa8ghP4f45=oeqv_4p=^TFdUk!cqLtLDVyU82Pm70aJng(y84fG?8H|l
zcIdf*t(+J*9%oV344HO$x=pppq9x-z9$0&uUAuR=XZNm|;*Q;WU9flKWdt%h`*a;7
z5fWW=3KghYDpR=l3qlIiEJPOAHH#8FD?Tph!bwOVS4+yWpdV*Z0Zq9ADL`Ml30=vT
zvZFeaGH9JuH(EMVLK@}l?UwbPZ`pxAn%a>UckRH*v8^5*S%3e~owv|6Q^Z0nt@@`j
zMjJCba9B=#QmuQZZNo3jY^Wh*?@rsc-fP>vziZj<56zdyl)ZgajbTab;>G5w1=ps#
z?5e=&3@q?MtMF|V$Q>?Z<uIH=wO6ib$nhGL@-pt=;;e#b@sdodQEj<C22TyLZ8tK?
zo)s9m`8zxl#wz{y&$VphrKz3#t&tslW=kzgt!>=0@qi|=5MXQs&vL_F#a^7w#8!?>
zR7sRsC~VT0zIV50o0q$G^PC+0oZ0Rjv%w8j$cHVB-6{?bEYZe>yJS)TCL@>;&U1B@
zdYlUcrH;`JCv~K;<*Pmz!wpeZrveyEN)clCL7HR0hD`O~nGAElis)7(tEa38pg~ti
z<Q{sWl0ueuB|VVVzcjN`FAwbS$L_1e3g=DRSwc`zp{U3!fQGpsG7FQ6CmV|)g|WLj
zwj)n*Nrm(bHhcELFZ*`&uiLiygQ<<TWaF~NV2t!q5W85#@?sW)ZtZnn6wu=4)kone
zzRMCeT!B2&bqHq#)-_0!^XQ>+SdKaJaY~|x%Lgsn{8`KHeMbf!mwul73UHzY3nGM_
zG!~!#9&Fo*S9fjw@x7`j(0R#<A=vOh5P!<_RtrG_k~sMaoCg~{j23Nb2;CziJN?Ot
z%FwdmKR3JiizU1Hw;k(x3lvTAXP3ovoLlQr(UbuWj5JK}VKm)8Xrn8UNtuOI`53#&
zyQ5SZrbUN;e`aT1l5tOr)LPX2cGS(E?%1to+jjH&EgM}@Pd|Xbx(b_?P2MwGc||Sv
zcgMDVZeZP&kxhp2)NvbhOIxJcS+T)^N_d)E5;>rehc*K=j#qgV)4IL<y{WBiOl_Zr
zB+9V5(v~d~>-Hqo<%*cz#6t@SF_*&)TGN+;AvZ6WyyXxJ?hmHY@{xejz+gq>schtd
zLJm)B+nm|qi@F{k*}fBd-rd$@<i?q<t)E=hw5e-%E{R@KC|XLBUl1=OHZPx>+S$(y
zG|$zMgAq*&tOAM%#0BP{0{0f%q;cXxoA87^Di$3>2;@_Z_vqPod|>-esR#DFjRVxf
zfEJ}cVy0nO<pqLSbm5>FGTc_bA&*4E8j_9+SU5XCK`T76Mbp`*E~P2ea9bNls$s5)
zu2y#<Blqmc(`z=k+_LTOYhI~2EOipv%4W_kPY%r-4(I`QU}$a4>?v&OL{l>~tZafk
z?YIU3vy%*Ug8`CoFJzTVTBj)G@G&?HE-hHR?8r}O`wG-c&KPFW0&U%LLxFF8%NW$=
z5aJmGlz@R@RyY<<%@`{6puhd2j%_^Cu|rP^$Eph+(Ra1_I`yf6T6*7Zt##$Z;6<zJ
zqT;nuTRAqfqo2@1UM)WZDYvc=JElfES;K$H7O^uHP~mZTDtPi#vLS2AE&2+#b;oif
zZe#3a4b9t%c#t*uqGfx_aB7T4Qc(IlwB)Fk%E=XN$YOS3V_~lbclXJbEx$OkwZ~@G
zTf^g$$v<?Z74BD8JM|l82Tp0lS!NZ&x<D_NZcAFJ?K?Dfi~MO1+L7Vpq;tM<n}aPl
zWzJ#HgC`W3k!jo$pP)v*J7DsufMakMe+&hbHRZ+B3aW&t<#>z5@d1O+ovUoZ;2_{m
z?+^@)YZ^*FGqwKVmaUyO+qf{ZLl=j(c6?M80>RTzW$S16^uP$X_k=V9+1N>57sHFk
zkOFIz0Z;~K_nRQ1nG58>WepW1dI%mRZ-9b6(+hEzRvV7NMH*iv0f&aDfZ;HlRCKtA
zaA@sdXD(dOg$+=Jb0_b|*nRMeZM*QLp&fdBX#KT`%WP{l-twK9riLO6SqudjsZcpI
zvU6jt>ueOh%1dlz6Tk&EX?qbF5j5z8*Xf%~64K1Vv6u&@;0q0K>>kx_p-{RC6H#Kr
z<;}a03fLW2;7~Xl$}u;E&{O^BKbzW#PmOK=X<bLgwj}4`*sAq4y9@#qvJts`<Q*7g
z@pOX*)B}!6qC{n$7@?VOrX8kRp{bk;4WaP3Z5qp}W>?@rRNu>6W%S7zenqRqO$b3j
z;6iqGe})L)X#m{(d2hguZOst0Kv?~p=DD99+sS7qcKEy;dvM@gnbprk4=9P?|06>w
ztJ7sU;PG?<9wnh7Tp&okj2F;h*Mf0Pg{1#qhKr=^MFeHu-PH}|(mO?tQ`K`MJnSNY
zlOvZ^;dn8vJf+G1Z?^1-*LG}WeQaa3=*f`2&<G*op|&<mc)*#d(Ir7R2bh=N$VD;*
z!_!F9SX>Of2{@TKxyocd`9fkXC-WtylNKp4@;31<tK6ccN`5M65|S=9we_GGT~@38
zQp?W0Hqi`V$NDQw{;_D$sv<-(y-WrDNF9azf#^{-JwR9kTvgMYOlK_82gM3m@D*7h
zBA@gXPB2a9qgAqbPM4nx$pLdCy+GwG4r4;12D<Nwww?Z+v7LHhV9WcZ0bX5g=BW$J
zWO;!3gRG&Wveu>R24V6x=@OQ7iCcsxKE*8J;S-F`NM*bJMVgdRXg%9VCtGEw2)bT)
zVW3+K-fD&LuA{g~vsf9P*N#}{g!UDFU)zPx4s74ifsOZ6b$TB*88GH5U5_`ejtvtQ
z6rH{*nAb9tE)`_~OTH>V8Y+O36hyK$(1k#dMP!o*Tna~~@;OR4S@Ncyq)iza!<*?6
zcbS&qocK#@Y|419aQOaaq8G&YsH)b>j@HT<vkR|o+nOf+qaD38k#U2qu5Ib9z}9=+
zvLucNX-mp`T09(nW@HD?4r1CSeO?}JSupe}-OOS_F|9_-5md%LJR#Z~_7Ic}&6O0{
z+4Ed|kqwVmz{90J0IinFSQ&#w7{2K8T!u7?RSAQ3^1fDN|B#2;%=&sWd+*wkeekm-
zyQ5bv1MTyU?}+BE9-n%v8?Tqp$nw^-kJ`1P&vxwOCnmQ3*skv<Ov|F7QqoKm2RJC5
z^C<jBINcp6zI3!i)x!hul21BiqasKUiX9)JB4-gnPmu{YdhwALt2tCYDzt3rh@7mQ
z|EsSr+190wZT^kkXMH=W2F`X*@_C)261kH#T(q?Nw5!?0_*d!&nqllasg|sz?*pNs
z+LPQwRuvwWLQ|1eiJ<*RnaPXH1wOJ4TQJMXbZe3?>QD>*`vqDlLjgJ#^tb}Y>2U0>
zTIxH0x@0?ltFcvYCAu0iXr<`M9s)l@G0w@uDuXw)Nv);x>6g0J)p*?2{;H414Fj{K
zJzxX^MdzeR-!wAQi4%D<ID3(ia;l1hu*gm^>41u_&@^RcS_=(a^U;C9BhDVEi%V)Q
zHj<0h-94u_5qb-8=^eGs`)a7lSADM#X8DM@qNR9BdET8##?`*99Guva9(>F$lBbAx
zpmuS3Rd9&B)D`tdCz`ZPMJZ5m6HI2#@xoJvs^TA_&0BEFOJU@3Dt`o8Z%2~Yww!2$
zPbKkyR0Rp(GXQNrj<@CDw#L>4txef3wA@k$#<%pKoUpuhU6Q#VqnMLXNJ!(AtCC8f
zFYSbIQIr!n0>TC_unaCFGRSs$l@bB4IcXme`(8xi;B7MCSc1n51WDK9j;Oo4!{`tq
zz;VfsjIb-*Nje?tvUKyUOdSZ>cY0{uWo?@BkZXo!HiV_nCRL<G>m*4>Ug=5%iNr0&
zNT>)yoRcJ71DDBWMFvL^A%g0)eHJ*SH=To^YFH?WfWZ^X=9)VW*#!}I=#T|PQUTA4
zV_35t4MF?0v_7vh2&ebtV9C{9Mb+v;oafU~1tdudVN9KlR2C(3^Z7Xeg(T%PaGosr
z%AQ){TrY7jw8$yJ9h`-4IyDJ0#*w%wX^PH<(;nu)*jsMsbH^gnABvL3o0HLp+86$k
z*{Ns4y17?15F;Q9ucYfv1Hd<fhA`KsTgEVi<m4^LIbc&rq+NyI9>gWYb!3Kk0l??K
zzCdWwG}F-Yfb*7<%u?E{6r3KYBtSw~285cQ=>axTOP%QKS7IC|SD*NbW)HtJ()+hP
zUrzhRIT9dDk-;QD34*i9#4ao2KRUR!KhzZQgRbo|=hhH5(5_xvvzXO`n$c)}e(?0j
zRt}BCqkV7<L-D?$C~4}G8edR=O5F>1hd1#`7fE5e=zY7A?jMLm2ca7+46Ushe2OKW
z&<ih;buWe>g(Meg=DM8U>Yvw~MTbhdt6Gfc1?KXRspigFT%4SF!I#(dx}7(|MUGfK
zWVUjsgmSuOGU(Xgo-Q3}8tKr<crvy7@AvKQTOHfE3XP69U6TE)+8=pb4%Ruc^^cjY
zozkl+!Isx%nz4+1sm_p;!%tJGmxWt~G$!+piVIH{r$o9bC0Z@hFQAUmjW~=bPL(I1
zsGjyo;5;(8DCY=hcTMNTF1Bp_;>7xL@aiF*AviX+m7{y2Q)^NsOyyh`;kTk#X>Umq
zHW{<85sqNCv3s*;x8BtCv##C!@yxd0rK!ZJ#+KeP!`R}`ijFnyXr9eW*2`)xeXVvj
z{!!bG>($jU?V0eps$F^kHlw~7GVkTdOcFF1lvby4ei|pf^4+wg%@`S6v|Qr2yLfk|
zuj&vcY?F?0n$}H78KmKy-PU1@6H~kJyIbC^83yRuev(l~B7Hc37)BTrgOAfQdLg^p
zwe9Omc0&%m`<`Co-<;XtmWCY7xhFe%@g@518LCQrN@F`>QXZ#+z-j&BZ=bi`n%F(H
z@+;q4w$m^7?fhp4dKsX@7t&cD&_;j)HW9hNNONDv)`&t6!1sf3Q+9ZOkq?7{wkfJm
zf@pwoP*X+&rLjTXSBIJJzumSQKRsYap4nDmhVImfTBLgiz1q%XOB2VAc64O)O5g5p
zwl$u{3UT+twpyu9{#=qgb^VEU?@X&jqqVXO_pvNBN97AsImjD~#$%e<R5E98Y0Os7
zxjO3D@ZORgx!BXYLLGJ8;AD^sbM~s7rOc@zkjN`3;UQ@T-|TT{A*u<Yi$|veSsP4C
zh*?F5O6LYufkou^7IPIfj{84o+2xzdHvB^k52y4s&XQi&Yf9GNr&sPO&+xt;PFvdA
zWbC}tvAb%mciz(JMI8^_)n*cZ9BOVKku|zHI7=Z+4|^MKaf|En1g+oI#9ONLmX_u-
z73BW6)FZytvF$HQ`WMWOYMkz^=yVAEz4*oXl=f`G5YCl(CsMYN*V#1HW<ktHP=$Fo
z^8qQ68gfEILuMtWq7bsZ!q}<8{CsS8|FUnbi+wxrl6K!dqZ5js(4$`A_ODj#-T$SQ
z`z>|*t*F|m&U^VO#j~<Ns$!I`R47qbd{`U35qrP{tVzF+7D4M=Oeb%AP4t>-v~;-l
z*mK+dQq~28uy9;SyA;xdRHA%>0-+%ST%K_V+R}2p8q!5c{_xnxWQnGt@(l@;H8=BJ
z@KVoinl^wYzfvpJJG-u4C$Zta^<mH6|F*{2cSWV$w6?mv8><F@V<|*cj>S^AE{3!~
zKo{SUC{e;gSc-xeS(u7;G`qO-T`_dkHKzMi@p|2*-Zj<3wTMn}9;Zwnn~RN$bn3iJ
z!*E5I4->gC7Mw1jvMo><6P<{h-op?Xr-LL@HE})=nej@9hs2y2b;jXQde_&|5V7yn
zz-4dW)M?7EidJt#d@L>9KkVjS%at!G9gZmqNfW%~W=45$E5sESRD@EhLfg_(eXIxH
z=J!N9?%49-C0jouWKWa$#o;0Z_}$g(=3*LpQRjOR)E<GMAY2=!FrLLOT9`815nd0L
zuEwtRMIkj-j&G;}<mjnzQ%#5XOp1pN)1#I?hoW|~a?pV$&Z8}9oICi$%$C=O+TvWY
zyO+8)(mYmQPSO0TP}}RA4}l9*P?esV$?3g#vLl8<C7dOw!6i8r!MHruS&p0kO>^dp
zOB#!3I?JI`M|v0*Mw}E$KuT8?*pL+z@>L24;1hY(RE~4B+$d{MwRHHde@qYVCpB?b
zOPh}L;JP9jNnw>X&{5QZ4pY06RT1otF-LCdK+i;{DG&X@%#J;+lRd)UzSOtPpY*J|
zzr2@&s1a)ZI@LfciD%{^AC-fYGV=VPDd8_*?l-lv_J;6>TK4{b)(e0$Z9AYL4J4J3
z&J-kqU=?q|Tu@}x_96iDVFCt8@s<mxrcu*-!fLv7{NGOP^l$H4U#p)E6Fh;L$GQvE
zRQV2K=SELcvA%uyO+A@kS4%x5yxzN2R*0voYTM8R|H#Mh`{w#RecQ107t*PDEOe+P
zDCcSNq`B&l*cysGIDt^51%sld0-G90*E$lOGIlRdZC4FubYG{ado+fi@Ml61=#sdl
zf{cq`EtSEg!obp%s8`+uw=}=(J=L-kUl`i)=ZCicq|V?<Sx77zk)Y&EZ;w}4er`-`
z<6|0A-{{(hf6}$-RmnXXEK_yA)Bh$;voq)2e0RmR-qF`PlF?_tDh8G)vMLewU{|v&
z6>(vLr#U3yWC9WV`4^Az^5F6!AhmL@(~*b%-g|AktL68>3%k-SNh&Bh+{sP@r9y~^
zGzyWctJ~Hx);~GoAti`E+(a<pn5o9pl~0=;`|XLH{>?qTZyV@vv|25TgOrG{Oe1i0
zWa|e8cJO4^_8(nh_tNgY*|FU>#i!ZW%FAZQKc$K~F|wiFI^X`~lI?0`hWq#s(8nai
zmw=PPwZyKh+>;{X7>b~w(Ns1m1uXtZ2VFqRL%hJipgJ2EL*|Ygymhr}2hSIgrIw-d
z3dAI3aHa?BC10}LwmuW}&jrHv01G>ngS+QicJPInoqI(quLEN(0E8$4T|$!wPK1kQ
zGEr^GxHWwe@bn*y?D|jk*|lXo#O}}R_-ChjXvB9E<Dq^xPgAs|!yW5AA)Tzu2t{t~
zlv)wxs|Y+Dw=58GPS*lc^D^%8M+M*zABR03a2x|QL!`$vawXi62qx`#-H7w%2?zPj
zNg-6|9{;CP+x)3^pMIo|?QU=gn~&$T+w?-)&i;#mo%z(R^_DdLM6(Dk?nMAvSlV{9
z$RD%3y}GQlW(SA#W<sr*aQrv6?XbSS!BDmgdn*$^r`FcX&0{a@+L7mHcI&kzd-uQV
zHUD2~<45vZC#6CU9E=V7-E5b)cuS`x9MjUt?o3C76Zy_NzQ)(ip3>=bNV4}jxo*Ca
z^8zMhAr8aBKBdzoRf6&!cwC>FzPM+DKhkPeEr^E}`=>Z!{p`qAwJslPEcRli1jQuT
zfkOJ=PT#g}F;=Of-q!;`@T1S_)2zo-S^A!AS*@S$1}&RB3^DA*Qfc&zt||n5oqu9>
z?QG9J)I4<O=YpM=5@#zd44nc9<d-5DEL<^<Y_xjl>i~V^g=IYVOcPr81j5N+2r1U%
z%+zc_<Fdq`Ob#u~in>F6;(ti5Y5J>iUKf0v6;munaP-MT5tL~hHr9c@y}Mnz{p-HH
z_pPqo_<9VX^n&5P>REqDpJP3#l@LRVU^pVXT#CctqrH~vKl!X?D1AAg)3$5cCF2t>
zlZ>3|rQ3XrbV1Umis3{Nb8<=7Ur^C935@R155NWm^Zl>|n(z!%iBA~M4;owcUY8hR
zi}YZ32_Z%R1<@2T>t6a(9cg-N!_I&HzV>Hzc9)js4hh=o-V`7p)3mMYeS7okt9I-4
zsSU4c$$KuSJMU|Xc1<4=YR0gkIddIURB86E*DwNWs7%7)r?*v5?S>C}cI8i0z|%5T
zg(Se6-{WB>9_g<OsETH8&B7)~LskwCkcR)~3jtL?=HUXngQzMhkRDcrl59XKRF!BT
zyW{t?$)Z)t@cxP&`($5Rc0+xeOVf$rB46L2(T4=JmeF?CuKZ-xE`PsccQkg7^?hzj
zzj`sdB_0hY{6NCt&yMZr)2c8jTT<`1@%D;c|M9X`Zrb4a<hCtqE<IWNemMMM8+@s$
zDV)v<*$4ky@?~T9f(*iN(fHwRZ62+h>Da3F560Sh+`F#lfIbQ1k8aN12ja+Q+f-+X
z9wa!ufO~L+;%LP|4TOD_WxZ`#I~LTG<s(CgnIrL)+~|#&-T3RS4Q^_opo#Uq)9SKX
zBJ%Z4Px}RVywrz;duo{<wC&2b^(Nu#GEc`-Tk6Jb?Vql`Xtw_u&4cxsz{%%zy7I8T
z+?2Y_%gc7<hfDVUf9TrEtAcb_?D)s`Y*nv_IC<$rm?ac$;UTzjZfLF7B!5XCTz{)=
zdz$9qswisPHoh{mv#*To_Aj&ne^~<p&9xCIE6&Rh`8icC3z>06#iS33asP_G)?d@y
zpWfrOn*tveyZto+macazy%4m6Q@i^Ya>oDAKCQawfiKT&UEdC`>b)5c66UBos(?Fh
zwCtu<U6|85E9a|4v)_B*AMmXjUu;h704F8)X{Ml_F}UBcx4yYzAN*Oz#`<!7`v+#f
z*3#Jio!N!YspC=-EFo4P$*UvIMjXD#uF|UY^e*l8FJuFAcF`^CySS5j-E&fvbnEZb
zD70VPKC2d2niw*0ZnQ;2N2;hmjRLTmCQK+4jOiMKd^UARr;PM+V6@w42qEBsyK^^`
zAV#h!5LHq49BG7WkKvbEAiOOzd-`oVQSy47x$#U7#r}Eh6HH%}vkcz<M8}@`$Gdjy
zsa=0>#!$isF88nZ?C1Y=&9;82Zm#J`hw)T;2Jfgc^<whgnN{tkX@%s!0Tg=OYMJ3f
zlj1`cckF<EGGO;5rhwY7&?eIUGnz-M0`9)EqSr{;oKa=7B+V`?N$wz*MPU?TOIESF
z6@bd-1G%Hq3ne4PVq1Gfy-B^3AL(#00)JEpy+M(-Xox^j@RM*uBygnd$cg5~(><9a
zJeO&>XtCX;71>Nf1qPgWRX=>8ebWP{w1oC244qg*hK%RU#O7Zq*29h;s-PSDSMjQp
z+uv*3vVQF1>9cI`NSD|sZ&e1$C{<JzpCELO57m-lKE9%%Wp}G%mw%u)An%Gs<2nI)
z0=X<8ZM1?Z&7Ua4UrHvA6O|ha9z-4fwBEePMux~Drb+f-8YamMje*urE0T!S4G5Q|
zLeVn)(uo^JKHdyZuc<JiS^cEm4u5u{AH0~_q4N`sQCK7@4GC_UXc#&;%s0LrmEto2
z3M5=dWBlIVwCu)-jvaq?MU^u!79BJA(>jt$`w*lwC*V73wH-bDcDH(V{pZUXoArQG
zFJg0^kgRng;DHO*CInh+A%wew-<>H~_lV~4AJ+%!hxO`+r{muzU@vrOh+_YQ0Cr$J
zef<fnc+MPookDcAx?0vJtw%0umG|<{4yvoN!JhM6yiY6SHrnGwqSj2RAoXD{Ol78M
z+WMK6q4pr&`Jb!y_#f(A#2L*TDgyB|gXnSejMw&(eeLyS`}KcZ(iW)<V+vLHvem-c
z6g5|t28PDvJ-E`PMxkxj?nyPE7hATUXUYDB7ohWkLy?ym8zrcuQ>4E1WOF1;aOa9D
z=oG6kv|M)iH}uue$={l))#}5RjX12~0#&<}P8bzvtveboH}wl3-V12<3QgT@J-GPk
zl^frg+VXKNuSIk4{H`xvg1WvlOz_%f?@rI&`R=k^|E|XI+boRed7<4^%U%`{gox^U
z0SEF?cZr&4s<~f3N%PpN`rLO(dG)H~t;+c*{)8uk@_hX7wFr#ifqc}fjMP!ouEx%d
zms)oA_Xc+8f__{`Qz*K#2em3!$}QL&%o_i$rgGQ6p&5y~v@iNa010;|mqR&uGyQO8
z*Z+?yaniS=o0`9@OTH>7TLVk#-L010*DL#bS6X)KhkD@sR5H|~c#{$VJCIIDJ(13P
znir<VonC>h<OsZx*{9ygFR!d$(1TQaF!`_rFLK1s2j!i=#7@(o&=8?oS6_jMh8CaH
zDgmW7!dErWpZ~mmU`UIG{+d1})T$}Rq`3!#YZ04PWSduXK;#!)yZ>W77taf!f9&Fl
z3KR(WQrJGE)~>yW>({l9@s73yb@HdB8Hl$;F)%&c)*i>!59R2$G!E-Q+c}P%*>fV!
zW`Y^$$&h+8A8}N(<ETjrqG+nq`A7eyUMgriwYMh43R%|3_<jC{!bb3Hfg#%408Yl>
z*kwW&<DK+!UiX5w7@yzv9kMZpF|bM@otyRn!?`>9ov}B+wqm#clh$Fpp%6pdgVnc2
zWdN1w-CM~11p!oXTYsffPG9TzOH?YtpDpSEo&CCW+-m7OT8i~^ses~YS|kCxJSH8<
za-Yw6U(_m;p=?Rx?lC#{=*4Y+hRm^%N!2MrdG`bP#6ef^;Pe?6X2n?MEx6E*Z>#lc
z8g}rEoUPVIB{ajFOpSdUak_hT$=>|)Rol`|*i6Ty%Eo}}Mn63D134V;?N9Q3Q-!52
zCv_B{_gNn)GP1KCZ);ncc7%>{ClaGaBo!z^8QcQET?EtjrR#Xhp8n&Z9X_MoLoIZi
zu~t*j7qL~|69NLKQ>Js1fR{9m1Xp)EW%N@mtLHfotuEVSB(30)97`B)_w?ejXV-qD
zmzRI8Cp|AO^?)FR8zVh`pD#QD(Sr?C^n+z9iiINuK4{P|kIOR=O$|`_Pe6*Pk}bC3
zB|X$$F+2Z7W=Hyo1+74v<F4x};yo&9sc#4>$x5(e9a#N9Gaz_teyw8UsAZg0fF5x}
zke=)`$I*_qE8kkOOW)AXzI;_D7d0$!q=`aDYpJzHs@5PW4SnP!R_N#~^K^lYdo3}c
zK%kGx0orsfd2CTXbSm=bn7k+FzHD~p^ZG%hPwD}#g$z?ncd*2z1zCQ|9k$gt_XPqU
z5quWGxab9&GfU>kDmLKfLMaQ%hdS}N`OdQa>Z@Jb`G&@@bJ|CfARkg(GsJa(XC6}L
zG2BH{up}fQ#3E0kYssW=Uj79JzTgfCL4in>m+?pE+i1D&+zrjc847a@b7MkI-d#$F
z3Y(g?LKNnrv<mb_f3mCY{M}rRwIKWlipoAMbRH0@);rnl+08eX?2Z4TcWv*gwQF+T
zW*}CmT|%3g4=z_AoD^5IHR$}ohC`F7O3cf6RIXwZ0b7k46iV4h5#(YSFug3DD%Z#U
zy*7+q(6F$s1(Oe;PE_4c?=rdR!rr)5ByMX#*LK%v8ZI77J{jdw$m<;)$3<_%_r}g6
z97;J^{=pl1i}6hk>S-v@e7U8Ur&!@mDsk;-<i$e@s-VQ7sn@0Z4PyyubmZpmfqNJQ
z8siTR<cB?qWjLEQgLip&n?3Qb^$RS|4RsJ)pA#@wPjMKRLFr}|lDUvPi!n^)Vr1|f
z&nuk3p9h`b+1A$N9lf@W?-+z<d{WKdyVkeM-|5;1I$qR$Ofbz&y#TT@5BX6r{vxF0
zkX|%6HYp0BM@<;%kko`WscYXnk`_<XMYSqjdsSoZ?@jFdr}e(^u=aTwB(s;MVe{hW
zb0~o>X`68qUbw2YP{mLXEqzNd{+Tvbw2402)t05^8(jRb#<d?W+4fs{An`*R7_aAk
z>J2xbsZP1xd{S@-L%3X?2VGbh9LTFfbn?gtXI*Vc1z+;kWsC<}&b3Y3oNaC3T>SD-
zUo&ZyrnfAFYRvVFgX)`v(xa<qLXD|YsW{^r<0*Y>BZKKa%KD|W7eRt&nv-%U<ns6S
z>1!SR&}CmEn*{CL((FNp{!DK?$UA*0B5jmHMO&@4QE(rBWi5C<;pMMsS7?q-9qA?(
zS&?tzfFza6SKb>e<&aW#0PTv-mp#|E=l*!lPJDth8R1-EYG%)r8^&^#KpFpkgW6<1
zTP1=aKvwai@-uCM&-h{DD>J+D4ZRLJwq$*sM(4~!ltA>%7!>)N1Q`?s49lXmrJDs4
zAuRzcJOp%e_fDV`t_^PJf+{G2y5SZ8RY;zYSHN27j^x~BeRy;9i~4Ds&y2LSI@D4-
u8cActQ^|Q~q8LkMd1w|OVGm^t;Qs}WsDb-P?Ba0%0000<MNUMnLSTY`2Cmxx

literal 0
HcmV?d00001

diff --git a/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java b/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java
index 5f7c4d1d..a34f26de 100644
--- a/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java
+++ b/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java
@@ -239,6 +239,29 @@ public class AllInOneTest extends TestBase {
         client.execute(requestBuilder);
     }
 
+    /**
+     * 演示文件上传
+     */
+    public void testFile3() {
+        Client client = new Client(url, appId, privateKey);
+        String root = System.getProperty("user.dir");
+        Client.RequestBuilder requestBuilder = new Client.RequestBuilder()
+                .method("demo.file.upload3")
+                .version("1.0")
+                .bizContent(new BizContent().add("remark", "test file upload"))
+                // 添加文件
+                .addFile("image", new File(root + "/src/main/resources/img.png"))
+                .callback((requestInfo, responseData) -> {
+                    System.out.println(responseData);
+                    JSONObject jsonObject = JSON.parseObject(responseData);
+                    JSONObject data = jsonObject.getJSONObject(requestInfo.getDataNode());
+                    Assert.assertEquals(data.getString("code"), "10000");
+                })
+                ;
+
+        client.execute(requestBuilder);
+    }
+
     /**
      * 下载文件
      */

From e8e34f01371a175b5b5745887e401c18d9dd5cdc Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Wed, 15 Apr 2020 16:00:06 +0800
Subject: [PATCH 3/3] 3.1.2

---
 changelog.md                                | 4 ++++
 sop-auth/pom.xml                            | 2 +-
 sop-common/pom.xml                          | 2 +-
 sop-common/sop-bridge-gateway/pom.xml       | 6 +++---
 sop-common/sop-bridge-zuul/pom.xml          | 6 +++---
 sop-common/sop-gateway-common/pom.xml       | 4 ++--
 sop-common/sop-service-common/pom.xml       | 4 ++--
 sop-example/sop-book/sop-book-web/pom.xml   | 2 +-
 sop-example/sop-easyopen/pom.xml            | 2 +-
 sop-example/sop-springmvc/pom.xml           | 2 +-
 sop-example/sop-story/sop-story-web/pom.xml | 2 +-
 sop-gateway/pom.xml                         | 2 +-
 sop-website/pom.xml                         | 2 +-
 13 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/changelog.md b/changelog.md
index cfc42ddd..b645af4e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # changelog
 
+## 3.1.2
+
+- 修复图片上传保存后图片破损问题
+
 ## 3.1.1
 
 - 修复继承WebMvcConfigurationSupport导致的jackson序列化时间问题
diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml
index d5b56ffa..fa46dd66 100644
--- a/sop-auth/pom.xml
+++ b/sop-auth/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.2-SNAPSHOT</version>
 		</dependency>
 		<!-- sop相关配置 end-->
 
diff --git a/sop-common/pom.xml b/sop-common/pom.xml
index 89c70b7d..39a33e38 100644
--- a/sop-common/pom.xml
+++ b/sop-common/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.gitee.sop</groupId>
 	<artifactId>sop-common</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/sop-common/sop-bridge-gateway/pom.xml b/sop-common/sop-bridge-gateway/pom.xml
index 078a0d9c..5c1465bd 100644
--- a/sop-common/sop-bridge-gateway/pom.xml
+++ b/sop-common/sop-bridge-gateway/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <artifactId>sop-common</artifactId>
         <groupId>com.gitee.sop</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.2-SNAPSHOT</version>
 
     <artifactId>sop-bridge-gateway</artifactId>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-common/sop-bridge-zuul/pom.xml b/sop-common/sop-bridge-zuul/pom.xml
index 4787ab59..efd0927e 100644
--- a/sop-common/sop-bridge-zuul/pom.xml
+++ b/sop-common/sop-bridge-zuul/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <artifactId>sop-common</artifactId>
         <groupId>com.gitee.sop</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.2-SNAPSHOT</version>
 
     <artifactId>sop-bridge-zuul</artifactId>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml
index 5a1e11ca..bb26587d 100644
--- a/sop-common/sop-gateway-common/pom.xml
+++ b/sop-common/sop-gateway-common/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-gateway-common</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-gateway-common</name>
diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml
index 7f6343dd..7aa25523 100644
--- a/sop-common/sop-service-common/pom.xml
+++ b/sop-common/sop-service-common/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-service-common</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-service-common</name>
diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml
index 57a9ed0a..50b40b53 100644
--- a/sop-example/sop-book/sop-book-web/pom.xml
+++ b/sop-example/sop-book/sop-book-web/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>
diff --git a/sop-example/sop-easyopen/pom.xml b/sop-example/sop-easyopen/pom.xml
index e9ef1f8d..f1810e84 100644
--- a/sop-example/sop-easyopen/pom.xml
+++ b/sop-example/sop-easyopen/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- 使用nacos注册中心
diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml
index 4dbd44ba..ab6ad846 100644
--- a/sop-example/sop-springmvc/pom.xml
+++ b/sop-example/sop-springmvc/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.2-SNAPSHOT</version>
         </dependency>
         <!-- nacos  -->
         <dependency>
diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml
index 286d149d..9da1e54b 100644
--- a/sop-example/sop-story/sop-story-web/pom.xml
+++ b/sop-example/sop-story/sop-story-web/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>
diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml
index e3595ace..878516d8 100644
--- a/sop-gateway/pom.xml
+++ b/sop-gateway/pom.xml
@@ -34,7 +34,7 @@
             <groupId>com.gitee.sop</groupId>
              <artifactId>sop-bridge-gateway</artifactId>
              <!--<artifactId>sop-bridge-zuul</artifactId>-->
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-website/pom.xml b/sop-website/pom.xml
index 883372af..19beadad 100644
--- a/sop-website/pom.xml
+++ b/sop-website/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>