mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-13 12:02:51 +00:00
feat:初步融合工作流
This commit is contained in:
parent
d14d5a5942
commit
fe46d63031
@ -22,8 +22,28 @@ class WorkflowController extends AbstractController
|
|||||||
private $flow_url = '';
|
private $flow_url = '';
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
// $this->flow_url = 'http://dootask-workflow-'.env('APP_ID');
|
$this->flow_url = env('FLOW_URL') ?: 'http://dootask-workflow-'.env('APP_ID');
|
||||||
$this->flow_url = 'http://192.168.100.219:8700';
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @api {get} api/workflow/verifyToken 01. 验证APi登录
|
||||||
|
*
|
||||||
|
* @apiVersion 1.0.0
|
||||||
|
* @apiGroup users
|
||||||
|
* @apiName verifyToken
|
||||||
|
*
|
||||||
|
* @apiSuccess {String} version
|
||||||
|
* @apiSuccess {String} publish
|
||||||
|
*/
|
||||||
|
public function verifyToken()
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$user = User::auth();
|
||||||
|
$user->checkAdmin();
|
||||||
|
return Base::retSuccess('成功');
|
||||||
|
} catch (\Throwable $th) {
|
||||||
|
return response('身份无效', 400)->header('Content-Type', 'text/plain');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -601,4 +621,5 @@ class WorkflowController extends AbstractController
|
|||||||
}
|
}
|
||||||
return $user;
|
return $user;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -81,5 +81,7 @@
|
|||||||
"sort-packages": true
|
"sort-packages": true
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true
|
"prefer-stable": true,
|
||||||
|
"repositories": {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -49,6 +49,7 @@ services:
|
|||||||
- drawio-webapp
|
- drawio-webapp
|
||||||
- drawio-export
|
- drawio-export
|
||||||
- minder
|
- minder
|
||||||
|
- workflow
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
@ -149,22 +150,21 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
workflow:
|
workflow:
|
||||||
container_name: "dootask-workflow-${APP_ID}"
|
container_name: "dootask-workflow-${APP_ID}"
|
||||||
image: "weifashi/go-workflow:1.0.0"
|
image: "weifashi/go-workflow:1.0.0"
|
||||||
ports:
|
environment:
|
||||||
- "8800:80"
|
MYSQL_HOST: "${DB_HOST}"
|
||||||
environment:
|
MYSQL_PORT: "${DB_PORT}"
|
||||||
TZ: "Asia/Shanghai"
|
MYSQL_DBNAME: "${DB_DATABASE}"
|
||||||
MYSQL_HOST: "${DB_HOST}"
|
MYSQL_USERNAME: "${DB_USERNAME}"
|
||||||
MYSQL_PORT: "${DB_PORT}"
|
MYSQL_PASSWORD: "${DB_PASSWORD}"
|
||||||
MYSQL_DBNAME: "${DB_DATABASE}"
|
MYSQL_Prefix: "${DB_PREFIX}workflow_"
|
||||||
MYSQL_USERNAME: "${DB_USERNAME}"
|
networks:
|
||||||
MYSQL_PASSWORD: "${DB_PASSWORD}"
|
extnetwork:
|
||||||
MYSQL_Prefix: "${DB_PREFIX}workflow_"
|
ipv4_address: "${APP_IPPR}.11"
|
||||||
networks:
|
depends_on:
|
||||||
extnetwork:
|
- mariadb
|
||||||
ipv4_address: "${APP_IPPR}.11"
|
restart: unless-stopped
|
||||||
restart: always
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
extnetwork:
|
extnetwork:
|
||||||
|
|||||||
@ -168,6 +168,22 @@ server {
|
|||||||
proxy_set_header Server-Port $server_port;
|
proxy_set_header Server-Port $server_port;
|
||||||
proxy_pass http://minder/;
|
proxy_pass http://minder/;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# 工作流
|
||||||
|
location /workflow/api/ {
|
||||||
|
auth_request /workflowauth;
|
||||||
|
auth_request_set $auth_status $upstream_status;
|
||||||
|
proxy_pass http://workflow/api/;
|
||||||
|
}
|
||||||
|
location /workflow/ {
|
||||||
|
proxy_pass http://workflow/;
|
||||||
|
}
|
||||||
|
location /workflowauth {
|
||||||
|
internal;
|
||||||
|
proxy_set_header Content-Type "application/json";
|
||||||
|
proxy_set_header Content-Length $request_length;
|
||||||
|
proxy_pass http://service/api/workflow/verifyToken;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
include /etc/nginx/conf.d/conf.d/*.conf;
|
include /etc/nginx/conf.d/conf.d/*.conf;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user