Merge branch 'dev' into 2.8.x

changelog.txt

@@ -2,7 +2,7 @@ WEIXIN-POPULAR CHANGELOG
 ===========================
 https://github.com/liyiorg/weixin-popular
 
-Changes in version 2.8.22 (2018-08-?)
+Changes in version 2.8.22 (2018-08-22)
 -------------------------------------
 * 改进XML XXE 处理
 * 添加部分bean类构造方法

pom.xml

@@ -4,7 +4,7 @@
 
  <groupId>com.github.liyiorg</groupId>
  <artifactId>weixin-popular</artifactId>
- <version>2.8.21</version>
+ <version>2.8.22</version>
 
  <name>weixin-popular</name>
  <description>The weixin-popular is a JAVA SDK for weixin. Weixin web url is https://mp.weixin.qq.com.</description>

src/main/java/weixin/popular/bean/bizwifi/device/list/DeviceListResultData.java

@@ -12,7 +12,6 @@ public class DeviceListResultData {
  private Integer totalcount;
  private Integer pageindex;
  private Integer pagecount;
-
  private List<Records> records;
 
  public Integer getTotalcount() {
@@ -47,7 +46,7 @@ public void setRecords(List<Records> records) {
  this.records = records;
  }
 
- private class Records {
+ public static class Records {
  private Integer shop_id;
  private String ssid;
  private String bssid;

src/main/java/weixin/popular/bean/bizwifi/homepage/set/HomePageSet.java

@@ -29,7 +29,7 @@ public void setStruct(Struct struct) {
  this.struct = struct;
  }
 
- private class Struct {
+ public static class Struct {
  private String wxa_user_name;
  private String wxa_path;
  private String url;

src/main/java/weixin/popular/bean/bizwifi/shop/get/ShopGetResultData.java

@@ -46,7 +46,7 @@ public void setSsid_password_list(List<SsidPassword> ssid_password_list) {
  this.ssid_password_list = ssid_password_list;
  }
 
- private class SsidPassword {
+ public static class SsidPassword {
  private String ssid;
  private String password;
 

src/main/java/weixin/popular/bean/bizwifi/shop/list/ShopListResultData.java

@@ -46,7 +46,7 @@ public void setRecords(List<Records> records) {
  this.records = records;
  }
 
- private class Records {
+ public static class Records {
  private Integer shop_id;
  private String shop_name;
  private String ssid;

src/main/java/weixin/popular/bean/semantic/semproxy/SemproxySearchResult.java

@@ -1,6 +1,7 @@
 package weixin.popular.bean.semantic.semproxy;
 
 import weixin.popular.bean.BaseResult;
+import weixin.popular.bean.semantic.semproxy.inner.Semantic;
 
 /**
  * @ProjectName weixin-popular
@@ -37,240 +38,5 @@ public Semantic getSemantic() {
  public void setSemantic(Semantic semantic) {
  this.semantic = semantic;
  }
-
- private class Semantic {
- private Details details;
-
- public Details getDetails() {
- return details;
- }
-
- public void setDetails(Details details) {
- this.details = details;
- }
-
- public String getIntent() {
- return intent;
- }
-
- public void setIntent(String intent) {
- this.intent = intent;
- }
-
- private class Details {
- private String airline;
- private String hit_str;
- private String answer;
- private ContextInfo context_info;
- private StartLoc start_loc;
- private EndLoc end_loc;
- private StartDate start_date;
-
- public String getHit_str() {
- return hit_str;
- }
-
- public void setHit_str(String hit_str) {
- this.hit_str = hit_str;
- }
-
- public String getAnswer() {
- return answer;
- }
-
- public void setAnswer(String answer) {
- this.answer = answer;
- }
-
- public ContextInfo getContext_info() {
- return context_info;
- }
-
- public void setContext_info(ContextInfo context_info) {
- this.context_info = context_info;
- }
-
- public StartLoc getStart_loc() {
- return start_loc;
- }
-
- public void setStart_loc(StartLoc start_loc) {
- this.start_loc = start_loc;
- }
-
- public EndLoc getEnd_loc() {
- return end_loc;
- }
-
- public void setEnd_loc(EndLoc end_loc) {
- this.end_loc = end_loc;
- }
-
- public StartDate getStart_date() {
- return start_date;
- }
-
- public void setStart_date(StartDate start_date) {
- this.start_date = start_date;
- }
-
- public String getAirline() {
- return airline;
- }
-
- public void setAirline(String airline) {
- this.airline = airline;
- }
-
- private class StartLoc {
- private String type;
- private String city;
- private String city_simple;
- private String loc_ori;
- private String modify_times;
- private String slot_content_type;
-
- public String getModify_times() {
- return modify_times;
- }
-
- public void setModify_times(String modify_times) {
- this.modify_times = modify_times;
- }
-
- public String getSlot_content_type() {
- return slot_content_type;
- }
-
- public void setSlot_content_type(String slot_content_type) {
- this.slot_content_type = slot_content_type;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getCity_simple() {
- return city_simple;
- }
-
- public void setCity_simple(String city_simple) {
- this.city_simple = city_simple;
- }
-
- public String getLoc_ori() {
- return loc_ori;
- }
-
- public void setLoc_ori(String loc_ori) {
- this.loc_ori = loc_ori;
- }
- }
-
- private class EndLoc extends StartLoc {
- }
-
- private class StartDate {
- private String type;
- private String date;
- private String date_ori;
- private String date_lunar;
- private String modify_times;
- private String slot_content_type;
- private String week;
-
- public String getDate_lunar() {
- return date_lunar;
- }
-
- public void setDate_lunar(String date_lunar) {
- this.date_lunar = date_lunar;
- }
-
- public String getModify_times() {
- return modify_times;
- }
-
- public void setModify_times(String modify_times) {
- this.modify_times = modify_times;
- }
-
- public String getSlot_content_type() {
- return slot_content_type;
- }
-
- public void setSlot_content_type(String slot_content_type) {
- this.slot_content_type = slot_content_type;
- }
-
- public String getWeek() {
- return week;
- }
-
- public void setWeek(String week) {
- this.week = week;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getDate() {
- return date;
- }
-
- public void setDate(String date) {
- this.date = date;
- }
-
- public String getDate_ori() {
- return date_ori;
- }
-
- public void setDate_ori(String date_ori) {
- this.date_ori = date_ori;
- }
- }
-
- private class ContextInfo {
- private String isFinished;
- private String null_times;
-
- public String getIsFinished() {
- return isFinished;
- }
-
- public void setIsFinished(String isFinished) {
- this.isFinished = isFinished;
- }
-
- public String getNull_times() {
- return null_times;
- }
-
- public void setNull_times(String null_times) {
- this.null_times = null_times;
- }
- }
- }
-
- private String intent;
- }
 }
 

src/main/java/weixin/popular/bean/semantic/semproxy/inner/ContextInfo.java

@@ -0,0 +1,28 @@
+package weixin.popular.bean.semantic.semproxy.inner;
+
+/**
+ * @program: weixin-popular
+ * @description:
+ * @author: 01
+ * @create: 2018-08-18 13:33
+ **/
+public class ContextInfo {
+ private String isFinished;
+ private String null_times;
+
+ public String getIsFinished() {
+ return isFinished;
+ }
+
+ public void setIsFinished(String isFinished) {
+ this.isFinished = isFinished;
+ }
+
+ public String getNull_times() {
+ return null_times;
+ }
+
+ public void setNull_times(String null_times) {
+ this.null_times = null_times;
+ }
+}