From f1be21583453ca3bcc39387bba29e7c281ff7490 Mon Sep 17 00:00:00 2001 From: wlx Date: Tue, 4 Nov 2014 02:32:01 +0000 Subject: [PATCH] merge heihedata branch r5009 - r5033 into trunk --- .../admin/controllers/DataController.php | 37 ++- .../views/scripts/data/attachments.phtml | 2 +- .../views/scripts/data/attachmentsadd.phtml | 40 ++- .../views/scripts/data/author-datas.phtml | 2 +- .../views/scripts/data/author-list.phtml | 2 +- .../admin/views/scripts/data/author.phtml | 2 +- .../admin/views/scripts/data/doi-add.phtml | 43 ++- .../admin/views/scripts/data/doi.phtml | 2 +- .../views/scripts/data/fund-data-list.phtml | 2 +- .../admin/views/scripts/data/fund.phtml | 4 +- application/admin/views/scripts/data/md.phtml | 7 +- .../scripts/data/newdata-add-bydata.phtml | 4 +- .../views/scripts/data/newdata-add.phtml | 4 +- .../admin/views/scripts/data/project.phtml | 2 +- .../admin/views/scripts/data/ref-files.phtml | 4 +- .../admin/views/scripts/data/ref.phtml | 4 +- .../admin/views/scripts/data/source.phtml | 10 +- .../admin/views/scripts/data/sourceadd.phtml | 263 ++++++++++++------ .../views/scripts/data/sourcefetchone.phtml | 2 +- .../views/scripts/data/sourceselect.phtml | 2 +- .../views/scripts/data/version-bydata.phtml | 6 +- .../admin/views/scripts/down/data.phtml | 2 +- .../admin/views/scripts/down/offline.phtml | 2 +- .../admin/views/scripts/down/offlineapp.phtml | 4 +- .../admin/views/scripts/down/online.phtml | 2 +- .../admin/views/scripts/down/user.phtml | 2 +- .../admin/views/scripts/heihe/project.phtml | 4 +- .../admin/views/scripts/review/accept.phtml | 2 +- .../admin/views/scripts/review/canceled.phtml | 2 +- .../admin/views/scripts/review/comments.phtml | 2 +- .../views/scripts/review/commentslist.phtml | 4 +- .../scripts/review/commentslistbyuser.phtml | 2 +- .../admin/views/scripts/review/draft.phtml | 2 +- .../admin/views/scripts/review/editor.phtml | 2 +- .../admin/views/scripts/review/experts.phtml | 2 +- .../admin/views/scripts/review/inreview.phtml | 4 +- .../admin/views/scripts/review/invite.phtml | 4 +- .../admin/views/scripts/review/myreview.phtml | 2 +- .../admin/views/scripts/review/reviewed.phtml | 2 +- .../admin/views/scripts/sys/message.phtml | 2 +- .../admin/views/scripts/sys/regions.phtml | 2 +- .../default/controllers/AccountController.php | 12 +- .../default/controllers/AuthorController.php | 40 ++- .../default/views/scripts/author/accept.phtml | 5 +- .../default/views/scripts/footer.phtml | 8 +- .../default/views/scripts/hiwater/view.phtml | 3 - application/layouts/glacier.phtml | 10 + application/layouts/heihe.phtml | 10 + application/layouts/hiwater.phtml | 10 + application/layouts/layout.phtml | 9 + application/models/Dataorder.php | 2 +- application/models/ISO19115.php | 2 +- application/module/Open/OAuth2.php | 35 ++- application/module/Open/Source.php | 2 +- 54 files changed, 450 insertions(+), 192 deletions(-) diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 492bad81..ffea291e 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -1615,12 +1615,15 @@ class Admin_DataController extends Zend_Controller_Action $redirect = "/admin/data/source/"; - if(!empty($_POST['submit'])) + if(!empty($_POST['submit']) and $_POST['submit']==1) { try{ $title = $this->_request->getParam('title'); $uuid = $this->_request->getParam('uuid'); $code = $this->_request->getParam('code'); + $admin_status = $this->_request->getparam('admin_status'); + $admin_email = '{'.implode(",",$this->_request->getparam('admin_email')).'}'; + $exclude_data = '{'.implode(",",$this->_request->getparam('exclude_data')).'}'; $description = $this->_request->getParam('description'); $has_pages = $this->_request->getParam('has_pages'); $has_agreement = $this->_request->getParam('has_agreement'); @@ -1629,11 +1632,15 @@ class Admin_DataController extends Zend_Controller_Action 'title' => $title, 'uuid' => $uuid, 'code' => $code, + 'admin_status' => $admin_status, + 'admin_email' => $admin_email, + 'exclude_data' => $exclude_data, 'description' => $description, 'has_pages' => $has_pages, 'has_agreement' => $has_agreement ); - +# print_r($data); +# exit(); if($this->db->insert('source',$data)) { $this->messenger->addMessage('添加来源信息成功'); @@ -1652,19 +1659,36 @@ class Admin_DataController extends Zend_Controller_Action else if($do == 'edit' && !empty($id)) { - if(!empty($_POST['submit'])) + if(!empty($_POST['submit']) and $_POST['submit']==1) { try{ $title = $this->_request->getParam('title'); $uuid = $this->_request->getParam('uuid'); $code = $this->_request->getParam('code'); + $admin_status = $this->_request->getparam('admin_status'); + $admin_email = '{'.implode(",",$this->_request->getparam('admin_email')).'}'; + $exclude_data = '{'.implode(",",$this->_request->getparam('exclude_data')).'}'; $description = $this->_request->getParam('description'); $has_pages = $this->_request->getParam('has_pages'); $has_agreement = $this->_request->getParam('has_agreement'); - $sql = "update source set title='$title',uuid='$uuid',code='$code',description='$description',has_pages='$has_pages',has_agreement='$has_agreement' where id='$id'"; + $data = array( + 'title' => $title, + 'uuid' => $uuid, + 'code' => $code, + 'admin_status' => $admin_status, + 'admin_email' => $admin_email, + 'exclude_data' => $exclude_data, + 'description' => $description, + 'has_pages' => $has_pages, + 'has_agreement' => $has_agreement + ); + $sql = "update source set title='$title',uuid='$uuid',code='$code',admin_status='$admin_status',admin_email='$admin_email',exclude_data='$exclude_data',description='$description',has_pages='$has_pages',has_agreement='$has_agreement' where id='$id'"; +# print_r($sql); +# exit(); if($this->db->exec($sql)) + { $this->messenger->addMessage('修改来源信息成功'); $this->_redirect("/admin/data/source/do/edit/id/$id"); @@ -2262,7 +2286,6 @@ class Admin_DataController extends Zend_Controller_Action $files=new Files(); $msg = $files -> upload($_FILES['Filedata'],empty($uuid)?'file/':'md/',true); - if(empty($msg['error'])) { $msg['error']=""; @@ -2271,9 +2294,9 @@ class Admin_DataController extends Zend_Controller_Action $filedesc = $this->_request->getParam('filedesc'); $filetype = 'md'; $realname = $msg['realname']; + $language = $this->_getParam('language'); - - $sql = "insert into attachments (filename,filetype,filedesc,userid,filesize,realname) values ('$filename','$filetype','$filedesc','$userid','$filesize','$realname') RETURNING id"; + $sql = "insert into attachments (filename,filetype,filedesc,userid,filesize,realname,language) values ('$filename','$filetype','$filedesc','$userid','$filesize','$realname','$language') RETURNING id"; $sth = $this->db->prepare($sql); $sth->execute(); $att = $sth->fetch(PDO::FETCH_ASSOC); diff --git a/application/admin/views/scripts/data/attachments.phtml b/application/admin/views/scripts/data/attachments.phtml index 8f1de758..dd7eab55 100644 --- a/application/admin/views/scripts/data/attachments.phtml +++ b/application/admin/views/scripts/data/attachments.phtml @@ -32,7 +32,7 @@ 查看我的附件
-
+ diff --git a/application/admin/views/scripts/data/attachmentsadd.phtml b/application/admin/views/scripts/data/attachmentsadd.phtml index bc744788..0c5bb8b2 100644 --- a/application/admin/views/scripts/data/attachmentsadd.phtml +++ b/application/admin/views/scripts/data/attachmentsadd.phtml @@ -19,32 +19,53 @@ 查看元数据 返回附件管理
- + -

- 注:可选择多个文件
-

+
+ +
+
- -

+
+
+ +
+ +
+
+
+ + \ No newline at end of file diff --git a/application/admin/views/scripts/data/sourcefetchone.phtml b/application/admin/views/scripts/data/sourcefetchone.phtml index 06e3b65c..75e5febe 100644 --- a/application/admin/views/scripts/data/sourcefetchone.phtml +++ b/application/admin/views/scripts/data/sourcefetchone.phtml @@ -31,7 +31,7 @@
- +
diff --git a/application/admin/views/scripts/data/sourceselect.phtml b/application/admin/views/scripts/data/sourceselect.phtml index 0fd4ffd3..85362ac1 100644 --- a/application/admin/views/scripts/data/sourceselect.phtml +++ b/application/admin/views/scripts/data/sourceselect.phtml @@ -26,7 +26,7 @@

为元数据《info['title'];?>》选择项目来源

-
+
diff --git a/application/admin/views/scripts/data/version-bydata.phtml b/application/admin/views/scripts/data/version-bydata.phtml index 84d3ce3e..79923b6f 100644 --- a/application/admin/views/scripts/data/version-bydata.phtml +++ b/application/admin/views/scripts/data/version-bydata.phtml @@ -20,11 +20,11 @@
所有版本概况 - 逐数据浏览 + 逐数据浏览
-
- + +
diff --git a/application/admin/views/scripts/down/data.phtml b/application/admin/views/scripts/down/data.phtml index 3c5f0659..906f3316 100755 --- a/application/admin/views/scripts/down/data.phtml +++ b/application/admin/views/scripts/down/data.phtml @@ -26,7 +26,7 @@

title)) echo $this->title;?>共 count;?> 数据下载记录

