diff --git a/application/adminapi/controller/Version.php b/application/adminapi/controller/Version.php index 29dcbdcf..5558b94c 100644 --- a/application/adminapi/controller/Version.php +++ b/application/adminapi/controller/Version.php @@ -98,27 +98,34 @@ class Version extends adminApi * 修改 */ public function version_edit(){ - $version = input('version', ''); - $type = input('type', ''); - $downloadurl = input('downloadurl', ''); - $content = $_POST['content'] ?? ''; - $enforce = input('enforce', ''); - $version_code = input('version_code', ''); - $status = input('status', 1); + $version = input('version', '');//新版本好 + $type = input('type', '');//1-安卓 2-IOS + $downloadurl = input('downloadurl', '');//下载地址 + $content = $_POST['content'] ?? '';//更新内容 + $enforce = input('enforce', '');//强制更新 1-是 0-否 + $version_code = input('version_code', '');//版本号(目前安卓使用,用来判定是否升级) + $status = input('status', 1);//0-待发布,1-已发布,2-禁用 + $id = input('id', ''); - $versions = db::name($this->table)->where(['newversion'=>$version,'id'=>['neq',$id]])->find(); - if($versions){ + $now_version = db::name($this->table)->where(['id'=>$id])->find(); + if(!$now_version){ + return V(0,"数据不存在"); + } + $res = version_compare($now_version['newversion'], $version); + if($res == 0){ return V(0,"版本号已存在"); } + $data = [ 'newversion' => $version, + 'oldversion' => $now_version['newversion'], 'type' => $type, 'downloadurl' => $downloadurl, 'content' => $content, 'enforce' => $enforce, 'code' => $version_code, 'status' => $status, - 'createtime' => time() + 'updatetime' => time() ]; $res = db::name($this->table)->where(['id'=>$id])->update($data); if($res){ diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php index dc873989..d4d7b633 100644 --- a/application/api/controller/Activities.php +++ b/application/api/controller/Activities.php @@ -98,7 +98,7 @@ class Activities extends BaseCom $api_version = 0; if ($system == 'iOS') { $api_versions = db::name('version')->where(['type' => 2, 'status' => 1])->order('id', 'desc')->find(); - $result = version_compare($api_versions['oldversion'],$app_version); + $result = version_compare($api_versions['apiversion'],$app_version); if ($result < 0) { $api_version = 1; } @@ -303,7 +303,7 @@ class Activities extends BaseCom $api_version = 0; if ($system == 'iOS') { $api_versions = db::name('version')->where(['type' => 2, 'status' => 1])->order('id', 'desc')->find(); - $result = version_compare($api_versions['oldversion'],$app_version); + $result = version_compare($api_versions['apiversion'],$app_version); if ($result < 0) { $api_version = 1; } diff --git a/application/api/controller/Theme.php b/application/api/controller/Theme.php index 8cc8abaa..0efb2120 100644 --- a/application/api/controller/Theme.php +++ b/application/api/controller/Theme.php @@ -52,7 +52,7 @@ class Theme extends controller $api_version = 0; if ($system == 'iOS') { $api_versions = db::name('version')->where(['type' => 2, 'status' => 1])->order('id', 'desc')->find(); - $result = version_compare($api_versions['oldversion'],$app_version); + $result = version_compare($api_versions['apiversion'],$app_version); if ($result < 0) { $api_version = 1; } diff --git a/application/api/controller/User.php b/application/api/controller/User.php index c0e6c33b..2bf31ff3 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -229,7 +229,7 @@ class User extends BaseCom $api_version = 0; if ($system == 'iOS') { $api_versions = db::name('version')->where(['type' => 2, 'status' => 1])->order('id', 'desc')->find(); - $result = version_compare($api_versions['oldversion'],$app_version); + $result = version_compare($api_versions['apiversion'],$app_version); if ($result < 0) { $api_version = 1; } diff --git a/application/api/controller/UserZone.php b/application/api/controller/UserZone.php index 2985f1a1..f48b51a5 100644 --- a/application/api/controller/UserZone.php +++ b/application/api/controller/UserZone.php @@ -170,7 +170,7 @@ class UserZone extends BaseCom $api_version = 0; if ($system == 'iOS') { $api_versions = db::name('version')->where(['type' => 2, 'status' => 1])->order('id', 'desc')->find(); - $result = version_compare($api_versions['oldversion'],$app_version); + $result = version_compare($api_versions['apiversion'],$app_version); if ($result < 0) { $api_version = 1; } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 295a14bb..1bfc0296 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -228,7 +228,7 @@ class Room extends Model $api_version = 0; if ($system == 'iOS') { $api_versions = db::name('version')->where(['type' => 2, 'status' => 1])->order('id', 'desc')->find(); - $result = version_compare($api_versions['oldversion'],$app_version); + $result = version_compare($api_versions['apiversion'],$app_version); if ($result < 0) { $api_version = 1; } diff --git a/application/common/controller/BaseCom.php b/application/common/controller/BaseCom.php index d77c3dce..7b1a2610 100644 --- a/application/common/controller/BaseCom.php +++ b/application/common/controller/BaseCom.php @@ -34,7 +34,7 @@ class BaseCom extends Controller if(empty($version)){ $version = request()->header('App-Version'); } - $zhenshi_version = db::name('version')->where('type', 2)->value('oldversion'); + $zhenshi_version = db::name('version')->where('type', 2)->value('apiversion'); $result = version_compare($version,$zhenshi_version); //请求的接口 $api = request()->controller().'/'.request()->action();