Skip to content

C
cloud-platform
Commit 59d88f7e authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'master_activity-hf' into base-modify

parents bff60675 bfab7af8
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 17 deletions
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java
View file @ 59d88f7e
......@@ -25,11 +25,8 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
......@@ -53,6 +50,7 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
//用户报名
public ObjectRestResponse userBmOrQd(ActivityBm activityBm,Integer meepoUserId)throws Exception{
......@@ -245,7 +243,8 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
Example exa = new Example(ActivityBm.class);
Example.Criteria criteria = exa.createCriteria();
if (StringUtils.isNotBlank(query.getInviter())) {
criteria.andEqualTo("inviter",String.format("%%%s%%",query.getInviter().trim()));
String format = String.format("%%%s%%", query.getInviter().trim());
criteria.andLike("inviter", format);
}
if (StringUtils.isNotBlank(query.getName())) {
......@@ -278,4 +277,15 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
return activityBmExcels;
}
public ObjectRestResponse checkSubscribe(HttpServletRequest request){
int subscribe=-1;
User user=userBiz.getSession(request);
if (user!=null&&StringUtils.isNotBlank(user.getOpenId())){
subscribe=userBiz.checkSubscribe(user.getOpenId());
}
return ObjectRestResponse.succ(subscribe);
}
}
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/UserBiz.java
View file @ 59d88f7e
......@@ -97,7 +97,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
log.info("----code为空---");
throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("code为空"));
}
String openid = "ohe-C0vTEyivU7MK4BKEiDq0UdW4";
String openid = "oXDd91N8Rwijd3gscAND9TO77a2I";
/*String access_token = null;
try {
JSONObject jsonData = weixinService.getAccessToken(code);
......@@ -136,9 +136,9 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("redis的报名信息activityId---为空"));
}
User userInfo=new User();
String nickName = "何振";//userinfo_json.getString("nickname");
String headimgurl = "http://thirdwx.qlogo.cn/mmopen/vi_32/X2WxAZeZlhME5RtHKA3iadPA1yGq084s59Sl0Dzana0QInaceROnto82zyNBGdQaiaQZCdBaHsjtdM0Zkob4PXMA/132";//userinfo_json.getString("headimgurl");
String sex =null; //userinfo_json.getString("sex");
String nickName = "小雨";//userinfo_json.getString("nickname");
String headimgurl = "http://thirdwx.qlogo.cn/mmopen/4eFHvhmOX6XuiaG6ib7wxkLa8AwMLFIbW9BSJ7EmwC3kRMUdgCrobdRUbhjMXbkY7aBc2CazjXFJiap5ianMH6yQnH2UQ4TfkXJw/132";//userinfo_json.getString("headimgurl");
String sex ="2"; //userinfo_json.getString("sex");
if (StringUtils.isBlank(sex)){
sex="0";
}
......@@ -191,6 +191,18 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
return null;
}
//判断用户是否关注过
public int checkSubscribe(String openId){
JSONObject userinfo_json=weixinService.getBaseUserInfo(openId);
int subscribe=0;
if (userinfo_json == null || StringUtils.isNotBlank(userinfo_json.getString("errcode"))) {
log.info("调用获取用户基本信息失败");
return subscribe;
}
subscribe=userinfo_json.getInteger("subscribe");
return subscribe;
}
......
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/AuthActivityController.java
View file @ 59d88f7e
......@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.summit.biz.ActivityBiz;
import com.xxfc.platform.summit.biz.ActivityBmBiz;
import com.xxfc.platform.summit.biz.UserBiz;
import com.xxfc.platform.summit.entity.ActivityBm;
......@@ -27,6 +28,9 @@ public class AuthActivityController extends BaseController<ActivityBmBiz,Activit
@Autowired
UserBiz userBiz;
@Autowired
private ActivityBmBiz activityBmBiz;
@PostMapping("app/unauth/bm")
public ObjectRestResponse bm(@RequestBody ActivityBm activityBm, HttpServletRequest request){
......@@ -52,5 +56,10 @@ public class AuthActivityController extends BaseController<ActivityBmBiz,Activit
}
@GetMapping("app/unauth/subscribe")
public ObjectRestResponse subscribe(HttpServletRequest request){
return activityBmBiz.checkSubscribe(request);
}
}
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/FrontActivityController.java
View file @ 59d88f7e
......@@ -7,7 +7,6 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.summit.biz.ActivityBiz;
import com.xxfc.platform.summit.biz.ActivityBmBiz;
import com.xxfc.platform.summit.entity.Activity;
import com.xxfc.platform.summit.pojo.ActivityQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -52,4 +51,8 @@ public class FrontActivityController extends BaseController<ActivityBiz, Activit
}
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/WeixinController.java
View file @ 59d88f7e
package com.xxfc.platform.summit.controller;
import cn.hutool.core.codec.Base64;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.summit.biz.ActivityBmBiz;
import com.xxfc.platform.summit.biz.UserBiz;
import com.xxfc.platform.summit.constant.RedisKey;
import com.xxfc.platform.summit.entity.ActivityBm;
import com.xxfc.platform.summit.entity.User;
import com.xxfc.platform.summit.service.WXjsService;
import com.xxfc.platform.summit.service.WeixinService;
import com.xxfc.platform.summit.vo.UserInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
/**
* @author Administrator
......@@ -83,8 +77,11 @@ public class WeixinController {
log.info("-----微信回调userInfo---code=="+code+"----redirec_url==="+callback);
try {
String [] params=callback.split(",");
String key= RedisKey.CONSTANT_CODE_PREFIX+params[1];
String key=null;
if (params.length>1){
callback=params[0];
key= RedisKey.CONSTANT_CODE_PREFIX+params[1];
}
log.info("-----微信回调userInfo---key=="+key+"----callback==="+callback);
userBiz.authUser(code,key,request);
//callback =new String(Base64.decode(callback), "utf-8");
......@@ -99,6 +96,7 @@ public class WeixinController {
}
/**
* 微信分享
* @param url
......
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/WXjsService.java
View file @ 59d88f7e
......@@ -7,6 +7,7 @@ import java.util.UUID;
import com.xxfc.platform.summit.util.Sha1;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import java.util.Map.Entry;
......@@ -18,6 +19,9 @@ public class WXjsService {
@Autowired
JsTicketService jsTicketService;
@Value("${wx.appid}")
private String wy_appid;
/**
* 生成js 微信调用配置参数
* @param _wxShareUrl:回掉的地址
......@@ -40,6 +44,7 @@ public class WXjsService {
data.put("timestamp", _wxTimestamp );
data.put("jsapi_ticket", _wxJsapiTicket);
data.put("url", _wxShareUrl);
data.put("appId", wy_appid);
// 加密获取signature
StringBuilder _wxBaseString = new StringBuilder();
for (Entry<String, String> param : _wxMap.entrySet()) {
......
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/WeixinService.java
View file @ 59d88f7e
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.xxfc.platform.summit.util.HttpRequestUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -20,6 +21,9 @@ public class WeixinService {
@Value("${wx.appSercet}")
private String wy_secret;
@Autowired
AccessTokenService tokenService;
public JSONObject getAccessToken(String code){
String url = "https://api.weixin.qq.com/sns/oauth2/access_token?";
......@@ -63,6 +67,12 @@ public class WeixinService {
return oauth_api;
}
public JSONObject getBaseUserInfo(String openid){
String url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + tokenService.getAccessTokenStr() + "&openid=" + openid + "&lang=zh_CN";
String result = HttpRequestUtil.httpGet(url);
JSONObject data = JSON.parseObject(result);
return data;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment