第三方会议平台默认用管理员账号登录

webmain/flow/input/mode_meet_sysAction.php

@@ -28,9 +28,9 @@ class mode_meet_sysClassAction extends inputAction{
 	}
 
     public function testAjax() {
+        return $roomInfo = m("meeting_room")->getone("id=2", 'room_id, room_name, capacity');
+        return m('meet_sys')->createMeetingRoom(15);
         return substr(md5("Zhks2023_jw"), 0, 16);
-        $con = m('meet_sys_login')->dropUser("testttt");
-        return json_encode($con);
     }
     /*
      * 第三方会议->用户信息同步接口

webmain/model/flow/meeting_roomModel.php

@@ -12,10 +12,9 @@ class flow_meeting_roomClassModel extends flowModel
         return null;
     }
 
-
     //删除单据时调用
     public function flowdeletebill($sm) {
-        $res = m('meet_sys')->deleteMeetingRoom($this->id);
+        m('meet_sys')->deleteMeetingRoom($this->rs);
     }
 
     //流程全部完成后调用

webmain/model/meet_sysModel.php

@@ -81,6 +81,7 @@ class meet_sysClassModel extends Model
             $type = '3-会议id不存在';
             $remark = json_encode($flowModelRs);
             m('log')->addlog($type, $remark);
+            return;
         }
 
         // 设置 body 参数的值
@@ -127,11 +128,13 @@ class meet_sysClassModel extends Model
         $response = $this->sendPostRequest($url, $body, $token);
         $code = $response['code'];
 
-        if ($code == 400) {
+        if ($code != 0) {
             $type = '3-创建会议-失败';
             $remark = $response['msg'];
             m('log')->addlog($type, $remark);
         } else {
+//            $type = '3-创建会议-code非400';
+//            m('log')->addlog($type, $response);
             $data = $response['data'];
             // 请求到的会议室id更新到表里
             $valArr = [
@@ -140,35 +143,33 @@ class meet_sysClassModel extends Model
             m('meeting_room')->update($valArr, "id=$meetingRoomId");
         }
 
-        return $response;
+//        return $response;
     }
 
     /*
      * 第三方会议-删除会议室
      * */
-    public function deleteMeetingRoom($meetingRoomId) {
+    public function deleteMeetingRoom($rs) {
 
         $baseUrl = getconfig('meetsys_basurl');
         $url = $baseUrl.'room/del';
 
-        $roomInfo = m("meeting_room")->getone("id=$meetingRoomId", 'room_id, room_name, desc, capacity');
-
-        if (isset($roomInfo['room_id'])) {
-            $body = ["id"=>$roomInfo['room_id']];
+        if (isset($rs['room_id'])) {
+            $body = ["id"=>intval($rs['room_id'])];
 
             $token = m('meet_sys_login')->getMeetSysToken($this->adminid);
 
             // 调用封装的发送 POST 请求的方法
             $response = $this->sendPostRequest($url, $body, $token);
 
-            $type = '3-会议室创建成功';
-            $remark = json_encode($roomInfo);
+            $type = '3-会议室删除成功';
+            $remark = json_encode($response);
             m('log')->addlog($type, $remark);
 
             return $response;
         }
 
-        $type = '3-会议室创建失败';
+        $type = '3-会议室删除失败';
         $remark = '未找到会议室id';
         m('log')->addlog($type, $remark);
         return false;

webmain/model/meet_sys_loginModel.php

@@ -13,19 +13,20 @@ class meet_sys_loginClassModel extends Model
 
         $loginUrl = $baseUrl.'login';
 
-        if ($uname == '杰唯智能') {
-            $body = [
-                'username'=>'杰唯智能',
-                'password'=>substr(md5('Zhks2023_jw'), 0, 16),
-                'from'=>'wx'
-            ];
-        } else {
-            $body = [
-                'username'=>$uname,
-                'password'=>substr(md5($pass), 0, 16),
-                'from'=>'wx'
-            ];
-        }
+//        if ($uname == '杰唯智能') {
+        $body = [
+            'username'=>getconfig('meetsys_admin_name'),
+            'password'=>getconfig('meetsys_admin_pass'),
+            'from'=>'wx'
+        ];
+        $adminid = getconfig('meetsys_admin_id');
+//        } else {
+//            $body = [
+//                'username'=>$uname,
+//                'password'=>substr(md5($pass), 0, 16),
+//                'from'=>'wx'
+//            ];
+//        }
 
         // 发送请求
         $resp = $this->sendPostRequest($loginUrl, $body);
@@ -86,20 +87,20 @@ class meet_sys_loginClassModel extends Model
             'door_pass' => $resp['user']['door_pass'],
             'token' => $resp['token'],
             'token_expired' => date('Y-m-d H:i:s', $resp['expired']),
-            'oa_uid' =>  $this->adminid,
+            'oa_uid' =>  $adminid,
             'pass' =>  substr(md5($pass), 0, 16),
             'desc' =>  $pass,
         ];
 
         // 查找是否已有登录信息
-        $conInfo = m('meet_sys_login')->getone("`oa_uid`=$this->adminid", 'count(1) con');
+        $conInfo = m('meet_sys_login')->getone("`oa_uid`=$adminid", 'count(1) con');
         $con = $conInfo['con'];
 
         // 如果存在则更新，不存在则插入
         if ($con > 0) {
             $type = '登录第三方会议-登录2';
             $remark = '更新';
-            m('meet_sys_login')->update($data, "`oa_uid`=".$this->adminid);
+            m('meet_sys_login')->update($data, "`oa_uid`=".$adminid);
         } else {
             $type = '登录第三方会议-登录3';
 //            $remark = $con.json_encode($data);
@@ -132,8 +133,7 @@ class meet_sys_loginClassModel extends Model
 
         // 打log
         $type = '登录第三方会议-创建用户-获取token';
-        $remark = $adminname;
-        m('log')->addlog($type, $remark);
+        m('log')->addlog($type, $adminname);
 
         // 请求创建用户接口
         $resp = $this->sendPostRequest($url, $body, $token);
@@ -300,7 +300,8 @@ class meet_sys_loginClassModel extends Model
      * */
     public function getMeetSysToken($adminid=null) {
         // 没传默认用管理员id
-        $adminid = $adminid ?? getconfig('meetsys_admin_id');
+//        $adminid = $adminid ?? getconfig('meetsys_admin_id');
+        $adminid = getconfig('meetsys_admin_id');
         $token = m('meet_sys_login')->getone("oa_uid='{$adminid}'", 'token');
         if ($token == null || $token == '') {
             // 打log