From accd4bbbd19cd7f82bd468cb6e6fc1eb9639923b Mon Sep 17 00:00:00 2001 From: yexuejc <1107047387@qq.com> Date: Tue, 19 Jun 2018 22:19:16 +0800 Subject: [PATCH] 1.0.11 --- UPDATE.md | 7 +++++ pom.xml | 4 +-- yexuejc-springboot-base/pom.xml | 2 +- .../autoconfigure/WebAutoConfiguration.java | 4 +++ .../springboot/base/test/ApplicationTest.java | 2 +- .../springboot/base/web/IndexCtrl.java | 7 +++++ .../springboot/base/web/UserLoginVo.java | 29 ++++++++++++++++++ .../src/test/resources/lgfishing2.cer | 20 ------------ .../src/test/resources/lgfishing2.keystore | Bin 1592 -> 0 bytes .../src/test/resources/lgfishing2.pfx | Bin 1938 -> 0 bytes .../src/test/resources/testPub.key | Bin 0 -> 419 bytes 11 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/UserLoginVo.java delete mode 100644 yexuejc-springboot-base/src/test/resources/lgfishing2.cer delete mode 100644 yexuejc-springboot-base/src/test/resources/lgfishing2.keystore delete mode 100644 yexuejc-springboot-base/src/test/resources/lgfishing2.pfx create mode 100644 yexuejc-springboot-base/src/test/resources/testPub.key diff --git a/UPDATE.md b/UPDATE.md index 53ac81e..d842021 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -1,6 +1,13 @@ uselaw-base 更新内容 ------------------- +#### version :1.0.11 +**time:2018-6-19 22:18:03**
+**branch:** master
+**update:**
+1. 更新springboot-base:1.1.5依赖 +# + #### version :1.0.10 **time:2018年6月14日22:31:18**
**branch:** master
diff --git a/pom.xml b/pom.xml index f49e5b5..4943545 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.yexuejc.springboot yexuejc-springboot-parent - 1.0.10 + 1.0.11 pom ${project.artifactId} @@ -35,7 +35,7 @@ 1.2.0 3.4.2 - 1.1.4 + 1.1.5 0.7.0 1.1.46 1.10 diff --git a/yexuejc-springboot-base/pom.xml b/yexuejc-springboot-base/pom.xml index 4004b03..40d4208 100644 --- a/yexuejc-springboot-base/pom.xml +++ b/yexuejc-springboot-base/pom.xml @@ -9,7 +9,7 @@ com.yexuejc.springboot yexuejc-springboot-parent - 1.0.10 + 1.0.11 diff --git a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/autoconfigure/WebAutoConfiguration.java b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/autoconfigure/WebAutoConfiguration.java index f9a07ef..1e1fd13 100644 --- a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/autoconfigure/WebAutoConfiguration.java +++ b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/autoconfigure/WebAutoConfiguration.java @@ -28,6 +28,7 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; @@ -166,8 +167,11 @@ public class WebAutoConfiguration extends WebMvcConfigurerAdapter { LogUtil.exceptionLogger.error("", e); if (e instanceof GatewayException) { return Resps.error(StrUtil.setStr(e.getMessage(), ERROR_MSG)); + } else if (e instanceof HttpRequestMethodNotSupportedException) { + return Resps.error("请求方式错误"); } return Resps.error(ERROR_MSG); } + } } diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/test/ApplicationTest.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/test/ApplicationTest.java index 9a1e3bb..61ff94e 100644 --- a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/test/ApplicationTest.java +++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/test/ApplicationTest.java @@ -150,7 +150,7 @@ public class ApplicationTest { // System.out.println(publicEncryptResult); // System.out.println(StrUtil.toMD5(dataStr)); - String publicEncryptResult="MxyCtlTnkvh+0vOPsDDL1+hO9NZ+pDps+uVt8NwJvn4SZoYfjuj2a1WYZrvDk/sUC41zRQAE85/c\ndm9IC0BtFr7CtHSnbJfExSBwHtkG3/pE4hd5ysrdQiaFmlvENJ24cVYX+4WBEZ6bfh9jB3e1QXQi\n05o+uwxOX1UW6VENEx0\u003d\n"; + String publicEncryptResult="KHAtNzGkT/Mn7d/Ei6aoZ8KCA04mYJi5b/sxt/Jgzq76jNi0O/EMACDsipgQuwZTJrrys5xOPyy4\n1Gf8LMEldZE3GeY3i92A5jnH7IeWnLojYhNaKdIuLuf4l5uJmFgpzxhoxqSkp2JJ5Vbt8j5Hy4ov\n7tfxPDBwnT6FSfDqGLU\u003d\n"; //服务器私钥解密 String privateDecryptResult = RSA.privateDecrypt(publicEncryptResult, RSA2.getPrivateKey(privateKey, privateAlias, privatePwd)); diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java index 1f9fe90..451bd18 100644 --- a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java +++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/IndexCtrl.java @@ -6,6 +6,7 @@ import com.yexuejc.base.util.JsonUtil; import com.yexuejc.base.util.StrUtil; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -72,6 +73,12 @@ public class IndexCtrl { return Resps.success("请求成功").setSucc(05652.154); } + @RequestMapping(value = {"/logina"},method = RequestMethod.POST) + public Resps l2(@RequestBody UserLoginVo loginVo) { + System.out.println("请求参数:" + JsonUtil.obj2Json(loginVo)); + return Resps.success("请求成功").setSucc(05652.154); + } + @RequestMapping(value = {"/3"}) public Resps b(@RequestBody TaVO pagerVO) { System.out.println("请求参数:" + JsonUtil.obj2Json(pagerVO)); diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/UserLoginVo.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/UserLoginVo.java new file mode 100644 index 0000000..665ddef --- /dev/null +++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/UserLoginVo.java @@ -0,0 +1,29 @@ +package com.yexuejc.springboot.base.web; + +import java.io.Serializable; + +/** + * @author: maxf + * @date: 2018/6/15 22:09 + */ +public class UserLoginVo implements Serializable { + private String phoneNumber; + private String password; + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + +} \ No newline at end of file diff --git a/yexuejc-springboot-base/src/test/resources/lgfishing2.cer b/yexuejc-springboot-base/src/test/resources/lgfishing2.cer deleted file mode 100644 index 34911f7..0000000 --- a/yexuejc-springboot-base/src/test/resources/lgfishing2.cer +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDLjCCApegAwIBAgIEAkwsIjANBgkqhkiG9w0BAQsFADCByDELMAkGA1UEBhMC -Q04xDzANBgNVBAgMBuWbm+W3nTEPMA0GA1UEBwwG5oiQ6YO9MT4wPAYDVQQKDDXm -iJDpg73mnoHoh7TmgJ3nu7TnvZHnu5znp5HmioDmnInpmZDlhazlj7gt6ICBR+mS -k+mxvDE7MDkGA1UECwwy5rex5Zyz6YeR5aSn57Gz572R57uc56eR5oqA5pyJ6ZmQ -5YWs5Y+4LeiAgUfpkpPpsbwxGjAYBgNVBAMTEWhlaWtlbmdkaWFveXUuY29tMCAX -DTE4MDUyNzA0MDQ0NFoYDzIxMTgwNTAzMDQwNDQ0WjCByDELMAkGA1UEBhMCQ04x -DzANBgNVBAgMBuWbm+W3nTEPMA0GA1UEBwwG5oiQ6YO9MT4wPAYDVQQKDDXmiJDp -g73mnoHoh7TmgJ3nu7TnvZHnu5znp5HmioDmnInpmZDlhazlj7gt6ICBR+mSk+mx -vDE7MDkGA1UECwwy5rex5Zyz6YeR5aSn57Gz572R57uc56eR5oqA5pyJ6ZmQ5YWs -5Y+4LeiAgUfpkpPpsbwxGjAYBgNVBAMTEWhlaWtlbmdkaWFveXUuY29tMIGfMA0G -CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsI2RVILgGqA+SUxIhWPC+SvJHkGZJXF55 -4m5+sGkvXdL4Qd2rZKRZLk6nAFnJym4svuWommtfVXdWQZAJce1eg9cgjbj4EJnX -77m0xEayoZhOnbRhUYx3XUviKeZwJY8Xwtv6LZu0S25HqkQa65LMJDVqNzi3xlll -7uXwmc3NowIDAQABoyEwHzAdBgNVHQ4EFgQUb86SydPXdx8FO9FAlnXShVr3J6Yw -DQYJKoZIhvcNAQELBQADgYEAZC0dpZ1x2xmoR5Sq0V3yqZ0NySZ7n49FmDr1GUy1 -WiyK4XwuOQJitu4gv/7NWwvNXqPwbjbKqLnQvYr+PO2duvnU6xMzB66C108fBPh1 -LU8gzMl7avm1pDKODVXN5Ovl0I7gx8N5XvjazjfXYchEPrvh91WkXqLkNxwd6cK3 -hag= ------END CERTIFICATE----- diff --git a/yexuejc-springboot-base/src/test/resources/lgfishing2.keystore b/yexuejc-springboot-base/src/test/resources/lgfishing2.keystore deleted file mode 100644 index d96c0a1b1e003bf7198b4efaacd2d9f6d4757255..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1592 zcmezO_TO6u1_mY|W&~r-ob9Rd);cWvU@J?EbrOqvFezgL!DbA5Br_wT-k{?dUmYy z@cZ5_8RGMAk{LY+NzX(O#QvZDRugW8y0=)LcV%$d90QPTkg3l{=7q! zL8)Xu@8f?VkJen{4VoOw{{OJ%jJ>lqi)xp{QO&Df@QC+&EhMBeOfv@9zQwzD=w1 zZvWB$B6dzRLDbH_(`s&Y`Q+&bHRty1|Fq>_5CWdY7oyzACoLRMyj4TkhV; z=kR7b>y|4WEZ?)$TaykHuXGRG&w0Mkf3n!*yUMYht?W~$PXDn=n@3(o&1#G7))<8u z721`2zba(23tucqSjMpXoUhF!%S5JI z>wC_P_ZD%pLz@pwSFm2d7?!E`=Tt^S(Jj*m?feeE*gw7&86W?chB>!39R2rq!U$FRRQ`Q(M%1sm%~Y|MBT~0dYM=7YS8urlWm|Iemh4-5 z;qV??HixY z+5ED7;?pI|pKshujAkhV36N%HVZn^l%^pwoR{K`_j#D{%e zpWG*;dB((5KFX`xkf|Sg>4)Rp)hSCN_57AIM4mjAr?cQl6UChMH$iTQ*(Lmln78qHwd@N!tBKhYgoxFU#T%OhXqQkV(ORZ7g z)t4dr0GJk;flg1+m0dcw@V4X%_bIC`#(r8km-nPv_56O<8CG8gbI zqdwlyvrk?>z0mjI_~FX9AGgk#Ur#*YVz>L@_s}JAi=LRv$i6(Zy>$i8<>UJgKd<(g Q(v-0*BKuKk`P7gj0L-e(WB>pF diff --git a/yexuejc-springboot-base/src/test/resources/lgfishing2.pfx b/yexuejc-springboot-base/src/test/resources/lgfishing2.pfx deleted file mode 100644 index 6aae0950771a6755fcd05330d2a99c201f6e4b42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1938 zcmY+DXH*ji630Ulk`Pc@5LA#Ny_tlX04flv!H5J5hzJ&X2PKrHgwTtM6p<>R5I546 z4l9Nx3Zj4@oOB|DWzkR)DTge+cei)@VP@X@&&>bBy!jz1&`cl?2uXojK=@P>EfT*U z;eqm$QlJqmUGk;y+p-aWDlWdMFDX20w)VKU)HD9$+a2SdXLttC7kO_-zZw(6%??eGK-y+tB;@eluB=XlCaMqi#IUr zm~_~qzB2(SMOVFBiO){>%&+SKa>6-@3N5WluFnv+~E?MkO zz3P)aZ|e4Bc8>HeG&*zC{ndtc_Hky{1WP35eM61oZJYI7!SqIAAo^@+a(Sk~z#6~2 z0rRXU|Gf-6>Y`~J_4!NoRJ}E0xAX)TzVJ%8EF#{mddO zy5?It>+mZ4XFKJ|*m#{Xh3@c1616%HE64i2+i|}GH*k7194y{`wxzLLJ4c6kTx5H> zlR9CCETXWYKEN2ROM1BV5dO@4FlO>deCo>wwdZ^TvU=u%m6xQ7@(kJ(i$S+t#4&5( z`%$>zb?SGgN(Yx?qbjYJRWPNncS5I?rF3Q&R-&|KH9su1z*3pxrXnaar0m}x&WAuD zPKf|~0UiK%fEOSH;CYz+0UrN9B8EbMMTlO0w`EW|Xgw{Awk{Hl(LbaG4Eoy#3Mr+4 zwhjql19iplg#uz%byJr?s zsDkdA!{gU0aU43j)o?{T;xgLZs5L*lJ?FS``U580vi@E#!-jd&t$n~aQDB!h${T%Vr$q(7 z>J`^Z*pT7Lg$EbNhmYX{!b+P0<37*1vg9p&Y8z3NWCwx!I(_SqYNbVC*OyjTzJ|;h zAOB2?=2jBvgUgYLH7}klQJ-g9tE9i<8W6DUS4X-6q?gLA${y*zV8mqgbJ$rS_q&gV zX_@B`SVL7_P=bw5d0btQIWno~SXF=Bn*@TJO9Jf6gy9<3*_gimpzJFiJ@;Emv~-G; z#AIJ8`27O0?_4nRol5>hT%Q7oc{$*#10%+%yNQNLpf$vLx5hUA>7ycHu2r#&caW6X zQ&pDX66TvDtl9nsS(o-6pR~oPjh!|KD$l6}*x&5XcTL*mn`5`91C^VKbJUb(hUv3U z;mpCQ?Od(}Z+D@`OyZ8hC5ba$f0)_djK0;EJ3ciZpS>Xw(UkyEIB-{V8w^!_df;7p zr`fV#S_5k1QYi{Ao%0rJ?e_Wv&0dy`p6Lr(-f$misUqKN43WUr4%C&4hb7Q9hhn4B znDOI)0ak8giqFQvV=;{LoZ#z7=0*F_G0C8QCI%i>$T^GH(0vdE)GOA`O~tWzHmCOD zImiL@`3uZ{PwC6lU2#w}4|I@A2WGKHw_p! zBgr4?;F^-fl98k4IXeY2j7+Xg@Ms^ir=L#EA?q@vlIOG zJpl!B!Kg_UJs&k#+yK@?NA7 zQWnVv;Z-{d0-oRnfDv*Bwfcj0B%1LA%rn_9<*}jbCp9p_yTornJ0=-vHtH<9<% L+CmASpUD3O%JF`X diff --git a/yexuejc-springboot-base/src/test/resources/testPub.key b/yexuejc-springboot-base/src/test/resources/testPub.key new file mode 100644 index 0000000000000000000000000000000000000000..99701787aee82447a191969685c4aa4c6a1efa8e GIT binary patch literal 419 zcmZ4UmVvdnh(RPPu`E%qI5oMnD6^ze&pWj;D79ekPyfvwvz9tDF|hbBa3{^I7}{8%M|kCI*Iz0tN<#MFx%Y z4S3l&wc0$|zVk9NGO{u-H}*0ZG7gt444F^NGuLe0AYfm(T3_g! zfzg7STbY;{85m0#SR?dI4J_-57$mU;C)k@nuYiFN&|gIid|-8;aMW|nE6qig1cnA% KK&X?Cr!xQ&;*#J1 literal 0 HcmV?d00001