-
+ diff --git a/application/admin/views/scripts/down/offline.phtml b/application/admin/views/scripts/down/offline.phtml index 9f718b22..c28697d2 100644 --- a/application/admin/views/scripts/down/offline.phtml +++ b/application/admin/views/scripts/down/offline.phtml @@ -35,7 +35,7 @@ 下载上月服务记录(科技部上报)
- + diff --git a/application/admin/views/scripts/down/offlineapp.phtml b/application/admin/views/scripts/down/offlineapp.phtml index c53e7143..e7b792cf 100644 --- a/application/admin/views/scripts/down/offlineapp.phtml +++ b/application/admin/views/scripts/down/offlineapp.phtml @@ -26,7 +26,7 @@
-
+
重置1年前的所有未收到申请表的记录 已收到的申请 已拒绝的申请 @@ -35,7 +35,7 @@
- + diff --git a/application/admin/views/scripts/down/online.phtml b/application/admin/views/scripts/down/online.phtml index cd9071a4..753e24e7 100644 --- a/application/admin/views/scripts/down/online.phtml +++ b/application/admin/views/scripts/down/online.phtml @@ -25,7 +25,7 @@

title)) echo $this->title;?>共有 count;?> 条在线下载记录

- + diff --git a/application/admin/views/scripts/down/user.phtml b/application/admin/views/scripts/down/user.phtml index af85cde2..68d09ad6 100755 --- a/application/admin/views/scripts/down/user.phtml +++ b/application/admin/views/scripts/down/user.phtml @@ -26,7 +26,7 @@

