fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整所有返工接口的响应返回数据，为兼容RPC调用做支持

Browse Source
This commit is contained in:
柳清爽
2025-04-22 15:04:38 +08:00
parent 0503260040
commit 0896686934
27 changed files with 132 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/application/common/controller/Auth.php
View File

@@ -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;

57
Server/application/common/helper/ResponseHelper.php
View File

@@ -1,57 +0,0 @@
<?php
namespace app\common\helper;
class ResponseHelper
{
/**
* 成功响应
* @param mixed $data 响应数据
* @param string $msg 响应消息
* @param int $code 响应代码
* @return \think\response\Json
*/
public static function success($data = null, $msg = '操作成功', $code = 200)
{
return json([
'code' => $code,
'msg' => $msg,
'data' => $data
]);
}
/**
* 错误响应
* @param string $msg 错误消息
* @param int $code 错误代码
* @param mixed $data 错误数据
* @return \think\response\Json
*/
public static function error($msg = '操作失败', $code = 400, $data = null)
{
return json([
'code' => $code,
'msg' => $msg,
'data' => $data
]);
}
/**
* 未授权响应
* @param string $msg 错误消息
* @return \think\response\Json
*/
public static function unauthorized($msg = '未授权访问')
{
return self::error($msg, 401);
}
/**
* 禁止访问响应
* @param string $msg 错误消息
* @return \think\response\Json
*/
public static function forbidden($msg = '禁止访问')
{
return self::error($msg, 403);
}
}

6
Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php
View File

@@ -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;
/**
* 设备管理控制器

158
Server/application/library/s2/CurlHandle.php
View File

@@ -1,158 +0,0 @@
<?php
namespace app\library\s2;
use think\Exception;
use think\facade\Cache;
use think\facade\Env;
use think\facade\Log;
class CurlHandle
{
private $baseUrl = '';
private $authorization = '';
private $header = [];
private $method = 'get';
private static $instant = null;
/**
* 获取域名
* @return void
*/
private function getBaseUrl()
{
$this->baseUrl = Env::get('api.wechat_url');
}
/**
* CurlHandle constructor.
*/
public function __construct()
{
$this->getBaseUrl();
}
/**
* 设置头部
*
* @param array $headerData 头部数组
* @param string $authorization
* @param string $type 类型 默认json (json,plain)
* @return array
*/
public function setHeader($key, $value): CurlHandle
{
if (is_array($key)) {
$this->header = array_merge($this->header, $key);
} else {
$this->header[$key] = $value;
}
return $this;
}
private function getHearder(): array
{
$header = [];
foreach ($this->header as $key => $value) {
$header[] = $key . ':' . $value;
}
return $header;
}
public function setMethod(string $method): CurlHandle
{
$this->method = $method;
return $this;
}
/**
* @param string $baseUrl
* @return $this
*/
public function setBaseUrl(string $baseUrl): CurlHandle
{
$this->baseUrl = $baseUrl;
return $this;
}
/**
* @param string $url 请求的链接
* @param array $params 请求附带的参数
* @param string $method 请求的方式, 支持GET, POST, PUT, DELETE等
* @param array $header 头部
* @param string $type 数据类型，支持dataBuild、json等
* @return bool|string
*/
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)) {
$url = $url . '?' . dataBuild($params);
}
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 30); //30秒超时
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
curl_setopt($ch, CURLOPT_HTTPHEADER, $this->getHearder());
// 处理不同的请求方法
if (strtoupper($method) != 'GET') {
// 设置请求方法
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, strtoupper($method));
// 处理参数格式
if ($type == 'dataBuild') {
$params = dataBuild($params);
} elseif ($type == 'json') {
$params = json_encode($params);
} else {
$params = dataBuild($params);
}
// 设置请求体
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
}
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 = '';
}
}
return $str;
}
/**
* 单例
*
* @return static|null
*/
public static function getInstant()
{
if (self::$instant instanceof self) {
return self::$instant;
}
return new static();
}
}

23
Server/application/library/s2/interfaces/AccountInterface.php
View File

@@ -1,23 +0,0 @@
<?php
namespace app\library\s2\interfaces;
interface AccountInterface
{
/**
* 创建账号
*
* @param string $accout
* @param string $password
* @return mixed
*/
public function create(string $accout, string $password);
/**
* 删除账号
*
* @param int $id
* @return mixed
*/
public function delete(int $id);
}

13
Server/application/library/s2/interfaces/DeviceInterface.php
View File

