|
|
@@ -63,11 +63,11 @@ public class AuthCtrl
|
|
63
|
63
|
String url="http://gzxc.yunjia99.cn/user/indexForOld.do?openid=" + openid+"&sn="+cursn;
|
|
64
|
64
|
if (GzhUtil.isEmpty(cursn)){
|
|
65
|
65
|
url="http://gzxc.yunjia99.cn/user/indexForOld.do?openid=" + openid;
|
|
66
|
|
- } /*else {
|
|
|
66
|
+ } else {
|
|
67
|
67
|
if (getDevtype(cursn)==16){
|
|
68
|
68
|
url="http://dy.yunjia99.cn/user/indexForOld.do?openid=" + openid+"&sn="+cursn;
|
|
69
|
69
|
}
|
|
70
|
|
- }*/
|
|
|
70
|
+ }
|
|
71
|
71
|
url = URLEncoder.encode(url);
|
|
72
|
72
|
log.info("url="+url);
|
|
73
|
73
|
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";
|
|
|
@@ -115,7 +115,7 @@ public class AuthCtrl
|
|
115
|
115
|
// }
|
|
116
|
116
|
}
|
|
117
|
117
|
|
|
118
|
|
- /*private int getDevtype(String cursn){
|
|
|
118
|
+ private int getDevtype(String cursn){
|
|
119
|
119
|
Map<String, String> para = new HashMap<>();
|
|
120
|
120
|
para.put("devid", cursn);
|
|
121
|
121
|
String devTypeResult = GzhUtil.sendPost(Constants.m3IntAddr + "/device/getDevType.do", para);
|
|
|
@@ -134,7 +134,7 @@ public class AuthCtrl
|
|
134
|
134
|
log.info(Tools.getExceptionMessage( e));
|
|
135
|
135
|
}
|
|
136
|
136
|
return 0;
|
|
137
|
|
- }*/
|
|
|
137
|
+ }
|
|
138
|
138
|
|
|
139
|
139
|
/**
|
|
140
|
140
|
* 用户登陆界面,登陆后将微信号自动绑定到用户账号
|