Skip to content

Commit fbb9362

Browse files
committed
Merge branch 'dev' into master
# Conflicts: # Cargo.toml # doc/release/release-plan.md # doc/release/release.md
2 parents b73b5de + f99ae70 commit fbb9362

37 files changed

+315
-373
lines changed

.env

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ MANAGER_CLIENT_URL=http://localhost:8280
3131
# common settings-----------------------------------------------------
3232
QUERY_SIZE_LIMIT=1000
3333

34-
# value: Off,Error,Warn,Info,Debug,Trace
35-
RUST_LOG=debug,actix_web=off,hyper=off
36-
#RUST_LOG=debug,hyper=off
37-
3834
# separator for `Instance.para`
3935
SEPARATOR_INS_PARA=/
4036
# separator for `Instance.key`
@@ -49,4 +45,10 @@ SEPARATOR_META_KEY=/
4945
# content length limited
5046
INSTANCE_CONTENT_MAX_LENGTH=65535
5147
INSTANCE_CONTEXT_MAX_LENGTH=65535
52-
TASK_CONTENT_MAX_LENGTH=16777215
48+
TASK_CONTENT_MAX_LENGTH=16777215
49+
50+
# rust setting------------------------------------------
51+
# value: Off,Error,Warn,Info,Debug,Trace
52+
RUST_LOG=debug,actix_web=off,hyper=off
53+
#RUST_LOG=debug,hyper=off
54+
RUST_BACKTRACE=1

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
22
name = "nature"
3-
version = "0.21.1"
3+
version = "0.22.0"
44
authors = ["XueBin Li <llxxbb@yeah.net>"]
55
edition = "2018"
6-
description = "It's a low code platform, it's a tool of data orchestration. But the most important is it goes right to the heart of the business, standardize and simplify the implementation of complex businesses in a simple way."
6+
description = "It's a low code platform, it's a tool of data orchestration. But the most important is it goes right to the heart of the business, standardize and simplify the implementation of complex businesses in a simple way. As long as you're willing, Nature can help you extract the business control logic and centrally manage it so that the system has the brain and says goodbye to the brainless era of traditional systems."
77
repository = "https://github.com/llxxbb/Nature"
88
readme = "README.md"
9-
license = "GPL-3.0+"
9+
license = "MIT"
1010
keywords = ["platform", "data", "stream", "distributed", "management"]
1111
categories = ["network-programming", "database", "asynchronous", "visualization", "development-tools"]
1212

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 XueBin Li
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

LICENSE.md

Lines changed: 0 additions & 189 deletions
This file was deleted.

doc/release/release-plan.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,19 @@
55
- 功能性先于非功能性需求
66
- 应用情景支持,内部优先于外部(如网关)
77

8-
## Release 0.21.2
9-
10-
11-
12-
### should commit
13-
8+
## Release 0.23.0
149

10+
### It should commit
1511

1612
### 未完成
1713

18-
add manager
19-
20-
2114
- 文档:将所有的外部请求分为读写两个职能。查询和结算都为读。目前缺少写之前的验证过程。
2215

2316
- demo java(leave application: 请假)
2417
last state check
2518

2619
- use lru-cache for cache
2720

28-
- 使用状态化代替静态化,以减少多线程锁。
29-
30-
- 架构:流式计算:可以理解为只有 map,可以内嵌 filter(两层意思:条件过滤和内容修改)
31-
32-
- channel_store:17-19 说用 tokio::spawn 任务不启动, 且有个怪问题,前一个任务是如何完成的?
33-
3421
- 修正 prepare.md
3522
- write the document for summary use
3623
- 流式计算:

doc/release/release.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# 发布的功能
22

3+
## Release 0.22.0
4+
5+
Manager: add `Instance` interface for UI management
6+
chang `Instance` id from u64, so that js long will be work fine
7+
38
## Release 0.21.1 2021-01-23
49

510
change manage client port to 8280 to avoid conflict with nature.exe
File renamed without changes.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
POST
2+
http://localhost:8180/instance/byId
3+
@Content-Type: application/json
4+
{
5+
"id": "343203022136596708",
6+
"meta": "B:finance/payment:1",
7+
"para": "",
8+
"state_version": 0
9+
}
10+
11+
%%%
12+
# Duration: 7 ms
13+
# POST
14+
# http://localhost:8180/instance/byId
15+
# Headers
16+
# @Content-Type: application/json
17+
# Body
18+
# {
19+
# "id": "343203022136596708",
20+
# "meta": "B:finance/payment:1",
21+
# "para": "",
22+
# "state_version": 0
23+
# }
24+
25+
26+
# status 200
27+
28+
@content-length: 263
29+
@content-type: application/json
30+
@date: Sat, 30 Jan 2021 12:02:43 GMT
31+
32+
{"Ok":{"id":"343203022136596708","data":{"meta":"B:finance/payment:1","content":"{\"order\":\"10071269418607538781\",\"from_account\":\"b\",\"paid\":200,\"pay_time\":1612007992419}","sys_context":{"target.id":"10071269418607538781"}},"create_time":1612007992000}}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GET
22
http://localhost:8180/metaIdGreatThan/0/123
33
%%%
4-
# Duration: 12 ms
4+
# Duration: 10 ms
55
# GET
66
# http://localhost:8180/metaIdGreatThan/0/123
77

@@ -10,6 +10,6 @@ http://localhost:8180/metaIdGreatThan/0/123
1010

1111
@content-length: 1196
1212
@content-type: application/json
13-
@date: Sat, 16 Jan 2021 07:02:10 GMT
13+
@date: Sat, 30 Jan 2021 07:25:24 GMT
1414

