|
@@ -21,7 +21,7 @@ class Config extends Controller
|
|
|
/**
|
|
/**
|
|
|
* @description: 分页数据
|
|
* @description: 分页数据
|
|
|
* @return {*}
|
|
* @return {*}
|
|
|
- */
|
|
|
|
|
|
|
+ */
|
|
|
function index()
|
|
function index()
|
|
|
{
|
|
{
|
|
|
try {
|
|
try {
|
|
@@ -42,35 +42,35 @@ class Config extends Controller
|
|
|
/**
|
|
/**
|
|
|
* @description: 修改|新增
|
|
* @description: 修改|新增
|
|
|
* @return {*}
|
|
* @return {*}
|
|
|
- */
|
|
|
|
|
|
|
+ */
|
|
|
public function store()
|
|
public function store()
|
|
|
{
|
|
{
|
|
|
// try {
|
|
// try {
|
|
|
- $params = request()->all();
|
|
|
|
|
-
|
|
|
|
|
- $id = request()->post('id','');
|
|
|
|
|
- if($id){
|
|
|
|
|
- $validator = [
|
|
|
|
|
- 'field' => 'required|string|max:50|alpha_dash|unique:config,field,'.$id,
|
|
|
|
|
- 'val' => 'nullable|string',
|
|
|
|
|
- 'remark' => 'required|nullable|string',
|
|
|
|
|
- ];
|
|
|
|
|
- }else{
|
|
|
|
|
- $validator = [
|
|
|
|
|
- 'field' => 'required|string|max:50|alpha_dash|unique:config,field',
|
|
|
|
|
- 'val' => 'nullable|string',
|
|
|
|
|
- 'remark' => 'required|nullable|string',
|
|
|
|
|
- ];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ $params = request()->all();
|
|
|
|
|
+
|
|
|
|
|
+ $id = request()->post('id', '');
|
|
|
|
|
+ if ($id) {
|
|
|
|
|
+ $validator = [
|
|
|
|
|
+ 'field' => 'required|string|max:50|alpha_dash|unique:config,field,' . $id,
|
|
|
|
|
+ 'val' => 'nullable|string',
|
|
|
|
|
+ 'remark' => 'required|nullable|string',
|
|
|
|
|
+ ];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ $validator = [
|
|
|
|
|
+ 'field' => 'required|string|max:50|alpha_dash|unique:config,field',
|
|
|
|
|
+ 'val' => 'nullable|string',
|
|
|
|
|
+ 'remark' => 'required|nullable|string',
|
|
|
|
|
+ ];
|
|
|
|
|
+ }
|
|
|
//
|
|
//
|
|
|
-
|
|
|
|
|
|
|
|
|
|
- request()->validate($validator);
|
|
|
|
|
|
|
|
|
|
- $ret = ConfigService::submit($params);
|
|
|
|
|
- if ($ret['code'] == ConfigService::NOT) {
|
|
|
|
|
- return $this->error($ret['code'], $ret['msg']);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ request()->validate($validator);
|
|
|
|
|
+ unset($params['field']);
|
|
|
|
|
+ $ret = ConfigService::submit($params);
|
|
|
|
|
+ if ($ret['code'] == ConfigService::NOT) {
|
|
|
|
|
+ return $this->error($ret['code'], $ret['msg']);
|
|
|
|
|
+ }
|
|
|
// } catch (ValidationException $e) {
|
|
// } catch (ValidationException $e) {
|
|
|
// return $this->error(HttpStatus::VALIDATION_FAILED, '', $e->errors());
|
|
// return $this->error(HttpStatus::VALIDATION_FAILED, '', $e->errors());
|
|
|
// } catch (Exception $e) {
|
|
// } catch (Exception $e) {
|
|
@@ -273,7 +273,7 @@ class Config extends Controller
|
|
|
} else {
|
|
} else {
|
|
|
request()->validate([
|
|
request()->validate([
|
|
|
'chatId' => ['required', 'string', 'min:1'],
|
|
'chatId' => ['required', 'string', 'min:1'],
|
|
|
- 'video' => ['required','url'],
|
|
|
|
|
|
|
+ 'video' => ['required', 'url'],
|
|
|
'video_caption' => ['nullable', 'string'],
|
|
'video_caption' => ['nullable', 'string'],
|
|
|
'isSend' => ['nullable', 'boolean'],
|
|
'isSend' => ['nullable', 'boolean'],
|
|
|
'isTop' => ['nullable', 'boolean'],
|
|
'isTop' => ['nullable', 'boolean'],
|