diff --git a/Server/application/common/controller/Auth.php b/Server/application/common/controller/Auth.php
index b63ea9f7..4b1099db 100644
--- a/Server/application/common/controller/Auth.php
+++ b/Server/application/common/controller/Auth.php
@@ -1,8 +1,8 @@
 <?php
 namespace app\common\controller;
 
-use app\common\helper\ResponseHelper;
 use app\common\service\AuthService;
+use library\ResponseHelper;
 use think\Controller;
 use think\facade\Request;
 
diff --git a/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php b/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php
index 9d808a0b..f8232194 100644
--- a/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php
+++ b/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php
@@ -1,14 +1,12 @@
 <?php
 namespace app\cunkebao\controller\device;
 
-use app\cunkebao\controller\BaseController;
 use app\common\model\Device as DeviceModel;
 use app\common\model\DeviceHandleLog as DeviceHandleLogModel;
-use app\library\s2\CurlHandle;
-use Couchbase\ViewOptions;
+use app\cunkebao\controller\BaseController;
+use library\s2\CurlHandle;
 use think\Db;
 use think\Validate;
-use think\facade\Request;
 
 /**
  * 设备管理控制器
diff --git a/Server/application/superadmin/controller/Menu/GetMenuTreeController.php b/Server/application/superadmin/controller/Menu/GetMenuTreeController.php
index 7f1ceedc..77eed0e7 100644
--- a/Server/application/superadmin/controller/Menu/GetMenuTreeController.php
+++ b/Server/application/superadmin/controller/Menu/GetMenuTreeController.php
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\Menu;
 use app\common\model\Menu as MenuModel;
 use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
 use app\superadmin\controller\BaseController;
+use library\ResponseHelper;
 use think\facade\Cache;
 
 /**
@@ -182,10 +183,6 @@ class GetMenuTreeController extends BaseController
             );
         }
 
-        return json([
-            'code' => 200,
-            'msg' => '获取成功',
-            'data' => $menuTree
-        ]);
+        return ResponseHelper::success($menuTree);
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/administrator/AddAdministratorController.php b/Server/application/superadmin/controller/administrator/AddAdministratorController.php
index c6a2c605..5f5a9505 100644
--- a/Server/application/superadmin/controller/administrator/AddAdministratorController.php
+++ b/Server/application/superadmin/controller/administrator/AddAdministratorController.php
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
 use app\common\model\Administrator as AdministratorModel;
 use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
 use app\superadmin\controller\BaseController;
+use library\ResponseHelper;
 use think\Controller;
 use think\Db;
 use think\Validate;
@@ -41,12 +42,12 @@ class AddAdministratorController extends BaseController
     {
         $validate = Validate::make([
             'account' => 'require|/\S+/',
-            'name' => 'require|/\S+/',
+            'username' => 'require|/\S+/',
             'password' => 'require|/\S+/',
             'permissionIds' => 'require|array',
         ], [
             'account.require' => '账号不能为空',
-            'name.require' => '姓名不能为空',
+            'username.require' => '用户名不能为空',
             'password.require' => '密码不能为空',
             'permissionIds.require' => '请至少分配一种权限',
         ]);
@@ -125,7 +126,7 @@ class AddAdministratorController extends BaseController
     public function index()
     {
         try {
-            $params = $this->request->only(['account', 'name', 'password', 'permissionIds']);
+            $params = $this->request->only(['account', 'username', 'password', 'permissionIds']);
 
             $this->dataValidate($params);
             $this->checkPermission()->chekAdminIsExist($params['account']);
@@ -140,17 +141,10 @@ class AddAdministratorController extends BaseController
 
             Db::commit();
 
-            return json([
-                'code' => 200,
-                'msg' => '添加成功',
-            ]);
+            return ResponseHelper::success();
         } catch (\Exception $e) {
             Db::rollback();
-
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/administrator/DeleteAdministratorController.php b/Server/application/superadmin/controller/administrator/DeleteAdministratorController.php
index 4f908447..c8233053 100644
--- a/Server/application/superadmin/controller/administrator/DeleteAdministratorController.php
+++ b/Server/application/superadmin/controller/administrator/DeleteAdministratorController.php
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
 use app\superadmin\controller\BaseController;
 use app\common\model\Administrator as AdministratorModel;
 use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
+use library\ResponseHelper;
 use think\Controller;
 use think\Db;
 use think\Validate;
@@ -118,17 +119,10 @@ class DeleteAdministratorController extends BaseController
 
             Db::commit();
 
-            return json([
-                'code' => 200,
-                'msg' => '删除成功',
-            ]);
+            return ResponseHelper::success();
         } catch (\Exception $e) {
             Db::rollback();
-
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage(),
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php b/Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php
index d3c16f99..4c053e38 100644
--- a/Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php
+++ b/Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php
@@ -4,6 +4,7 @@ namespace app\superadmin\controller\administrator;
 
 use app\common\model\Administrator as AdministratorModel;
 use app\superadmin\controller\BaseController;
+use library\ResponseHelper;
 use think\Db;
 
 /**
@@ -22,7 +23,7 @@ class GetAdministratorDetailController extends BaseController
     {
         $admin = AdministratorModel::alias('a')
             ->field(
-                'a.id, a.account, a.name, a.status, a.authId, a.createTime createdAt, a.lastLoginTime lastLogin, p.permissions'
+                'a.id, a.account, a.username, a.status, a.authId, a.createTime createdAt, a.lastLoginTime lastLogin, p.permissions'
             )
             ->leftJoin('administrator_permissions p', 'a.id = p.adminId')
             ->where('a.id', $adminId)
@@ -91,21 +92,16 @@ class GetAdministratorDetailController extends BaseController
             $roleName = $this->getRoleName($admin->authId);
             $permissionIds = $this->parsePermissions($admin->permissions);
 
-            return json([
-                'code' => 200,
-                'msg' => '获取成功',
-                'data' => array_merge($admin->toArray(), [
+            return ResponseHelper::success(
+                array_merge($admin->toArray(), [
                     'roleName' => $roleName,
                     'permissions' => $permissionIds,
                     'lastLogin' => $admin->lastLogin ? date('Y-m-d H:i', $admin->lastLogin) : '从未登录',
                     'createdAt' => date('Y-m-d H:i', $admin->createdAt),
                 ])
-            ]);
+            );
         } catch (\Exception $e) {
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 }
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/administrator/GetAdministratorListController.php b/Server/application/superadmin/controller/administrator/GetAdministratorListController.php
index e9f08cda..c3b7d28b 100644
--- a/Server/application/superadmin/controller/administrator/GetAdministratorListController.php
+++ b/Server/application/superadmin/controller/administrator/GetAdministratorListController.php
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
 use app\common\model\Administrator as AdministratorModel;
 use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
 use app\common\model\Menu as MenuModel;
+use library\ResponseHelper;
 use think\Controller;
 
 /**
@@ -24,7 +25,7 @@ class GetAdministratorListController extends Controller
 
         // 如果有搜索关键词
         if (!empty($keyword = $this->request->param('keyword/s', ''))) {
-            $where[] = ['account|name', 'like', "%{$keyword}%"];
+            $where[] = ['account|username', 'like', "%{$keyword}%"];
         }
 
         return array_merge($params, $where);
@@ -34,15 +35,13 @@ class GetAdministratorListController extends Controller
      * 获取管理员列表
      *
      * @param array $where 查询条件
-     * @param int $page 页码
-     * @param int $limit 每页数量
      * @return \think\Paginator 分页对象
      */
     protected function getAdministratorList(array $where): \think\Paginator
     {
         $query = AdministratorModel::alias('a')
             ->field(
-                'id, account, name, status, authId, createTime createdAt, lastLoginTime, lastLoginIp'
+                'id, account, username, status, authId, createTime createdAt, lastLoginTime, lastLoginIp'
             );
 
         foreach ($where as $key => $value) {
@@ -141,8 +140,8 @@ class GetAdministratorListController extends Controller
         foreach ($list->items() as $item) {
             $section = [
                 'id' => $item->id,
-                'username' => $item->account,
-                'name' => $item->name,
+                'account' => $item->account,
+                'username' => $item->username,
                 'status' => $item->status,
                 'createdAt' => date('Y-m-d H:i:s', $item->createdAt),
                 'lastLogin' => !empty($item->lastLoginTime) ? date('Y-m-d H:i:s', $item->lastLoginTime) : '从未登录',
@@ -166,13 +165,11 @@ class GetAdministratorListController extends Controller
         $where = $this->makeWhere();
         $result = $this->getAdministratorList($where);
 
-        return json([
-            'code' => 200,
-            'msg' => '获取成功',
-            'data' => [
+        return ResponseHelper::success(
+            [
                 'list' => $this->makeReturnedResult($result),
                 'total' => $result->total(),
             ]
-        ]);
+        );
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php b/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php
index f8bc85d6..13ff4071 100644
--- a/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php
+++ b/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
 use app\common\model\Administrator as AdministratorModel;
 use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
 use app\superadmin\controller\BaseController;
+use library\ResponseHelper;
 use think\Db;
 use think\Validate;
 
@@ -49,13 +50,13 @@ class UpdateAdministratorController extends BaseController
         $validate = Validate::make([
             'id' => 'require|regex:/^[1-9]\d*$/',
             'account' => 'require|/\S+/',
-            'name' => 'require|/\S+/',
+            'username' => 'require|/\S+/',
             'password' => '/\S+/',
             'permissionIds' => 'array',
         ], [
             'id.require' => '缺少必要参数',
             'account.require' => '账号不能为空',
-            'name.require' => '姓名不能为空',
+            'username.require' => '用户名不能为空',
             'permissionIds.array' => '请至少分配一种权限',
         ]);
 
@@ -123,7 +124,7 @@ class UpdateAdministratorController extends BaseController
     public function index()
     {
         try {
-            $params = $this->request->only(['id', 'account', 'name', 'password', 'permissionIds']);
+            $params = $this->request->only(['id', 'account', 'username', 'password', 'permissionIds']);
 
             // 被修改的管理员id
             $adminId = $params['id'] ?? 0;
@@ -143,18 +144,10 @@ class UpdateAdministratorController extends BaseController
             }
 
             Db::commit();
-
-            return json([
-                'code' => 200,
-                'msg' => '更新成功',
-            ]);
+            return ResponseHelper::success();
         } catch (\Exception $e) {
             Db::rollback();
-
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/auth/AuthLoginController.php b/Server/application/superadmin/controller/auth/AuthLoginController.php
index a73d9185..71c5ac8f 100644
--- a/Server/application/superadmin/controller/auth/AuthLoginController.php
+++ b/Server/application/superadmin/controller/auth/AuthLoginController.php
@@ -4,6 +4,7 @@ namespace app\superadmin\controller\auth;
 
 use app\common\model\Administrator as AdministratorModel;
 use app\superadmin\controller\administrator\DeleteAdministratorController;
+use library\ResponseHelper;
 use think\Controller;
 use think\Validate;
 
@@ -14,7 +15,7 @@ class AuthLoginController extends Controller
      * @param DeleteAdministratorController $admin
      * @return string
      */
-    protected function createToken($admin): string
+    protected function createToken(AdministratorModel $admin): string
     {
         return md5($admin->id . '|' . $admin->account . 'cunkebao_admin_secret');
     }
@@ -41,6 +42,8 @@ class AuthLoginController extends Controller
     }
 
     /**
+     * 获取管理员信息
+     *
      * @param array $params
      * @return object|AdministratorModel
      * @throws \Exception
@@ -108,21 +111,16 @@ class AuthLoginController extends Controller
             $admin = $this->dataValidate($params)->getAdministrator($params);
             $this->saveLoginInfo($admin)->setCookie($admin);
 
-            return json([
-                'code' => 200,
-                'msg' => '登录成功',
-                'data' => [
+            return ResponseHelper::success(
+                [
                     'id' => $admin->id,
-                    'name' => $admin->name,
+                    'name' => $admin->username,
                     'account' => $admin->account,
                     'token' => cookie('admin_token')
                 ]
-            ]);
+            );
         } catch (\Exception $e) {
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 }
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php
index 0925d9d9..1685c460 100644
--- a/Server/application/superadmin/controller/company/CreateCompanyController.php
+++ b/Server/application/superadmin/controller/company/CreateCompanyController.php
@@ -4,9 +4,10 @@ namespace app\superadmin\controller\company;
 
 use app\common\model\Company as CompanyModel;
 use app\common\model\User as UsersModel;
-use app\library\s2\CurlHandle;
 use app\superadmin\controller\BaseController;
 use Eison\Utils\Helper\ArrHelper;
+use library\ResponseHelper;
+use library\s2\CurlHandle;
 use think\Db;
 use think\facade\Env;
 use think\Validate;
@@ -167,20 +168,14 @@ class CreateCompanyController extends BaseController
             $params = $this->dataValidate($params)->creatS2About($params);
 
             Db::startTrans();
-            $this->createCkbAbout($params);
-            Db::commit();
 
-            return json([
-                'code' => 200,
-                'msg' => '创建成功'
-            ]);
+            $this->createCkbAbout($params);
+
+            Db::commit();
+            return ResponseHelper::success();
         } catch (\Exception $e) {
             Db::rollback();
-
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/company/DeleteCompanyController.php b/Server/application/superadmin/controller/company/DeleteCompanyController.php
index 29547137..60d66ea7 100644
--- a/Server/application/superadmin/controller/company/DeleteCompanyController.php
+++ b/Server/application/superadmin/controller/company/DeleteCompanyController.php
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\company;
 use app\common\model\Company as CompanyModel;
 use app\common\model\User as UserModel;
 use app\superadmin\controller\BaseController;
+use library\ResponseHelper;
 use think\Db;
 use think\Validate;
 
@@ -111,23 +112,15 @@ class DeleteCompanyController extends BaseController
             $params = $this->request->only('id');
             $companId = $params['id'];
 
-            $this->dataValidate($params);
-
             Db::startTrans();
-            $this->delteCkbAbout($companId)->deleteS2About($companId);
-            Db::commit();
 
-            return json([
-                'code' => 200,
-                'msg' => '删除成功'
-            ]);
+            $this->dataValidate($params)->delteCkbAbout($companId)->deleteS2About($companId);
+
+            Db::commit();
+            return ResponseHelper::success();
         } catch (\Exception $e) {
             Db::rollback();
-
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 }
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
index e907f465..9ca5bc67 100644
--- a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
+++ b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\company;
 use app\common\model\Company as CompanyModel;
 use app\common\model\Device as DeviceModel;
 use app\superadmin\controller\BaseController;
+use library\ResponseHelper;
 
 /**
  * 公司控制器
@@ -64,16 +65,11 @@ class GetCompanyDetailForUpdateController extends BaseController
             $data = $this->getCompanyDetail($id);
             $devices = $this->getDevicesByCompanyId($data['companyId']);
 
-            return json([
-                'code' => 200,
-                'msg' => '获取成功',
-                'data' => array_merge($data, compact('devices')),
-            ]);
+            return ResponseHelper::success(
+                array_merge($data, compact('devices'))
+            );
         } catch (\Exception $e) {
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/company/GetCompanyListController.php b/Server/application/superadmin/controller/company/GetCompanyListController.php
index 2914ea92..e53d9990 100644
--- a/Server/application/superadmin/controller/company/GetCompanyListController.php
+++ b/Server/application/superadmin/controller/company/GetCompanyListController.php
@@ -7,6 +7,7 @@ use app\common\model\Device as DeviceModel;
 use app\common\model\User as usersModel;
 use app\superadmin\controller\BaseController;
 use Eison\Utils\Helper\ArrHelper;
+use library\ResponseHelper;
 
 /**
  * 公司控制器
@@ -115,13 +116,11 @@ class GetCompanyListController extends BaseController
         $where = $this->makeWhere();
         $result = $this->getCompanyList($where);
 
-        return json([
-            'code' => 200,
-            'msg' => '获取成功',
-            'data' => [
+        return ResponseHelper::success(
+            [
                 'list' => $this->makeReturnedResult($result),
                 'total' => $result->total(),
             ]
-        ]);
+        );
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/company/UpdateCompanyController.php b/Server/application/superadmin/controller/company/UpdateCompanyController.php
index c69e0468..3cd2f4b9 100644
--- a/Server/application/superadmin/controller/company/UpdateCompanyController.php
+++ b/Server/application/superadmin/controller/company/UpdateCompanyController.php
@@ -6,6 +6,7 @@ use app\common\model\Company as CompanyModel;
 use app\common\model\User as UsersModel;
 use app\superadmin\controller\BaseController;
 use Eison\Utils\Helper\ArrHelper;
+use library\ResponseHelper;
 use think\Db;
 use think\Validate;
 
@@ -99,6 +100,8 @@ class UpdateCompanyController extends BaseController
     }
 
     /**
+     * 更新存客宝端数据
+     *
      * @param array $params
      * @return self
      * @throws \Exception
@@ -115,6 +118,8 @@ class UpdateCompanyController extends BaseController
     }
 
     /**
+     * 更新触客宝端数据
+     * 
      * @param array $params
      * @return self
      * @throws \Exception
@@ -208,17 +213,10 @@ class UpdateCompanyController extends BaseController
             $this->updateCkbAbout($params)->updateS2About($params);
             Db::commit();
 
-            return json([
-                'code' => 200,
-                'msg' => '更新成功'
-            ]);
+            return ResponseHelper::success();
         } catch (\Exception $e) {
             Db::rollback();
-
-            return json([
-                'code' => $e->getCode(),
-                'msg' => $e->getMessage()
-            ]);
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
         }
     }
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/dashboard/GetBasestatisticsController.php b/Server/application/superadmin/controller/dashboard/GetBasestatisticsController.php
index 552340be..71ea2132 100644
--- a/Server/application/superadmin/controller/dashboard/GetBasestatisticsController.php
+++ b/Server/application/superadmin/controller/dashboard/GetBasestatisticsController.php
@@ -4,6 +4,7 @@ namespace app\superadmin\controller\dashboard;
 
 use app\common\model\Administrator as AdministratorModel;
 use app\common\model\Company as CompanyModel;
+use library\ResponseHelper;
 use think\Controller;
 
 /**
@@ -48,14 +49,12 @@ class GetBasestatisticsController extends Controller
      */
     public function index()
     {
-        return json([
-            'code' => 200,
-            'msg' => '获取成功',
-            'data' => [
+        return ResponseHelper::success(
+            [
                 'companyCount' => $this->getCompanyCount(),
-                'adminCount' => $this->getAdminCount(),
+                'adminCount'    => $this->getAdminCount(),
                 'customerCount' => $this->getCustomerCount(),
             ]
-        ]);
+        );
     }
 }
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/traffic/GetPoolListController.php b/Server/application/superadmin/controller/traffic/GetPoolListController.php
index b5138f2c..67ee2d0b 100644
--- a/Server/application/superadmin/controller/traffic/GetPoolListController.php
+++ b/Server/application/superadmin/controller/traffic/GetPoolListController.php
@@ -4,6 +4,7 @@ namespace app\superadmin\controller\traffic;
 
 use app\common\model\TrafficPool as TrafficPoolModel;
 use app\superadmin\controller\BaseController;
+use library\ResponseHelper;
 use think\facade\Request;
 
 /**
@@ -105,15 +106,13 @@ class GetPoolListController extends BaseController
     {
         $list = $this->gePoolList();
 
-        return json([
-            'code' => 200,
-            'msg' => '获取成功',
-            'data' => [
+        return ResponseHelper::success(
+            [
                 'list' => $this->makeReturnedValue($list)->items(),
                 'total' => $list->total(),
                 'page' => $list->currentPage(),
                 'limit' => $list->listRows()
             ]
-        ]);
+        );
     }
 } 
\ No newline at end of file
diff --git a/Server/application/common/helper/ResponseHelper.php b/Server/extend/library/ResponseHelper.php
similarity index 96%
rename from Server/application/common/helper/ResponseHelper.php
rename to Server/extend/library/ResponseHelper.php
index 2b0966e2..aa7c0294 100644
--- a/Server/application/common/helper/ResponseHelper.php
+++ b/Server/extend/library/ResponseHelper.php
@@ -1,10 +1,12 @@
 <?php
-namespace app\common\helper;
+
+namespace library;
 
 class ResponseHelper
 {
     /**
      * 成功响应
+     *
      * @param mixed $data 响应数据
      * @param string $msg 响应消息
      * @param int $code 响应代码
@@ -21,6 +23,7 @@ class ResponseHelper
 
     /**
      * 错误响应
+     *
      * @param string $msg 错误消息
      * @param int $code 错误代码
      * @param mixed $data 错误数据
@@ -37,6 +40,7 @@ class ResponseHelper
 
     /**
      * 未授权响应
+     *
      * @param string $msg 错误消息
      * @return \think\response\Json
      */
@@ -47,6 +51,7 @@ class ResponseHelper
 
     /**
      * 禁止访问响应
+     *
      * @param string $msg 错误消息
      * @return \think\response\Json
      */
diff --git a/Server/application/library/s2/CurlHandle.php b/Server/extend/library/s2/CurlHandle.php
similarity index 98%
rename from Server/application/library/s2/CurlHandle.php
rename to Server/extend/library/s2/CurlHandle.php
index e5773b1f..0d10d517 100644
--- a/Server/application/library/s2/CurlHandle.php
+++ b/Server/extend/library/s2/CurlHandle.php
@@ -1,11 +1,9 @@
 <?php
 
-namespace app\library\s2;
+namespace library\s2;
 
 use think\Exception;
-use think\facade\Cache;
 use think\facade\Env;
-use think\facade\Log;
 
 class CurlHandle
 {
diff --git a/Server/application/library/s2/interfaces/AccountInterface.php b/Server/extend/library/s2/interfaces/AccountInterface.php
similarity index 90%
rename from Server/application/library/s2/interfaces/AccountInterface.php
rename to Server/extend/library/s2/interfaces/AccountInterface.php
index f4576521..7fe2807a 100644
--- a/Server/application/library/s2/interfaces/AccountInterface.php
+++ b/Server/extend/library/s2/interfaces/AccountInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\library\s2\interfaces;
+namespace library\s2\interfaces;
 
 interface AccountInterface
 {
diff --git a/Server/application/library/s2/interfaces/DeviceInterface.php b/Server/extend/library/s2/interfaces/DeviceInterface.php
similarity index 82%
rename from Server/application/library/s2/interfaces/DeviceInterface.php
rename to Server/extend/library/s2/interfaces/DeviceInterface.php
index 133fcdf2..c1128bec 100644
--- a/Server/application/library/s2/interfaces/DeviceInterface.php
+++ b/Server/extend/library/s2/interfaces/DeviceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\library\s2\interfaces;
+namespace library\s2\interfaces;
 
 interface DeviceInterface
 {
diff --git a/Server/application/library/s2/interfaces/LoginInterface.php b/Server/extend/library/s2/interfaces/LoginInterface.php
similarity index 86%
rename from Server/application/library/s2/interfaces/LoginInterface.php
rename to Server/extend/library/s2/interfaces/LoginInterface.php
index f50f1711..d53dbc13 100644
--- a/Server/application/library/s2/interfaces/LoginInterface.php
+++ b/Server/extend/library/s2/interfaces/LoginInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\library\s2\interfaces;
+namespace library\s2\interfaces;
 
 interface LoginInterface
 {
diff --git a/Server/application/library/s2/logics/AccountLogic.php b/Server/extend/library/s2/logics/AccountLogic.php
similarity index 77%
rename from Server/application/library/s2/logics/AccountLogic.php
rename to Server/extend/library/s2/logics/AccountLogic.php
index 429c4558..48d24c07 100644
--- a/Server/application/library/s2/logics/AccountLogic.php
+++ b/Server/extend/library/s2/logics/AccountLogic.php
@@ -1,8 +1,8 @@
 <?php
-namespace app\library\s2\logics;
+namespace library\s2\logics;
 
-use app\library\s2\interfaces\AccountInterface;
-use app\library\s2\interfaces\LoginInterface;
+use library\s2\interfaces\AccountInterface;
+use library\s2\interfaces\LoginInterface;
 
 class AccountLogic implements AccountInterface, LoginInterface
 {
diff --git a/Server/application/library/s2/logics/DeviceLogic.php b/Server/extend/library/s2/logics/DeviceLogic.php
similarity index 98%
rename from Server/application/library/s2/logics/DeviceLogic.php
rename to Server/extend/library/s2/logics/DeviceLogic.php
index 6e7bc606..cf8c7dd4 100644
--- a/Server/application/library/s2/logics/DeviceLogic.php
+++ b/Server/extend/library/s2/logics/DeviceLogic.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace app\library\s2\logics;
+namespace library\s2\logics;
 
+use app\api\model\DeviceGroupModel;
 use app\api\model\DeviceModel;
 use app\common\service\AuthService;
-use app\library\s2\CurlHandle;
-use app\library\s2\interfaces\DeviceInterface;
+use library\s2\CurlHandle;
+use library\s2\interfaces\DeviceInterface;
 use think\facade\Log;
-use app\api\model\DeviceGroupModel;
 
 class DeviceLogic implements DeviceInterface
 {
diff --git a/Server/library/s2/logics/DeviceLogic.php b/Server/library/s2/logics/DeviceLogic.php
deleted file mode 100644
index 1faa724c..00000000
--- a/Server/library/s2/logics/DeviceLogic.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace library\s2\logics;
-
-use app\api\model\DeviceModel;
-use app\common\service\AuthService;
-use library\s2\CurlHandle;
-use library\s2\Interfaces\DeviceInterface;
-
-class DeviceLogic implements DeviceInterface
-{
-    /**
-     * 获取设备列表
-     * @inheritDoc
-     */
-    public function getlist(array $params = []): array
-    {
-
-        try {
-            // 构建请求参数
-            $params = [
-                'accountId' => $params['accountId'] ?? '',
-                'keyword' => $params['keyword'] ?? '',
-                'imei' => $params['imei'] ?? '',
-                'groupId' => $params['groupId'] ?? '',
-                'brand' => $params['brand'] ?? '',
-                'model' => $params['model'] ?? '',
-                'deleteType' => $params['deleteType'] ?? 'unDeleted',
-                'operatingSystem' => $params['operatingSystem'] ?? '',
-                'softwareVersion' => $params['softwareVersion'] ?? '',
-                'phoneAppVersion' => $params['phoneAppVersion'] ?? '',
-                'recorderVersion' => $params['recorderVersion'] ?? '',
-                'contactsVersion' => $params['contactsVersion'] ?? '',
-                'rooted' => $params['rooted'] ?? '',
-                'xPosed' => $params['xPosed'] ?? '',
-                'alive' => $params['alive'] ?? '',
-                'hasWechat' => $params['hasWechat'] ?? '',
-                'departmentId' => $params['departmentId'] ?? '',
-                'pageIndex' => $params['pageIndex'] ?? 0,
-                'pageSize' => $params['pageSize'] ?? 20
-            ];
-
-            $JWT = AuthService::getSystemAuthorization();
-            $result = CurlHandle::getInstant()
-                ->setHeader('Content-Type', 'text/plain')
-                ->setHeader('authorization', 'bearer ' . $JWT)
-                ->setMethod('get')
-                ->requestCurl('api/Account/myTenantPageAccounts', $params);
-            $response = handleApiResponse($result);
-            // 保存数据到数据库
-            if (!empty($response['results'])) {
-                foreach ($response['results'] as $item) {
-                    $this->saveData($item);
-                }
-            }
-            return json_encode(['code' => 200, 'msg' => '获取公司账号列表成功', 'data' => $response]);
-
-        } catch (\Exception $e) {
-            return json_encode(['code' => 500, 'msg' => '获取公司账号列表失败：' . $e->getMessage()]);
-        }
-    }
-
-
-    private function saveData($item)
-    {
-        $data = [
-            'id' => isset($item['id']) ? $item['id'] : '',
-            'userName' => isset($item['userName']) ? $item['userName'] : '',
-            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-            'realName' => isset($item['realName']) ? $item['realName'] : '',
-            'groupName' => isset($item['groupName']) ? $item['groupName'] : '',
-            'wechatAccounts' => isset($item['wechatAccounts']) ? json_encode($item['wechatAccounts']) : json_encode([]),
-            'alive' => isset($item['alive']) ? $item['alive'] : false,
-            'lastAliveTime' => isset($item['lastAliveTime']) ? $item['lastAliveTime'] : null,
-            'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
-            'groupId' => isset($item['groupId']) ? $item['groupId'] : 0,
-            'currentAccountId' => isset($item['currentAccountId']) ? $item['currentAccountId'] : 0,
-            'imei' => $item['imei'],
-            'memo' => isset($item['memo']) ? $item['memo'] : '',
-            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
-            'deletedAndStop' => isset($item['deletedAndStop']) ? $item['deletedAndStop'] : false,
-            'deleteTime' => empty($item['isDeleted']) ? 0 : strtotime($item['deleteTime']),
-            'rooted' => isset($item['rooted']) ? $item['rooted'] : false,
-            'xPosed' => isset($item['xPosed']) ? $item['xPosed'] : false,
-            'brand' => isset($item['brand']) ? $item['brand'] : '',
-            'model' => isset($item['model']) ? $item['model'] : '',
-            'operatingSystem' => isset($item['operatingSystem']) ? $item['operatingSystem'] : '',
-            'softwareVersion' => isset($item['softwareVersion']) ? $item['softwareVersion'] : '',
-            'extra' => isset($item['extra']) ? json_encode($item['extra']) : json_encode([]),
-            'phone' => isset($item['phone']) ? $item['phone'] : '',
-            'lastUpdateTime' => isset($item['lastUpdateTime']) ? ($item['lastUpdateTime'] == '0001-01-01T00:00:00' ? 0 : strtotime($item['lastUpdateTime'])) : 0
-        ];
-
-        // 使用imei作为唯一性判断
-        $device = DeviceModel::where('id', $item['id'])->find();
-
-        if ($device) {
-            $device->save($data);
-        } else {
-
-            // autoLike：自动点赞
-            // momentsSync：朋友圈同步
-            // autoCustomerDev：自动开发客户
-            // groupMessageDeliver：群消息推送
-            // autoGroup：自动建群
-
-            $data['taskConfig'] = json_encode([
-                'autoLike' => true,
-                'momentsSync' => true,
-                'autoCustomerDev' => true,
-                'groupMessageDeliver' => true,
-                'autoGroup' => true,
-            ]);
-            DeviceModel::create($data);
-        }
-    }
-}
\ No newline at end of file
diff --git a/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx b/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx
index a181c616..cf17712a 100644
--- a/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx
+++ b/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx
@@ -35,7 +35,7 @@ export default function EditAdminPage({ params }: { params: { id: string } }) {
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [adminInfo, setAdminInfo] = useState<any | null>(null)
   const [account, setAccount] = useState("")
-  const [name, setName] = useState("")
+  const [username, setUserName] = useState("")
   const [password, setPassword] = useState("")
   const [confirmPassword, setConfirmPassword] = useState("")
   const [menuPermissions, setMenuPermissions] = useState<MenuPermission[]>([])
@@ -60,7 +60,7 @@ export default function EditAdminPage({ params }: { params: { id: string } }) {
         if (adminResponse.code === 200 && adminResponse.data) {
           setAdminInfo(adminResponse.data)
           setAccount(adminResponse.data.account)
-          setName(adminResponse.data.name)
+          setUserName(adminResponse.data.username)
           
           // 判断是否可以编辑权限
           // 只有超级管理员(ID为1)可以编辑其他人的权限
@@ -228,12 +228,12 @@ export default function EditAdminPage({ params }: { params: { id: string } }) {
               </div>
 
               <div className="space-y-2">
-                <Label htmlFor="name">姓名</Label>
+                <Label htmlFor="username">用户名</Label>
                 <Input
-                  id="name"
-                  value={name}
-                  onChange={(e) => setName(e.target.value)}
-                  placeholder="请输入姓名"
+                  id="username"
+                  value={username}
+                  onChange={(e) => setUserName(e.target.value)}
+                  placeholder="请输入用户名"
                   required
                 />
               </div>
diff --git a/SuperAdmin/app/dashboard/admins/new/page.tsx b/SuperAdmin/app/dashboard/admins/new/page.tsx
index 28cb2ef1..20cbd2a0 100644
--- a/SuperAdmin/app/dashboard/admins/new/page.tsx
+++ b/SuperAdmin/app/dashboard/admins/new/page.tsx
@@ -25,7 +25,7 @@ export default function NewAdminPage() {
   const router = useRouter()
   const { toast } = useToast()
   const [account, setAccount] = useState("")
-  const [name, setName] = useState("")
+  const [username, setUserName] = useState("")
   const [password, setPassword] = useState("")
   const [confirmPassword, setConfirmPassword] = useState("")
   const [isLoading, setIsLoading] = useState(true)
@@ -172,12 +172,12 @@ export default function NewAdminPage() {
               </div>
 
               <div className="space-y-2">
-                <Label htmlFor="name">姓名</Label>
+                <Label htmlFor="username">用户名</Label>
                 <Input
-                  id="name"
-                  value={name}
-                  onChange={(e) => setName(e.target.value)}
-                  placeholder="请输入姓名"
+                  id="username"
+                  value={username}
+                  onChange={(e) => setUserName(e.target.value)}
+                  placeholder="请输入用户名"
                   required
                 />
               </div>
diff --git a/SuperAdmin/app/dashboard/admins/page.tsx b/SuperAdmin/app/dashboard/admins/page.tsx
index b2a642d8..af272b9a 100644
--- a/SuperAdmin/app/dashboard/admins/page.tsx
+++ b/SuperAdmin/app/dashboard/admins/page.tsx
@@ -25,8 +25,8 @@ import {
 const adminsData = [
   {
     id: "1",
-    username: "admin_zhang",
-    name: "张管理",
+    account: "admin_zhang",
+    username: "张管理",
     role: "超级管理员",
     permissions: ["项目管理", "客户池", "管理员权限"],
     createdAt: "2023-05-01",
@@ -34,8 +34,8 @@ const adminsData = [
   },
   {
     id: "2",
-    username: "admin_li",
-    name: "李管理",
+    account: "admin_li",
+    username: "李管理",
     role: "项目管理员",
     permissions: ["项目管理", "客户池"],
     createdAt: "2023-05-10",
@@ -43,8 +43,8 @@ const adminsData = [
   },
   {
     id: "3",
-    username: "admin_wang",
-    name: "王管理",
+    account: "admin_wang",
+    username: "王管理",
     role: "客户管理员",
     permissions: ["客户池"],
     createdAt: "2023-05-15",
@@ -52,8 +52,8 @@ const adminsData = [
   },
   {
     id: "4",
-    username: "admin_zhao",
-    name: "赵管理",
+    account: "admin_zhao",
+    username: "赵管理",
     role: "项目管理员",
     permissions: ["项目管理"],
     createdAt: "2023-05-20",
@@ -98,8 +98,10 @@ export default function AdminsPage() {
         // 加载失败时显示示例数据
         setAdministrators(adminsData.map(admin => ({
           ...admin,
-          id: Number(admin.id)
-        })) as Administrator[])
+          id: Number(admin.id),
+          name: admin.username,
+          status: 1
+        })))
         setTotalCount(adminsData.length)
       }
     } catch (error) {
@@ -112,8 +114,10 @@ export default function AdminsPage() {
       // 加载失败时显示示例数据
       setAdministrators(adminsData.map(admin => ({
         ...admin,
-        id: Number(admin.id)
-      })) as Administrator[])
+        id: Number(admin.id),
+        name: admin.username,
+        status: 1
+      })))
       setTotalCount(adminsData.length)
     } finally {
       setIsLoading(false)
@@ -155,7 +159,7 @@ export default function AdminsPage() {
       if (response.code === 200) {
         toast({
           title: "删除成功",
-          description: `管理员 ${adminToDelete.name} 已成功删除`,
+          description: `管理员 ${adminToDelete.username} 已成功删除`,
           variant: "success",
         })
         
@@ -213,7 +217,7 @@ export default function AdminsPage() {
           <TableHeader>
             <TableRow>
               <TableHead>账号</TableHead>
-              <TableHead>姓名</TableHead>
+              <TableHead>用户名</TableHead>
               <TableHead>角色</TableHead>
               <TableHead>权限</TableHead>
               <TableHead>创建时间</TableHead>
@@ -233,8 +237,8 @@ export default function AdminsPage() {
             ) : administrators.length > 0 ? (
               administrators.map((admin) => (
                 <TableRow key={admin.id}>
-                  <TableCell className="font-medium">{admin.username}</TableCell>
-                  <TableCell>{admin.name}</TableCell>
+                  <TableCell className="font-medium">{admin.account}</TableCell>
+                  <TableCell>{admin.username}</TableCell>
                   <TableCell>
                     <Badge variant={admin.role === "超级管理员" ? "default" : "outline"}>{admin.role}</Badge>
                   </TableCell>
@@ -317,7 +321,7 @@ export default function AdminsPage() {
           <AlertDialogHeader>
             <AlertDialogTitle>确认删除管理员</AlertDialogTitle>
             <AlertDialogDescription>
-              您确定要删除管理员 "{adminToDelete?.name}" 吗？此操作无法撤销。
+              您确定要删除管理员 "{adminToDelete?.username}" 吗？此操作无法撤销。
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>