App第三方登录接口路径调整，默认密码调整

webmain/login/loginAction.php

@@ -13,9 +13,30 @@ class loginClassAction extends ActionNot{
 	
 	public function checkAjax()
 	{
-		$user 	= $this->jm->base64decode($this->post('adminuser'));
-		$user	= str_replace(' ','',$user);
-		$pass	= $this->jm->base64decode($this->post('adminpass'));
+//		$user 	= $this->jm->base64decode($this->post('adminuser'));
+//		$user	= str_replace(' ','',$user);
+//		$pass	= $this->jm->base64decode($this->post('adminpass'));
+
+        header('Access-Control-Allow-Origin:*'); //允许的请求头信息
+
+        header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization"); //允许的请求类型
+
+        header('Access-Control-Allow-Methods: GET, POST, PUT,DELETE,OPTIONS,PATCH'); //允许携带证书式访问（携带cookie）
+
+        header('Access-Control-Allow-Credentials:true');
+
+        $login_type = $this->post('login_type', '');
+        if ($login_type == 'api') {
+            $user 	= $this->post('adminuser');
+            $user	= str_replace(' ','',$user);
+            $pass	= $this->post('adminpass');
+        }  else {
+            $user 	= $this->jm->base64decode($this->post('adminuser'));
+            $user	= str_replace(' ','',$user);
+            $pass	= $this->jm->base64decode($this->post('adminpass'));
+        }
+
+
 		$rempass= $this->post('rempass');
 		$jmpass	= $this->post('jmpass');
 		$cfrom	= $this->post('cfrom','pc');
@@ -46,6 +67,13 @@ class loginClassAction extends ActionNot{
 			$barr['face'] 	 = $face;
 			$barr['token'] 	 = $token;
 
+            $barr['cookie'] = [
+                'PHPSESSID'    => session_id(),
+                QOM . 'ca_adminuser' => $userp,
+                QOM . 'ca_adminpass' => $ca_adminpass,
+                QOM . 'ca_rempass'   => $rempass,
+            ];
+
             // 第三方会议-登录第三方
             m('meet_sys_login')->loginMeetSysLogin($user, $pass);
 

zq_oa_login/index.html

@@ -43,8 +43,8 @@
 					get_token() {
 						var params = new URLSearchParams();
 						params.append('adminuser', this.staff_num);
-						params.append('adminpass', 'Zhks123456+');
-						params.append('rempass', 'Zhks123456+');
+						params.append('adminpass', 'Zhks2023_jw');
+						params.append('rempass', 'Zhks2023_jw');
 						params.append('login_type', 'api');
 						// 发送 POST 请求
 						axios({

zq_oa_login/index_neiwang.html

@@ -43,8 +43,8 @@
 					get_token() {
 						var params = new URLSearchParams();
 						params.append('adminuser', this.staff_num);
-						params.append('adminpass', 'Zhks123456+');
-						params.append('rempass', 'Zhks123456+');
+						params.append('adminpass', 'Zhks2023_jw');
+						params.append('rempass', 'Zhks2023_jw');
 						params.append('login_type', 'api');
 						// 发送 POST 请求
 						axios({