5 anni fa
parent
commit
bdfd13c78e

+ 70 - 51
minigame/WebContent/index.html

@@ -2,43 +2,32 @@
 <html>
 <head>
     <meta charset="UTF-8">
+	<meta http-equiv="Access-Control-Allow-Origin" content="*" />
     <title>测试用页面</title>
     <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
     <script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
-    <style>
-        div, a {
-            font-size: 60px;
-        }
-    </style>
-</head>
-<body>
-<div>
-    <a onclick="getMsgByWX()">获取微信数据</a>
-</div>
-<br>
-<div>
-    <a onclick="getMsgByWB()">获取微博数据</a>
-</div>
-<script>
-    function getMsgByWX() {
-    }
-
-    function getMsgByWB() {
-    }
-
+    <script>
     (function() {
+		//初始化用户信息数据
+		window.user_info = {
+			logo:'http://img5q.duitang.com/uploads/item/201502/25/20150225060808_wuANL.jpeg',//用户头像
+			nickname:'不羡鸳鸯',//用户昵称,
+			textmsg:'GOOD GOOD STUDY,DAY DAY UP'//寄语
+		};
+		
+		var ua = navigator.userAgent.toLowerCase() , url = "" , type = 0;
         if (!!navigator.userAgent.match(/AppleWebKit.*Mobile.*/)) {
-            var ua = navigator.userAgent.toLowerCase() , url = "" , type = 0;
             if (ua.match(/MicroMessenger/i) == "micromessenger") {
+				console.log(123)
+				alert('123')
                 alert("微信浏览器中打开");
                 type = 0;
                 url = "https://open.weixin.qq.com/connect/oauth2/authorize?"
                         +"appid=wx749c84daac654e1e&"
                         +"redirect_uri=http://wx.ttkuaiban.com/minigame&"
                         +"response_type=code&"
-                        +"scope=snsapi_base&"
+                        +"scope=snsapi_userinfo&"
                         +"state=STATE#wechat_redirect";
-                //https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx749c84daac654e1e&redirect_uri=wx.ttkuaiban.com&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
             }
 
             if (ua.match(/WeiBo/i) == "weibo") {
@@ -48,35 +37,65 @@
                     +"client_id=2141531565&"
                     +"display=mobile&"
                     +"response_type=code&"
-                    +"redirect_uri=code&"
+                    +"redirect_uri=http://wx.ttkuaiban.com/minigame&"
                     +"scope=snsapi_base";
-            }
-            var URLParams = new Array();  
-        	var params = document.location.search.substr(1).split('&');   
-        	for (i=0; i < params.length ; i++){  
-        		var aParam = params[i].split('=');   
-        		URLParams[aParam[0]] = aParam[1];   
-        	}
-        	if(URLParams['code']){
-        		var code = URLParams['code'];
-        		$.post("https://http://118.190.47.230/minigame/user/weiXinLogin.do",{
-        			code:code,
-        			type:type
-       			},function(result){
-                    console.log(result)
-                });
-        	}else{
-        		window.location.href = url;
-        	}
-            
-            /* $.get(url ,function(data,status){
-                console.log("Data: " + data + "nStatus: " + status);
-                $.post("demo_ajax_gethint.html",{suggest:txt},function(result){
-                    $("span").html(result);
-                });
-            }); */
-        }
+            }            
+        } else {
+			var ua = navigator.userAgent.toLowerCase();
+			if (ua.match(/MicroMessenger/i) == "micromessenger") {
+				console.log(245)
+				alert('234')
+				alert("微信浏览器中打开");
+                type = 0;
+                url = "https://open.weixin.qq.com/connect/oauth2/authorize?"
+                        +"appid=wx749c84daac654e1e&"
+                        +"redirect_uri=http://wx.ttkuaiban.com/minigame&"
+                        +"response_type=code&"
+                        +"scope=snsapi_userinfo&"
+                        +"state=STATE#wechat_redirect";
+			}
+		}
+		var URLParams = new Array();  
+		var params = document.location.search.substr(1).split('&');   
+		for (i=0; i < params.length ; i++){  
+			var aParam = params[i].split('=');   
+			URLParams[aParam[0]] = aParam[1];   
+		}
+		if(URLParams['code']){
+			var code = URLParams['code'];
+			<!-- $.get("http://118.190.47.230/minigame/user/weiXinLogin",{ -->
+				<!-- code:code, -->
+				<!-- type:type -->
+			<!-- },function(result){ -->
+				<!-- console.log(result) -->
+			<!-- }); -->
+			
+			$.ajax({
+			    url:"http://118.190.47.230/minigame/user/weiXinLogin",
+			    type:"POST",//请求方式
+				data:{"code":code,"type":type},
+			    dataType:"json",  //数据格式设置为jsonp
+			    success:function (data) {//请求成功后调用的函数
+				   alert("succ:"+data);
+					if(URLParams['act']=='hbshare'){
+						document.write('<h1>这里是海报页</h1>');
+						document.write('头像<img src="'+window.user_info.logo+'" width=40 height=40 /><br>');
+						document.write('昵称:'+window.user_info.nickname+'<br>');
+						document.write('寄语:'+window.user_info.textmsg);
+					}else{
+						document.write('<h1>这是首页哦</h1>');
+					}
+			    },
+			    error:function (textStatus) {//请求失败后调用的函数
+				   alert("fail");
+			    }
+			 })
+		}else{
+			window.location.href = url;
+		}
     })()
 </script>
