微信接口修改

src/main/java/com/yingying/tourist/exception/ErrorCode.java

@@ -1,58 +1,61 @@
-package com.yingying.tourist.exception;
-
-/**
- * @Author: XPF
- * @Description:
- * @Date: Created in 12:02 2018/6/30
- * @Modified by:
- */
-public enum ErrorCode {
-
-    SERVER_OK(200, "请求成功"),
-    /**
-     * 服务端异常
-     */
-    SERVER_SYSERR(1001, "系统错误"),
-    SERVER_BIZERR(1002, "业务逻辑异常"),
-    PARAMETERS_ERROR(1003, "参数异常"),
-    SESSION_TIMEOUT(1004, "登录超时"),
-    PARAM_BINDINGERR(1005, "拦截绑定参数异常"),
-    DATA_ERROR(1006, "数据异常"),
-    DATA_CURDERR(1007, "数据CURD操作失败"),
-    CONNECTION_COINERR(1008,"访问coin服务器失败"),
-    
-    // 2000以上 错误是业务操作问题
-    NOT_LOGIN(2000,"请先登录"),
-    FAILURE_LOGIN(2000,"登录失效"),
-    HAVE_HAPPENED(2001,"已经发生请勿重复操作，如若没有收到验证码，请在五分钟以后再次操作"),
-	CHOICE_VALID_COIN(2002,"请输入正确的币种id"),
-	REPEAT_ADD_COIN(2003,"请勿重复添加自选"),
-	REPEAT_DEL_COIN(2004,"请勿重复删除自选"),
-	CHOICE_VALID_COIN_PAIR(2005,"请输入正确的币对id"),
-    ;
-
-    private int code;
-    private String msg;
-
-    ErrorCode(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuffer sb = new StringBuffer("ErrorCode{");
-        sb.append("code=").append(code);
-        sb.append(", msg='").append(msg).append('\'');
-        sb.append('}');
-        return sb.toString();
-    }
-}
+package com.yingying.tourist.exception;
+
+/**
+ * @Author: XPF
+ * @Description:
+ * @Date: Created in 12:02 2018/6/30
+ * @Modified by:
+ */
+public enum ErrorCode {
+
+    SERVER_OK(200, "请求成功"),
+    /**
+     * 服务端异常
+     */
+    SERVER_SYSERR(1001, "系统错误"),
+    SERVER_BIZERR(1002, "业务逻辑异常"),
+    PARAMETERS_ERROR(1003, "参数异常"),
+    SESSION_TIMEOUT(1004, "登录超时"),
+    PARAM_BINDINGERR(1005, "拦截绑定参数异常"),
+    DATA_ERROR(1006, "数据异常"),
+    DATA_CURDERR(1007, "数据CURD操作失败"),
+    CONNECTION_COINERR(1008,"访问coin服务器失败"),
+    
+    // 2000以上 错误是业务操作问题
+    NOT_LOGIN(2000,"请先登录"),
+    FAILURE_LOGIN(2000,"登录失效"),
+    HAVE_HAPPENED(2001,"已经发生请勿重复操作，如若没有收到验证码，请在五分钟以后再次操作"),
+	CHOICE_VALID_COIN(2002,"请输入正确的币种id"),
+	REPEAT_ADD_COIN(2003,"请勿重复添加自选"),
+	REPEAT_DEL_COIN(2004,"请勿重复删除自选"),
+	CHOICE_VALID_COIN_PAIR(2005,"请输入正确的币对id"),
+	
+	// 3000-3100微信端错误
+	JS_SIGN_NULL(3000, "未获取到JS授权验证"),
+	OPENID_NULL(3001,"未获取到OPENID");
+
+    private int code;
+    private String msg;
+
+    ErrorCode(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("ErrorCode{");
+        sb.append("code=").append(code);
+        sb.append(", msg='").append(msg).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}

src/main/java/com/yingying/tourist/service/WechatService.java

@@ -1,5 +1,7 @@
 package com.yingying.tourist.service;
 
+import java.io.UnsupportedEncodingException;
+
 import com.yingying.tourist.domain.User;
 
 public interface WechatService {
@@ -34,6 +36,6 @@ public interface WechatService {
 	 * @param openId
 	 * @return
 	 */
-	User getWechatUser(String token, String openId);
+	User getWechatUser(String token, String openId) throws UnsupportedEncodingException;
 
 }

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

@@ -1,5 +1,7 @@
 package com.yingying.tourist.service.impl;
 
+import java.io.UnsupportedEncodingException;
+
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
@@ -74,11 +76,13 @@ public class WechatServiceImpl implements WechatService {
 	
 	
 	@Override
-	public User getWechatUser(String token, String openId) {
+	public User getWechatUser(String token, String openId) throws UnsupportedEncodingException {
 		String url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + token + "&openid=" + openId + "&lang=zh_CN";
 		String result = HttpRequestSimple.doGet(url);
 		
-		User user = JSON.parseObject(result, User.class);
+		String decodeResult = new String(result.getBytes("ISO-8859-1"), "UTF-8");
+		
+		User user = JSON.parseObject(decodeResult, User.class);
 		
 		return user;
 	  

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

@@ -1,7 +1,9 @@
 package com.yingying.tourist.web;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,13 +11,18 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yingying.tourist.common.WechatUtil;
 import com.yingying.tourist.domain.User;
+import com.yingying.tourist.exception.ErrorCode;
 import com.yingying.tourist.result.MessageResult;
 import com.yingying.tourist.service.UserService;
 import com.yingying.tourist.service.WechatService;
 
+import lombok.extern.slf4j.Slf4j;
+
 @Controller
+@Slf4j
 public class WechatController {
 	
 	@Autowired
@@ -42,19 +49,42 @@ public class WechatController {
 		
 		String sign = JSON.toJSONString(map);
 		
+		if(StringUtils.isBlank(sign)) {
+			return new MessageResult<String>().failure(ErrorCode.JS_SIGN_NULL);
+		}
+		
 		 return new MessageResult<String>().ok(sign);
 		
 	}
-	@RequestMapping(value="code")
+	@RequestMapping(value="code",produces="application/json;charset=utf-8")
 	@ResponseBody
-	public MessageResult<String>  code(String code) {
+	public MessageResult<String> code(String code) {
 		String result = wechatService.getAuthToken(code);
 		JSONObject jsonObject = JSONObject.parseObject(result);	
 		String openId = jsonObject.getString("openid");
 		String token = jsonObject.getString("access_token");
 		
-		User wechatUser = wechatService.getWechatUser(token, openId);
-		userService.insert(wechatUser);
+		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) {
+			return new MessageResult<String>().ok(openId);
+		}
+			
+		try {
+			// 如果不存在，通过token和openid去获取用户信息，并插入到数据库中
+			User wechatUser = wechatService.getWechatUser(token, openId);
+			if(wechatUser != null) {
+				userService.insert(wechatUser);
+			}	
+		} catch (UnsupportedEncodingException e) {
+			log.info("编码集转换失败");
+		}
 		
 		return new MessageResult<String>().ok(openId);
 	}