diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java
index c6fd7671..2c7c374c 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java
@@ -18,39 +18,38 @@ import java.util.List;
* @date 2019/01/23
*/
public interface WxOpenFastMaService extends WxMaService {
-
/**
- * 1 获取帐号基本信息
+ * 1 获取帐号基本信息.
*/
String OPEN_GET_ACCOUNT_BASIC_INFO = "https://api.weixin.qq.com/cgi-bin/account/getaccountbasicinfo";
/**
- * 2 小程序名称设置及改名
+ * 2 小程序名称设置及改名.
*/
String OPEN_SET_NICKNAME = "https://api.weixin.qq.com/wxa/setnickname";
/**
- * 3 小程序改名审核状态查询
+ * 3 小程序改名审核状态查询.
*/
String OPEN_API_WXA_QUERYNICKNAME = "https://api.weixin.qq.com/wxa/api_wxa_querynickname";
/**
- * 4 微信认证名称检测
+ * 4 微信认证名称检测.
*/
String OPEN_CHECK_WX_VERIFY_NICKNAME = "https://api.weixin.qq.com/cgi-bin/wxverify/checkwxverifynickname";
/**
- * 5 修改头像
+ * 5 修改头像.
*/
String OPEN_MODIFY_HEADIMAGE = "https://api.weixin.qq.com/cgi-bin/account/modifyheadimage";
/**
- * 6修改功能介绍
+ * 6修改功能介绍.
*/
String OPEN_MODIFY_SIGNATURE = "https://api.weixin.qq.com/cgi-bin/account/modifysignature";
/**
- * 7 换绑小程序管理员接口
+ * 7 换绑小程序管理员接口.
*/
String OPEN_COMPONENT_REBIND_ADMIN = "https://api.weixin.qq.com/cgi-bin/account/componentrebindadmin";
@@ -79,37 +78,43 @@ public interface WxOpenFastMaService extends WxMaService {
/**
* 1.获取小程序的信息
*
- * @return
- * @throws WxErrorException
+ * @return .
+ * @throws WxErrorException .
*/
WxFastMaAccountBasicInfoResult getAccountBasicInfo() throws WxErrorException;
/**
* 2.小程序名称设置及改名
- *
categoryList) throws WxErrorException;
/**
* 8.3删除类目
- * @param first 一级类目ID
+ *
+ * @param first 一级类目ID
* @param second 二级类目ID
- * @return
- * @throws WxErrorException
+ * @return .
+ * @throws WxErrorException .
*/
WxOpenResult deleteCategory(int first, int second) throws WxErrorException;
/**
* 8.4获取账号已经设置的所有类目
- * @return
- * @throws WxErrorException
+ *
+ * @return .
+ * @throws WxErrorException .
*/
WxFastMaBeenSetCategoryResult getCategory() throws WxErrorException;
/**
* 8.5修改类目
+ *
* @param category 实体
- * @return
- * @throws WxErrorException
+ * @return .
+ * @throws WxErrorException .
*/
WxOpenResult modifyCategory(WxFastMaCategory category) throws WxErrorException;
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
index f3ea5934..6e0af839 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
@@ -98,7 +98,6 @@ public interface WxOpenMaService extends WxMaService {
String API_UPDATE_SHOW_WXA_ITEM = "https://api.weixin.qq.com/wxa/updateshowwxaitem";
-
/**
* 以下接口为三方平台代小程序实现的代码管理功能
*
@@ -268,7 +267,6 @@ public interface WxOpenMaService extends WxMaService {
WxOpenMaTesterListResult getTesterList() throws WxErrorException;
-
/**
* 设置小程序隐私设置(是否可被搜索)
*
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
index 84f7e382..bad174b6 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
@@ -265,8 +265,8 @@ public class WxOpenComponentServiceImpl implements WxOpenComponentService {
return "success";
}
//快速创建小程序
- if (StringUtils.equalsIgnoreCase(wxMessage.getInfoType(), "notify_third_fasteregister") && wxMessage.getStatus () == 0) {
- WxOpenQueryAuthResult queryAuth = wxOpenService.getWxOpenComponentService().getQueryAuth(wxMessage.getAuthCode ());
+ if (StringUtils.equalsIgnoreCase(wxMessage.getInfoType(), "notify_third_fasteregister") && wxMessage.getStatus() == 0) {
+ WxOpenQueryAuthResult queryAuth = wxOpenService.getWxOpenComponentService().getQueryAuth(wxMessage.getAuthCode());
if (queryAuth == null || queryAuth.getAuthorizationInfo() == null || queryAuth.getAuthorizationInfo().getAuthorizerAppid() == null) {
throw new NullPointerException("getQueryAuth");
}
@@ -318,11 +318,11 @@ public class WxOpenComponentServiceImpl implements WxOpenComponentService {
jsonObject.addProperty("count", len);
String responseContent = post(url, jsonObject.toString());
WxOpenAuthorizerListResult ret = WxOpenGsonBuilder.create().fromJson(responseContent, WxOpenAuthorizerListResult.class);
- if(ret != null && ret.getList() != null){
- for(Map data : ret.getList()){
+ if (ret != null && ret.getList() != null) {
+ for (Map data : ret.getList()) {
String authorizerAppid = data.get("authorizer_appid");
String refreshToken = data.get("refresh_token");
- if(authorizerAppid != null && refreshToken != null){
+ if (authorizerAppid != null && refreshToken != null) {
this.getWxOpenConfigStorage().setAuthorizerRefreshToken(authorizerAppid, refreshToken);
}
}
@@ -451,25 +451,25 @@ public class WxOpenComponentServiceImpl implements WxOpenComponentService {
}
@Override
- public WxOpenResult fastRegisterWeapp(String name, String code, String codeType, String legalPersonaWechat, String legalPersonaName, String componentPhone) throws WxErrorException{
+ public WxOpenResult fastRegisterWeapp(String name, String code, String codeType, String legalPersonaWechat, String legalPersonaName, String componentPhone) throws WxErrorException {
JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("name",name);
+ jsonObject.addProperty("name", name);
jsonObject.addProperty("code", code);
jsonObject.addProperty("code_type", codeType);
jsonObject.addProperty("legal_persona_wechat", legalPersonaWechat);
jsonObject.addProperty("legal_persona_name", legalPersonaName);
jsonObject.addProperty("component_phone", componentPhone);
- String response = post(FAST_REGISTER_WEAPP_URL, jsonObject.toString (), "component_access_token");
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ String response = post(FAST_REGISTER_WEAPP_URL, jsonObject.toString(), "component_access_token");
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
@Override
- public WxOpenResult fastRegisterWeappSearch(String name, String legalPersonaWechat, String legalPersonaName) throws WxErrorException{
+ public WxOpenResult fastRegisterWeappSearch(String name, String legalPersonaWechat, String legalPersonaName) throws WxErrorException {
JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("name",name);
+ jsonObject.addProperty("name", name);
jsonObject.addProperty("legal_persona_wechat", legalPersonaWechat);
jsonObject.addProperty("legal_persona_name", legalPersonaName);
- String response = post(FAST_REGISTER_WEAPP_SEARCH_URL, jsonObject.toString (), "component_access_token");
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ String response = post(FAST_REGISTER_WEAPP_SEARCH_URL, jsonObject.toString(), "component_access_token");
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java
index e72fb02b..20981e86 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java
@@ -18,237 +18,134 @@ import java.util.List;
import java.util.Map;
/**
+ * .
+ *
* @author Hipple
- * @description
* @since 2019/1/23 15:27
*/
public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFastMaService {
-
- protected final Logger log = LoggerFactory.getLogger (this.getClass ());
-
private WxOpenComponentService wxOpenComponentService;
private WxMaConfig wxMaConfig;
private String appId;
- public WxOpenFastMaServiceImpl (WxOpenComponentService wxOpenComponentService, String appId, WxMaConfig wxMaConfig) {
+ public WxOpenFastMaServiceImpl(WxOpenComponentService wxOpenComponentService, String appId, WxMaConfig wxMaConfig) {
this.wxOpenComponentService = wxOpenComponentService;
this.appId = appId;
this.wxMaConfig = wxMaConfig;
- initHttp ();
+ initHttp();
}
@Override
- public WxMaConfig getWxMaConfig () {
+ public WxMaConfig getWxMaConfig() {
return wxMaConfig;
}
@Override
- public String getAccessToken (boolean forceRefresh) throws WxErrorException {
- return wxOpenComponentService.getAuthorizerAccessToken (appId, forceRefresh);
+ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
+ return wxOpenComponentService.getAuthorizerAccessToken(appId, forceRefresh);
}
- /**
- * 1.获取小程序的信息,GET请求
- *
- * 注意:这里不能直接用小程序的access_token
- *
- *
- * @return
- * @throws WxErrorException
- */
@Override
- public WxFastMaAccountBasicInfoResult getAccountBasicInfo () throws WxErrorException {
- String response = get (OPEN_GET_ACCOUNT_BASIC_INFO, "");
- return WxOpenGsonBuilder.create ().fromJson (response, WxFastMaAccountBasicInfoResult.class);
+ public WxFastMaAccountBasicInfoResult getAccountBasicInfo() throws WxErrorException {
+ String response = get(OPEN_GET_ACCOUNT_BASIC_INFO, "");
+ return WxOpenGsonBuilder.create().fromJson(response, WxFastMaAccountBasicInfoResult.class);
}
- /**
- * 2.小程序名称设置及改名
- *
- * @param nickname 昵称
- * @param idCard 身份证照片–临时素材mediaid(个人号必填)
- * @param license 组织机构代码证或营业执照–临时素材mediaid(组织号必填)
- * @param namingOtherStuff1 其他证明材料---临时素材 mediaid
- * @param namingOtherStuff2 其他证明材料---临时素材 mediaid
- * @throws WxErrorException
- */
@Override
- public WxFastMaSetNickameResult setNickname (String nickname, String idCard, String license, String namingOtherStuff1, String namingOtherStuff2) throws WxErrorException {
- JsonObject params = new JsonObject ();
- params.addProperty ("nick_name", nickname);
- params.addProperty ("id_card", idCard);
- params.addProperty ("license", license);
- params.addProperty ("naming_other_stuff_1", namingOtherStuff1);
- params.addProperty ("naming_other_stuff_2", namingOtherStuff2);
- String response = post (OPEN_SET_NICKNAME, GSON.toJson (params));
- return WxOpenGsonBuilder.create ().fromJson (response, WxFastMaSetNickameResult.class);
+ public WxFastMaSetNickameResult setNickname(String nickname, String idCard, String license, String namingOtherStuff1, String namingOtherStuff2) throws WxErrorException {
+ JsonObject params = new JsonObject();
+ params.addProperty("nick_name", nickname);
+ params.addProperty("id_card", idCard);
+ params.addProperty("license", license);
+ params.addProperty("naming_other_stuff_1", namingOtherStuff1);
+ params.addProperty("naming_other_stuff_2", namingOtherStuff2);
+ String response = post(OPEN_SET_NICKNAME, GSON.toJson(params));
+ return WxOpenGsonBuilder.create().fromJson(response, WxFastMaSetNickameResult.class);
}
- /**
- * 3 小程序改名审核状态查询
- *
- * @param auditId 审核单id
- * @return
- * @throws WxErrorException
- */
@Override
- public WxFastMaQueryNicknameStatusResult querySetNicknameStatus (String auditId) throws WxErrorException {
- JsonObject params = new JsonObject ();
- params.addProperty ("audit_id", auditId);
- String response = post (OPEN_API_WXA_QUERYNICKNAME, GSON.toJson (params));
- return WxOpenGsonBuilder.create ().fromJson (response, WxFastMaQueryNicknameStatusResult.class);
+ public WxFastMaQueryNicknameStatusResult querySetNicknameStatus(String auditId) throws WxErrorException {
+ JsonObject params = new JsonObject();
+ params.addProperty("audit_id", auditId);
+ String response = post(OPEN_API_WXA_QUERYNICKNAME, GSON.toJson(params));
+ return WxOpenGsonBuilder.create().fromJson(response, WxFastMaQueryNicknameStatusResult.class);
}
- /**
- * 4. 微信认证名称检测
- *
- * 命中关键字策略时返回命中关键字的说明描述
- *
- *
- * @param nickname 名称
- * @throws WxErrorException
- */
@Override
- public WxFastMaCheckNickameResult checkWxVerifyNickname (String nickname) throws WxErrorException {
- JsonObject params = new JsonObject ();
- params.addProperty ("nick_name", nickname);
- String response = post (OPEN_CHECK_WX_VERIFY_NICKNAME, GSON.toJson (params));
- return WxOpenGsonBuilder.create ().fromJson (response, WxFastMaCheckNickameResult.class);
+ public WxFastMaCheckNickameResult checkWxVerifyNickname(String nickname) throws WxErrorException {
+ JsonObject params = new JsonObject();
+ params.addProperty("nick_name", nickname);
+ String response = post(OPEN_CHECK_WX_VERIFY_NICKNAME, GSON.toJson(params));
+ return WxOpenGsonBuilder.create().fromJson(response, WxFastMaCheckNickameResult.class);
}
- /**
- * 5.修改头像
- *
- * 图片格式只支持:BMP、JPEG、JPG、GIF、PNG,大小不超过2M
- * 注:实际头像始终为正方形
- *
- *
- * @param headImgMediaId 头像素材media_id
- * @param x1 裁剪框左上角x坐标(取值范围:[0, 1])
- * @param y1 裁剪框左上角y坐标(取值范围:[0, 1])
- * @param x2 裁剪框右下角x坐标(取值范围:[0, 1])
- * @param y2 裁剪框右下角y坐标(取值范围:[0, 1])
- * @throws WxErrorException
- */
@Override
- public WxOpenResult modifyHeadImage (String headImgMediaId, float x1, float y1, float x2, float y2) throws WxErrorException {
- JsonObject params = new JsonObject ();
- params.addProperty ("head_img_media_id", headImgMediaId);
- params.addProperty ("x1", x1);
- params.addProperty ("y1", y1);
- params.addProperty ("x2", x2);
- params.addProperty ("y2", y2);
- String response = post (OPEN_MODIFY_HEADIMAGE, GSON.toJson (params));
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ public WxOpenResult modifyHeadImage(String headImgMediaId, float x1, float y1, float x2, float y2) throws WxErrorException {
+ JsonObject params = new JsonObject();
+ params.addProperty("head_img_media_id", headImgMediaId);
+ params.addProperty("x1", x1);
+ params.addProperty("y1", y1);
+ params.addProperty("x2", x2);
+ params.addProperty("y2", y2);
+ String response = post(OPEN_MODIFY_HEADIMAGE, GSON.toJson(params));
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
- /**
- * 6.修改功能介绍
- *
- * @param signature 简介:4-120字
- * @throws WxErrorException
- */
@Override
- public WxOpenResult modifySignature (String signature) throws WxErrorException {
- JsonObject params = new JsonObject ();
- params.addProperty ("signature", signature);
- String response = post (OPEN_MODIFY_SIGNATURE, GSON.toJson (params));
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ public WxOpenResult modifySignature(String signature) throws WxErrorException {
+ JsonObject params = new JsonObject();
+ params.addProperty("signature", signature);
+ String response = post(OPEN_MODIFY_SIGNATURE, GSON.toJson(params));
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
- /**
- * 7.3 管理员换绑
- *
- * @param taskid 换绑管理员任务序列号(公众平台最终点击提交回跳到第三方平台时携带)
- * @return
- * @throws WxErrorException
- */
@Override
- public WxOpenResult componentRebindAdmin (String taskid) throws WxErrorException {
- JsonObject params = new JsonObject ();
- params.addProperty ("taskid", taskid);
- String response = post (OPEN_COMPONENT_REBIND_ADMIN, GSON.toJson (params));
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ public WxOpenResult componentRebindAdmin(String taskid) throws WxErrorException {
+ JsonObject params = new JsonObject();
+ params.addProperty("taskid", taskid);
+ String response = post(OPEN_COMPONENT_REBIND_ADMIN, GSON.toJson(params));
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
- /**
- * 8.1 获取账号可以设置的所有类目
- *
- * @return
- */
@Override
- public String getAllCategories () throws WxErrorException {
- return get (OPEN_GET_ALL_CATEGORIES, "");
+ public String getAllCategories() throws WxErrorException {
+ return get(OPEN_GET_ALL_CATEGORIES, "");
}
- /**
- * 8.2添加类目
- *
- * @param categoryList
- * @return
- * @throws WxErrorException
- */
@Override
- public WxOpenResult addCategory (List categoryList) throws WxErrorException {
- Map map = new HashMap<> ();
- map.put ("categories", categoryList);
- String response = post (OPEN_ADD_CATEGORY, WxOpenGsonBuilder.create ().toJson (map));
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ public WxOpenResult addCategory(List categoryList) throws WxErrorException {
+ Map map = new HashMap<>();
+ map.put("categories", categoryList);
+ String response = post(OPEN_ADD_CATEGORY, WxOpenGsonBuilder.create().toJson(map));
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
- /**
- * 8.3删除类目
- *
- * @param first 一级类目ID
- * @param second 二级类目ID
- * @return
- * @throws WxErrorException
- */
@Override
- public WxOpenResult deleteCategory (int first, int second) throws WxErrorException {
- JsonObject params = new JsonObject ();
- params.addProperty ("first", first);
- params.addProperty ("second", second);
- String response = post (OPEN_DELETE_CATEGORY, GSON.toJson (params));
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ public WxOpenResult deleteCategory(int first, int second) throws WxErrorException {
+ JsonObject params = new JsonObject();
+ params.addProperty("first", first);
+ params.addProperty("second", second);
+ String response = post(OPEN_DELETE_CATEGORY, GSON.toJson(params));
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
- /**
- * 8.4获取账号已经设置的所有类目
- *
- * @return
- * @throws WxErrorException
- */
@Override
- public WxFastMaBeenSetCategoryResult getCategory () throws WxErrorException {
- String response = get (OPEN_GET_CATEGORY, "");
- return WxOpenGsonBuilder.create ().fromJson (response, WxFastMaBeenSetCategoryResult.class);
+ public WxFastMaBeenSetCategoryResult getCategory() throws WxErrorException {
+ String response = get(OPEN_GET_CATEGORY, "");
+ return WxOpenGsonBuilder.create().fromJson(response, WxFastMaBeenSetCategoryResult.class);
}
- /**
- * 8.5修改类目
- *
- * @param category 实体
- * @return
- * @throws WxErrorException
- */
@Override
- public WxOpenResult modifyCategory (WxFastMaCategory category) throws WxErrorException {
- String response = post (OPEN_MODIFY_CATEGORY, GSON.toJson (category));
- return WxOpenGsonBuilder.create ().fromJson (response, WxOpenResult.class);
+ public WxOpenResult modifyCategory(WxFastMaCategory category) throws WxErrorException {
+ String response = post(OPEN_MODIFY_CATEGORY, GSON.toJson(category));
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
- /**
- * 将字符串对象转化为GsonArray对象
- *
- * @param strList
- * @return
- */
- private JsonArray toJsonArray (List strList) {
- JsonArray jsonArray = new JsonArray ();
- if (strList != null && ! strList.isEmpty ()) {
+ private JsonArray toJsonArray(List strList) {
+ JsonArray jsonArray = new JsonArray();
+ if (strList != null && !strList.isEmpty()) {
for (String str : strList) {
- jsonArray.add (str);
+ jsonArray.add(str);
}
}
return jsonArray;
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
index 80882b0c..c9811470 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
@@ -1,23 +1,23 @@
package me.chanjar.weixin.open.api.impl;
-import java.io.File;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
import cn.binarywang.wx.miniapp.config.WxMaConfig;
import me.chanjar.weixin.common.bean.WxAccessToken;
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
-import me.chanjar.weixin.mp.config.WxMpConfigStorage;
import me.chanjar.weixin.mp.bean.WxMpHostConfig;
+import me.chanjar.weixin.mp.config.WxMpConfigStorage;
import me.chanjar.weixin.mp.enums.TicketType;
import me.chanjar.weixin.open.api.WxOpenConfigStorage;
import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken;
import me.chanjar.weixin.open.bean.WxOpenComponentAccessToken;
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
+import java.io.File;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
/**
* 基于内存的微信配置provider,在实际生产环境中应该将这些配置持久化
*
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
index 1ddfc0ff..8962b38c 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
@@ -84,7 +84,7 @@ public class WxOpenInRedisConfigStorage extends WxOpenInMemoryConfigStorage {
}
@Override
- public void expireComponentAccessToken(){
+ public void expireComponentAccessToken() {
try (Jedis jedis = this.jedisPool.getResource()) {
jedis.expire(this.componentAccessTokenKey, 0);
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxOpenMaCategory.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxOpenMaCategory.java
index 9c5fc4cc..f5f68df1 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxOpenMaCategory.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxOpenMaCategory.java
@@ -1,11 +1,11 @@
package me.chanjar.weixin.open.bean.ma;
-import java.io.Serializable;
-
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
+import java.io.Serializable;
+
/**
* 微信小程序分类目录.
*
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
index 0473cc3c..bef7d16d 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
@@ -58,48 +58,48 @@ public class WxOpenXmlMessage implements Serializable {
// 以下为快速创建小程序接口推送的的信息
- @XStreamAlias ("appid")
+ @XStreamAlias("appid")
private String registAppId;
- @XStreamAlias ("status")
+ @XStreamAlias("status")
private int status;
- @XStreamAlias ("auth_code")
+ @XStreamAlias("auth_code")
private String authCode;
- @XStreamAlias ("msg")
- @XStreamConverter (value = XStreamCDataConverter.class)
+ @XStreamAlias("msg")
+ @XStreamConverter(value = XStreamCDataConverter.class)
private String msg;
- @XStreamAlias ("info")
+ @XStreamAlias("info")
private Info info = new Info();
- @XStreamAlias ("info")
+ @XStreamAlias("info")
@Data
public static class Info implements Serializable {
private static final long serialVersionUID = 7706235740094081194L;
- @XStreamAlias ("name")
- @XStreamConverter (value = XStreamCDataConverter.class)
+ @XStreamAlias("name")
+ @XStreamConverter(value = XStreamCDataConverter.class)
private String name;
- @XStreamAlias ("code")
- @XStreamConverter (value = XStreamCDataConverter.class)
+ @XStreamAlias("code")
+ @XStreamConverter(value = XStreamCDataConverter.class)
private String code;
- @XStreamAlias ("code_type")
+ @XStreamAlias("code_type")
private int codeType;
- @XStreamAlias ("legal_persona_wechat")
- @XStreamConverter (value = XStreamCDataConverter.class)
+ @XStreamAlias("legal_persona_wechat")
+ @XStreamConverter(value = XStreamCDataConverter.class)
private String legalPersonaWechat;
- @XStreamAlias ("legal_persona_name")
- @XStreamConverter (value = XStreamCDataConverter.class)
+ @XStreamAlias("legal_persona_name")
+ @XStreamConverter(value = XStreamCDataConverter.class)
private String legalPersonaName;
- @XStreamAlias ("component_phone")
- @XStreamConverter (value = XStreamCDataConverter.class)
+ @XStreamAlias("component_phone")
+ @XStreamConverter(value = XStreamCDataConverter.class)
private String componentPhone;
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaAccountBasicInfoResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaAccountBasicInfoResult.java
index b8bf8d83..9654559a 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaAccountBasicInfoResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaAccountBasicInfoResult.java
@@ -10,55 +10,55 @@ import lombok.EqualsAndHashCode;
* @since 2019/1/23 14:39
*/
@Data
-@EqualsAndHashCode (callSuper = true)
-public class WxFastMaAccountBasicInfoResult extends WxOpenResult{
- private static final long serialVersionUID = - 8713680081353954208L;
+@EqualsAndHashCode(callSuper = true)
+public class WxFastMaAccountBasicInfoResult extends WxOpenResult {
+ private static final long serialVersionUID = -8713680081353954208L;
/**
* 小程序ID
*/
- @SerializedName ("appid")
+ @SerializedName("appid")
private String appId;
/**
* 帐号类型(1:订阅号,2:服务号,3:小程序)
*/
- @SerializedName ("account_type")
+ @SerializedName("account_type")
private Integer accountType;
/**
* 主体类型(1:企业)
*/
- @SerializedName ("principal_type")
+ @SerializedName("principal_type")
private Integer principalType;
/**
* 主体名称
*/
- @SerializedName ("principal_name")
+ @SerializedName("principal_name")
private String principalName;
/**
* 实名验证状态(1:实名验证成功,2:实名验证中,3:实名验证失败)调用接口1.1创建帐号时,realname_status会初始化为2对于注册方式为微信认证的帐号,资质认证成功时,realname_status会更新为1 注意!!!当realname_status不为1时,帐号只允许调用本文档内的以下API:(即无权限调用其他API) 微信认证相关接口(参考2.x) 帐号设置相关接口(参考3.x)
*/
- @SerializedName ("realname_status")
+ @SerializedName("realname_status")
private Integer realnameStatus;
/**
* 微信认证信息
*/
- @SerializedName ("wx_verify_info")
+ @SerializedName("wx_verify_info")
private WxVerifyInfo wxVerifyInfo;
/**
* 功能介绍信息
*/
- @SerializedName ("signature_info")
+ @SerializedName("signature_info")
private SignatureInfo signatureInfo;
/**
* 头像信息
*/
- @SerializedName ("head_image_info")
+ @SerializedName("head_image_info")
private HeadImageInfo headImageInfo;
@Data
@@ -66,29 +66,29 @@ public class WxFastMaAccountBasicInfoResult extends WxOpenResult{
/**
* 是否资质认证(true:是,false:否)若是,拥有微信认证相关的权限
*/
- @SerializedName ("qualification_verify")
+ @SerializedName("qualification_verify")
private Boolean qualificationVerify;
/**
* 是否名称认证(true:是,false:否)对于公众号(订阅号、服务号),是名称认证,微信客户端才会有微信认证打勾的标识。
*/
- @SerializedName ("naming_verify")
+ @SerializedName("naming_verify")
private Boolean namingVerify;
/**
* 是否需要年审(true:是,false:否)(qualification_verify = true时才有该字段)
*/
- @SerializedName ("annual_review")
+ @SerializedName("annual_review")
private Boolean annualReview;
/**
* 年审开始时间,时间戳(qualification_verify = true时才有该字段)
*/
- @SerializedName ("annual_review_begin_time")
+ @SerializedName("annual_review_begin_time")
private String annualReviewBeginTime;
/**
* 年审截止时间,时间戳(qualification_verify = true时才有该字段)
*/
- @SerializedName ("annual_review_end_time")
+ @SerializedName("annual_review_end_time")
private String annualReviewEndTime;
}
@@ -98,17 +98,17 @@ public class WxFastMaAccountBasicInfoResult extends WxOpenResult{
/**
* 功能介绍
*/
- @SerializedName ("signature")
+ @SerializedName("signature")
private String signature;
/**
* 头像已使用修改次数(本月)
*/
- @SerializedName ("modify_used_count")
+ @SerializedName("modify_used_count")
private Integer modifyUsedCount;
/**
* 头像修改次数总额度(本月)
*/
- @SerializedName ("modify_quota")
+ @SerializedName("modify_quota")
private Integer modifyQuota;
}
@@ -118,18 +118,18 @@ public class WxFastMaAccountBasicInfoResult extends WxOpenResult{
/**
* 头像url
*/
- @SerializedName ("head_image_url")
+ @SerializedName("head_image_url")
private String headImageUrl;
/**
* 头像已使用修改次数(本月)
*/
- @SerializedName ("modify_used_count")
+ @SerializedName("modify_used_count")
private Integer modifyUsedCount;
/**
* 头像修改次数总额度(本月)
*/
- @SerializedName ("modify_quota")
+ @SerializedName("modify_quota")
private Integer modifyQuota;
}
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaBeenSetCategoryResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaBeenSetCategoryResult.java
index 11d6693c..db334eb3 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaBeenSetCategoryResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaBeenSetCategoryResult.java
@@ -12,29 +12,29 @@ import java.util.List;
* @since 2019/1/26 18:27
*/
@Data
-@EqualsAndHashCode (callSuper = true)
+@EqualsAndHashCode(callSuper = true)
public class WxFastMaBeenSetCategoryResult extends WxOpenResult {
- private static final long serialVersionUID = - 7662344448437700644L;
+ private static final long serialVersionUID = -7662344448437700644L;
/**
* 一个更改周期内可以设置类目的次数
*/
- @SerializedName ("limit")
+ @SerializedName("limit")
private int limit;
/**
* 本更改周期内还可以设置类目的次数
*/
- @SerializedName ("quota")
+ @SerializedName("quota")
private int quota;
/**
* 最多可以设置的类目数量
*/
- @SerializedName ("category_limit")
+ @SerializedName("category_limit")
private int categoryLimit;
/**
* 类目
*/
- @SerializedName ("categories")
+ @SerializedName("categories")
private List categories;
@Data
@@ -42,32 +42,32 @@ public class WxFastMaBeenSetCategoryResult extends WxOpenResult {
/**
* 一级类目ID
*/
- @SerializedName ("first")
+ @SerializedName("first")
private int first;
/**
* 一级类目名称
*/
- @SerializedName ("first_name")
+ @SerializedName("first_name")
private String firstName;
/**
* 二级类目ID
*/
- @SerializedName ("second")
+ @SerializedName("second")
private int second;
/**
* 二级类目名称
*/
- @SerializedName ("second_name")
+ @SerializedName("second_name")
private String secondName;
/**
* 审核状态(1审核中 2审核不通过 3审核通过)
*/
- @SerializedName ("audit_status")
+ @SerializedName("audit_status")
private int auditStatus;
/**
* 审核不通过原因
*/
- @SerializedName ("audit_reason")
+ @SerializedName("audit_reason")
private String auditReason;
}
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java
index 59d1f456..b3d0dd9d 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java
@@ -2,25 +2,29 @@ package me.chanjar.weixin.open.bean.result;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
/**
+ * 获取账号所有可以设置的类目.
+ *
* @author Hipple
- * @description 获取账号所有可以设置的类目
* @since 2019/1/26 18:43
*/
@Data
+@EqualsAndHashCode(callSuper = false)
public class WxFastMaCanSetCategoryResult extends WxOpenResult {
- private static final long serialVersionUID = - 2469386233538980102L;
- @SerializedName ("errcode")
- private int errcodeX;
- @SerializedName ("categories_list")
+ private static final long serialVersionUID = -2469386233538980102L;
+ @SerializedName("errcode")
+ private int errCode;
+ @SerializedName("categories_list")
private CategoriesListBean categoriesList;
@Data
public static class CategoriesListBean {
private List categories;
+
@Data
public static class CategoriesBean {
private int id;
@@ -28,29 +32,29 @@ public class WxFastMaCanSetCategoryResult extends WxOpenResult {
private String name;
private int level;
private int father;
- @SerializedName ("sensitive_type")
+ @SerializedName("sensitive_type")
private int sensitiveType;
- @SerializedName ("available_for_plugin")
+ @SerializedName("available_for_plugin")
private boolean availableForPlugin;
- @SerializedName ("is_hidden")
+ @SerializedName("is_hidden")
private boolean isHidden;
private String type;
- @SerializedName ("need_report")
+ @SerializedName("need_report")
private int needReport;
- @SerializedName ("can_use_cityserivce")
- private int canUseCityserivce;
+ @SerializedName("can_use_cityserivce")
+ private int canUseCityService;
private List children;
- @SerializedName ("type_list")
+ @SerializedName("type_list")
private List> typeList;
- @SerializedName ("available_api_list")
+ @SerializedName("available_api_list")
private List> availableApiList;
private List> apis;
@Data
public static class QualifyBean {
private String remark;
- @SerializedName ("exter_list")
- private List> exterList;
+ @SerializedName("exter_list")
+ private List> externalList;
}
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCheckNickameResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCheckNickameResult.java
index 943645e3..650f2b08 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCheckNickameResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCheckNickameResult.java
@@ -10,20 +10,20 @@ import lombok.EqualsAndHashCode;
* @since 2019/1/26 17:39
*/
@Data
-@EqualsAndHashCode (callSuper = true)
+@EqualsAndHashCode(callSuper = true)
public class WxFastMaCheckNickameResult extends WxOpenResult {
private static final long serialVersionUID = 8022192589710319473L;
/**
* 审核编号.
*/
- @SerializedName ("hit_condition")
+ @SerializedName("hit_condition")
boolean hitCondition;
/**
* 材料说明
*/
- @SerializedName ("wording")
+ @SerializedName("wording")
String wording;
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaQueryNicknameStatusResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaQueryNicknameStatusResult.java
index 6594c483..d6e85064 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaQueryNicknameStatusResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaQueryNicknameStatusResult.java
@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
* @description 查询改名状态实体类
* @since 2019/1/26 17:52
*/
-@EqualsAndHashCode (callSuper = true)
+@EqualsAndHashCode(callSuper = true)
@Data
public class WxFastMaQueryNicknameStatusResult extends WxOpenResult {
@@ -18,26 +18,26 @@ public class WxFastMaQueryNicknameStatusResult extends WxOpenResult {
/**
* 审核昵称
*/
- @SerializedName ("nickname")
+ @SerializedName("nickname")
private String nickname;
/**
* 审核状态,1:审核中,2:审核失败,3:审核成功
*/
- @SerializedName ("audit_stat")
+ @SerializedName("audit_stat")
private int auditStat;
/**
* 失败原因
*/
- @SerializedName ("fail_reason")
+ @SerializedName("fail_reason")
private String failReason;
/**
* 审核提交时间
*/
- @SerializedName ("create_time")
+ @SerializedName("create_time")
private String createTime;
/**
* 审核提交时间
*/
- @SerializedName ("audit_time")
+ @SerializedName("audit_time")
private String auditTime;
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaSetNickameResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaSetNickameResult.java
index 7a2cab23..2716dfa5 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaSetNickameResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaSetNickameResult.java
@@ -10,20 +10,20 @@ import lombok.EqualsAndHashCode;
* @since 2019/1/26 17:39
*/
@Data
-@EqualsAndHashCode (callSuper = true)
+@EqualsAndHashCode(callSuper = true)
public class WxFastMaSetNickameResult extends WxOpenResult {
private static final long serialVersionUID = 8022192589710319473L;
/**
* 审核编号.
*/
- @SerializedName ("audit_id")
+ @SerializedName("audit_id")
Long auditId;
/**
* 材料说明
*/
- @SerializedName ("wording")
+ @SerializedName("wording")
String wording;
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenAuthorizerListResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenAuthorizerListResult.java
index afe9ea94..19f3ebde 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenAuthorizerListResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenAuthorizerListResult.java
@@ -11,5 +11,5 @@ import java.util.Map;
@Data
public class WxOpenAuthorizerListResult {
private int totalCount;
- private List