🎨 批量格式化部分代码

This commit is contained in:
Binary Wang 2019-09-05 13:59:03 +08:00
parent 8ab4af031a
commit d638b20bf5
26 changed files with 285 additions and 370 deletions

View File

@ -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,8 +78,8 @@ public interface WxOpenFastMaService extends WxMaService {
/**
* 1.获取小程序的信息
*
* @return
* @throws WxErrorException
* @return .
* @throws WxErrorException .
*/
WxFastMaAccountBasicInfoResult getAccountBasicInfo() throws WxErrorException;
@ -89,27 +88,33 @@ public interface WxOpenFastMaService extends WxMaService {
* <pre>
* 若接口未返回audit_id说明名称已直接设置成功无需审核若返回audit_id则名称正在审核中
* </pre>
*
* @param nickname 昵称
* @param idCard 身份证照片临时素材mediaid(个人号必填)
* @param license 组织机构代码证或营业执照临时素材mediaid(组织号必填)
* @param namingOtherStuff1 其他证明材料---临时素材 mediaid
* @param namingOtherStuff2 其他证明材料---临时素材 mediaid
* @throws WxErrorException
* @return .
* @throws WxErrorException .
*/
WxFastMaSetNickameResult setNickname(String nickname, String idCard, String license, String namingOtherStuff1, String namingOtherStuff2) throws WxErrorException;
WxFastMaSetNickameResult setNickname(String nickname, String idCard, String license, String namingOtherStuff1,
String namingOtherStuff2) throws WxErrorException;
/**
* 3 小程序改名审核状态查询
*
* @param auditId 审核单id
* @return
* @throws WxErrorException
* @return .
* @throws WxErrorException .
*/
WxFastMaQueryNicknameStatusResult querySetNicknameStatus(String auditId) throws WxErrorException;
/**
* 4. 微信认证名称检测
*
* @param nickname 名称
* @throws WxErrorException
* @return .
* @throws WxErrorException .
*/
WxFastMaCheckNickameResult checkWxVerifyNickname(String nickname) throws WxErrorException;
@ -119,29 +124,34 @@ public interface WxOpenFastMaService extends WxMaService {
* 图片格式只支持BMPJPEGJPGGIFPNG大小不超过2M
* 实际头像始终为正方形
* </pre>
*
* @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
* @return .
* @throws WxErrorException .
*/
WxOpenResult modifyHeadImage(String headImgMediaId, float x1, float y1, float x2, float y2) throws WxErrorException;
/**
* 6.修改功能介绍
*
* @param signature 简介4-120字
* @throws WxErrorException
* @return .
* @throws WxErrorException .
*/
WxOpenResult modifySignature(String signature) throws WxErrorException;
/**
* 7.3 管理员换绑
* @param taskid 换绑管理员任务序列号(公众平台最终点击提交回跳到第三方平台时携带)
* @return
* @throws WxErrorException
*
* @param taskId 换绑管理员任务序列号(公众平台最终点击提交回跳到第三方平台时携带)
* @return .
* @throws WxErrorException .
*/
WxOpenResult componentRebindAdmin(String taskid) throws WxErrorException;
WxOpenResult componentRebindAdmin(String taskId) throws WxErrorException;
/**
* 8.1 获取账号可以设置的所有类目
@ -150,38 +160,45 @@ public interface WxOpenFastMaService extends WxMaService {
* 目前没有完整的类目信息数据
* 为保证兼容性放弃将response转换为实体
* </pre>
* @return
*
* @return .
* @throws WxErrorException .
*/
String getAllCategories() throws WxErrorException;
/**
* 8.2添加类目
* @return
* @throws WxErrorException
*
* @param categoryList 类目列表
* @return .
* @throws WxErrorException .
*/
WxOpenResult addCategory(List<WxFastMaCategory> categoryList) throws WxErrorException;
/**
* 8.3删除类目
*
* @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;
}

View File

@ -98,7 +98,6 @@ public interface WxOpenMaService extends WxMaService {
String API_UPDATE_SHOW_WXA_ITEM = "https://api.weixin.qq.com/wxa/updateshowwxaitem";
/**
* 以下接口为三方平台代小程序实现的代码管理功能
* <p>
@ -268,7 +267,6 @@ public interface WxOpenMaService extends WxMaService {
WxOpenMaTesterListResult getTesterList() throws WxErrorException;
/**
* 设置小程序隐私设置是否可被搜索
*

View File

@ -18,14 +18,12 @@ 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;
@ -47,31 +45,12 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
return wxOpenComponentService.getAuthorizerAccessToken(appId, forceRefresh);
}
/**
* 1.获取小程序的信息,GET请求
* <pre>
* 注意这里不能直接用小程序的access_token
* </pre>
*
* @return
* @throws WxErrorException
*/
@Override
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();
@ -84,13 +63,6 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
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();
@ -99,15 +71,6 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
return WxOpenGsonBuilder.create().fromJson(response, WxFastMaQueryNicknameStatusResult.class);
}
/**
* 4. 微信认证名称检测
* <pre>
* 命中关键字策略时返回命中关键字的说明描述
* </pre>
*
* @param nickname 名称
* @throws WxErrorException
*/
@Override
public WxFastMaCheckNickameResult checkWxVerifyNickname(String nickname) throws WxErrorException {
JsonObject params = new JsonObject();
@ -116,20 +79,6 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
return WxOpenGsonBuilder.create().fromJson(response, WxFastMaCheckNickameResult.class);
}
/**
* 5.修改头像
* <pre>
* 图片格式只支持BMPJPEGJPGGIFPNG大小不超过2M
* 实际头像始终为正方形
* </pre>
*
* @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();
@ -142,12 +91,6 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
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();
@ -156,13 +99,6 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
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();
@ -171,23 +107,11 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
/**
* 8.1 获取账号可以设置的所有类目
*
* @return
*/
@Override
public String getAllCategories() throws WxErrorException {
return get(OPEN_GET_ALL_CATEGORIES, "");
}
/**
* 8.2添加类目
*
* @param categoryList
* @return
* @throws WxErrorException
*/
@Override
public WxOpenResult addCategory(List<WxFastMaCategory> categoryList) throws WxErrorException {
Map<String, Object> map = new HashMap<>();
@ -196,14 +120,6 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
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();
@ -213,37 +129,18 @@ public class WxOpenFastMaServiceImpl extends WxMaServiceImpl implements WxOpenFa
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);
}
/**
* 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);
}
/**
* 将字符串对象转化为GsonArray对象
*
* @param strList
* @return
*/
private JsonArray toJsonArray(List<String> strList) {
JsonArray jsonArray = new JsonArray();
if (strList != null && !strList.isEmpty()) {

View File

@ -1,23 +1,23 @@
package me.chanjar.weixin.open.api.impl;
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.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;
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.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;
/**
* 基于内存的微信配置provider在实际生产环境中应该将这些配置持久化
*

View File

@ -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;
/**
* 微信小程序分类目录.
*

View File

@ -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;
private int errCode;
@SerializedName("categories_list")
private CategoriesListBean categoriesList;
@Data
public static class CategoriesListBean {
private List<CategoriesBean> categories;
@Data
public static class CategoriesBean {
private int id;
@ -38,7 +42,7 @@ public class WxFastMaCanSetCategoryResult extends WxOpenResult {
@SerializedName("need_report")
private int needReport;
@SerializedName("can_use_cityserivce")
private int canUseCityserivce;
private int canUseCityService;
private List<Integer> children;
@SerializedName("type_list")
private List<?> typeList;
@ -50,7 +54,7 @@ public class WxFastMaCanSetCategoryResult extends WxOpenResult {
public static class QualifyBean {
private String remark;
@SerializedName("exter_list")
private List<?> exterList;
private List<?> externalList;
}
}

View File

@ -1,13 +1,13 @@
package me.chanjar.weixin.open.bean.result;
import java.util.List;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import me.chanjar.weixin.open.bean.ma.WxOpenMaCategory;
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
import java.util.List;
/**
* 微信开放平台小程序分类目录列表返回
*

View File

@ -1,11 +1,11 @@
package me.chanjar.weixin.open.bean.result;
import java.util.List;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 微信开放平台小程序域名设置返回对象.
*

View File

@ -5,9 +5,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
import java.io.Serializable;
import java.util.List;
/**
* 微信开放平台小程序当前分阶段发布详情
*/

View File

@ -1,12 +1,12 @@
package me.chanjar.weixin.open.bean.result;
import java.util.List;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
import java.util.List;
/**
* 微信开放平台小程序第三方提交代码的页面配置列表.
*

View File

@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
/**
* .
*
* @author yqx
* @date 2018/10/3
*/

View File

@ -16,6 +16,7 @@ public class WxOpenAuthorizerListResultGsonAdapter implements JsonDeserializer<
private static final String AUTHORIZER_APPID = "authorizer_appid";
private static final String REFRESH_TOKEN = "refresh_token";
private static final String AUTH_TIME = "auth_time";
@Override
public WxOpenAuthorizerListResult deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
JsonObject jsonObject = jsonElement.getAsJsonObject();