Merge remote-tracking branch 'origin/master_activity' into master_activity-hf

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/UserBiz.java

@@ -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";
             }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/AuthActivityController.java

@@ -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

@@ -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.*;
 
@@ -48,10 +47,7 @@ public class FrontActivityController extends BaseController<ActivityBiz, Activit
         return activityBiz.checkQdlimits(latitude,longitude,activityId);
     }
 
-    @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/WeixinController.java

 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

@@ -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()) {