+</head>
+<body>
 </body>
 </html>

+ 1 - 1
minigame/src/com/hssx/constant/Constant.java

@@ -10,7 +10,7 @@ public class Constant {
     public static final String MICROBLOG_APPKEY = "2141531565";//微博的appkey
     public static final String MICROBLOG_APPSECRET = "f39462b939a56ce6d846bf83e04c20b5";//微博的accesstoken
     public static final String WECHAT_APPID = "wx749c84daac654e1e";//微信的appid
-    public static final String WECHAT_APPSECRET = "f39462b939a56ce6d846bf83e04c20b5";//微信的appsecret
+    public static final String WECHAT_APPSECRET = "aacbd046ec1c790836f4f684c96fe585";//微信的appsecret
 
 }
 

+ 7 - 6
minigame/src/com/hssx/controller/UserController.java

@@ -38,7 +38,7 @@ public class UserController {
      * @return
      */
     @RequestMapping(value = "weiXinLogin")
-    public Object weiXinLogin(@RequestParam String code, Integer type,
+    public void weiXinLogin(@RequestParam String code, @RequestParam Integer type,
                               HttpServletResponse response) throws Exception, KeyManagementException, NoSuchAlgorithmException, NoSuchProviderException, IOException {
         HttpRespMsg msg = new HttpRespMsg();
         if (type == 0) {
@@ -59,10 +59,11 @@ public class UserController {
                 resp = StringEscapeUtils.unescapeJava(resp);
                 System.out.println(resp);
                  json = (JSONObject) JSON.parse(resp);
-                 if(!json.containsKey("errcode")){
+//                 if(!json.containsKey("errcode")){
                      user.setNickName(json.getString("nickname"));
                      user.setHeaderPic(json.getString("headimgurl"));
-                 }
+//                 }
+                     System.out.println(user+"user");
                  UserExample example = new UserExample();
                  example.createCriteria().andVoucherIdEqualTo(openId).andTypeEqualTo(type);
                 if (usermapper.countByExample(example)==0) {
@@ -70,19 +71,19 @@ public class UserController {
                 } else {
                     //列表中已包含当前用户,
                     user = usermapper.selectByExample(example).get(0);
+                    user.setNickName(json.getString("nickname"));
+                    user.setHeaderPic(json.getString("headimgurl"));
+                    usermapper.updateByPrimaryKeySelective(user);
                 }
                 msg.data = user;
             } else {
                 msg.setError(json.getString("errmsg"));
             }
         }else if(type == 1){
-//            String url = "https://api.weibo.com/oauth2/authorize?client_id="+Constant.MICROBLOG_APPKEY +"&response_type=code&redirect_uri="+callbackURL;
-
         }
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
         response.getWriter().println(msg.toJSONStr());
-        return msg;
     }
 	
 }

+ 7 - 0
minigame/src/com/hssx/entity/User.java

@@ -200,4 +200,11 @@ public class User {
     public void setNickName(String nickName) {
         this.nickName = nickName;
     }
+
+	@Override
+	public String toString() {
+		return "User [id=" + id + ", type=" + type + ", voucherId=" + voucherId + ", indate=" + indate + ", headerPic="
+				+ headerPic + ", nickName=" + nickName + "]";
+	}
+    
 }

+ 1 - 1
minigame/src/log4j.properties

@@ -5,7 +5,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[minigame] %p [%t] %C.%M(%L) | %m%n   
     
 log4j.appender.R=org.apache.log4j.DailyRollingFileAppender   
-log4j.appender.R.File=D://log/qiangkebao.log
+log4j.appender.R.File=E://log/qiangkebao.log
 #log4j.appender.R.File=/log/qiangkebao.log
 log4j.appender.R.layout=org.apache.log4j.PatternLayout   
 log4j.appender.R.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n