From 11452e6de09dfd41a8861df8946dfb3ec608e8e5 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 25 Oct 2016 14:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/bean/pay/result/WxEntPayQueryResult.java | 17 ----------------- .../weixin/mp/bean/template/WxMpTemplate.java | 12 ++++++------ .../weixin/mp/demo/WxMpEndpointServlet.java | 3 +-- .../weixin/mp/demo/WxMpOAuth2Servlet.java | 3 +-- 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxEntPayQueryResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxEntPayQueryResult.java index d74c0b41..8ffbeff2 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxEntPayQueryResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxEntPayQueryResult.java @@ -10,7 +10,6 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; @XStreamAlias("xml") public class WxEntPayQueryResult extends WxPayBaseResult { - //############以下字段在return_code 和result_code都为SUCCESS的时候有返回############## /** * 商户订单号 */ @@ -65,22 +64,6 @@ public class WxEntPayQueryResult extends WxPayBaseResult { @XStreamAlias("desc") private String desc; - public String getReturnCode() { - return this.returnCode; - } - - public void setReturnCode(String returnCode) { - this.returnCode = returnCode; - } - - public String getReturnMsg() { - return this.returnMsg; - } - - public void setReturnMsg(String returnMsg) { - this.returnMsg = returnMsg; - } - public String getPartnerTradeNo() { return this.partnerTradeNo; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java index ffa2711f..0b3a1e61 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java @@ -76,7 +76,7 @@ public class WxMpTemplate { private String example; public String getTemplateId() { - return templateId; + return this.templateId; } public void setTemplateId(String templateId) { @@ -84,7 +84,7 @@ public class WxMpTemplate { } public String getTitle() { - return title; + return this.title; } public void setTitle(String title) { @@ -92,7 +92,7 @@ public class WxMpTemplate { } public String getPrimaryIndustry() { - return primaryIndustry; + return this.primaryIndustry; } public void setPrimaryIndustry(String primaryIndustry) { @@ -100,7 +100,7 @@ public class WxMpTemplate { } public String getDeputyIndustry() { - return deputyIndustry; + return this.deputyIndustry; } public void setDeputyIndustry(String deputyIndustry) { @@ -108,7 +108,7 @@ public class WxMpTemplate { } public String getContent() { - return content; + return this.content; } public void setContent(String content) { @@ -116,7 +116,7 @@ public class WxMpTemplate { } public String getExample() { - return example; + return this.example; } public void setExample(String example) { diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java index d052af6c..63052f8b 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java @@ -2,7 +2,6 @@ package me.chanjar.weixin.mp.demo; import java.io.IOException; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -33,7 +32,7 @@ public class WxMpEndpointServlet extends HttpServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { response.setContentType("text/html;charset=utf-8"); response.setStatus(HttpServletResponse.SC_OK); diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java index 4008e1fb..8eeb9052 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java @@ -2,7 +2,6 @@ package me.chanjar.weixin.mp.demo; import java.io.IOException; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -23,7 +22,7 @@ public class WxMpOAuth2Servlet extends HttpServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { response.setContentType("text/html;charset=utf-8"); response.setStatus(HttpServletResponse.SC_OK);