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 d96c0a1..0000000 Binary files a/yexuejc-springboot-base/src/test/resources/lgfishing2.keystore and /dev/null differ 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 6aae095..0000000 Binary files a/yexuejc-springboot-base/src/test/resources/lgfishing2.pfx and /dev/null differ 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 0000000..9970178 Binary files /dev/null and b/yexuejc-springboot-base/src/test/resources/testPub.key differ