修改是否需要密码的字段名称 nopassword改成passwordRequired

李勇
Commit 73087fb17550af986c64a20b63973897832df9ac 73087fb1 1 parent c264e630
dist/main.js
src/EngineEntrance.js
src/GlobalConfig.js
src/Sass.js
--- a/dist/main.js
查看文件 @73087fb
+++ b/dist/main.js
查看文件 @73087fb
--- a/src/EngineEntrance.js
查看文件 @73087fb
+++ b/src/EngineEntrance.js
查看文件 @73087fb
@@ -136,7 +136,7 @@ export default class MessageEntrance extends Emiter {
     if(_data){
       GlobalConfig.md5=_data.md5||"";//这个暂时用假数据，后台接口写完就有数据了
       GlobalConfig.msType=_data.msType||1;
-      GlobalConfig.nopassword=_data.passwordRequired||false;
+      GlobalConfig.passwordRequired=_data.passwordRequired||false;
       GlobalConfig.siteId=_data.siteId;
     }
     loger.log('向SASS平台获取入会验证信息成功.');
--- a/src/GlobalConfig.js
查看文件 @73087fb
+++ b/src/GlobalConfig.js
查看文件 @73087fb
@@ -37,7 +37,7 @@ class GlobalConfig {
                 "userName": this.userName,
                 "password": this.password,
                 "userType": this.userType,
-                "nopassword": this.nopassword,
+                "passwordRequired": this.passwordRequired,
                 "md5": this.md5,
                 "msType": this.msType,
                 "portal": this.portal,
@@ -64,7 +64,7 @@ GlobalConfig.userName="";
 GlobalConfig.password="";
 GlobalConfig.userType=8;
 GlobalConfig.h5Module=0;
-GlobalConfig.nopassword=false;
+GlobalConfig.passwordRequired=false;
 GlobalConfig.md5="";
 GlobalConfig.msType=1;
 GlobalConfig.mcuDelay=3000;
--- a/src/Sass.js
查看文件 @73087fb
+++ b/src/Sass.js
查看文件 @73087fb
@@ -19,7 +19,7 @@ class Sass extends Emiter {
   //-----2.开始校验，如果有密码先校验密码，否则直接开始MD5验证-----
   //sendPWDChecking入会密码校验                let url = `http://${confInfo.portal}/3m/getCheckMeetinig.do?siteId=${confInfo.siteId}&classId=${confInfo.confId}&password=${confInfo.password}`;
-  //sendMD5Checking MD5校验(发起入会)          let url = `http://${confInfo.portal}/3m/meeting/md5CheckMeeting.do?siteId=${confInfo.siteId}&meetingNumber=${confInfo.confId}&userId=${confInfo.userId}&userName=${confInfo.userName}&userType=${confInfo.userType}&nopassword=${confInfo.nopassword}&md5=${confInfo.md5}`;
+  //sendMD5Checking MD5校验(发起入会)          let url = `http://${confInfo.portal}/3m/meeting/md5CheckMeeting.do?siteId=${confInfo.siteId}&meetingNumber=${confInfo.confId}&userId=${confInfo.userId}&userName=${confInfo.userName}&userType=${confInfo.userType}&passwordRequired=${confInfo.passwordRequired}&md5=${confInfo.md5}`;
   //----3.验证完成后获取------
   //getClassDetail 获取会议详情                let url = `http://${confInfo.portal}/3m/meeting/getClassH5.do?classNumber=${confInfo.confId}`;
@@ -82,8 +82,9 @@ class Sass extends Emiter {
     loger.log('发起Sass校验', _param);
     confInfo = _param;
     // 密码校验
-    if (confInfo.nopassword === 'true') {
-      return this.sendPWDChecking();
+    if (confInfo.passwordRequired === 'true'||confInfo.passwordRequired === true) {
+      this.sendPWDChecking();
+      return ;
     }
     // MD5校验
     this.sendMD5Checking();
@@ -127,7 +128,7 @@ class Sass extends Emiter {
   // 发起入会
   sendMD5Checking() {
-    let url = `http://${confInfo.portal}/3m/meeting/md5CheckMeeting.do?siteId=${confInfo.siteId}&meetingNumber=${confInfo.confId}&userId=${confInfo.userId}&userName=${confInfo.userName}&userType=${confInfo.userType}&nopassword=${confInfo.nopassword}&md5=${confInfo.md5}`;
+    let url = `http://${confInfo.portal}/3m/meeting/md5CheckMeeting.do?siteId=${confInfo.siteId}&meetingNumber=${confInfo.confId}&userId=${confInfo.userId}&userName=${confInfo.userName}&userType=${confInfo.userType}&nopassword=${confInfo.passwordRequired}&md5=${confInfo.md5}`;
     loger.log('H5SassMD5校验', url);
     fetch(url, {
         timeout: 5000