🎨 优化部分代码,重构OAuth2网页授权、网页登录等相关接口,方便接入open模块

This commit is contained in:
Binary Wang
2020-10-11 00:10:08 +08:00
parent 6cc5ebdcce
commit c7b1abc796
26 changed files with 352 additions and 367 deletions

View File

@ -65,12 +65,12 @@ public class WxMaSubscribeMessage implements Serializable {
/**
* 跳转小程序类型developer为开发版trial为体验版formal为正式版默认为正式版
*/
private String miniprogramState = WxMaConstants.MiniprogramState.FORMAL;
private String miniprogramState = WxMaConstants.MiniProgramState.FORMAL;
/**
* 进入小程序查看的语言类型支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)默认为zh_CN
*/
private String lang = WxMaConstants.MiniprogramLang.ZH_CN;
private String lang = WxMaConstants.MiniProgramLang.ZH_CN;
public WxMaSubscribeMessage addData(Data datum) {
if (this.data == null) {

View File

@ -7,7 +7,10 @@ package cn.binarywang.wx.miniapp.constant;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
public class WxMaConstants {
public abstract class WxMaConstants {
private WxMaConstants() {
}
/**
* 微信接口返回的参数errcode.
*/
@ -16,7 +19,7 @@ public class WxMaConstants {
/**
* 素材类型.
*/
public static class MediaType {
public abstract static class MediaType {
/**
* 图片.
*/
@ -26,7 +29,7 @@ public class WxMaConstants {
/**
* 消息格式.
*/
public static class MsgDataFormat {
public abstract static class MsgDataFormat {
public static final String XML = "XML";
public static final String JSON = "JSON";
}
@ -72,7 +75,7 @@ public class WxMaConstants {
/**
* 快递账号绑定类型
*/
public static final class BindAccountType{
public static final class BindAccountType {
/**
* 绑定
@ -88,7 +91,7 @@ public class WxMaConstants {
/**
* 快递下单订单来源
*/
public static final class OrderAddSource{
public static final class OrderAddSource {
/**
* 小程序
@ -104,7 +107,11 @@ public class WxMaConstants {
/**
* 快递下单保价
*/
public static final class OrderAddInsured{
public static final class OrderAddInsured {
private OrderAddInsured() {
}
/**
* 不保价
*/
@ -121,13 +128,15 @@ public class WxMaConstants {
public static final int DEFAULT_INSURED_VALUE = 0;
}
/**
* 小程序订阅消息跳转小程序类型
*
* <p>
* developer为开发版trial为体验版formal为正式版默认为正式版
*/
public static final class MiniprogramState{
public static final class MiniProgramState {
private MiniProgramState() {
}
/**
* 开发版
*/
@ -149,7 +158,10 @@ public class WxMaConstants {
* 进入小程序查看的语言类型
* 支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)默认为zh_CN
*/
public static final class MiniprogramLang{
public static final class MiniProgramLang {
private MiniProgramLang() {
}
/**
* 简体中文
*/

View File

@ -12,9 +12,6 @@ import com.google.gson.JsonObject;
import com.google.inject.Inject;
import me.chanjar.weixin.common.error.WxErrorException;
import java.text.SimpleDateFormat;
import java.util.Date;
import static org.assertj.core.api.Assertions.assertThat;
/**
@ -47,8 +44,8 @@ public class WxMaMsgServiceImplTest {
WxMaSubscribeMessage message = new WxMaSubscribeMessage();
message.setTemplateId(config.getTemplateId());
message.setToUser(config.getOpenid());
message.setLang(WxMaConstants.MiniprogramLang.ZH_CN);
message.setMiniprogramState(WxMaConstants.MiniprogramState.FORMAL);
message.setLang(WxMaConstants.MiniProgramLang.ZH_CN);
message.setMiniprogramState(WxMaConstants.MiniProgramState.FORMAL);
message.addData(new WxMaSubscribeMessage.Data("thing1", "苹果到货啦"));
message.addData(new WxMaSubscribeMessage.Data("amount3", "¥5"));
message.addData(new WxMaSubscribeMessage.Data("thing5", "记得领取哦"));