From 07eea28458a973c967dc7209c5c3654ca0657538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 11 Nov 2019 12:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4qq=E7=99=BB=E5=BD=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/login/LoginDialog.js | 36 +++++------
 .../react/src/modules/login/Otherloginqq.js   | 43 +++++++------
 .../src/modules/login/Otherloginstart.js      |  2 +-
 .../modules/user/LoginRegisterComponent.js    | 64 +++++++++----------
 .../modules/user/account/AccountBinding.js    |  7 +-
 5 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index e580e7cce..9a347a279 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -563,13 +563,13 @@ class LoginDialog extends Component {
 			qqlogin:true
 		})
 		//window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
-		window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginqq&response_type=code`
+		window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
 		// window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
 	}
 
 	openphoneqqlogin=()=>{
 		window.open(
-			`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2ftest-newweb.educoder.net%2fotherloginqq&response_type=code`
+			`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
 		)
 	}
 
@@ -720,24 +720,24 @@ class LoginDialog extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./WeChat.png')}  alt="微信登录"/>
 														</a>
-														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
-														{/*</a>*/}
+														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+															<img src={require('./qq.png')}  alt="qq登录"/>
+														</a>
 													</div>
-												</p>:""}
+												</p>:<p className="clearfix mt20">
+
+														<span className={"startlogin"}>————————  快速登录  ————————</span>
+														<div className={"mt10"}>
+															{/*<a onClick={()=>this.openweixinlogin()}>*/}
+															{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
+															{/*</a>*/}
+															<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>
+																<img src={require('./qq.png')}  alt="qq登录"/>
+															</a>
+														</div>
+													</p>}
+
 
