修正 Proxied、 SSL/TLS 设为 Flexible、开启 Always Use HTTPS
This commit is contained in:
@@ -8,6 +8,7 @@ use app\admin\model\split\Link as LinkModel;
|
||||
use app\admin\model\split\Ticket as TicketModel;
|
||||
use app\common\controller\Backend;
|
||||
use app\common\service\SplitTicketRuleService;
|
||||
use app\common\service\SplitTicketSyncLogger;
|
||||
use app\common\service\SplitTicketSyncService;
|
||||
use think\Db;
|
||||
use think\Lang;
|
||||
@@ -57,6 +58,12 @@ class Ticket extends Backend
|
||||
$this->assignconfig('ticketTypeList', $this->model->getTicketTypeList());
|
||||
$this->assignconfig('numberTypeList', $this->model->getNumberTypeList());
|
||||
$this->assignconfig('statusList', $this->model->getStatusList());
|
||||
$this->assignconfig([
|
||||
'syncConfirmMsg' => __('Sync confirm'),
|
||||
'syncBackgroundStartedMsg' => __('Sync background started'),
|
||||
'syncInProgressMsg' => __('Sync in progress'),
|
||||
'syncTicketStartedMsg' => __('Sync ticket started'),
|
||||
]);
|
||||
|
||||
$this->setupPatchFrontend();
|
||||
}
|
||||
@@ -103,13 +110,8 @@ class Ticket extends Backend
|
||||
|
||||
$cfg = is_array($this->view->config ?? null) ? $this->view->config : [];
|
||||
$version = (string) \think\Config::get('site.version');
|
||||
$scriptUrl = (string) url('split.ticket/script', ['v' => $version], false, true);
|
||||
if (strpos($scriptUrl, '?') === false) {
|
||||
$scriptUrl .= '?v=' . $version;
|
||||
}
|
||||
if (strpos($scriptUrl, '://') === false) {
|
||||
$scriptUrl = $this->request->domain() . $scriptUrl;
|
||||
}
|
||||
// 使用站内相对路径,避免生产环境 domain() 与反向代理/HTTPS 不一致导致 JS 跨域丢 Cookie
|
||||
$scriptUrl = (string) url('split.ticket/script', ['v' => $version], '', false);
|
||||
$cfg['jsname'] = $scriptUrl;
|
||||
$this->view->assign('config', $cfg);
|
||||
$this->view->config = $cfg;
|
||||
@@ -228,6 +230,11 @@ class Ticket extends Backend
|
||||
$this->error(__('No Results were found'));
|
||||
}
|
||||
|
||||
SplitTicketSyncLogger::log('web', 'manual sync request', [
|
||||
'ids' => $ids,
|
||||
'appDebug' => SplitTicketSyncLogger::isEnabled(),
|
||||
]);
|
||||
|
||||
$service = new SplitTicketSyncService();
|
||||
$ok = 0;
|
||||
$fail = 0;
|
||||
@@ -276,15 +283,42 @@ class Ticket extends Backend
|
||||
|
||||
if (isset($values['status'])) {
|
||||
$pk = $this->model->getPk();
|
||||
$rows = $this->model->where($pk, 'in', $ids)->select();
|
||||
parent::multi($ids);
|
||||
$adminIds = $this->getDataLimitAdminIds();
|
||||
$query = $this->model->where($pk, 'in', $ids);
|
||||
if (is_array($adminIds)) {
|
||||
$query->where($this->dataLimitField, 'in', $adminIds);
|
||||
}
|
||||
$rows = $query->select();
|
||||
if (!$rows || count($rows) === 0) {
|
||||
$this->error(__('No Results were found'));
|
||||
}
|
||||
|
||||
$count = 0;
|
||||
Db::startTrans();
|
||||
try {
|
||||
foreach ($rows as $item) {
|
||||
$count += $item->allowField(true)->isUpdate(true)->save($values);
|
||||
}
|
||||
Db::commit();
|
||||
} catch (ValidateException $e) {
|
||||
Db::rollback();
|
||||
$this->error($e->getMessage());
|
||||
} catch (PDOException|Exception $e) {
|
||||
Db::rollback();
|
||||
$this->error($e->getMessage());
|
||||
}
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$fresh = $this->model->get($row['id']);
|
||||
if ($fresh) {
|
||||
$ruleService->syncNumbersWithTicketStatus($fresh);
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
||||
if ($count > 0) {
|
||||
$this->success();
|
||||
}
|
||||
$this->error(__('No rows were updated'));
|
||||
}
|
||||
|
||||
parent::multi($ids);
|
||||
@@ -330,7 +364,7 @@ class Ticket extends Backend
|
||||
if ($result === false) {
|
||||
$this->error(__('No rows were inserted'));
|
||||
}
|
||||
$this->success();
|
||||
$this->success('', null, ['id' => (int) $this->model->id]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -363,6 +397,7 @@ class Ticket extends Backend
|
||||
if (($params['number_type'] ?? '') !== 'custom') {
|
||||
$params['number_type_custom'] = '';
|
||||
}
|
||||
$oldStatus = (string) ($row['status'] ?? 'hidden');
|
||||
$result = false;
|
||||
Db::startTrans();
|
||||
try {
|
||||
@@ -383,6 +418,12 @@ class Ticket extends Backend
|
||||
if ($result === false) {
|
||||
$this->error(__('No rows were updated'));
|
||||
}
|
||||
if (isset($params['status']) && (string) $params['status'] !== $oldStatus) {
|
||||
$fresh = $this->model->get($row['id']);
|
||||
if ($fresh) {
|
||||
(new SplitTicketRuleService())->syncNumbersWithTicketStatus($fresh);
|
||||
}
|
||||
}
|
||||
$this->success();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user