正在显示
2 个修改的文件
包含
2 行增加
和
1 行删除
| @@ -69,7 +69,7 @@ class UpdateProgress extends Command | @@ -69,7 +69,7 @@ class UpdateProgress extends Command | ||
| 69 | if(!empty($info)){ | 69 | if(!empty($info)){ |
| 70 | $info = (array)$info; | 70 | $info = (array)$info; |
| 71 | //超时时间 | 71 | //超时时间 |
| 72 | - $time = date("Y-m-d H:i:s",strtotime($info['created_at']) + $info['total_num'] * 60); | 72 | + $time = date("Y-m-d H:i:s",strtotime($info['created_at']) + $info['total_num'] * 5); |
| 73 | if($time > date("Y-m-d H:i:s")){ | 73 | if($time > date("Y-m-d H:i:s")){ |
| 74 | DB::connection('custom_mysql')->table('gl_update_progress')->where('id',$info['id'])->update(['current_num'=>$info['total_num']]); | 74 | DB::connection('custom_mysql')->table('gl_update_progress')->where('id',$info['id'])->update(['current_num'=>$info['total_num']]); |
| 75 | //获取当前项目的用户 | 75 | //获取当前项目的用户 |
| @@ -200,6 +200,7 @@ class UserLoginLogic | @@ -200,6 +200,7 @@ class UserLoginLogic | ||
| 200 | $info['is_upload_manage'] = $project['is_upload_manage']; | 200 | $info['is_upload_manage'] = $project['is_upload_manage']; |
| 201 | $info['upload_config'] = $project['upload_config']; | 201 | $info['upload_config'] = $project['upload_config']; |
| 202 | $info['image_max'] = $project['image_max']; | 202 | $info['image_max'] = $project['image_max']; |
| 203 | + $info['is_update_language'] = $project['is_update_language']; | ||
| 203 | $info['configuration'] = $project['deploy_build']['configuration']; | 204 | $info['configuration'] = $project['deploy_build']['configuration']; |
| 204 | $info['type'] = $project['type']; | 205 | $info['type'] = $project['type']; |
| 205 | if($info['is_customized'] == 1){ | 206 | if($info['is_customized'] == 1){ |
-
请 注册 或 登录 后发表评论