diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 8d133e55..00000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# YiShi - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 2f277eb7..00000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# YiShi - -#### 介绍 -{**以下是 Gitee 平台说明,您可以替换此简介** -Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业,都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/Server/application/library/s2/CurlHandle.php b/Server/application/library/s2/CurlHandle.php index 7efeb74c..e5773b1f 100644 --- a/Server/application/library/s2/CurlHandle.php +++ b/Server/application/library/s2/CurlHandle.php @@ -2,6 +2,7 @@ namespace app\library\s2; +use think\Exception; use think\facade\Cache; use think\facade\Env; use think\facade\Log; @@ -68,10 +69,16 @@ class CurlHandle return $this; } + /** + * @param string $baseUrl + * @return $this + */ + public function setBaseUrl(string $baseUrl): CurlHandle + { + $this->baseUrl = $baseUrl; - - - + return $this; + } /** * @param string $url 请求的链接 @@ -81,12 +88,14 @@ class CurlHandle * @param string $type 数据类型,支持dataBuild、json等 * @return bool|string */ - public function requestCurl($url, $params = [], $method = 'GET', $type = 'dataBuild') + public function send($url, $params = [], $type = 'dataBuild') { $str = ''; if (!empty($url)) { try { $ch = curl_init(); + $method = $this->method; + $url = $this->baseUrl . $url; // 处理GET请求的参数 if (strtoupper($method) == 'GET' && !empty($params)) { @@ -121,6 +130,9 @@ class CurlHandle curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); //是否验证对等证书,1则验证,0则不验证 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); $str = curl_exec($ch); + if(curl_errno($ch)) { + echo 'Curl error: ' .curl_errno($ch) . ':' . curl_error($ch); + } curl_close($ch); } catch (Exception $e) { $str = ''; diff --git a/Server/application/library/s2/logics/DeviceLogic.php b/Server/application/library/s2/logics/DeviceLogic.php index d0f58798..6e7bc606 100644 --- a/Server/application/library/s2/logics/DeviceLogic.php +++ b/Server/application/library/s2/logics/DeviceLogic.php @@ -47,10 +47,7 @@ class DeviceLogic implements DeviceInterface ->setHeader('Content-Type', 'text/plain') ->setHeader('authorization', 'bearer ' . $JWT) ->setMethod('get') - ->requestCurl('api/Account/myTenantPageAccounts', $params); - - print_r($result); - exit(); + ->send('api/Account/myTenantPageAccounts', $params); $response = handleApiResponse($result); // 保存数据到数据库 diff --git a/Server/application/superadmin/config/route.php b/Server/application/superadmin/config/route.php index cc679cba..627e3ee3 100644 --- a/Server/application/superadmin/config/route.php +++ b/Server/application/superadmin/config/route.php @@ -2,37 +2,37 @@ use think\facade\Route; // 超级管理员认证相关路由(不需要鉴权) -Route::post('auth/login', 'app\\superadmin\\controller\\Auth@login'); +Route::post('auth/login', 'app\\superadmin\\controller\\AuthController@login'); // 需要登录认证的路由组 Route::group('', function () { // 菜单管理相关路由 Route::group('menu', function () { - Route::get('tree', 'app\\superadmin\\controller\\Menu@getMenuTree'); - Route::get('list', 'app\\superadmin\\controller\\Menu@getMenuList'); - Route::post('save', 'app\\superadmin\\controller\\Menu@saveMenu'); - Route::delete('delete/:id', 'app\\superadmin\\controller\\Menu@deleteMenu'); - Route::post('status', 'app\\superadmin\\controller\\Menu@updateStatus'); - Route::get('toplevel', 'app\\superadmin\\controller\\Menu@getTopLevelMenus'); + Route::get('tree', 'app\\superadmin\\controller\\MenuController@getTree'); + Route::get('list', 'app\\superadmin\\controller\\MenuController@getList'); + Route::post('save', 'app\\superadmin\\controller\\MenuController@save'); + Route::delete('delete/:id', 'app\\superadmin\\controller\\MenuController@delete'); + Route::post('status', 'app\\superadmin\\controller\\MenuController@updateStatus'); + Route::get('toplevel', 'app\\superadmin\\controller\\MenuController@getTopLevelMenus'); }); // 管理员相关路由 Route::group('administrator', function () { - Route::get('list', 'app\\superadmin\\controller\\Administrator@getList'); - Route::get('detail/:id', 'app\\superadmin\\controller\\Administrator@getDetail'); - Route::post('update', 'app\\superadmin\\controller\\Administrator@updateAdmin'); - Route::post('add', 'app\\superadmin\\controller\\Administrator@addAdmin'); - Route::post('delete', 'app\\superadmin\\controller\\Administrator@deleteAdmin'); + Route::get('list', 'app\\superadmin\\controller\\AdministratorController@getList'); + Route::get('detail/:id', 'app\\superadmin\\controller\\AdministratorController@getDetail'); + Route::post('update', 'app\\superadmin\\controller\\AdministratorController@update'); + Route::post('add', 'app\\superadmin\\controller\\AdministratorController@add'); + Route::delete('delete/:id', 'app\\superadmin\\controller\\AdministratorController@delete'); }); // 客户池管理路由 Route::group('trafficPool', function () { - Route::get('list', 'app\\superadmin\\controller\\TrafficPool@getList'); // 获取客户池列表 - Route::get('detail', 'app\\superadmin\\controller\\TrafficPool@getDetail'); // 获取客户详情 + Route::get('list', 'app\\superadmin\\controller\\TrafficPoolController@getList'); // 获取客户池列表 + Route::get('detail', 'app\\superadmin\\controller\\TrafficPoolController@getDetail'); // 获取客户详情 }); // 公司路由 Route::group('company', function () { - Route::post('create', 'app\\superadmin\\controller\\Company@create'); + Route::post('create', 'app\\superadmin\\controller\\CompanyController@create'); }); })->middleware(['app\\superadmin\\middleware\\AdminAuth']); \ No newline at end of file diff --git a/Server/application/superadmin/controller/Administrator.php b/Server/application/superadmin/controller/AdministratorController.php similarity index 99% rename from Server/application/superadmin/controller/Administrator.php rename to Server/application/superadmin/controller/AdministratorController.php index 5b36e827..a4a4e865 100644 --- a/Server/application/superadmin/controller/Administrator.php +++ b/Server/application/superadmin/controller/AdministratorController.php @@ -8,7 +8,7 @@ use app\superadmin\model\Administrator as AdminModel; /** * 管理员控制器 */ -class Administrator extends Controller +class AdministratorController extends Controller { /** * 获取管理员列表 diff --git a/Server/application/superadmin/controller/Auth.php b/Server/application/superadmin/controller/AuthController.php similarity index 95% rename from Server/application/superadmin/controller/Auth.php rename to Server/application/superadmin/controller/AuthController.php index bffa5b01..105fef4a 100644 --- a/Server/application/superadmin/controller/Auth.php +++ b/Server/application/superadmin/controller/AuthController.php @@ -4,7 +4,7 @@ namespace app\superadmin\controller; use think\Controller; use app\superadmin\model\Administrator; -class Auth extends Controller +class AuthController extends Controller { /** * 管理员登录 @@ -52,7 +52,7 @@ class Auth extends Controller /** * 创建登录令牌 - * @param Administrator $admin + * @param AdministratorController $admin * @return string */ private function createToken($admin) diff --git a/Server/application/superadmin/controller/Company.php b/Server/application/superadmin/controller/CompanyController.php similarity index 69% rename from Server/application/superadmin/controller/Company.php rename to Server/application/superadmin/controller/CompanyController.php index d28130d4..0c0bb20d 100644 --- a/Server/application/superadmin/controller/Company.php +++ b/Server/application/superadmin/controller/CompanyController.php @@ -1,6 +1,7 @@ Config::get('app.api_base_url'), - 'timeout' => 10.0 - ]); + $curl = CurlHandle::getInstant()->setBaseUrl('http://yishi.com/'); // 1. 调用创建部门接口 - $departmentResponse = $client->post('/v1/api/account/department/create', [ - 'json' => [ - 'name' => $params['name'], - 'memo' => $params['memo'] ?: '', - ] + $departmentResponse = $curl->setMethod('post')->send('v1/api/account/department/create', [ + 'name' => $params['name'], + 'memo' => $params['memo'] ?: '', ]); - $departmentData = json_decode($departmentResponse->getBody(), true); + $departmentData = json_decode($departmentResponse, true); if ($departmentData['code'] != 200) { throw new \Exception($departmentData['msg']); } // 2. 调用创建账号接口 - $accountResponse = $client->post('/v1/api/account/create', [ - 'json' => [ - 'userName' => $params['account'], - 'password' => $params['password'], - 'realName' => $params['realName'], - 'nickname' => $params['nickname'], - 'departmentId' => $departmentData['data']['id'] - ] + $accountResponse = $curl->setMethod('post')->send('v1/api/account/create', [ + 'userName' => $params['account'], + 'password' => $params['password'], + 'realName' => $params['realName'], + 'nickname' => $params['nickname'], + 'departmentId' => $departmentData['data']['id'] ]); - $accountData = json_decode($accountResponse->getBody(), true); + $accountData = json_decode($accountResponse, true); if ($accountData['code'] != 200) { throw new \Exception($accountData['msg']); } diff --git a/Server/application/superadmin/controller/Menu.php b/Server/application/superadmin/controller/MenuController.php similarity index 99% rename from Server/application/superadmin/controller/Menu.php rename to Server/application/superadmin/controller/MenuController.php index a4b36601..9aa099de 100644 --- a/Server/application/superadmin/controller/Menu.php +++ b/Server/application/superadmin/controller/MenuController.php @@ -7,7 +7,7 @@ use app\superadmin\model\Menu as MenuModel; /** * 菜单控制器 */ -class Menu extends Controller +class MenuController extends Controller { /** * 获取菜单列表(树状结构) diff --git a/Server/application/superadmin/controller/TrafficPool.php b/Server/application/superadmin/controller/TrafficPoolController.php similarity index 99% rename from Server/application/superadmin/controller/TrafficPool.php rename to Server/application/superadmin/controller/TrafficPoolController.php index f81edaaf..8eac8ab8 100644 --- a/Server/application/superadmin/controller/TrafficPool.php +++ b/Server/application/superadmin/controller/TrafficPoolController.php @@ -14,7 +14,7 @@ use think\facade\Validate; /** * 客户池控制器 */ -class TrafficPool extends Controller +class TrafficPoolController extends Controller { /** * 获取客户池列表 diff --git a/Server/composer.json b/Server/composer.json index 0cd84b6a..27ec3adc 100644 --- a/Server/composer.json +++ b/Server/composer.json @@ -25,7 +25,8 @@ "aliyuncs/oss-sdk-php": "^2.7", "topthink/think-worker": "2.0.*", "topthink/think-queue": "2.0.*", - "textalk/websocket": "^1.5" + "textalk/websocket": "^1.5", + "guzzlehttp/guzzle": "^7.9" }, "autoload": { "psr-4": { diff --git a/Server/composer.lock b/Server/composer.lock index fda9c60c..ac2c3e7d 100644 --- a/Server/composer.lock +++ b/Server/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3f1dbb62be88ad00a166b59ed9183932", + "content-hash": "9ad1ad6eaacd62087a3871dd6bef4424", "packages": [ { "name": "adbario/php-dot-notation", diff --git a/SuperAdmin/app/dashboard/projects/new/page.tsx b/SuperAdmin/app/dashboard/projects/new/page.tsx index b923976c..e285f64d 100644 --- a/SuperAdmin/app/dashboard/projects/new/page.tsx +++ b/SuperAdmin/app/dashboard/projects/new/page.tsx @@ -112,29 +112,6 @@ export default function NewProjectPage() {