|
|
@@ -57,53 +57,53 @@ public class AuthCtrl
|
|
57
|
57
|
}
|
|
58
|
58
|
log.info("wxCode="+wxCode+",openid="+openid);
|
|
59
|
59
|
|
|
60
|
|
- if ("o2P0j59YcTmvpZurZWK2fQHAPXJk".equals(openid)){
|
|
|
60
|
+// if ("o2P0j59YcTmvpZurZWK2fQHAPXJk".equals(openid)||"o2P0j5wNH9HBD5mDHo9of1-Lyuxo".equals(openid)){
|
|
61
|
61
|
String url="http://xcwx.jimi.link/user/indexForOld.do?&openid=" + openid;
|
|
62
|
62
|
url = URLEncoder.encode(url);
|
|
63
|
63
|
log.info("url="+url);
|
|
64
|
64
|
String path = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb06cf14f96dd7149&redirect_uri=" + url + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
|
|
65
|
65
|
return new TextView(path);
|
|
66
|
|
- }
|
|
67
|
|
-
|
|
68
|
|
- para.put("openid", openid);
|
|
69
|
|
- GzhUtil.toM3Sign(para);
|
|
70
|
|
- String u=Constants.m3IntAddr + "/user/wxIndex.do";
|
|
71
|
|
- String result = GzhUtil.sendPost(u, para);
|
|
72
|
|
- log.info("url="+u+",result="+result);
|
|
73
|
|
- JSONObject resJson = JSONObject.parseObject(result);
|
|
74
|
|
- int resCode = resJson.getIntValue("code");
|
|
75
|
|
- if(resCode == 0)
|
|
76
|
|
- {
|
|
77
|
|
- JSONObject dataJson = resJson.getJSONObject("data");
|
|
78
|
|
- String phonenum=dataJson.getString("phonenum");
|
|
79
|
|
- if(Tools.isEmpty(phonenum))
|
|
80
|
|
- {
|
|
81
|
|
- context.getRequest().setAttribute("sn", cursn);
|
|
82
|
|
- return new TextView("/activation.jsp");
|
|
83
|
|
- }
|
|
84
|
|
- else
|
|
85
|
|
- {
|
|
86
|
|
- session.setAttribute("appuid", dataJson.getString("appuid")); // 用户ID
|
|
87
|
|
- session.setAttribute("phonenum", phonenum); // 用户账户
|
|
88
|
|
- String defaultdev =dataJson.getString("defaultdev");
|
|
89
|
|
- if(Tools.isEmpty(defaultdev))
|
|
90
|
|
- defaultdev=cursn;
|
|
91
|
|
- session.setAttribute("defaultdev", defaultdev); // 默认设备
|
|
92
|
|
- if(Tools.isEmpty(defaultdev)) {
|
|
93
|
|
- return new TextView("/device/getDevInfo.do");
|
|
94
|
|
- } else {
|
|
95
|
|
- return new TextView("/consumer/getPkgsByDevId.do");
|
|
96
|
|
- }
|
|
97
|
|
- }
|
|
98
|
|
- }
|
|
99
|
|
- else
|
|
100
|
|
- {
|
|
101
|
|
- context.getRequest().setAttribute("sn", cursn);
|
|
102
|
|
- String lt=DateTimeUtil.longtime();
|
|
103
|
|
- lt=lt.substring(0,lt.length()-2);
|
|
104
|
|
- context.getRequest().setAttribute("sign", CodecUtil.str2md5("znz"+cursn+"125226"+lt));
|
|
105
|
|
- return new TextView("/activation.jsp");
|
|
106
|
|
- }
|
|
|
66
|
+// }
|
|
|
67
|
+//
|
|
|
68
|
+// para.put("openid", openid);
|
|
|
69
|
+// GzhUtil.toM3Sign(para);
|
|
|
70
|
+// String u=Constants.m3IntAddr + "/user/wxIndex.do";
|
|
|
71
|
+// String result = GzhUtil.sendPost(u, para);
|
|
|
72
|
+// log.info("url="+u+",result="+result);
|
|
|
73
|
+// JSONObject resJson = JSONObject.parseObject(result);
|
|
|
74
|
+// int resCode = resJson.getIntValue("code");
|
|
|
75
|
+// if(resCode == 0)
|
|
|
76
|
+// {
|
|
|
77
|
+// JSONObject dataJson = resJson.getJSONObject("data");
|
|
|
78
|
+// String phonenum=dataJson.getString("phonenum");
|
|
|
79
|
+// if(Tools.isEmpty(phonenum))
|
|
|
80
|
+// {
|
|
|
81
|
+// context.getRequest().setAttribute("sn", cursn);
|
|
|
82
|
+// return new TextView("/activation.jsp");
|
|
|
83
|
+// }
|
|
|
84
|
+// else
|
|
|
85
|
+// {
|
|
|
86
|
+// session.setAttribute("appuid", dataJson.getString("appuid")); // 用户ID
|
|
|
87
|
+// session.setAttribute("phonenum", phonenum); // 用户账户
|
|
|
88
|
+// String defaultdev =dataJson.getString("defaultdev");
|
|
|
89
|
+// if(Tools.isEmpty(defaultdev))
|
|
|
90
|
+// defaultdev=cursn;
|
|
|
91
|
+// session.setAttribute("defaultdev", defaultdev); // 默认设备
|
|
|
92
|
+// if(Tools.isEmpty(defaultdev)) {
|
|
|
93
|
+// return new TextView("/device/getDevInfo.do");
|
|
|
94
|
+// } else {
|
|
|
95
|
+// return new TextView("/consumer/getPkgsByDevId.do");
|
|
|
96
|
+// }
|
|
|
97
|
+// }
|
|
|
98
|
+// }
|
|
|
99
|
+// else
|
|
|
100
|
+// {
|
|
|
101
|
+// context.getRequest().setAttribute("sn", cursn);
|
|
|
102
|
+// String lt=DateTimeUtil.longtime();
|
|
|
103
|
+// lt=lt.substring(0,lt.length()-2);
|
|
|
104
|
+// context.getRequest().setAttribute("sign", CodecUtil.str2md5("znz"+cursn+"125226"+lt));
|
|
|
105
|
+// return new TextView("/activation.jsp");
|
|
|
106
|
+// }
|
|
107
|
107
|
}
|
|
108
|
108
|
|
|
109
|
109
|
/**
|