1
0
mirror of synced 2026-02-16 02:00:13 +08:00

🎨 #1659 Json解析统一优化

* 解决动态添加第一个公众号时由于configStorageMap为null报空指针异常

* Json解析统一优化

Co-authored-by: niefy <niefy@qq.com>
This commit is contained in:
niefy
2020-07-06 17:01:37 +08:00
committed by GitHub
parent 8121a521d3
commit 0adca9650d
114 changed files with 229 additions and 337 deletions

View File

@@ -1,6 +1,5 @@
package cn.binarywang.wx.miniapp.api.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.*;
import cn.binarywang.wx.miniapp.constant.WxMaConstants;
import org.testng.annotations.*;
@@ -12,8 +11,6 @@ import com.google.common.collect.Lists;
import com.google.gson.JsonObject;
import com.google.inject.Inject;
import me.chanjar.weixin.common.error.WxErrorException;
import org.testng.annotations.Guice;
import org.testng.annotations.Test;
import java.text.SimpleDateFormat;
import java.util.Date;

View File

@@ -1,19 +1,13 @@
package cn.binarywang.wx.miniapp.api.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.bean.WxMaShareInfo;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import cn.binarywang.wx.miniapp.test.ApiTestModule;
import cn.binarywang.wx.miniapp.test.TestConfig;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import me.chanjar.weixin.common.error.WxErrorException;
import org.testng.annotations.Guice;
import org.testng.annotations.Test;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
/**
* 测试分享相关的接口

View File

@@ -5,7 +5,6 @@ import java.util.List;
import org.testng.annotations.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.*;
/**
* <pre>

View File

@@ -1,13 +1,11 @@
package cn.binarywang.wx.miniapp.config.impl;
import cn.binarywang.wx.miniapp.config.WxMaConfig;
import lombok.SneakyThrows;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
import org.redisson.config.TransportMode;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

View File

@@ -4,7 +4,6 @@ import me.chanjar.weixin.common.api.WxConsts;
import org.testng.annotations.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.*;
public class WxMaXmlOutMessageTest {

View File

@@ -2,7 +2,7 @@ package cn.binarywang.wx.miniapp.util.json;
import cn.binarywang.wx.miniapp.bean.WxMaTemplateData;
import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage;
import com.google.gson.JsonParser;
import me.chanjar.weixin.common.util.json.GsonParser;
import org.testng.annotations.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -33,7 +33,7 @@ public class WxMaUniformMessageGsonAdapterTest {
.addData(new WxMaTemplateData("keyword3", "2014年9月22日", "#173177"))
.addData(new WxMaTemplateData("remark", "欢迎再次购买!", "#173177"));
assertThat(message.toJson()).isEqualTo(new JsonParser().parse("{\n" +
assertThat(message.toJson()).isEqualTo(GsonParser.parse("{\n" +
" \"touser\":\"OPENID\",\n" +
" \"mp_template_msg\":{\n" +
" \"appid\":\"APPID\",\n" +
@@ -66,7 +66,7 @@ public class WxMaUniformMessageGsonAdapterTest {
" }\n" +
" }\n" +
" }\n" +
"}").getAsJsonObject().toString());
"}").toString());
}
@Test
@@ -84,7 +84,7 @@ public class WxMaUniformMessageGsonAdapterTest {
.addData(new WxMaTemplateData("keyword3", "腾讯微信总部"))
.addData(new WxMaTemplateData("keyword4", "广州市海珠区新港中路397号"));
assertThat(message.toJson()).isEqualTo(new JsonParser().parse("{\n" +
assertThat(message.toJson()).isEqualTo(GsonParser.parse("{\n" +
" \"touser\":\"OPENID\",\n" +
" \"weapp_template_msg\":{\n" +
" \"template_id\":\"TEMPLATE_ID\",\n" +
@@ -106,6 +106,6 @@ public class WxMaUniformMessageGsonAdapterTest {
" },\n" +
" \"emphasis_keyword\":\"keyword1.DATA\"\n" +
" }\n" +
"}").getAsJsonObject().toString());
"}").toString());
}
}