@@ -109,10 +109,12 @@
var formdata = new FormData();
formdata.append('apk',$('#upload_file_app')[0].files[0])
formdata.append('file_name',$('#file_name').val())
- formdata.append('version_num',$('#version_num').val())
+ formdata.append('version_num','V'+$('#version_num').val())
+ formdata.append('version_num_original',$('#version_num').val())
formdata.append('content',$('#content').val())
// return
if(pd){
+ load()
pd = false
console.log('进来了')
$.ajax({
@@ -123,6 +125,7 @@
data:formdata, //参数值
type:"POST", //请求方式
success:function(req){
+ c_load()
pd = true
if(req.code == 0){
layer.alert("增加成功", {icon: 6},function() {
@@ -170,7 +173,7 @@
return '必须填写文件名';
}
},
- version_num: [/^V[\d.]{0,9}$/, '版本号必须以大写V开头最多10个字符（由数字跟英文"."组成）'],
+ version_num: [/[\d.]{0,9}$/, '版本号必须以大写V开头最多10个字符（由数字跟英文"."组成）'],
content: function(value) {
if (value == '') {
return '必须填写描述';
diff --git a/application/admin/view/appversion/index.html b/application/admin/view/appversion/index.html
index 6f70529..c210a10 100644
--- a/application/admin/view/appversion/index.html
+++ b/application/admin/view/appversion/index.html
@@ -85,8 +85,7 @@
{$vo.version_num} |
{$vo.content} |
{$vo.create_time} |
-
{$vo.download_url} |
-
+
下载 |
{/volist}
diff --git a/application/app/controller/Base.php b/application/app/controller/Base.php
index 1fcb9e0..111f312 100644
--- a/application/app/controller/Base.php
+++ b/application/app/controller/Base.php
@@ -194,14 +194,14 @@ class Base extends Controller{
- public function msg($data,$str=''){
+ public function msg($data,$str='',$result = []){
if(is_array($data)){
return json(['code'=>0,'msg'=>'操作成功','data'=>$data]);
}else{
if($str != ''){
- return json(['code'=>$data,'msg'=>$str]);
+ return json(['code'=>$data,'msg'=>$str,'data'=>$result]);
}
- return json(['code'=>$data,'msg'=>$this->return_data_all[$data]]);
+ return json(['code'=>$data,'msg'=>$this->return_data_all[$data],'data'=>$result]);
}
}
diff --git a/application/app/controller/Index.php b/application/app/controller/Index.php
index 7df11f7..2914eed 100644
--- a/application/app/controller/Index.php
+++ b/application/app/controller/Index.php
@@ -49,13 +49,31 @@ class Index extends Base{
################################################################个人资料卡################################################################
################################################################个人资料卡################################################################
- // // 个人信息
- // public function personal_information(){
- // // phpinfo();
- // dump(123);
- // $result = Db::table('admin_user')->select();
- // dump($result);
- // }
+ // 检测版本及判断是否登录失效
+ public function login_invalid_version($data = ['token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
+ // phpinfo();
+ if(count(input('post.')) > 0){
+ $data = input('post.');
+ }
+ if(!array_key_exists('token', $data)){
+ return $this->msg(10001);
+ }
+ $result = Db::table('app_version_log')->order('id desc')->find();
+ if($result){
+ $version = $result['version_num_original'];
+ $url = $result['download_url'];
+ }else{
+ $version = '';
+ $url = '';
+ }
+ if($this->token_time_validate($data['token']) === false){
+ return $this->msg(20001,'未登录',['version'=>$version,'url'=>$url]);
+ }else{
+ return $this->msg(['version'=>$version,'url'=>$url]);
+ }
+
+
+ }
// 创建用户
public function create_user_data($data = ['aan_id'=>66,'nickname'=>'王小二','birthday'=>'2019-01-01','gender'=>1,'grade'=>'二年级','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
if(count(input('post.')) > 0){
diff --git a/application/route.php b/application/route.php
index 19dded3..d1eaa80 100644
--- a/application/route.php
+++ b/application/route.php
@@ -55,6 +55,9 @@ Route::any('/get_all_record_detailed_information', 'app/pagingcontrast/get_all_r
Route::any('/get_all_card_data_contrast', 'app/pagingcontrast/get_all_card_data_contrast');
// 删除某个历史数据
Route::any('/card_del_record_data', 'app/pagingcontrast/del_all_record_data');
+// 检测版本及判断是否登录失效
+Route::any('/login_invalid_version', 'app/index/login_invalid_version');
+
// ################################登录接口################################
// 注册接口12