更新tzs

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -32,6 +32,8 @@ public class RedisKey {
     public static final String CTI_TOKEN = "cti_token";
     /**微信公众平台 token */
     public static final String WECHAT_TOKEN = "wechat_token";
+    /**微信公众平台 token */
+    public static final String WECHAT_JS_TOKEN = "wechat_js_token";
     
     /** 驼峰转下划线(简单写法，效率低于 ) */
 	public static String humpToLine(String str) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatController.java

@@ -37,6 +37,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -77,6 +79,8 @@ import java.util.Map;
 @RequestMapping(value = "/wechatBack")
 public class WechatController extends BaseController {
 
+	private final Logger logger = LoggerFactory.getLogger(WechatController.class);
+
 	private long time = 600l;
 
 	@Value("${tzs.wechat.token}")
@@ -150,19 +154,30 @@ public class WechatController extends BaseController {
 		List<String> params = new ArrayList<String>();
 
 		try {
-			if(!redisUtils.hasKey(RedisKey.WECHAT_TOKEN)){
-				throw new BadRequest("token不存在或已失效");
-			}
-			String token =  redisUtils.get(RedisKey.WECHAT_TOKEN).toString();
-			String result = HttpUtils.doGet(WECHAT_TICKETURL+token+"&type=jsapi");
-			JSONObject jsonObject = JSONObject.parseObject(result);
-			String ticket =	jsonObject.get("ticket").toString();
+            String ticket = null;
+		    if(redisUtils.hasKey(RedisKey.WECHAT_JS_TOKEN)) {
+                ticket = redisUtils.get(RedisKey.WECHAT_JS_TOKEN).toString();
+            } else  {
+                if(!redisUtils.hasKey(RedisKey.WECHAT_TOKEN)){
+                    this.getAccessToken();
+                }
+                String token =  redisUtils.get(RedisKey.WECHAT_TOKEN).toString();
+                String result = HttpUtils.doGet(WECHAT_TICKETURL+token+"&type=jsapi");
+                JSONObject jsonObject = JSONObject.parseObject(result);
+                ticket =	jsonObject.get("ticket").toString();
+                redisUtils.set(RedisKey.WECHAT_JS_TOKEN,ticket, 6000l);
+            }
 			params.add("jsapi_ticket="+ticket);
 			params.add(noncestr);
 			params.add(timestamp);
 			params.add(url);
 			Collections.sort(params);
+			logger.error("jsapi_ticket="+ticket);
+			logger.error(noncestr);
+			logger.error(timestamp);
+			logger.error(url);
 			String tokenStr = StringUtils.join(params,"&");
+			logger.error(tokenStr);
 			tokenStr = DigestUtils.sha1Hex(tokenStr);
 			return ResponseHelper.buildResponse(tokenStr);
 		} catch (Exception e) {