Skip to content

Commit

Permalink
Merge pull request #1186 from kyonRay/dev
Browse files Browse the repository at this point in the history
complete gitee url adapt for domestic user.
  • Loading branch information
MaggieNgWu committed Mar 11, 2021
2 parents c57fb9b + be2f2b6 commit c406e68
Show file tree
Hide file tree
Showing 54 changed files with 355 additions and 39 deletions.
2 changes: 2 additions & 0 deletions docs/articles/2_required/entry_to_master.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@

[FISCO BCOS开源项目github地址](https://www.github.com/fisco-bcos)

[FISCO BCOS开源项目gitee地址](https://gitee.com/fisco-bcos)

[关键概念阅读](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/tutorial/key_concepts.html)

[《FISCO BCOS零基础入门,五步轻松构建应用》](https://mp.weixin.qq.com/s?__biz=MzA3MTI5Njg4Mw==&mid=2247485305&idx=1&sn=5a8dc012880aac6f5cd3dacd7db9f1d9&chksm=9f2ef565a8597c73b87fd248c41d1a5b9b0e6a6c6c527baf873498e351e3cb532b77eda9377a&token=705851025&lang=zh_CN#rd)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
- openssl:FISCO BCOS 2.0的网络协议依赖openssl
- build_chain.sh脚本:主要用于构建区块链节点配置,可从https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/manual/build_chain.sh下载

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载build_chain.sh脚本,请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/FISCO-BCOS/raw/master/tools/build_chain.sh && chmod u+x build_chain.sh`
```

### 生成区块链节点配置

FISCO BCOS 2.0提供的build_chain.sh可快速生成区块链节点配置,按照【仲裁链组网详情】介绍的节点组织结构,先生成区块链配置文件ip_list:
Expand Down Expand Up @@ -99,6 +104,12 @@ $ ps aux | grep fisco-bcos
启动控制台前需获取并配置控制台:

- **获取控制台**:从https://github.com/FISCO-BCOS/console/releases/download/v1.0.0/console.tar.gz下载控制台

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载控制台脚本,请尝试从gitee下载:https://gitee.com/FISCO-BCOS/console/attach_files/420303/download/console.tar.gz
```

- **配置控制台:**主要拷贝证书、配置conf/applicationContext.xml所连接节点的IP和端口信息,控制台关键配置如下:

![](../../../../images/articles/group_architecture_practice/IMG_5086.PNG)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@ chmod +x sample-bt-off-cpu
./flamegraph.pl --colors=io out.folded > offcpu.svg
```

如果因为网络问题出现`sample-bt-off-cpu`脚本长时间下载失败,可尝试以下命令:

```bash
https://gitee.com/mirrors/openresty-systemtap-toolkit/raw/master/sample-bt-off-cpu
```

得到的Off-CPU火焰图如下图所示:

![](../../../../images/articles/performance_optimization_tools/IMG_5245.JPG)
Expand Down
3 changes: 1 addition & 2 deletions docs/articles/3_features/33_storage/crud_guidance.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ FISCO BCOS SDK提供CRUD Service数据上链接口,这些接口实现的原理
| remove(Table table, Condition condition) | 删除数据 | 表对象,Condition对象 |
| desc(String tableName) | 查询表的信息 | 表名 |

以上接口覆盖了表的创建、查看和增删改查操作。用户只需要调用SDK的接口就能完成相关操作,[具体示例以下地址查看](https://github.com/FISCO-BCOS/web3sdk/blob/master/src/integration-test/java/org/fisco/bcos/precompile/CRUDServiceTest.java)
以上接口覆盖了表的创建、查看和增删改查操作。用户只需要调用SDK的接口就能完成相关操作,[具体示例以下地址查看](https://github.com/FISCO-BCOS/web3sdk/blob/master/src/integration-test/java/org/fisco/bcos/precompile/CRUDServiceTest.java) [gitee地址查看](https://gitee.com/FISCO-BCOS/web3sdk/blob/master/src/integration-test/java/org/fisco/bcos/precompile/CRUDServiceTest.java)

其中调用写接口会产生与调用CRUD合约接口等效的交易,需要共识节点共识一致后才会落盘存储。值得关注的是,利用CRUD Service接口,FISCO BCOS控制台针对每个接口实现了易用的sql语句命令,[欢迎访问以下地址体验](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/console/console.html)

Expand Down Expand Up @@ -261,4 +261,3 @@ CRUD合约是具备CRUD功能的Solidity合约,因此Solidity之前的状态
#### 条款7:采用权限控制管理用户表

CRUD合约的逻辑与用户表数据分离,因此通过合约接口的限制已控制不住用户表的写操作(包括插入、更新和删除操作)。为了避免任何账户均可以写用户表,推荐使用权限控制来管理用户表([点击参考权限控制具体使用](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/design/security_control/permission_control.html)),指定特定账户才有权限写用户表。

Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ FISCO BCOS为实际项目中部署和使用联盟链提供了企业级部署工

- 获取企业级部署工具:git clone https://github.com/FISCO-BCOS/generator.git,得到企业级部署工具根目录generator。

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载企业级部署工具,请尝试 `git clone https://gitee.com/FISCO-BCOS/generator.git`
```

- 将generator上传(或直接clone)为/usr/local/rc3-test-BCOS/generator/,以下简称为目录generator。

- 保证generator的操作权限:chmod -R 777 /usr/local/rc3-test-BCOS/generator/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,22 @@

搭建国密版FISCO BCOS的区块链方式主要有2种:

##### (1). 使用buildchain.sh脚本搭建
##### (1). 使用build_chain.sh脚本搭建

buildchain.sh脚本的-g为国密编译选项,使用成功后会生成国密版的节点。默认从GitHub下载最新稳定版本可执行程序,操作方式:

```
```bash
curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/`curl -s https://api.github.com/repos/FISCO-BCOS/FISCO-BCOS/releases | grep "\"v2\.[0-9]\.[0-9]\"" | sort -u | tail -n 1 | cut -d \" -f 4`/build_chain.sh && chmod u+x build_chain.sh
```

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载build_chain.sh脚本,请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/FISCO-BCOS/raw/master/tools/build_chain.sh && chmod u+x build_chain.sh`
```

运行以下命令,搭建四节点的国密版FISCO BCOS联盟链

```bash
./build_chain.sh -l 127.0.0.1:4 -p 30300,20200,8545 -g
```

Expand Down
4 changes: 3 additions & 1 deletion docs/articles/3_features/37_safety/disk_encryption.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,6 @@ ed157f4588b86d61a2e1745efe71e6ea

#### 参考链接

[Key Manager源码](https://github.com/FISCO-BCOS/key-manager)
[Key Manager源码](https://github.com/FISCO-BCOS/key-manager)

[Key Manager源码gitee地址](https://gitee.com/FISCO-BCOS/key-manager)
2 changes: 2 additions & 0 deletions docs/articles/4_tools/44_sdk/use_javasdk_in_eclipse.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ public class NodeVersionTest {

下载[asset-app](https://github.com/FISCO-BCOS/LargeFiles/raw/master/tools/asset-app.tar.gz),下载之后本地解压至指定路径。

[asset-app gitee下载](https://gitee.com/FISCO-BCOS/LargeFiles/raw/master/tools/asset-app.tar.gz)

### 导入工程

打开Eclipse选择: File => Import => Gradle => Existing Gradle Project。
Expand Down
30 changes: 27 additions & 3 deletions docs/articles/4_tools/five_step_to_develop_application.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,18 @@

(请先在home目录创建fisco目录,接下来都在这个目录操作)

```
```bash
$ curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/`curl -s https://api.github.com/repos/FISCO-BCOS/FISCO-BCOS/releases | grep "\"v2\.[0-9]\.[0-9]\"" | sort -u | tail -n 1 | cut -d \" -f 4`/build_chain.sh && chmod u+x build_chain.sh
```

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载build_chain.sh脚本,请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/FISCO-BCOS/raw/master/tools/build_chain.sh && chmod u+x build_chain.sh`
```

执行`build_chain.sh`脚本,启动四个节点:

```bash
$ bash build_chain.sh -l 127.0.0.1:4 -p 30300,20200,8545
$ bash nodes/127.0.0.1/start_all.sh
```
Expand All @@ -29,8 +39,20 @@ $ bash nodes/127.0.0.1/start_all.sh

控制台是一个可以交互式访问区块链,进行区块链数据读写请求的工具。无需太多解释,**四步完成控制台安装:**

```
下载控制台:

```bash
$ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.7.1/download_console.sh && bash download_console.sh -c 1.2.0
```

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载控制台,请尝试命令 `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/download_console.sh && bash download_console.sh -c 1.2.0`
```

配置并启动控制台:

```bash
$ cp -n console/conf/applicationContext-sample.xml console/conf/applicationContext.xml
$ cp nodes/127.0.0.1/sdk/* console/conf/
$ cd console && ./start.sh
Expand Down Expand Up @@ -110,4 +132,6 @@ Solidity合约需要通过编译器转换成机器(虚拟机)可执行的二

具体代码可参考示例工程:https://github.com/FISCO-BCOS/LargeFiles/raw/master/tools/asset-app.tar.gz

到这里,你已经完成第一个基于FISCO BCOS的应用开发!如你对开发流程有疑问或优化建议,可以通过公众号进入技术交流群和我们一起探讨。
[示例工程gitee下载地址]https://gitee.com/FISCO-BCOS/LargeFiles/raw/master/tools/asset-app.tar.gz

到这里,你已经完成第一个基于FISCO BCOS的应用开发!如你对开发流程有疑问或优化建议,可以通过公众号进入技术交流群和我们一起探讨。
3 changes: 3 additions & 0 deletions docs/browser/deployOld.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ Python3.4及以上版本,需安装PyMysql依赖包:

```shell
git clone https://github.com/FISCO-BCOS/fisco-bcos-browser.git

# 若因网络问题导致长时间下载失败,可尝试以下命令
git clone https://gitee.com/FISCO-BCOS/fisco-bcos-browser.git
```

进入目录:
Expand Down
5 changes: 5 additions & 0 deletions docs/browser/server.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@
## 3.部署说明

### 3.1 拉取代码

执行命令:

```shell
git clone https://github.com/FISCO-BCOS/fisco-bcos-browser.git

# 若因网络问题导致长时间下载失败,可尝试以下命令
git clone https://gitee.com/FISCO-BCOS/fisco-bcos-browser.git
```

```shell
Expand Down
4 changes: 4 additions & 0 deletions docs/browser/web.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ nginx安装请参考附录

```shell
git clone https://github.com/FISCO-BCOS/fisco-bcos-browser.git


# 若因网络问题导致长时间下载失败,可尝试以下命令
git clone https://gitee.com/FISCO-BCOS/fisco-bcos-browser.git
```

```shell
Expand Down
20 changes: 14 additions & 6 deletions docs/console/console.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,20 @@ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.7.1/downloa
|-- sol2java.sh # solidity合约文件编译为java合约文件的开发工具脚本
```

**注意:默认下载的控制台内置`0.4.25`版本的`solidity`编译器,用户需要编译`0.5`或者`0.6`版本的合约时,可以通过下列命令获取内置对应编译器版本的控制台**
```bash
# 0.5
curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v1.1.0/download_console.sh && bash download_console.sh -v 0.5
# 0.6
curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v1.1.0/download_console.sh && bash download_console.sh -v 0.6
**注意:默认下载的控制台内置`0.4.25`版本的`solidity`编译器,用户需要编译`0.5`或者`0.6`版本的合约时,可以通过下列命令获取内置对应编译器版本的控制台**

```bash
# 0.5
curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v1.1.0/download_console.sh && bash download_console.sh -v 0.5
# 0.6
curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v1.1.0/download_console.sh && bash download_console.sh -v 0.6
```

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载,0.5版本请尝试命令: `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/v1.1.0/tools/download_console.sh && bash download_console.sh -v 0.5`
0.6版本请尝试命令: `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/v1.1.0/tools/download_console.sh && bash download_console.sh -v 0.6`
```

### 配置控制台
Expand Down
7 changes: 7 additions & 0 deletions docs/console/console_of_java_sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.7.1/downloa
curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.7.1/download_console.sh && bash download_console.sh -v 0.6
```

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载,0.5版本请尝试命令: `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/v2.7.1/tools/download_console.sh && bash download_console.sh -v 0.5`
0.6版本请尝试命令: `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/v2.7.1/tools/download_console.sh && bash download_console.sh -v 0.6`
```

### 配置控制台
- 区块链节点和证书的配置:
- 将节点sdk目录下的`ca.crt``sdk.crt``sdk.key`文件拷贝到`conf`目录下。
Expand Down
3 changes: 3 additions & 0 deletions docs/enterprise_tools/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ FISCO BCOS generator依赖如下:

``` bash
$ git clone https://github.com/FISCO-BCOS/generator.git

# 若因为网络问题导致长时间无法下载,请尝试以下命令:
$ git clone https://gitee.com/FISCO-BCOS/generator.git
```

安装
Expand Down
6 changes: 5 additions & 1 deletion docs/enterprise_tools/tutorial_detail_operation.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ FISCO BCOS运维部署工具面向于真实的多机构生产环境。为了保
**下载**

```bash
cd ~/ && git clone https://github.com/FISCO-BCOS/generator.git
cd ~/
git clone https://github.com/FISCO-BCOS/generator.git

# 若因为网络问题导致长时间无法下载,请尝试以下命令:
git clone https://gitee.com/FISCO-BCOS/generator.git
```

**安装**
Expand Down
6 changes: 5 additions & 1 deletion docs/enterprise_tools/tutorial_detail_operation_gm.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
**下载**

```bash
cd ~/ && git clone https://github.com/FISCO-BCOS/generator.git
cd ~/
git clone https://github.com/FISCO-BCOS/generator.git

# 若因为网络问题导致长时间无法下载,请尝试以下命令:
git clone https://gitee.com/FISCO-BCOS/generator.git
```

**安装**
Expand Down
6 changes: 5 additions & 1 deletion docs/enterprise_tools/tutorial_one_click.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
**下载**

```bash
cd ~/ && git clone https://github.com/FISCO-BCOS/generator.git
cd ~/
git clone https://github.com/FISCO-BCOS/generator.git

# 若因为网络问题导致长时间无法下载,请尝试以下命令:
git clone https://gitee.com/FISCO-BCOS/generator.git
```

**安装**
Expand Down
3 changes: 3 additions & 0 deletions docs/faq/console.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ The execution of the contract rolled back.
# 199.232.28.133 raw.githubusercontent.com
curl -LO https://github.com/FISCO-BCOS/LargeFiles/raw/master/tools/solcj/solcJ-all-0.4.25-gm.jar

# 若因为网络问题导致长时间无法下载,请尝试以下命令:
curl -LO https://gitee.com/FISCO-BCOS/LargeFiles/raw/master/tools/solcj/solcJ-all-0.4.25-gm.jar

# 替换非国密的`solc`为国密的solc
cp solcJ-all-0.4.25-gm.jar lib/ && rm -rf lib/solcJ-all-0.4.25.jar

Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ FISCO BCOS是由国内企业主导研发、对外开源、安全可控的企业
|场景化隐私保护机制|基于[WeDPR](https://fintech.webank.com/wedpr)支持隐匿支付、匿名投票、匿名竞拍、选择性披露等场景|
| <font color=Blue>**跨链协议**</font> |
|SPV|提供获取SPV证明的接口|
|跨链协议|基于[WeCross](https://github.com/WeBankFinTech/WeCross)支持同构、异构跨链|
|跨链协议|基于[WeCross](https://github.com/WeBankBlockchain/WeCross)支持同构、异构跨链|
| <font color=Blue>**开发支持**</font> |
|合约开发工具|[WeBASE-IDE](https://github.com/WeBankFinTech/WeBASE)[ChainIDE](https://fiscoide.com/)|
|开发建链工具|提供[一键搭链脚本工具](manual/build_chain.html)|
Expand Down
6 changes: 3 additions & 3 deletions docs/manual/build_chain.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FISCO BCOS提供了`build_chain.sh`脚本帮助用户快速搭建FISCO BCOS联

## 功能介绍

- `build_chain.sh`脚本用于快速生成一条链中节点的配置文件,脚本依赖于`openssl`请根据自己的操作系统安装`openssl 1.0.2`以上版本。脚本的源码位于[这里](https://github.com/FISCO-BCOS/FISCO-BCOS/blob/master/tools/build_chain.sh)
- `build_chain.sh`脚本用于快速生成一条链中节点的配置文件,脚本依赖于`openssl`请根据自己的操作系统安装`openssl 1.0.2`以上版本。脚本的源码位于[github源码](https://github.com/FISCO-BCOS/FISCO-BCOS/blob/master/tools/build_chain.sh)[gitee源码](https://gitee.com/FISCO-BCOS/FISCO-BCOS/blob/master/tools/build_chain.sh)
- 快速体验可以使用`-l`选项指定节点IP和数目。`-f`选项通过使用一个指定格式的配置文件,支持创建各种复杂业务场景FISCO BCOS链。**`-l``-f`选项必须指定一个且不可共存**
- 建议测试时使用`-T``-T`开启log级别到DEBUG,**p2p模块默认监听 `0.0.0.0`**

Expand Down Expand Up @@ -326,8 +326,8 @@ e.g
**最简单的操作方式是在有外网的Linux机器上使用build_chain建好链,借助-z选项打包,然后拷贝到无外网的机器上运行。**
1. 针对某些场景下无外网条件下建链,请从[发布页面](https://github.com/FISCO-BCOS/FISCO-BCOS/releases)下载最新的目标操作系统的二进制,例如对于Linux系统下载fisco-bcos.tar.gz。
1. 请从[发布页面](https://github.com/FISCO-BCOS/FISCO-BCOS/releases)下载最新版本的build_chain脚本。
1. 针对某些场景下无外网条件下建链,请从[发布页面](https://github.com/FISCO-BCOS/FISCO-BCOS/releases)或[gitee镜像发布页面](https://gitee.com/FISCO-BCOS/FISCO-BCOS/releases)下载最新的目标操作系统的二进制,例如对于Linux系统下载fisco-bcos.tar.gz。
1. 请从[发布页面](https://github.com/FISCO-BCOS/FISCO-BCOS/releases)或[gitee镜像发布页面](https://gitee.com/FISCO-BCOS/FISCO-BCOS/releases)下载最新版本的build_chain脚本。
1. 上传fisco-bcos.tar.gz和build_chain.sh到目标服务器,需要注意目标服务器要求64位,要求安装有openssl 1.0.2以上版本。
1. 解压fisco-bcos.tar.gz得到fisco-bcos可执行文件,作为-e选项的参数。
1. 构建本机上4节点的FISCO BCOS联盟链,使用默认起始端口`30300,20200,8545`(4个节点会占用`30300-30303`,`20200-20203`,`8545-8548`)。
Expand Down
6 changes: 5 additions & 1 deletion docs/manual/cfca.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ C7/4
- 获取generator

```bash
cd ~/ && git clone https://github.com/FISCO-BCOS/generator.git
cd ~/
git clone https://github.com/FISCO-BCOS/generator.git

# 若因为网络问题导致长时间无法下载,请尝试以下命令:
git clone https://gitee.com/FISCO-BCOS/generator.git
```

- 安装依赖
Expand Down
15 changes: 14 additions & 1 deletion docs/manual/data_governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,18 @@ fisco-sync工具需拉取FISCO-BCOS源码,打开编译开关后自行编译。
- 注意:fisco-sync工具编译涉及的编译开关为TOOL,默认OFF,可通过`cmake3 -DTOOL=ON ..`打开该编译开关;
- 编译后,fisco-sync工具路径的生成路径`build/bin/fisco-sync`

```
下载FISCO-BCOS:

```bash
$ git clone https://github.com/FISCO-BCOS/FISCO-BCOS.git
```

```eval_rst
.. note::
- 如果因为网络问题导致长时间无法下载,请尝试 `git clone https://gitee.com/FISCO-BCOS/FISCO-BCOS.git`
```

```bash
$ cd FISCO-BCOS
$ mkdir -p build && cd build
# CentOS请使用cmake3
Expand Down Expand Up @@ -184,6 +194,9 @@ fisco-sync工具以表为单位从“数据仓库”拉取数据。如一个表

```bash
git clone https://github.com/FISCO-BCOS/amdb-proxy.git

# 若因为网络问题导致长时间无法下载,请尝试以下命令:
git clone https://gitee.com/FISCO-BCOS/amdb-proxy.git
```

#### 编译源码
Expand Down

0 comments on commit c406e68

Please sign in to comment.