Merge branch 'dev' into master

# Conflicts:
#	Cargo.toml
#	doc/release/release-plan.md
#	doc/release/release.md

Author: llxxbb

.env

@@ -31,10 +31,6 @@ MANAGER_CLIENT_URL=http://localhost:8280
 # common settings-----------------------------------------------------
 QUERY_SIZE_LIMIT=1000
 
-# value: Off,Error,Warn,Info,Debug,Trace
-RUST_LOG=debug,actix_web=off,hyper=off
-#RUST_LOG=debug,hyper=off
-
 # separator for `Instance.para`
 SEPARATOR_INS_PARA=/
 # separator for `Instance.key`
@@ -49,4 +45,10 @@ SEPARATOR_META_KEY=/
 # content length limited
 INSTANCE_CONTENT_MAX_LENGTH=65535
 INSTANCE_CONTEXT_MAX_LENGTH=65535
-TASK_CONTENT_MAX_LENGTH=16777215
+TASK_CONTENT_MAX_LENGTH=16777215
+
+# rust setting------------------------------------------
+# value: Off,Error,Warn,Info,Debug,Trace
+RUST_LOG=debug,actix_web=off,hyper=off
+#RUST_LOG=debug,hyper=off
+RUST_BACKTRACE=1

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "nature"
-version = "0.21.1"
+version = "0.22.0"
 authors = ["XueBin Li <llxxbb@yeah.net>"]
 edition = "2018"
-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."
+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."
 repository = "https://github.com/llxxbb/Nature"
 readme = "README.md"
-license = "GPL-3.0+"
+license = "MIT"
 keywords = ["platform", "data", "stream", "distributed", "management"]
 categories = ["network-programming", "database", "asynchronous", "visualization", "development-tools"]
 

LICENSE

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

LICENSE.md

@@ -5,32 +5,19 @@
 - 功能性先于非功能性需求
 - 应用情景支持，内部优先于外部（如网关）
 
-## Release 0.21.2
-
-
-
-### should commit
-
+## Release 0.23.0
 
+### It should commit
 
 ### 未完成
 
-add manager
-
-
 - 文档：将所有的外部请求分为读写两个职能。查询和结算都为读。目前缺少写之前的验证过程。
 
 - demo java(leave application: 请假)
     last state check
 
 - use lru-cache for cache
 
-- 使用状态化代替静态化，以减少多线程锁。
-
-- 架构：流式计算：可以理解为只有 map,可以内嵌 filter(两层意思：条件过滤和内容修改) 
-
-- channel_store:17-19 说用 tokio::spawn 任务不启动， 且有个怪问题，前一个任务是如何完成的？
-
 - 修正 prepare.md
 - write the document for summary use
 - 流式计算：

doc/release/release-plan.md

@@ -1,5 +1,10 @@
 # 发布的功能
 
+## Release 0.22.0
+
+Manager: add `Instance` interface for UI management
+chang `Instance` id from u64, so that js long will be work fine
+
 ## Release 0.21.1 2021-01-23
 
 change manage client port to 8280 to avoid conflict with nature.exe

doc/release/release.md

@@ -0,0 +1,32 @@
+POST
+http://localhost:8180/instance/byId
+@Content-Type: application/json
+{
+    "id": "343203022136596708",
+    "meta": "B:finance/payment:1",
+    "para": "",
+    "state_version": 0
+}
+
+%%%
+# Duration: 7 ms
+# POST
+# http://localhost:8180/instance/byId
+# Headers
+# @Content-Type: application/json
+# Body
+# {
+#     "id": "343203022136596708",
+#     "meta": "B:finance/payment:1",
+#     "para": "",
+#     "state_version": 0
+# }
+
+
+# status 200
+
+@content-length: 263
+@content-type: application/json
+@date: Sat, 30 Jan 2021 12:02:43 GMT
+
+{"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}}

doc/release/request.md doc/release/requirement.mddoc/release/request.md renamed to doc/release/requirement.md

@@ -1,7 +1,7 @@
 GET
 http://localhost:8180/metaIdGreatThan/0/123
 %%%
-# Duration: 12 ms
+# Duration: 10 ms
 # GET
 # http://localhost:8180/metaIdGreatThan/0/123
 
@@ -10,6 +10,6 @@ http://localhost:8180/metaIdGreatThan/0/123
 
 @content-length: 1196
 @content-type: application/json
-@date: Sat, 16 Jan 2021 07:02:10 GMT
+@date: Sat, 30 Jan 2021 07:25:24 GMT
 
-{"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"}]}
+{"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_instance_by_id.rest

@@ -1,7 +1,7 @@
 GET
 http://localhost:8180/relationIdGreatThan/0/123
 %%%
-# Duration: 16 ms
+# Duration: 66 ms
 # GET
 # http://localhost:8180/relationIdGreatThan/0/123
 
@@ -10,6 +10,6 @@ http://localhost:8180/relationIdGreatThan/0/123
 
 @content-length: 2003
 @content-type: application/json
-@date: Sat, 16 Jan 2021 07:00:44 GMT
+@date: Sat, 30 Jan 2021 07:25:09 GMT
 
 {"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}]}