Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/controller/WechatScanLoginController.java

@@ -311,8 +311,8 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 			return CommonResult.fail("请传入code");
 		}
 		String url = "https://api.weixin.qq.com/sns/jscode2session?" +
-				"appid=" + PropertiesUtil.getValue(HttpParame.APPID) +
-				"&secret=" + PropertiesUtil.getValue(HttpParame.SECRET) +
+				"appid=" + PropertiesUtil.getValue(HttpParame.APPIDX) +
+				"&secret=" + PropertiesUtil.getValue(HttpParame.SECRETX) +
 				"&js_code=" + code +
 				"&grant_type=authorization_code";
 
@@ -325,11 +325,15 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 		} catch (Exception e) {
 			return CommonResult.fail("code异常");
 		}
-		SmartUser user = wechatScanLoginService.selectByOpenid(openid);
-		if (user==null){
+		QueryWrapper<SmartUser> queryWrapper1 = new QueryWrapper<>();
+		queryWrapper1.eq("deleted", 0);
+		queryWrapper1.eq("is_cancel",0);
+		queryWrapper1.eq("x_open_id", openid);
+		List<SmartUser> user = smartUserService.list(queryWrapper1);
+		if (user.isEmpty()){
 			return CommonResult.fail("请绑定后再进入");
 		}
-		String token = JWTUtil.getToken(user);
+		String token = JWTUtil.getToken(user.get(0));
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("token", token);
 		jsonObject.put("user", user);
@@ -392,19 +396,20 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 			return CommonResult.fail("请传入wxcode");
 		}
 		String url = "https://api.weixin.qq.com/sns/jscode2session?" +
-				"appid=" + PropertiesUtil.getValue(HttpParame.APPID) +
-				"&secret=" + PropertiesUtil.getValue(HttpParame.SECRET) +
+				"appid=" + PropertiesUtil.getValue(HttpParame.APPIDX) +
+				"&secret=" + PropertiesUtil.getValue(HttpParame.SECRETX) +
 				"&js_code=" + wxcode +
 				"&grant_type=authorization_code";
 
 		String json = HttpClientUtils.getInstance().sendHttpGet(url);
+		System.out.println(json);
 		Gson gson = new Gson();
 		HashMap<String, String> userMap = gson.fromJson(json.toString(), new TypeToken<HashMap<String, String>>() {}.getType());
 		String openid = "";
 		try {
 			openid = userMap.get("openid").toString();
 		} catch (Exception e) {
-			return CommonResult.fail("code异常");
+			return CommonResult.fail("wxcode异常");
 		}
 		QueryWrapper<SmartUser> queryWrapper2 = new QueryWrapper<>();
 		queryWrapper2.eq("deleted", 0);
@@ -413,7 +418,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 		if (user.isEmpty()){
 			return CommonResult.fail("该用户不存在");
 		}
-		user.get(0).setOpenId(openid);
+		user.get(0).setXOpenId(openid);
 		smartUserService.updateSmartUser(user.get(0));
 		String token = JWTUtil.getToken(user.get(0));
 		JSONObject jsonObject = new JSONObject();

src/main/java/com/template/model/pojo/SmartUser.java

@@ -34,9 +34,6 @@ public class SmartUser implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "时间组ID")
-    private Integer timeGroupId;
-
     @ApiModelProperty(value = "编号（学号）")
     private String cardNo;
 
@@ -109,6 +106,9 @@ public class SmartUser implements Serializable {
     @ApiModelProperty(value = "微信openId")
     private String openId;
 
+    @ApiModelProperty(value = "小程序openId")
+    private String xOpenId;
+
     @ApiModelProperty(value = "公众号openId")
     private String gzhOpenId;
 

src/main/java/com/template/model/weixin/HttpParame.java

@@ -13,6 +13,12 @@ public class HttpParame {
 	// 密匙
 	public static final String SECRET = "secret";
 
+	// 应用唯一标识
+	public static final String APPIDX = "appidx";
+
+	// 密匙
+	public static final String SECRETX = "secretx";
+
 	// 微信用户唯一标识
 	public static final String OPENID = "openid";
 

src/main/resources/application.properties

@@ -1,5 +1,7 @@
 appid=wxa94836d74473fe5c
 secret=931fb0a5e82c081366e8c2cfc9c4f6b3
+appidx=wx2fc3f45732fae5d3
+secretx=7eee4a49a4470a77f9222995e8511547
 redirect_uri=https://www.campussmartlife.com/smartApi/wanzai/api/wechat/callback
 bind_uri=https://www.campussmartlife.com/smartApi/wanzai/api/wechat/bindcallback
 openid=null