{if condition="checkRuleButton('admin/Upgrade/check')"}
@@ -122,12 +122,12 @@
}
});
- //检测更新
+ //检测并更新系统
$('#upload-check').on('click',function(){
- var url = $(this).attr('data-url'),
+ var url = $(this).attr('data-url'),
loading = layer.load(2, {
shade: [0.2, '#000'],
- time: 2000,
+ //time: 2000,
});
$.ajax({
type:"post",
@@ -135,17 +135,31 @@
data:{"url":url},
daType:"json",
success:function (data){
- if (data.code == 1) {
- layer.close(loading);
- $('div#ver_nums').after('
发现'+data.upnum+'个新版本：可更新至v'+data.version+'
');
- $('button#upload-check').hide();
+ if (data.code == 0) {
+ //已件最新版本
+ layer.close(loading);
layer.msg(data.msg,{
- icon:6,
- time:2000
+ icon:6,
+ time:2000
+ });
+
+ } else if (data.code == 1) {
+ //可升级
+ layer.close(loading);
+ $('div#ver_nums').after('
发现'+data.upnum+'个新版本：可更新至v'+data.version+'
');
+ //$('div#ver_nums').after('
发现'+data.upnum+'个新版本：可更新至v'+data.version+'
');
+ $('button#upload-check').hide();
+
+ //更新系统
+ layer.confirm('可更新至v'+data.version+' 确定升级？',{icon: 3, title:'升级系统'}, function(index){
+ uploads(); //更新
+ layer.close(index); //关闭load加载层
});
} else {
+ //服务器错误
+ layer.close(loading);
layer.open({
- title:'添加失败',
+ title:'服务错误',
content:data.msg,
icon:5,
anim:6
@@ -156,41 +170,46 @@
return false;
});
+ //更新
+ function uploads(){
+ var url = "{$ver_num.upgrade_url}",
+ key = $('input[name=key]').attr("value"),
+ load = layer.load(); //loading
+ $.ajax({
+ type:"post",
+ url:"{:url('admin/upgrade/upload')}",
+ data:{"url":url,"key":key},
+ daType:"json",
+ success:function (data){
+ if (data.code == 0) {
+ layer.close(load);
+ layer.msg(data.msg,{
+ icon:6,
+ time:2000
+ },function(){
+ location.reload();
+ });
+ } else {
+ layer.close(load);
+ layer.open({
+ title:'升级失败',
+ content:data.msg,
+ icon:5,
+ anim:6
+ });
+ }
+ }
+ });
+ }
//确定升级操作
$(document).on('click','#update_system',function(){
- var url = $(this).attr('data-url'),
- key = $('input[name=key]').attr("value"),
- loading = layer.load(2, {
- shade: [0.2, '#000'],
- });
- $.ajax({
- type:"post",
- url:"{:url('admin/upgrade/upload')}",
- data:{"url":url,"key":key},
- daType:"json",
- success:function (data){
- if (data.code == 1) {
- layer.close(loading);
- layer.msg(data.msg,{
- icon:6,
- time:2000
- },function(){
- location.reload();
- });
- } else {
- layer.close(loading);
- layer.open({
- title:'升级失败',
- content:data.msg,
- icon:5,
- anim:6
- });
- }
- }
- });
+ //var url = $(this).attr('data-url'),
+ // key = $('input[name=key]').attr("value"),
+ uploads();
return false;
- });
+ });
+
//设置key
$('#upgrade-key').on('click',function(){
var key = $('input[name=key]').val();
diff --git a/app/install/controller/Index.php b/app/install/controller/Index.php
index 949b4d7..f2ffe21 100644
--- a/app/install/controller/Index.php
+++ b/app/install/controller/Index.php
@@ -74,7 +74,7 @@ class Index extends BaseController
$pass = md5(substr_replace(md5($data['admin_pass']),$salt,0,6));
$webname = $data['webname'];
$webtitle = $data['webtitle'];
- $web = Request::domain();
+ $web = Request::host();
//数据库配置
$dbhost = $data['DB_HOST'];
$dbuser = $data['DB_USER'];
diff --git a/extend/taoler/com/Api.php b/extend/taoler/com/Api.php
index 32a0d56..06bace5 100644
--- a/extend/taoler/com/Api.php
+++ b/extend/taoler/com/Api.php
@@ -21,7 +21,7 @@ class Api
if($httpCode == '200'){
return json_decode($res);
} else {
- return json(['code'=>-1,'msg'=>'远程服务器失败']);
+ return json_decode('{"code":-1,"msg":"远程服务器失败,稍后重试"}'); //转换为对象
}
}
@@ -29,17 +29,17 @@ class Api
{
$ch =curl_init ();
curl_setopt($ch,CURLOPT_URL, $url);
- curl_setopt($ch,CURLOPT_RETURNTRANSFER, 1);
- //curl_setopt($ch, CURLOPT_HEADER, 0); //启用时会将头文件的信息作为数据流输出。 参数为1表示输出信息头,为0表示不输出
- curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1) ; // 在启用 CURLOPT_RETURNTRANSFER 时候将获取数据返回
+ curl_setopt($ch,CURLOPT_RETURNTRANSFER, true); //将curl_exec()获取的信息以文件流的形式返回，而不是直接输出。 1表示传输数据，为0表示直接输出显示。
+ //curl_setopt($ch,CURLOPT_CONNECTTIMEOUT, 20);
+ curl_setopt($ch, CURLOPT_HEADER, false); //启用时会将头文件的信息作为数据流输出。 参数为1表示输出信息头,为0表示不输出
$data = curl_exec($ch);
$httpCode = curl_getinfo($ch,CURLINFO_HTTP_CODE);
curl_close($ch);
if($httpCode == '200'){
return json_decode($data);
} else {
- //return json(['code'=>-1,'msg'=>'远程服务器失败']);
- return false;
+ //$status ='{"code":-1,"msg":"远程服务器失败"}'; //字符串
+ return json_decode('{"code":-1,"msg":"远程服务器失败,稍后重试"}'); //转换为对象
}
}