mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#23) from dev into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/23
This commit is contained in:
mkm 2023-09-01 15:26:40 +08:00
commit 94318dbde5
5 changed files with 173 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/system/merchant/MerchantCategoryRepository.php
View File

@ -116,7 +116,7 @@ class MerchantCategoryRepository extends BaseRepository
*/
public function getSelect()
{
$query = $this->search([])->field('merchant_category_id,category_name');
$query = $this->search([])->field('merchant_category_id,category_name,background');
$list = $query->select()->toArray();
return $list;
}

53
app/controller/api/Auth.php
View File

@ -216,6 +216,8 @@ class Auth extends BaseController
$data['fan_num'] = app()->make(RelevanceRepository::class)->getUserFans($user->uid, 1, 1, 1);
$data['focus_num'] = app()->make(RelevanceRepository::class)->getUserFocus($user->uid, 1, 1, 1);
$data['community_num'] = Db::name('community')->where('uid', $user->uid)->whereIn('is_type', '1,2')->count();
$thirdparty = Db::name('user_thirdparty_token')->where('user_id', $user->uid)->select();
return app('json')->success($data);
}
@ -1213,4 +1215,55 @@ class Auth extends BaseController
return app('json')->success($data);
}
//同步其他小程序token信息
//userType小程序类型：1供销工作平台 2物流系统
public function syncToken()
{
$account = $this->request->param('account', '');
$userType = $this->request->param('user_type', 1);
$token = $this->request->param('token', '');
$expiresTime = $this->request->param('expires_time', '');
$user = $this->request->userInfo();
$uid = $user->uid;
$tokenInfo = Db::name('user_thirdparty_token')->where(['user_type'=>$userType, 'user_id'=>$uid])->find();
if ($tokenInfo) {
$updData = [
'account' => $account,
'token' => $token,
'expires_time' => $expiresTime,
'create_time' => date('Y-m-d H:i:s')
];
Db::name('user_thirdparty_token')->where(['user_type'=>$userType, 'user_id'=>$uid])->update($updData);
} else {
$insertData = [
'user_id' => $uid,
'user_type' => $userType,
'account' => $account,
'token' => $token,
'expires_time' => $expiresTime,
'create_time' => date('Y-m-d H:i:s')
];
Db::name('user_thirdparty_token')->insert($insertData);
}
return app('json')->success($this->request->param());
}
//获取全局配置信息
public function globalConfig()
{
$getUrl = env('TASK_WORKER_HOST_URL') . '/api/index/config';
$header = array('User-Agent:Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1');
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $getUrl);
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$data = curl_exec($ch);
curl_close($ch);
if (!empty($data) && is_string($data)) {
$miniappInfo = json_decode($data, true);
return app('json')->success($miniappInfo['data'] ?? []);
}
return app('json')->success([]);
}
}

116
config/swoole.php Normal file
View File

@ -0,0 +1,116 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
use app\webscoket\Manager;
use Swoole\Table;
use think\swoole\websocket\socketio\Parser;
return [
'server' => [
'host' => env('SWOOLE_HOST', '0.0.0.0'), // 监听地址
'port' => env('SWOOLE_PORT', 8325), // 监听端口
'mode' => SWOOLE_PROCESS, // 运行模式 默认为SWOOLE_PROCESS
'sock_type' => SWOOLE_SOCK_TCP, // sock type 默认为SWOOLE_SOCK_TCP
'options' => [
'pid_file' => runtime_path() . 'swoole.pid',
'log_file' => runtime_path() . 'swoole.log',
'daemonize' => false,
// Normally this value should be 1~4 times larger according to your cpu cores.
'reactor_num' => swoole_cpu_num(),
'worker_num' => swoole_cpu_num(),
'task_worker_num' => swoole_cpu_num(),
'task_enable_coroutine' => false,
'task_max_request' => 2000,
'enable_static_handler' => true,
'document_root' => root_path('public'),
'package_max_length' => 50 * 1024 * 1024,
'buffer_output_size' => 10 * 1024 * 1024,
'socket_buffer_size' => 128 * 1024 * 1024,
'max_request' => 3000,
'send_yield' => true,
'reload_async' => true,
],
],
'websocket' => [
'enable' => true,
'handler' => Manager::class,
'parser' => Parser::class,
'ping_interval' => 25000, //1000 = 1秒
'ping_timeout' => 60000, //1000 = 1秒
'room' => [
'type' => 'table',
'table' => [
'room_rows' => 4096,
'room_size' => 2048,
'client_rows' => 8192,
'client_size' => 2048,
],
'redis' => [
],
],
'listen' => [],
'subscribe' => [],
],
'rpc' => [
'server' => [
'enable' => false,
'port' => 9000,
'services' => [
],
],
'client' => [
],
],
'hot_update' => [
'enable' => env('APP_DEBUG', false),
'name' => ['*.php'],
'include' => [app_path(),root_path().'crmeb'],
'exclude' => [],
],
//连接池
'pool' => [
'db' => [
'enable' => true,
'max_active' => 3,
'max_wait_time' => 5,
],
'cache' => [
'enable' => true,
'max_active' => 3,
'max_wait_time' => 5,
],
],
'coroutine' => [
'enable' => false,
'flags' => SWOOLE_HOOK_ALL,
],
'tables' => [
'user' => [
'size' => 204800,
'columns' => [
['name' => 'fd', 'type' => Table::TYPE_INT],
['name' => 'type', 'type' => Table::TYPE_INT],
['name' => 'uid', 'type' => Table::TYPE_INT]
]
]
],
//每个worker里需要预加载以共用的实例
'concretes' => [],
//重置器
'resetters' => [],
//每次请求前需要清空的实例
'instances' => [],
//每次请求前需要重新执行的服务
'services' => [],
'locks' => ['group_buying'],
];

2
route/api.php
View File

@ -28,10 +28,12 @@ Route::group('api/', function () {
Route::get('region/order', 'api.Auth/orderList');
Route::get('region/merchant', 'api.Auth/merStatistics');
Route::get('region/goods', 'api.Auth/goodsStatistics');
Route::get('global/config', 'api.Auth/globalConfig');
Route::resource('upload', 'api.Upload');
Route::post('articleCatch', 'api.Upload/article');
//强制登录
Route::group(function () {
Route::post('sync/token', 'api.Auth/syncToken');
Route::group('micro', function () {
Route::get('seach_bar_code', '/seach_bar_code');