Commit cb8c5b2f91185047969f14ac6359686f5d1f21a3

Authored by 陈杰
1 parent cdc58444
Exists in master

1

src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
@@ -3,7 +3,6 @@ package com.sincere.wechatbusiness.controller; @@ -3,7 +3,6 @@ package com.sincere.wechatbusiness.controller;
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.alibaba.fastjson.TypeReference; 5 import com.alibaba.fastjson.TypeReference;
6 -import com.fasterxml.jackson.databind.ser.Serializers;  
7 import com.sincere.wechatbusiness.dto.BaseDto; 6 import com.sincere.wechatbusiness.dto.BaseDto;
8 import com.sincere.wechatbusiness.dto.ChannelDto; 7 import com.sincere.wechatbusiness.dto.ChannelDto;
9 import com.sincere.wechatbusiness.dto.CopyDto; 8 import com.sincere.wechatbusiness.dto.CopyDto;
@@ -14,7 +13,6 @@ import com.sincere.wechatbusiness.service.*; @@ -14,7 +13,6 @@ import com.sincere.wechatbusiness.service.*;
14 import com.sincere.wechatbusiness.utils.HttpClientUtils; 13 import com.sincere.wechatbusiness.utils.HttpClientUtils;
15 import com.sincere.wechatbusiness.utils.Page; 14 import com.sincere.wechatbusiness.utils.Page;
16 import com.sincere.wechatbusiness.utils.TokenUtils; 15 import com.sincere.wechatbusiness.utils.TokenUtils;
17 -import io.swagger.annotations.Api;  
18 import io.swagger.annotations.ApiOperation; 16 import io.swagger.annotations.ApiOperation;
19 import org.slf4j.Logger; 17 import org.slf4j.Logger;
20 import org.springframework.beans.factory.annotation.Autowired; 18 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +58,7 @@ public class ChannelController { @@ -60,7 +58,7 @@ public class ChannelController {
60 58
61 private static final Logger log_channel = LoggerUtils.Logger(LogName.channel); 59 private static final Logger log_channel = LoggerUtils.Logger(LogName.channel);
62 60
63 -// private String domain="https://mytest.myjxt.com:51314"; 61 + //private String domain="https://mytest.myjxt.com:51314";
64 private String domain="https://proxy.shunzhi.net:51314"; 62 private String domain="https://proxy.shunzhi.net:51314";
65 63
66 @RequestMapping(value = "getByTemplate",method = RequestMethod.GET) 64 @RequestMapping(value = "getByTemplate",method = RequestMethod.GET)
@@ -497,6 +495,7 @@ public class ChannelController { @@ -497,6 +495,7 @@ public class ChannelController {
497 } 495 }
498 String js=Get("https://api.weixin.qq.com/cgi-bin/ticket/getticket","type=jsapi&access_token="+token.getAccess_token()); 496 String js=Get("https://api.weixin.qq.com/cgi-bin/ticket/getticket","type=jsapi&access_token="+token.getAccess_token());
499 JSONObject jsonObject= JSONObject.parseObject(js); 497 JSONObject jsonObject= JSONObject.parseObject(js);
  498 + log_channel.info("获取ticket返回数据----"+jsonObject.toJSONString());
500 wxSign1.setJsapi_ticket(jsonObject.getString("ticket")); 499 wxSign1.setJsapi_ticket(jsonObject.getString("ticket"));
501 String rawstring = "jsapi_ticket=" + wxSign1.getJsapi_ticket() + "&noncestr=" + wxSign1.getNoncestr() + "&timestamp=" + wxSign1.getTimestamp() + "&url=" + url + ""; 500 String rawstring = "jsapi_ticket=" + wxSign1.getJsapi_ticket() + "&noncestr=" + wxSign1.getNoncestr() + "&timestamp=" + wxSign1.getTimestamp() + "&url=" + url + "";
502 wxSign1.setSignature(SHA1(rawstring)); 501 wxSign1.setSignature(SHA1(rawstring));
src/main/java/com/sincere/wechatbusiness/controller/TokenController.java
@@ -24,6 +24,12 @@ public class TokenController { @@ -24,6 +24,12 @@ public class TokenController {
24 @Autowired 24 @Autowired
25 ChannelService channelService ; 25 ChannelService channelService ;
26 26
  27 + @ApiOperation(value = "清空token")
  28 + @RequestMapping(value = "deleteToken",method = RequestMethod.GET)
  29 + public void deleteToken(){
  30 + channelService.deleteToken();
  31 + }
  32 +
27 @ApiOperation(value = "获取分享token") 33 @ApiOperation(value = "获取分享token")
28 @RequestMapping(value = "getToken",method = RequestMethod.GET) 34 @RequestMapping(value = "getToken",method = RequestMethod.GET)
29 public String getToken(){ 35 public String getToken(){
src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java
@@ -63,4 +63,6 @@ public interface ChannelMapper { @@ -63,4 +63,6 @@ public interface ChannelMapper {
63 int insertAccessToken(AccessToken accessToken); 63 int insertAccessToken(AccessToken accessToken);
64 64
65 AccessToken getAccessToken(); 65 AccessToken getAccessToken();
  66 +
  67 + int deleteToken();
66 } 68 }
src/main/java/com/sincere/wechatbusiness/service/ChannelService.java
@@ -56,4 +56,6 @@ public interface ChannelService { @@ -56,4 +56,6 @@ public interface ChannelService {
56 int insertAccessToken(AccessToken accessToken); 56 int insertAccessToken(AccessToken accessToken);
57 57
58 AccessToken getAccessToken(); 58 AccessToken getAccessToken();
  59 +
  60 + int deleteToken();
59 } 61 }
src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java
@@ -116,5 +116,10 @@ public class ChannelServiceImpl implements ChannelService { @@ -116,5 +116,10 @@ public class ChannelServiceImpl implements ChannelService {
116 116
117 @Override 117 @Override
118 public AccessToken getAccessToken(){return channelMapper.getAccessToken();} 118 public AccessToken getAccessToken(){return channelMapper.getAccessToken();}
  119 +
  120 + @Override
  121 + public int deleteToken() {
  122 + return channelMapper.deleteToken();
  123 + }
119 } 124 }
120 125
src/main/resources/mapper/ChannelMapper.xml
@@ -416,4 +416,8 @@ @@ -416,4 +416,8 @@
416 <select id="getAccessToken" resultMap="AccessTokenMap"> 416 <select id="getAccessToken" resultMap="AccessTokenMap">
417 select top 1.* from access_token order by create_time desc 417 select top 1.* from access_token order by create_time desc
418 </select> 418 </select>
  419 +
  420 + <delete id="deleteToken">
  421 + delete access_token
  422 + </delete>
419 </mapper> 423 </mapper>
420 \ No newline at end of file 424 \ No newline at end of file