-												{/*<p className="clearfix mt20">*/}
-
-														{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
-														{/*<div className={"mt10"}>*/}
-															{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
-														{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
-														{/*/!*</a>*!/*/}
-														{/*<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>*/}
-															{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
-														{/*</a>*/}
-													{/*</div>*/}
-													{/*</p>*/}
 
                         </form>}
 												{weixinlogin===true?<iframe
diff --git a/public/react/src/modules/login/Otherloginqq.js b/public/react/src/modules/login/Otherloginqq.js
index 30407bf3c..5a03a0fbb 100644
--- a/public/react/src/modules/login/Otherloginqq.js
+++ b/public/react/src/modules/login/Otherloginqq.js
@@ -8,32 +8,33 @@ class Otherloginqq extends Component {
 
 	componentDidMount() {
 		let query=this.props.location.search;
-
-		const type = query.split('?code=');
-		const types = type[1].split('&state=');
-		let codeurl = `/auth/qq/callback`;
-		axios.get(codeurl,{params:{
-				code:type[1],
-				redirect_uri:`https://${window.location.host}/otherloginqq`
-			}}).then((result)=> {
-			if(result){
-				if(result.data.status===0){
-					if(result.data.new_user===true){
-						window.location.href="/otherlogin?type=qq"
-					}else{
-						// this.getinfo()
-						if(types[1]==="account"){
-							window.location.href="/account/binding"
+		if(query!= ""){
+			const type = query.split('?code=');
+			const types = type[1].split('&state=');
+			const typeshref = types[1].split('%2C');
+			let codeurl = `/auth/qq/callback`;
+			axios.get(codeurl,{params:{
+					code:types[0],
+					redirect_uri:`https://www.educoder.net/otherloginqq`
+				}}).then((result)=> {
+				if(result){
+					if(result.data.status===0){
+						if(result.data.new_user===true){
+							window.location.href=`https://${decodeURIComponent(typeshref[1])}/otherlogin?type=qq`;
 						}else{
-							window.location.href="/"
+							// this.getinfo()
+							if(typeshref[0]==="account"){
+								window.location.href=`https://${decodeURIComponent(typeshref[1])}/account/binding`;
+							}else{
+								window.location.href=`https://${decodeURIComponent(typeshref[1])}`;
+							}
 						}
-
 					}
 				}
-			}
-		}).catch((error)=>{
+			}).catch((error)=>{
 
-		})
+			})
+		}
 	}
 
 	render() {
diff --git a/public/react/src/modules/login/Otherloginstart.js b/public/react/src/modules/login/Otherloginstart.js
index b549fdeae..216e3f073 100644
--- a/public/react/src/modules/login/Otherloginstart.js
+++ b/public/react/src/modules/login/Otherloginstart.js
@@ -24,7 +24,7 @@ class Otherloginstart extends Component {
 							window.location.href=`https://${typeshref[1]}/otherlogin?type=wechat`;
 						}else{
 							// this.getinfo()
-							if(typeshref[1]==="account"){
+							if(typeshref[0]==="account"){
 								window.location.href=`https://${typeshref[1]}/account/binding`;
 							}else{
 								window.location.href=`https://${typeshref[1]}`;
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 3090dc0dc..64924cf84 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -928,13 +928,13 @@ class LoginRegisterComponent extends Component {
 			qqlogin:true
 		})
 		//window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
-		window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginqq&response_type=code`
+		window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
 		// window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
 	}
 
 	openphoneqqlogin=()=>{
 		window.open(
-			`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2ftest-newweb.educoder.net%2fotherloginqq&response_type=code`
+			`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
 		)
 	}
     render() {
@@ -1085,29 +1085,24 @@ class LoginRegisterComponent extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
-														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
+														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+															<img src={require('./img/qq.png')}  alt="qq登录"/>
+														</a>
+													</div>
+												</p>:	<p className="clearfix mb10 textcenter">
+													<span className={"startlogin"}>————————  快速登录  ————————</span>
+													<div className={"mt10"}>
+														{/*<a onClick={()=>this.openweixinlogin()}>*/}
+														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
 														{/*</a>*/}
+														<a onClick={()=>this.openphoneqqlogin()}>
+															<img src={require('./img/qq.png')}  alt="qq登录"/>
+														</a>
 													</div>
-												</p>:""}
+												</p>}
                       </div>
                   }
 
-								{/*<p className="clearfix mb10 textcenter">*/}
-
-									{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
-									{/*<div className={"mt10"}>*/}
-										{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
-										{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
-										{/*/!*</a>*!/*/}
-										{/*<a onClick={()=>this.openphoneqqlogin()}>*/}
-											{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
-										{/*</a>*/}
-									{/*</div>*/}
-								{/*</p>*/}
-
-
-
 
 
                   {
@@ -1265,28 +1260,27 @@ class LoginRegisterComponent extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
-														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
+														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+															<img src={require('./img/qq.png')}  alt="qq登录"/>
+														</a>
+													</div>
+												</p>:	<p className="clearfix mb10 textcenter">
+													<span className={"startlogin"}>————————  快速登录  ————————</span>
+													<div className={"mt10"}>
+														{/*<a onClick={()=>this.openweixinlogin()}>*/}
+														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
 														{/*</a>*/}
+														<a onClick={()=>this.openphoneqqlogin()}>
+															<img src={require('./img/qq.png')}  alt="qq登录"/>
+														</a>
 													</div>
-												</p>:""}
+												</p>
+												}
                       </div>
                   }
 
 
-								{/*<p className="clearfix mb10 textcenter">*/}
 
-									{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
-									{/*<div className={"mt10"}>*/}
-										{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
-										{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
-										{/*/!*</a>*!/*/}
-										{/*<a onClick={()=>this.openphoneqqlogin()}>*/}
-											{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
-										{/*</a>*/}
-									{/*</div>*/}
-								{/*</p>*/}
-                  {/**/}
 
 								{weixinlogin===true?<iframe
 									className={"weixinheight390 mt20"}
diff --git a/public/react/src/modules/user/account/AccountBinding.js b/public/react/src/modules/user/account/AccountBinding.js
index 24032e84e..d1e47991c 100644
--- a/public/react/src/modules/user/account/AccountBinding.js
+++ b/public/react/src/modules/user/account/AccountBinding.js
@@ -144,12 +144,12 @@ class AccountSecure extends Component {
 		})
 	}
 	openqqlogin=()=>{
-		window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginqq&response_type=code`
+		window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=account,${window.location.host}&response_type=code`
 	}
 
 	openphoneqqlogin=()=>{
 		window.open(
-			`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2ftest-newweb.educoder.net%2fotherloginqq&response_type=code`
+			`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=account,${window.location.host}&response_type=code`
 		)
 	}
 	render() {
@@ -242,7 +242,6 @@ class AccountSecure extends Component {
 					<Form>
 
 						{list.map((item,key)=>{
-								if(item.en_type!="qq"){
 									return(
 										<div className="flexTable" key={key}>
 											<div className="flexTable">
@@ -271,7 +270,7 @@ class AccountSecure extends Component {
 											</div>
 										</div>
 									)
-								}
+
 							})
 						}