Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build

Browse Source
This commit is contained in:
kuaifan
2022-06-02 09:27:27 +08:00
parent fe3f6d2101
commit 777b329181
21 changed files with 116 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/ProjectController.php
+2 -75
View File
@@ -220,81 +220,8 @@ class ProjectController extends AbstractController
*/
public function add()
{
$user = User::auth();
// 项目名称
$name = trim(Request::input('name', ''));
$desc = trim(Request::input('desc', ''));
$flow = trim(Request::input('flow', 'close'));
$isPersonal = intval(Request::input('personal'));
if (mb_strlen($name) < 2) {
return Base::retError('项目名称不可以少于2个字');
} elseif (mb_strlen($name) > 32) {
return Base::retError('项目名称最多只能设置32个字');
}
if (mb_strlen($desc) > 255) {
return Base::retError('项目介绍最多只能设置255个字');
}
// 列表
$columns = explode(",", Request::input('columns'));
$insertColumns = [];
$sort = 0;
foreach ($columns AS $column) {
$column = trim($column);
if ($column) {
$insertColumns[] = [
'name' => $column,
'sort' => $sort++,
];
}
}
if (empty($insertColumns)) {
$insertColumns[] = [
'name' => 'Default',
'sort' => 0,
];
}
if (count($insertColumns) > 30) {
return Base::retError('项目列表最多不能超过30个');
}
// 开始创建
$project = Project::createInstance([
'name' => $name,
'desc' => $desc,
'userid' => $user->userid,
]);
if ($isPersonal) {
if (Project::whereUserid($user->userid)->wherePersonal(1)->exists()) {
return Base::retError('个人项目已存在，无须重复创建');
}
$project->personal = 1;
}
AbstractModel::transaction(function() use ($flow, $insertColumns, $project) {
$project->save();
ProjectUser::createInstance([
'project_id' => $project->id,
'userid' => $project->userid,
'owner' => 1,
])->save();
foreach ($insertColumns AS $column) {
$column['project_id'] = $project->id;
ProjectColumn::createInstance($column)->save();
}
$dialog = WebSocketDialog::createGroup(null, $project->userid, 'project');
if (empty($dialog)) {
throw new ApiException('创建项目聊天室失败');
}
$project->dialog_id = $dialog->id;
$project->save();
//
if ($flow == 'open') {
$project->addFlow(Base::json2array('[{"id":-10,"name":"待处理","status":"start","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-11,"name":"进行中","status":"progress","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-12,"name":"待测试","status":"test","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-13,"name":"已完成","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-14,"name":"已取消","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0}]'));
}
});
//
$data = Project::find($project->id);
$data->addLog("创建项目");
$data->pushMsg('add', $data);
return Base::retSuccess('添加成功', $data);
User::auth();
return Project::createProject(Request::all());
}
/**
app/Http/Controllers/Api/UsersController.php
+10
View File
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Models\AbstractModel;
use App\Models\Meeting;
use App\Models\Project;
use App\Models\UmengAlias;
use App\Models\User;
use App\Models\UserEmailVerification;
@@ -113,6 +114,15 @@ class UsersController extends AbstractController
$user->updateInstance($array);
$user->save();
User::token($user);
//
if (!Project::whereUserid($user->userid)->wherePersonal(1)->exists()) {
Project::createProject([
'name' => Base::Lang('个人项目'),
'desc' => Base::Lang('注册时系统自动创建项目，你可以自由删除。'),
'personal' => 1,
]);
}
//
return Base::retSuccess($type == 'reg' ? "注册成功" : "登录成功", $user);
}
app/Models/Project.php
+88
View File
@@ -5,6 +5,7 @@ namespace App\Models;
use App\Exceptions\ApiException;
use App\Module\Base;
use App\Tasks\PushTask;
use Arr;
use Carbon\Carbon;
use DB;
use Hhxsv5\LaravelS\Swoole\Task\Task;
@@ -465,6 +466,93 @@ class Project extends AbstractModel
});
}
/**
* 创建项目
* @param $params
* - name 项目名称
* - desc
* - flow
* - personal
* - columns
* @return array
*/
public static function createProject($params)
{
$name = trim(Arr::get($params, 'name', ''));
$desc = trim(Arr::get($params, 'desc', ''));
$flow = trim(Arr::get($params, 'flow', 'close'));
$isPersonal = intval(Arr::get($params, 'personal'));
if (mb_strlen($name) < 2) {
return Base::retError('项目名称不可以少于2个字');
} elseif (mb_strlen($name) > 32) {
return Base::retError('项目名称最多只能设置32个字');
}
if (mb_strlen($desc) > 255) {
return Base::retError('项目介绍最多只能设置255个字');
}
// 列表
$columns = explode(",", Arr::get($params, 'columns'));
$insertColumns = [];
$sort = 0;
foreach ($columns AS $column) {
$column = trim($column);
if ($column) {
$insertColumns[] = [
'name' => $column,
'sort' => $sort++,
];
}
}
if (empty($insertColumns)) {
$insertColumns[] = [
'name' => 'Default',
'sort' => 0,
];
}
if (count($insertColumns) > 30) {
return Base::retError('项目列表最多不能超过30个');
}
// 开始创建
$project = Project::createInstance([
'name' => $name,
'desc' => $desc,
'userid' => User::userid(),
]);
if ($isPersonal) {
if (Project::whereUserid(User::userid())->wherePersonal(1)->exists()) {
return Base::retError('个人项目已存在，无须重复创建');
}
$project->personal = 1;
}
AbstractModel::transaction(function() use ($flow, $insertColumns, $project) {
$project->save();
ProjectUser::createInstance([
'project_id' => $project->id,
'userid' => $project->userid,
'owner' => 1,
])->save();
foreach ($insertColumns AS $column) {
$column['project_id'] = $project->id;
ProjectColumn::createInstance($column)->save();
}
$dialog = WebSocketDialog::createGroup(null, $project->userid, 'project');
if (empty($dialog)) {
throw new ApiException('创建项目聊天室失败');
}
$project->dialog_id = $dialog->id;
$project->save();
//
if ($flow == 'open') {
$project->addFlow(Base::json2array('[{"id":-10,"name":"待处理","status":"start","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-11,"name":"进行中","status":"progress","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-12,"name":"待测试","status":"test","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-13,"name":"已完成","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0},{"id":-14,"name":"已取消","status":"end","turns":[-10,-11,-12,-13,-14],"userids":[],"usertype":"add","userlimit":0}]'));
}
});
//
$data = Project::find($project->id);
$data->addLog("创建项目");
$data->pushMsg('add', $data);
return Base::retSuccess('添加成功', $data);
}
/**
* 获取项目信息（用于判断会员是否存在项目内）
* @param int $project_id
public/css/app.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/app.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/401.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/401.js.LICENSE.txt
+1 -1
View File
@@ -8,7 +8,7 @@
/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <https://feross.org>
* @author Feross Aboukhadijeh <http://feross.org>
* @license MIT
*/
public/js/build/494.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/586.js
Vendored
+1
View File
File diff suppressed because one or more lines are too long
public/js/build/626.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/626.js.LICENSE.txt
+1 -1
View File
@@ -8,7 +8,7 @@
/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <https://feross.org>
* @author Feross Aboukhadijeh <http://feross.org>
* @license MIT
*/
public/js/build/824.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/870.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/900.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/900.js.LICENSE.txt
+1 -1
View File
@@ -8,7 +8,7 @@
/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <https://feross.org>
* @author Feross Aboukhadijeh <http://feross.org>
* @license MIT
*/
public/js/build/965.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/build/965.js.LICENSE.txt
+1 -1
View File
@@ -8,7 +8,7 @@
/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <https://feross.org>
* @author Feross Aboukhadijeh <http://feross.org>
* @license MIT
*/
public/js/build/99.js
Vendored
-1
View File
File diff suppressed because one or more lines are too long
public/js/hash
+1 -1
View File
@@ -1 +1 @@
1753293786d07e8d
eeb7a7e1b1e0679d
public/mix-manifest.json
-1
View File
@@ -1,6 +1,5 @@
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/.DS_Store": "/.DS_Store",
"/favicon.ico": "/favicon.ico"
}
resources/assets/js/pages/login.vue
+1 -1
View File
@@ -466,9 +466,9 @@ export default {
this.$store.dispatch("call", {
url: 'project/add',
data: {
personal: 1,
name: this.$L('个人项目'),
desc: this.$L('注册时系统自动创建项目，你可以自由删除。'),
personal: 1,
},
}).then(() => {
this.goNext2();