@@ -1,13 +0,0 @@
<?php
namespace app\library\s2\interfaces;
interface DeviceInterface
{
/**
* 获取设备列表
* @param array $params
* @return array
*/
public function getlist(array $params): array;
}

15
Server/application/library/s2/interfaces/LoginInterface.php
View File

@@ -1,15 +0,0 @@
<?php
namespace app\library\s2\interfaces;
interface LoginInterface
{
/**
* 创建账号
*
* @param string $accout
* @param string $password
* @return mixed
*/
public function login(string $accout, string $password): LoginInterface;
}

25
Server/application/library/s2/logics/AccountLogic.php
View File

@@ -1,25 +0,0 @@
<?php
namespace app\library\s2\logics;
use app\library\s2\interfaces\AccountInterface;
use app\library\s2\interfaces\LoginInterface;
class AccountLogic implements AccountInterface, LoginInterface
{
public function create(string $accout, string $password)
{
// TODO: Implement create() method.
}
public function login(string $accout, string $password): LoginInterface
{
// TODO: Implement login() method.
return $this;
}
public function delete(int $id)
{
// TODO: Implement delete() method.
}
}

214
Server/application/library/s2/logics/DeviceLogic.php
View File

@@ -1,214 +0,0 @@
<?php
namespace app\library\s2\logics;
use app\api\model\DeviceModel;
use app\common\service\AuthService;
use app\library\s2\CurlHandle;
use app\library\s2\interfaces\DeviceInterface;
use think\facade\Log;
use app\api\model\DeviceGroupModel;
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')
->send('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);
}
}
/**
* 保存设备数据
* @param array $item 设备数据
* @return bool
*/
public function saveDevice($item)
{
try {
$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
];
// 使用ID作为唯一性判断
$device = DeviceModel::where('id', $item['id'])->find();
if ($device) {
$device->save($data);
} else {
$data['taskConfig'] = json_encode([
'autoLike' => true,
'momentsSync' => true,
'autoCustomerDev' => true,
'groupMessageDeliver' => true,
'autoGroup' => true,
]);
DeviceModel::create($data);
}
return true;
} catch (\Exception $e) {
Log::error('保存设备数据失败：' . $e->getMessage());
return false;
}
}
/**
* 保存设备分组数据
* @param array $item 设备分组数据
* @return bool
*/
public function saveDeviceGroup($item)
{
try {
$data = [
'id' => $item['id'],
'tenantId' => $item['tenantId'],
'groupName' => $item['groupName'],
'groupMemo' => $item['groupMemo'],
'count' => isset($item['count']) ? $item['count'] : 0,
'createTime' => $item['createTime'] == '0001-01-01T00:00:00' ? 0 : strtotime($item['createTime'])
];
// 使用ID作为唯一性判断
$group = DeviceGroupModel::where('id', $item['id'])->find();
if ($group) {
$group->save($data);
} else {
DeviceGroupModel::create($data);
}
return true;
} catch (\Exception $e) {
Log::error('保存设备分组数据失败：' . $e->getMessage());
return false;
}
}
}

7
Server/application/superadmin/controller/Menu/GetMenuTreeController.php
View File

@@ -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);
}
}

18
Server/application/superadmin/controller/administrator/AddAdministratorController.php
View File

@@ -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());
}
}
}

12
Server/application/superadmin/controller/administrator/DeleteAdministratorController.php
View File

@@ -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());
}
}
}

16
Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php
View File

@@ -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());
}
}
}

19
Server/application/superadmin/controller/administrator/GetAdministratorListController.php
View File

@@ -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(),
]
]);
);
}
}

19
Server/application/superadmin/controller/administrator/UpdateAdministratorController.php
View File

@@ -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());
}
}
}

20
Server/application/superadmin/controller/auth/AuthLoginController.php
View File

@@ -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());
}
}
}

19
Server/application/superadmin/controller/company/CreateCompanyController.php
View File

@@ -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());
}
}
}

19
Server/application/superadmin/controller/company/DeleteCompanyController.php
View File

@@ -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());
}
}
}

14
Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
View File

@@ -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());
}
}
}

9
Server/application/superadmin/controller/company/GetCompanyListController.php
View File

@@ -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(),
]
]);
);
}
}

16
Server/application/superadmin/controller/company/UpdateCompanyController.php
View File

@@ -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());
}
}
}

11
Server/application/superadmin/controller/dashboard/GetBasestatisticsController.php
View File

@@ -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(),
]
]);
);
}
}

9
Server/application/superadmin/controller/traffic/GetPoolListController.php
View File

@@ -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()
]
]);
);
}
}