From ca81ee8ffb19fdcfdcdce751ddf062b824ada147 Mon Sep 17 00:00:00 2001 From: Houfeng Date: Mon, 25 Jul 2016 12:40:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3dd30ba..1c01c0d 100644 --- a/README.md +++ b/README.md @@ -208,4 +208,8 @@ Example: # 更多内容 -请访问 wiki: [https://github.com/Houfeng/cize/wiki](https://github.com/Houfeng/cize/wiki) \ No newline at end of file +请访问 wiki: [https://github.com/Houfeng/cize/wiki](https://github.com/Houfeng/cize/wiki) + +# 路线图 +- 所有 Job 都在单儿独立在一个进程中执行（现在可能会有 n 个 job 共用一个主进程） +- 集成 Docker \ No newline at end of file From 81a7b21bd4d78d1139659db8fa5e34fe325a8fc2 Mon Sep 17 00:00:00 2001 From: Houfeng Date: Wed, 27 Jul 2016 23:50:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- web/config.json | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 741eb9e..4aa0888 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "md5": "^2.1.0", "mkdir-p": "0.0.7", "nokit-pjax": "^0.2.0", - "nokitjs": "^1.24.5", + "nokitjs": "^1.25.1", "orm": "^3.1.0", "real-utils": "0.0.1", "request": "^2.74.0", diff --git a/web/config.json b/web/config.json index d65f761..f7e6047 100644 --- a/web/config.json +++ b/web/config.json @@ -3,8 +3,8 @@ "^/": "$./handlers/mvc" }, "filters": { - "^/": "../node_modules/nokit-pjax", - "^/:auth": "./filters/auth" + "^/@pjax": "../node_modules/nokit-pjax", + "^/@auth": "./filters/auth" }, "mvc": { "routes": { @@ -31,14 +31,12 @@ "post /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}/records/{sn:^[0-9]+$}/rerun": "./api rerun" } }, - "folders": { - "public": { - "^/bootstrap(.*)": "../node_modules/bootstrap/dist", - "^/jquery(.*)": "../node_modules/jquery/dist", - "^/font-awesome(.*)": "../node_modules/font-awesome", - "^/pjax/(.*)$": "../node_modules/nokit-pjax/client", - "^/js-yaml/(.*)$": "../node_modules/js-yaml/dist" - } + "public": { + "^/bootstrap(.*)": "../node_modules/bootstrap/dist", + "^/jquery(.*)": "../node_modules/jquery/dist", + "^/font-awesome(.*)": "../node_modules/font-awesome", + "^/pjax/(.*)$": "../node_modules/nokit-pjax/client", + "^/js-yaml/(.*)$": "../node_modules/js-yaml/dist" }, "session": { "timeout": 7200 From 1ba8506ec73959b4fcecd8d3d2570021006548a1 Mon Sep 17 00:00:00 2001 From: Houfeng Date: Wed, 27 Jul 2016 23:59:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/config.development.json | 3 --- web/config.development.yaml | 1 + web/config.json | 44 ------------------------------------- web/config.production.json | 1 - web/config.production.yaml | 0 web/config.yaml | 39 ++++++++++++++++++++++++++++++++ 6 files changed, 40 insertions(+), 48 deletions(-) delete mode 100644 web/config.development.json create mode 100644 web/config.development.yaml delete mode 100644 web/config.json delete mode 100644 web/config.production.json create mode 100644 web/config.production.yaml create mode 100644 web/config.yaml diff --git a/web/config.development.json b/web/config.development.json deleted file mode 100644 index 4aadfb1..0000000 --- a/web/config.development.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "showErrorDetail": true -} \ No newline at end of file diff --git a/web/config.development.yaml b/web/config.development.yaml new file mode 100644 index 0000000..5960a1a --- /dev/null +++ b/web/config.development.yaml @@ -0,0 +1 @@ +showErrorDetail: true \ No newline at end of file diff --git a/web/config.json b/web/config.json deleted file mode 100644 index f7e6047..0000000 --- a/web/config.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "handlers": { - "^/": "$./handlers/mvc" - }, - "filters": { - "^/@pjax": "../node_modules/nokit-pjax", - "^/@auth": "./filters/auth" - }, - "mvc": { - "routes": { - "/auth": { - "target": "./auth", - "ignoreAuth": true - }, - "/": "./main", - "/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}/records/{sn:^[0-9]+$}": "./main", - "/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}": "./main", - "/projects/{project:^[a-zA-Z0-9\\_\\-]+$}": "./main", - "get /api": "./api", - "post /api/token": "./api token", - "post /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}/trigger": "./api trigger", - "get /api/projects": "./api projects", - "get /api/records": "./api serverRecords", - "get /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}": "./api project", - "get /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs": "./api jobs", - "get /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/records": "./api projectRecords", - "get /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}": "./api job", - "get /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}/records": "./api records", - "get /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}/records/{sn:^[0-9]+$}": "./api record", - "get /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}/records/{sn:^[0-9]+$}/console": "./api console", - "post /api/projects/{project:^[a-zA-Z0-9\\_\\-]+$}/jobs/{job:^[a-zA-Z0-9\\_\\-]+$}/records/{sn:^[0-9]+$}/rerun": "./api rerun" - } - }, - "public": { - "^/bootstrap(.*)": "../node_modules/bootstrap/dist", - "^/jquery(.*)": "../node_modules/jquery/dist", - "^/font-awesome(.*)": "../node_modules/font-awesome", - "^/pjax/(.*)$": "../node_modules/nokit-pjax/client", - "^/js-yaml/(.*)$": "../node_modules/js-yaml/dist" - }, - "session": { - "timeout": 7200 - } -} \ No newline at end of file diff --git a/web/config.production.json b/web/config.production.json deleted file mode 100644 index 9e26dfe..0000000 --- a/web/config.production.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/web/config.production.yaml b/web/config.production.yaml new file mode 100644 index 0000000..e69de29 diff --git a/web/config.yaml b/web/config.yaml new file mode 100644 index 0000000..0acdc5e --- /dev/null +++ b/web/config.yaml @@ -0,0 +1,39 @@ +handlers: + ^/: $./handlers/mvc + +filters: + ^/@pjax: ../node_modules/nokit-pjax + ^/@auth: ./filters/auth + +mvc: + routes: + /auth: + target: ./auth + ignoreAuth: true + /: ./main + /projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}: ./main + /projects/{project}/jobs/{job}: ./main + /projects/{project}: ./main + get /api: ./api + post /api/token: ./api token + post /api/projects/{project}/jobs/{job}/trigger: ./api trigger + get /api/projects: ./api projects + get /api/records: ./api serverRecords + get /api/projects/{project}: ./api project + get /api/projects/{project}/jobs: ./api jobs + get /api/projects/{project}/records: ./api projectRecords + get /api/projects/{project}/jobs/{job}: ./api job + get /api/projects/{project}/jobs/{job}/records: ./api records + get /api/projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}: ./api record + get /api/projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}/console: ./api console + post /api/projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}/rerun: ./api rerun + +public: + ^/bootstrap(.*): ../node_modules/bootstrap/dist + ^/jquery(.*): ../node_modules/jquery/dist + ^/font-awesome(.*): ../node_modules/font-awesome + ^/pjax/(.*)$: ../node_modules/nokit-pjax/client + ^/js-yaml/(.*)$: ../node_modules/js-yaml/dist + +session: + timeout: 7200 \ No newline at end of file From d79907970617a190a0cb3ebee448f65d0869be78 Mon Sep 17 00:00:00 2001 From: Houfeng Date: Thu, 28 Jul 2016 00:02:03 +0800 Subject: [PATCH 4/4] 0.2.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4aa0888..c7a8aea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cize", - "version": "0.2.6", + "version": "0.2.7", "dbVersion": "1", "description": "Cize 是一个「持续集成」工具", "main": "index.js",