Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/utilsSve/utilsAuthSve.js

@@ -172,20 +172,22 @@ class UtilsAuthService extends AppServiceBase {
     let result = await this.get360Token();
     let token = result.access_token;
     //360验证接口
-    let subData = "pin=" + pin + "&token=" + token
-    let rtn = await this.restClient.execGet(subData,settings.requestUrl360());
-    if (!rtn || !rtn.stdout) {
-      return system.getResult(null, "restPost data is empty");
-    }
-    let checkRet = JSON.parse(rtn.stdout);
-    console.log(checkRet,'checkRet--------------')
+    // let subData = "pin=" + pin + "&token=" + token;
+    // let url = settings.requestUrl360() + 'api/v1/VerifyPin';
+    // let rtn = await this.restClient.execGet(subData,url);
+    // if (!rtn || !rtn.stdout) {
+    //   return system.getResult(null, "restGet data is empty");
+    // }
+    // let checkRet = JSON.parse(rtn.stdout);
+    // console.log(checkRet,'checkRet--------------');
+
     //---渠道用户登录，有则返回userpin ，没有则注册用户并返回userpin
     actionBody.channelUserId = pin;
     let loginRt = await this.getLoginByUserName(pobj,actionBody);
     if (loginRt.status != 0 && loginRt.status != 2060) {
       return loginRt;
     }
-    opResult.data={ userpin: pobj.actionBody.userpin }
+    opResult.data={ userpin : pobj.actionBody.userpin }
     if (loginRt.status == 2060) {
       opResult.msg = loginRt.msg;
       opResult.data.userpin = loginRt.data.userpin;