title)) echo $this->title;?>共 count;?> 数据下载记录

- + diff --git a/application/admin/views/scripts/heihe/project.phtml b/application/admin/views/scripts/heihe/project.phtml index 3f195840..018bba06 100644 --- a/application/admin/views/scripts/heihe/project.phtml +++ b/application/admin/views/scripts/heihe/project.phtml @@ -21,8 +21,8 @@
searchLink)){ ?>
- - + +
diff --git a/application/admin/views/scripts/review/accept.phtml b/application/admin/views/scripts/review/accept.phtml index be4f7649..60d910b3 100644 --- a/application/admin/views/scripts/review/accept.phtml +++ b/application/admin/views/scripts/review/accept.phtml @@ -23,7 +23,7 @@
-
+ diff --git a/application/admin/views/scripts/review/canceled.phtml b/application/admin/views/scripts/review/canceled.phtml index bb9c3357..696fcec6 100644 --- a/application/admin/views/scripts/review/canceled.phtml +++ b/application/admin/views/scripts/review/canceled.phtml @@ -24,7 +24,7 @@
- + diff --git a/application/admin/views/scripts/review/comments.phtml b/application/admin/views/scripts/review/comments.phtml index 57828620..482b424c 100644 --- a/application/admin/views/scripts/review/comments.phtml +++ b/application/admin/views/scripts/review/comments.phtml @@ -31,7 +31,7 @@
- + diff --git a/application/admin/views/scripts/review/commentslist.phtml b/application/admin/views/scripts/review/commentslist.phtml index ac4bc876..301e7a74 100644 --- a/application/admin/views/scripts/review/commentslist.phtml +++ b/application/admin/views/scripts/review/commentslist.phtml @@ -31,8 +31,8 @@
- - + + diff --git a/application/admin/views/scripts/review/commentslistbyuser.phtml b/application/admin/views/scripts/review/commentslistbyuser.phtml index d80c7799..9f642003 100644 --- a/application/admin/views/scripts/review/commentslistbyuser.phtml +++ b/application/admin/views/scripts/review/commentslistbyuser.phtml @@ -31,7 +31,7 @@
- + diff --git a/application/admin/views/scripts/review/draft.phtml b/application/admin/views/scripts/review/draft.phtml index e2f23b2b..99c15490 100644 --- a/application/admin/views/scripts/review/draft.phtml +++ b/application/admin/views/scripts/review/draft.phtml @@ -23,7 +23,7 @@
- + diff --git a/application/admin/views/scripts/review/editor.phtml b/application/admin/views/scripts/review/editor.phtml index 390c9da5..4e649123 100644 --- a/application/admin/views/scripts/review/editor.phtml +++ b/application/admin/views/scripts/review/editor.phtml @@ -26,7 +26,7 @@
- + diff --git a/application/admin/views/scripts/review/experts.phtml b/application/admin/views/scripts/review/experts.phtml index 76b13a5a..2b1a3b10 100644 --- a/application/admin/views/scripts/review/experts.phtml +++ b/application/admin/views/scripts/review/experts.phtml @@ -30,7 +30,7 @@
- + diff --git a/application/admin/views/scripts/review/inreview.phtml b/application/admin/views/scripts/review/inreview.phtml index 275eca84..cd971959 100644 --- a/application/admin/views/scripts/review/inreview.phtml +++ b/application/admin/views/scripts/review/inreview.phtml @@ -23,8 +23,8 @@
- - + + diff --git a/application/admin/views/scripts/review/invite.phtml b/application/admin/views/scripts/review/invite.phtml index 85fb9395..777caa27 100644 --- a/application/admin/views/scripts/review/invite.phtml +++ b/application/admin/views/scripts/review/invite.phtml @@ -23,8 +23,8 @@
-
- + +
diff --git a/application/admin/views/scripts/review/myreview.phtml b/application/admin/views/scripts/review/myreview.phtml index 12a0b69f..8845d8bc 100644 --- a/application/admin/views/scripts/review/myreview.phtml +++ b/application/admin/views/scripts/review/myreview.phtml @@ -25,7 +25,7 @@
-
- + diff --git a/application/admin/views/scripts/sys/message.phtml b/application/admin/views/scripts/sys/message.phtml index 8a30aaa2..7287f5a3 100644 --- a/application/admin/views/scripts/sys/message.phtml +++ b/application/admin/views/scripts/sys/message.phtml @@ -22,7 +22,7 @@ 查看新消息
- + diff --git a/application/admin/views/scripts/sys/regions.phtml b/application/admin/views/scripts/sys/regions.phtml index 8298ecdc..9fccca5e 100644 --- a/application/admin/views/scripts/sys/regions.phtml +++ b/application/admin/views/scripts/sys/regions.phtml @@ -20,7 +20,7 @@
- + diff --git a/application/default/controllers/AccountController.php b/application/default/controllers/AccountController.php index 10864530..45040eed 100755 --- a/application/default/controllers/AccountController.php +++ b/application/default/controllers/AccountController.php @@ -1,6 +1,7 @@ $this->_request->getModuleName(), 'controller' => $this->_request->getControllerName(), @@ -305,6 +306,15 @@ class AccountController extends Zend_Controller_Action { $this->view->href = $tohref; } + + $oauth2 = new OAuth2(); + if($oauth2->loginTest()) + { + $client = new Client(); + $url = $client->makeRequestCodeUrl("escience"); + + view::Post($this,"为您转入科技网登录入口",$url); + } $captcha = new Captcha(); diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php index c4f9cbda..9a4b1096 100644 --- a/application/default/controllers/AuthorController.php +++ b/application/default/controllers/AuthorController.php @@ -398,9 +398,10 @@ class AuthorController extends Zend_Controller_Action //列表 if(empty($ac) || $ac=='list' || $ac=='search'){ - $sql = "SELECT a.*,m.title,m.description,g.id as gid,mds.status as mdstatus FROM normalmetadata m + $sql = "SELECT a.*,m.title,m.description,g.id as gid,mds.status as mdstatus,gen.id as genid FROM normalmetadata m LEFT JOIN mdauthor a ON m.uuid=a.uuid - LEFT JOIN geonetworkmetadata g on m.uuid=g.uuid + LEFT JOIN geonetworkmetadata g on m.uuid=g.uuid + left join en.geonetworkmetadata gen on m.uuid=gen.uuid LEFT JOIN mdstatus mds ON m.uuid=mds.uuid WHERE a.userid=? AND a.status>=0 "; if ($ac=='search') @@ -4101,5 +4102,40 @@ class AuthorController extends Zend_Controller_Action return $text; } } + + //导出元数据到英文版本 + public function gnenexportAction() + { + $uuid = $this->_getParam('uuid'); + $auth = Zend_Auth::getInstance(); + if($auth->hasIdentity()) + { + $user = $auth->getIdentity(); + $u_id = $user->id; + if (!empty($uuid) && !view::isUuid($uuid)) die(); + $sql="select * from mdauthor where uuid=? and userid=? and status in (0,1)"; + $sth = $this->db->prepare($sql); + $sth->execute(array($uuid,$u_id)); + $row = $sth->fetch(); + if (empty($row)) die(); + $sql="select id,data,owner,source from geonetworkmetadata where uuid='$uuid'"; + $rs=$this->db->fetchRow($sql); + $sql="insert into en.geonetworkmetadata (uuid,source,owner,data) values('".$uuid."','".$rs['source']."',".$rs['owner'].",".$this->db->quote($rs['data']).")"; + $this->db->exec($sql); + $sql="select id from en.geonetworkmetadata where uuid='$uuid'"; + $rs1=$this->db->fetchRow($sql); + $shell="#!/bin/bash\n"; + $shell.='cp -r /var/www/westdc.westgis.ac.cn/geonetwork/data/'; + $shell.=sprintf('%05d',floor(($rs['id']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($rs['id']+0.1)/100)*100-1)."/".$rs['id']; + $shell.=' /var/www/card.westgis.ac.cn/geonetwork/data/'.sprintf('%05d',floor(($rs1['id']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($rs1['id']+0.1)/100)*100-1)."/".$rs1['id']; + $shell.="\nchown -R tomcat7:www-data /var/www/card.westgis.ac.cn/geonetwork/data/".sprintf('%05d',floor(($rs1['id']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($rs1['id']+0.1)/100)*100-1)."/".$rs1['id']; + $shell.="\n"; + $filename='/var/www/westdc.westgis.ac.cn/tools/sync-gn-thumbnail.sh'; + file_put_contents($filename, $shell); + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + echo '

成功导入英文版！

'; + } + } } diff --git a/application/default/views/scripts/author/accept.phtml b/application/default/views/scripts/author/accept.phtml index 5b4caed3..4217cbe1 100644 --- a/application/default/views/scripts/author/accept.phtml +++ b/application/default/views/scripts/author/accept.phtml @@ -51,10 +51,13 @@ $this->breadcrumb()->setSeparator(' > '); 邮件通知 | 支持项目 | DOI + 0) : ?> + | 导入英文版 + 】 - +

400?$this->escape(mb_substr($item['description'],0,400,'UTF-8').'...'):$this->escape($item['description']); ?>

pageIn?>').show(); $('#pageIn?>').prev('.accordion-heading').addClass('active'); $('#pageIn?>').prev('.accordion-heading').children('a.detail-link').children('i').addClass('icon-minus'); - - - \ No newline at end of file + \ No newline at end of file diff --git a/application/default/views/scripts/hiwater/view.phtml b/application/default/views/scripts/hiwater/view.phtml index ac27245b..cf29834d 100644 --- a/application/default/views/scripts/hiwater/view.phtml +++ b/application/default/views/scripts/hiwater/view.phtml @@ -581,9 +581,6 @@ function ajaxpage(page){ control=new TNavigationControl(config); //添加缩放平移控件 map.addControl(control); - downhistory) : ?> - $('#recommend').addClass('active'); -

Cannot find the metadata.

diff --git a/application/layouts/glacier.phtml b/application/layouts/glacier.phtml index e343cfae..64f078d8 100644 --- a/application/layouts/glacier.phtml +++ b/application/layouts/glacier.phtml @@ -35,5 +35,15 @@ piwikTracker.enableLinkTracking(); } catch( err ) {} + diff --git a/application/layouts/heihe.phtml b/application/layouts/heihe.phtml index 570acfe7..932bf058 100644 --- a/application/layouts/heihe.phtml +++ b/application/layouts/heihe.phtml @@ -40,4 +40,14 @@ } catch( err ) {} + \ No newline at end of file diff --git a/application/layouts/hiwater.phtml b/application/layouts/hiwater.phtml index dbc6d117..48d2fc21 100644 --- a/application/layouts/hiwater.phtml +++ b/application/layouts/hiwater.phtml @@ -37,5 +37,15 @@ + diff --git a/application/layouts/layout.phtml b/application/layouts/layout.phtml index 16d30ef2..9ce75c08 100755 --- a/application/layouts/layout.phtml +++ b/application/layouts/layout.phtml @@ -40,4 +40,13 @@ } catch( err ) {} + \ No newline at end of file diff --git a/application/models/Dataorder.php b/application/models/Dataorder.php index 0a96dd04..41e43713 100644 --- a/application/models/Dataorder.php +++ b/application/models/Dataorder.php @@ -24,7 +24,7 @@ class Dataorder if ($statu==4) $wheresql[] = " (o.ts_approved is null and o.pdflink is not null and d.status=4) "; elseif ($statu==-1) - $wheresql[] = " (o.pdflink is not null and d.status=-1)"; + $wheresql[] = " (o.pdflink is not null and o.status=-1)"; elseif ($statu == 3) $wheresql[] = " (o.applicationform is not null and d.status=3 ) "; elseif ($statu == 5) diff --git a/application/models/ISO19115.php b/application/models/ISO19115.php index 83e8b1e8..7f97f1dc 100755 --- a/application/models/ISO19115.php +++ b/application/models/ISO19115.php @@ -448,7 +448,7 @@ class ISO19115 { $this->author[$cnt+$m]['individual']=$author->getElementsByTagName('rpIndName')->item(0)->nodeValue; $this->author[$cnt+$m]['organisation']=$author->getElementsByTagName('rpOrgName')->item(0)->nodeValue; - $this->author[$cnt+$m]['position']=$author->getElementsByTagName('rpPosName')->item(0)->nodeValue; + @$this->author[$cnt+$m]['position']=$author->getElementsByTagName('rpPosName')->item(0)->nodeValue; $this->author[$cnt+$m]['delivery']=$author->getElementsByTagName('delPoint')->item(0)->nodeValue; $this->author[$cnt+$m]['phone']=$author->getElementsByTagName('voiceNum')->item(0)->nodeValue; $this->author[$cnt+$m]['email']=$author->getElementsByTagName('eMailAdd')->item(0)->nodeValue; diff --git a/application/module/Open/OAuth2.php b/application/module/Open/OAuth2.php index f31d6f37..2272ab23 100644 --- a/application/module/Open/OAuth2.php +++ b/application/module/Open/OAuth2.php @@ -1,6 +1,10 @@ table = new Table(); } - - //用户使用谷歌账号登陆 - public function googleClient() - { - - } + + //登录测试 + public function loginTest() + { + try { + $client = new Client(); + $url = $client->makeRequestCodeUrl("escience"); + + $curl = new Curl(); + $curl->port = 443; + $curl->initOptions(array('verifyssl' => false)); + $data = $curl->request($url, array(), "POST"); + + $cache_data = $data; + + if (isset($data['headers']['http_code']) && $data['headers']['http_code'] == 302) { + return true; + } else { + return false; + } + }catch (\Exception $e) + { + return false; + } + } } \ No newline at end of file diff --git a/application/module/Open/Source.php b/application/module/Open/Source.php index 49730998..fa044b9c 100644 --- a/application/module/Open/Source.php +++ b/application/module/Open/Source.php @@ -106,7 +106,7 @@ class Source //中国科技网通行证 $this->target->escience = array( 'name' => '中国科技网通行证', - 'code' => 'http://passport.escience.cn/oauth2/authorize', + 'code' => 'https://passport.escience.cn/oauth2/authorize', 'token' => 'https://passport.escience.cn/oauth2/token', 'code_response' => 'code', 'grant_type' => 'authorization_code',