diff --git a/niucloud/app/adminapi/controller/sys/Config.php b/niucloud/app/adminapi/controller/sys/Config.php index ea48fdb2b..a9b5ada22 100644 --- a/niucloud/app/adminapi/controller/sys/Config.php +++ b/niucloud/app/adminapi/controller/sys/Config.php @@ -49,6 +49,9 @@ class Config extends BaseAdminController [ 'front_end_name', '' ], [ 'front_end_logo', '' ], [ 'icon', '' ], + [ 'tel', '' ], + [ 'wechat_code', '' ], + [ 'enterprise_wechat', '' ], ]); $this->validate($data, 'app\validate\site\Site.edit'); ( new ConfigService() )->setWebSite($data); diff --git a/niucloud/app/dict/menu/admin.php b/niucloud/app/dict/menu/admin.php index 467a6ed9c..93aa06698 100644 --- a/niucloud/app/dict/menu/admin.php +++ b/niucloud/app/dict/menu/admin.php @@ -36,6 +36,19 @@ return [ 'sort' => 20, 'status' => 1, 'is_show' => 1 + ], + [ + 'menu_name' => '工具管理', + 'menu_key' => 'app_manage_tool', + 'menu_type' => 1, + 'icon' => 'iconfont-iconchajian1', + 'api_url' => '', + 'router_path' => 'tools', + 'view_path' => 'tools/index', + 'methods' => 'get', + 'sort' => 30, + 'status' => 1, + 'is_show' => 1 ] ] ], diff --git a/niucloud/app/service/admin/auth/LoginService.php b/niucloud/app/service/admin/auth/LoginService.php index d99ba87c5..52c14d0eb 100644 --- a/niucloud/app/service/admin/auth/LoginService.php +++ b/niucloud/app/service/admin/auth/LoginService.php @@ -72,6 +72,7 @@ class LoginService extends BaseAdminService 'userinfo' => [ 'uid' => $userinfo->uid, 'username' => $userinfo->username, + 'head_img' => $userinfo->head_img, ] ]; diff --git a/niucloud/app/service/core/addon/CoreAddonCloudService.php b/niucloud/app/service/core/addon/CoreAddonCloudService.php index 93467a58f..908b78fa1 100644 --- a/niucloud/app/service/core/addon/CoreAddonCloudService.php +++ b/niucloud/app/service/core/addon/CoreAddonCloudService.php @@ -80,6 +80,7 @@ class CoreAddonCloudService extends CoreCloudBaseService 'filename' => 'build.zip' ] ], + 'timeout' => 50.0 ]); if (isset($response['code']) && $response['code'] == 0) throw new CommonException($response['msg']); diff --git a/niucloud/config/version.php b/niucloud/config/version.php index d01695df1..ad8a8edc3 100644 --- a/niucloud/config/version.php +++ b/niucloud/config/version.php @@ -1,6 +1,6 @@ '1.0.5', - 'code' => '202307010001' + 'version' => '0.0.4', + 'code' => '202310240001' ];