js授权接口修改

src/main/java/com/yingying/tourist/common/WechatUtil.java

@@ -40,7 +40,6 @@ public class WechatUtil {
 		}
 
 		ret.put("url", url);
-		ret.put("jsapi_ticket", jsapi_ticket);
 		ret.put("nonceStr", nonce_str);
 		ret.put("timestamp", timestamp);
 		ret.put("signature", signature);

src/main/java/com/yingying/tourist/service/impl/WechatServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
@@ -21,8 +22,12 @@ public class WechatServiceImpl implements WechatService {
 	@Autowired
 	private StringRedisTemplate redisTemplate;
 
-	private static String appId = "wx00b0504317473c38";
-	private static String appSecret = "88d1172e0a53444298efe61c763bf894";
+	
+	
+	@Value("${weixin.appid}")
+	private String appId;
+	@Value("${weixin.appSecret}")
+	private String appSecret;
 
 	/**
 	 * 微信测试号

src/main/java/com/yingying/tourist/web/WechatController.java

@@ -27,80 +27,76 @@ import lombok.extern.slf4j.Slf4j;
 @Controller
 @Slf4j
 public class WechatController {
-	
+
 	@Autowired
 	private WechatService wechatService;
-	
+
 	@Autowired
 	private UserService userService;
-	
+
 	@Autowired
 	private StringRedisTemplate redisTemplate;
 
-	@RequestMapping(value="token")
+	@RequestMapping(value = "token")
 	@ResponseBody
 	public String checkToken(String signature, String echostr, String timestamp, String nonce) {
 
 		return echostr;
 	}
-	
-	
-	@RequestMapping(value="checkJsAuth")
+
+	@RequestMapping(value = "checkJsAuth")
 	@ResponseBody
 	public MessageResult<String> checkJsAuth(String url) {
-		
+
+		// 先从redis取jsapi_ticket,如果未取到，调用微信接口获取
 		ValueOperations<String, String> opsForValue = redisTemplate.opsForValue();
-		String value = opsForValue.get("jsapi_ticket");
-		if(StringUtils.isNoneBlank(value)) {
-			return new MessageResult<String>().ok(value);
+		String jsapiTicket = opsForValue.get("jsapi_ticket");
+		if (StringUtils.isBlank(jsapiTicket)) {
+			jsapiTicket = wechatService.getTicket();
+			opsForValue.set("jsapi_ticket", jsapiTicket, 7200, TimeUnit.SECONDS);
 		}
-			
-		String jsapi_ticket = wechatService.getTicket();
-		
-		opsForValue.set("jsapi_ticket", jsapi_ticket, 7200, TimeUnit.SECONDS);
-		
-		
-		Map<String, String> map = WechatUtil.sign(jsapi_ticket, url);
-		
+		Map<String, String> map = WechatUtil.sign(jsapiTicket, url);
+
 		String sign = JSON.toJSONString(map);
-		
-		if(StringUtils.isBlank(sign)) {
+
+		if (StringUtils.isBlank(sign)) {
 			return new MessageResult<String>().failure(ErrorCode.JS_SIGN_NULL);
 		}
-		
-		 return new MessageResult<String>().ok(sign);
-		
+
+		return new MessageResult<String>().ok(sign);
+
 	}
-	@RequestMapping(value="code",produces="application/json;charset=utf-8")
+
+	@RequestMapping(value = "code", produces = "application/json;charset=utf-8")
 	@ResponseBody
 	public MessageResult<String> code(String code) {
 		String result = wechatService.getAuthToken(code);
-		JSONObject jsonObject = JSONObject.parseObject(result);	
+		JSONObject jsonObject = JSONObject.parseObject(result);
 		String openId = jsonObject.getString("openid");
 		String token = jsonObject.getString("access_token");
-		
-		if(StringUtils.isBlank(openId)) {
+
+		if (StringUtils.isBlank(openId)) {
 			return new MessageResult<String>().failure(ErrorCode.OPENID_NULL);
 		}
-		
+
 		// 首先查询openid 是否在数据库中，如果存在直接返回openid
 		EntityWrapper<User> userWrapper = new EntityWrapper<>();
-        userWrapper.eq("openid", openId);
-        User user = userService.selectOne(userWrapper);
-        if (user != null) {
+		userWrapper.eq("openid", openId);
+		User user = userService.selectOne(userWrapper);
+		if (user != null) {
 			return new MessageResult<String>().ok(openId);
 		}
-			
+
 		try {
 			// 如果不存在，通过token和openid去获取用户信息，并插入到数据库中
 			User wechatUser = wechatService.getWechatUser(token, openId);
-			if(wechatUser != null) {
+			if (wechatUser != null) {
 				userService.insert(wechatUser);
-			}	
+			}
 		} catch (UnsupportedEncodingException e) {
 			log.info("编码集转换失败");
 		}
-		
+
 		return new MessageResult<String>().ok(openId);
 	}
 }