|
@@ -63,8 +63,8 @@ public class WxController {
|
|
return openId;
|
|
return openId;
|
|
}
|
|
}
|
|
|
|
|
|
- @GetMapping("/wxPayParam")
|
|
|
|
- public String wxPayParam(@RequestParam String url){
|
|
|
|
|
|
+ @GetMapping("/wxAccToken")
|
|
|
|
+ public TreeMap<String, String> getAccToken(@RequestParam String url){
|
|
TreeMap<String, String> treeMap = new TreeMap<>();
|
|
TreeMap<String, String> treeMap = new TreeMap<>();
|
|
treeMap.put("appid", topApiConfiger.wxAppId);
|
|
treeMap.put("appid", topApiConfiger.wxAppId);
|
|
String currentTimeMillis = String.valueOf(System.currentTimeMillis());
|
|
String currentTimeMillis = String.valueOf(System.currentTimeMillis());
|
|
@@ -81,7 +81,7 @@ public class WxController {
|
|
signMap.put("url",url);
|
|
signMap.put("url",url);
|
|
String joinParam = topApiConfiger.joinParam(signMap);
|
|
String joinParam = topApiConfiger.joinParam(signMap);
|
|
treeMap.put("signature", Sha1.getSha1(joinParam));
|
|
treeMap.put("signature", Sha1.getSha1(joinParam));
|
|
- return JSONObject.toJSONString(treeMap);
|
|
|
|
|
|
+ return treeMap;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -100,7 +100,9 @@ public class WxController {
|
|
String token = HttpUtils.sendGet(GET_TOKEN_URL, topApiConfiger.joinParam(tokenMap), null);
|
|
String token = HttpUtils.sendGet(GET_TOKEN_URL, topApiConfiger.joinParam(tokenMap), null);
|
|
Assert.check(StringUtils.isNotBlank(token),"获取微信token异常");
|
|
Assert.check(StringUtils.isNotBlank(token),"获取微信token异常");
|
|
JSONObject obj= JSON.parseObject(token);
|
|
JSONObject obj= JSON.parseObject(token);
|
|
- Assert.check(Objects.isNull(obj.get("errcode")),obj.get("errmsg").toString());
|
|
|
|
|
|
+ if (null != obj.get("errcode")){
|
|
|
|
+ throw new CustomException(obj.get("errmsg").toString());
|
|
|
|
+ }
|
|
String s = obj.get("access_token").toString();
|
|
String s = obj.get("access_token").toString();
|
|
redisCache.setCacheObject(WX_TOKEN_KEY, s, 7200, TimeUnit.MINUTES);
|
|
redisCache.setCacheObject(WX_TOKEN_KEY, s, 7200, TimeUnit.MINUTES);
|
|
return s;
|
|
return s;
|
|
@@ -117,7 +119,9 @@ public class WxController {
|
|
String ticket = HttpUtils.sendGet(GET_TICKET_URL, topApiConfiger.joinParam(ticketMap), null);
|
|
String ticket = HttpUtils.sendGet(GET_TICKET_URL, topApiConfiger.joinParam(ticketMap), null);
|
|
Assert.check(StringUtils.isNotBlank(ticket),"获取时间异常");
|
|
Assert.check(StringUtils.isNotBlank(ticket),"获取时间异常");
|
|
JSONObject obj= JSON.parseObject(ticket);
|
|
JSONObject obj= JSON.parseObject(ticket);
|
|
- Assert.check(Objects.isNull(obj.get("errcode")),obj.get("errmsg").toString());
|
|
|
|
|
|
+ if (!"0".equals(obj.get("errcode").toString())){
|
|
|
|
+ throw new CustomException(obj.get("errmsg").toString());
|
|
|
|
+ }
|
|
String s = obj.get("ticket").toString();
|
|
String s = obj.get("ticket").toString();
|
|
redisCache.setCacheObject(WX_TICKET_KEY, s, 7200, TimeUnit.MINUTES);
|
|
redisCache.setCacheObject(WX_TICKET_KEY, s, 7200, TimeUnit.MINUTES);
|
|
return s;
|
|
return s;
|