15-
{"Ok":[{"id":1,"meta_type":"B","meta_key":"sale/order","description":"order","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-10T10:16:10"},{"id":2,"meta_type":"B","meta_key":"sale/orderState","description":"order state","version":1,"states":"new|paid|package|outbound|dispatching|signed|canceling|canceled","fields":"","config":"{\"master\":\"B:sale/order:1\"}","flag":1,"create_time":"2021-01-10T10:16:10"},{"id":3,"meta_type":"B","meta_key":"finance/payment","description":"order payment","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-10T10:16:10"},{"id":4,"meta_type":"B","meta_key":"finance/orderAccount","description":"order account","version":1,"states":"unpaid|partial|paid","fields":"","config":"{\"master\":\"B:sale/order:1\"}","flag":1,"create_time":"2021-01-10T10:16:10"},{"id":5,"meta_type":"B","meta_key":"third/waybill","description":"waybill","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-10T10:16:10"},{"id":6,"meta_type":"B","meta_key":"sale/orderSign","description":"order finished","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-10T10:16:10"}]}
15+
{"Ok":[{"id":1,"meta_type":"B","meta_key":"sale/order","description":"order","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-30T09:47:21"},{"id":2,"meta_type":"B","meta_key":"sale/orderState","description":"order state","version":1,"states":"new|paid|package|outbound|dispatching|signed|canceling|canceled","fields":"","config":"{\"master\":\"B:sale/order:1\"}","flag":1,"create_time":"2021-01-30T09:47:21"},{"id":3,"meta_type":"B","meta_key":"finance/payment","description":"order payment","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-30T09:47:21"},{"id":4,"meta_type":"B","meta_key":"finance/orderAccount","description":"order account","version":1,"states":"unpaid|partial|paid","fields":"","config":"{\"master\":\"B:sale/order:1\"}","flag":1,"create_time":"2021-01-30T09:47:21"},{"id":5,"meta_type":"B","meta_key":"third/waybill","description":"waybill","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-30T09:47:21"},{"id":6,"meta_type":"B","meta_key":"sale/orderSign","description":"order finished","version":1,"states":"","fields":"","config":"","flag":1,"create_time":"2021-01-30T09:47:21"}]}

doc/test/manager_relation.rest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GET
22
http://localhost:8180/relationIdGreatThan/0/123
33
%%%
4-
# Duration: 16 ms
4+
# Duration: 66 ms
55
# GET
66
# http://localhost:8180/relationIdGreatThan/0/123
77

@@ -10,6 +10,6 @@ http://localhost:8180/relationIdGreatThan/0/123
1010

1111
@content-length: 2003
1212
@content-type: application/json
13-
@date: Sat, 16 Jan 2021 07:00:44 GMT
13+
@date: Sat, 30 Jan 2021 07:25:09 GMT
1414

1515
{"Ok":[{"id":1,"from_meta":"B:sale/order:1","to_meta":"B:sale/orderState:1","settings":"{\"target\":{\"state_add\":[\"new\"]}}","flag":1},{"id":2,"from_meta":"B:sale/order:1","to_meta":"B:finance/orderAccount:1","settings":"{\"executor\":{\"protocol\":\"localRust\",\"url\":\"nature_demo:order_receivable\"},\"target\":{\"state_add\":[\"unpaid\"]}}","flag":1},{"id":3,"from_meta":"B:finance/payment:1","to_meta":"B:finance/orderAccount:1","settings":"{\"executor\":{\"protocol\":\"localRust\",\"url\":\"nature_demo:pay_count\"}}","flag":1},{"id":4,"from_meta":"B:finance/orderAccount:1","to_meta":"B:sale/orderState:1","settings":"{\"selector\":{\"state_all\":[\"paid\"]},\"target\":{\"state_add\":[\"paid\"]}}","flag":1},{"id":5,"from_meta":"B:sale/orderState:1","to_meta":"N:warehouse/outApplication:1","settings":"{\"selector\":{\"state_all\":[\"paid\"]},\"executor\":{\"protocol\":\"localRust\",\"url\":\"nature_demo:stock_out_application\"}}","flag":1},{"id":6,"from_meta":"B:sale/orderState:1","to_meta":"B:sale/orderState:1","settings":"{\"selector\":{\"state_all\":[\"paid\"]},\"executor\":{\"protocol\":\"http\",\"url\":\"http://localhost:8082/send_to_warehouse\"},\"target\":{\"state_add\":[\"package\"]}}","flag":1},{"id":7,"from_meta":"B:sale/orderState:1","to_meta":"B:third/waybill:1","settings":"{\"id_bridge\":true, \"selector\":{\"state_all\":[\"outbound\"]}, \"executor\":{\"protocol\":\"localRust\",\"url\":\"nature_demo:go_express\"}}","flag":1},{"id":8,"from_meta":"B:third/waybill:1","to_meta":"B:sale/orderState:1","settings":"{\"target\":{\"state_add\":[\"dispatching\"]}}","flag":1},{"id":9,"from_meta":"B:sale/orderState:1","to_meta":"B:sale/orderSign:1","settings":"{\"delay\":1, \"id_bridge\":true, \"selector\":{\"state_all\":[\"dispatching\"]}, \"executor\":{\"protocol\":\"localRust\",\"url\":\"nature_demo:auto_sign\"}}","flag":1},{"id":10,"from_meta":"B:sale/orderSign:1","to_meta":"B:sale/orderState:1","settings":"{\"target\":{\"state_add\":[\"signed\"]}}","flag":1}]}

0 commit comments

Comments
 (0)