diff --git a/README.md b/README.md index 06a816bed..f003f3aa6 100755 --- a/README.md +++ b/README.md @@ -137,6 +137,7 @@ but some third-party libraries are distributed using their [own licenses](https: ## Releases +* 2022-08-24, Release [v4.0-r2](https://github.com/ossrs/srs/releases/tag/v4.0-r2), v4.0-r2, 4.0 release2, v4.0.257, 144890 lines. * 2022-06-29, Release [v4.0-r1](https://github.com/ossrs/srs/releases/tag/v4.0-r1), v4.0-r1, 4.0 release1, v4.0.253, 144680 lines. * 2022-06-11, Release [v4.0-r0](https://github.com/ossrs/srs/releases/tag/v4.0-r0), v4.0-r0, 4.0 release0, v4.0.252, 144680 lines. * 2022-03-19, Release [v4.0-b10](https://github.com/ossrs/srs/releases/tag/v4.0-b10), v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines. diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index c455388fe..f191e7991 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -1194,7 +1194,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_connect", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "tcUrl": "rtmp://video.test.com/live?key=d2fa801d08e3f90ed1e1670e6e52651a", # "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty" @@ -1211,7 +1211,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_close", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "send_bytes": 10240, "recv_bytes": 10240, "server_id": "vid-werty" # } @@ -1227,7 +1227,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_publish", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty" # } @@ -1243,7 +1243,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_unpublish", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty" # } @@ -1259,7 +1259,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_play", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "stream": "livestream", "param":"?token=xxx&salt=yyy", # "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty" @@ -1276,7 +1276,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_stop", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty" # } @@ -1292,7 +1292,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_dvr", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "stream": "livestream", "param":"?token=xxx&salt=yyy", # "cwd": "/usr/local/srs", @@ -1306,7 +1306,7 @@ vhost hooks.callback.srs.com { # the request in the POST data string is a object encode by json: # { # "action": "on_hls", - # "client_id": 1985, + # "client_id": "9308h583", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "stream": "livestream", "param":"?token=xxx&salt=yyy", # "duration": 9.36, // in seconds diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index 1cfb73a02..382c90f69 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -70,7 +70,7 @@ class RESTClients(object): the request in the POST data string is a object encode by json: { "action": "on_connect", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "tcUrl": "rtmp://video.test.com/live?key=d2fa801d08e3f90ed1e1670e6e52651a", "pageUrl": "http://www.test.com/live.html" @@ -80,7 +80,7 @@ class RESTClients(object): the request in the POST data string is a object encode by json: { "action": "on_close", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "send_bytes": 10240, "recv_bytes": 10240 } @@ -158,7 +158,7 @@ class RESTStreams(object): the request in the POST data string is a object encode by json: { "action": "on_publish", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "stream": "livestream", "param":"?token=xxx&salt=yyy" } @@ -167,7 +167,7 @@ class RESTStreams(object): the request in the POST data string is a object encode by json: { "action": "on_unpublish", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "stream": "livestream", "param":"?token=xxx&salt=yyy" } @@ -245,7 +245,7 @@ class RESTDvrs(object): the request in the POST data string is a object encode by json: { "action": "on_dvr", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "stream": "livestream", "param":"?token=xxx&salt=yyy", "cwd": "/usr/local/srs", @@ -364,7 +364,7 @@ class RESTHls(object): the request in the POST data string is a object encode by json: { "action": "on_dvr", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", @@ -436,7 +436,7 @@ class RESTSessions(object): the request in the POST data string is a object encode by json: { "action": "on_play", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "stream": "livestream", "param":"?token=xxx&salt=yyy", "pageUrl": "http://www.test.com/live.html" @@ -446,7 +446,7 @@ class RESTSessions(object): the request in the POST data string is a object encode by json: { "action": "on_stop", - "client_id": 1985, + "client_id": "9308h583", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "stream": "livestream", "param":"?token=xxx&salt=yyy" }