update download link

FISCO-BCOS · Aug 19, 2020 · c60db73 · c60db73
1 parent 53abb80
commit c60db73
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 74 deletions.
diff --git a/docs/enterprise_tools/tutorial_detail_operation_gm.md b/docs/enterprise_tools/tutorial_detail_operation_gm.md
@@ -974,18 +974,6 @@ vi ./console/conf/applicationContext.xml
 </bean>
 ```
 
-**替换国密jar包**
-
-```bash
-cd console && curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.4.25-gm.jar && bash replace_solc_jar.sh solcJ-all-0.4.25-gm.jar
-```
-
-```eval_rst
-.. note::
-
-    建议用户下载完jar包后，手动检查jar包完整性。可以尝试手动解压观察是否完整
-```
-
 ### 查看机构C节点4信息
 
 机构A使用控制台加入机构C节点4为观察节点，其中参数第二项需要替换为加入节点的nodeid，nodeid在节点文件夹的conf的`gmnode.nodeid`文件

diff --git a/docs/installation.md b/docs/installation.md
@@ -10,6 +10,7 @@
 ```eval_rst
 .. note::
     - 若需在已有区块链上进行升级，请转至 `版本及兼容 <change_log/index.html>`_ 章节。
+    - 搭建国密版本的链， `参考这里 <manual/guomi_crypto.html>`_ 。
     - 搭建多群组的链操作类似， `参考这里 <manual/group_use_cases.html>`_ 。
     - 本节使用预编译的静态`fisco-bcos`二进制文件，在CentOS 7和Ubuntu 16.04 64bit上经过测试。
     - `使用docker模式搭建 <manual/build_chain.html#d-optional>`_ ，供有丰富docker经验和容器化部署需求的用户参考。

diff --git a/docs/manual/account.md b/docs/manual/account.md
@@ -37,7 +37,7 @@ curl -LO https://raw.githubusercontent.com/FISCO-BCOS/console/master/tools/get_g
 ```eval_rst
 .. note::
     - 如果因为网络问题导致长时间无法下载，请尝试 `curl -LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_gm_account.sh && chmod u+x get_gm_account.sh && bash get_gm_account.sh -h`
-    - get_gm_account需要下载tassl，如果无法下载，请尝试 `curl -LO https://www.fisco.com.cn/cdn/deps/tools/tassl.tar.gz` ，解压放在~/.fisco/tassl，1.0.9及以下版本放在~/.tassl
+    - get_gm_account需要下载tassl，如果无法下载，请尝试 `curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/tassl-1.0.2/tassl.tar.gz` ，解压放在~/.fisco/tassl，1.0.9及以下版本放在~/.tassl
 ```
 
 执行上面的指令，看到如下输出则下载到了正确的脚本，否则请重试。

diff --git a/docs/manual/cdn.md b/docs/manual/cdn.md
@@ -41,34 +41,6 @@ FISCO BCOS控制台是一个交互式命令行工具，使用Java开发，代码
 curl -LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/download_console.sh && bash download_console.sh
 ```
 
-### 国密jar包官网CDN下载
-
-控制台可以通过替换solcJ包，实现对solidity 0.4/0.5的国密和非国密版本支持。参考这里[https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/console.html#jar](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/console.html#jar)，下面提供官网CDN下载地址。
-
-* 0.4版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.4.25.jar
-```
-
-* 0.5版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.5.2.jar
-```
-
-* 国密0.4版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.4.25-gm.jar
-```
-
-* 国密0.5版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.5.2-gm.jar
-```
-
 ### TASSL
 
 FISCO BCOS国密版本需要使用TASSL生成国密版本的证书，部署工具会自动从GitHub下载，解压后放置于~/.fisco/tassl，如果碰到下载失败，请尝试从[https://gitee.com/FISCO-BCOS/LargeFiles/blob/master/tools/tassl.tar.gz](https://gitee.com/FISCO-BCOS/LargeFiles/blob/master/tools/tassl.tar.gz)下载并解压后，放置于~/.fisco/tassl

diff --git a/docs/tutorial/sdk_application.md b/docs/tutorial/sdk_application.md
@@ -314,7 +314,7 @@ public class Asset extends Contract {
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -LO https://www.fisco.com.cn/cdn/deps/tools/asset-app.tar.gz`
+    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/asset-app.tar.gz`
 ```
 
 asset-app项目的目录结构如下：

diff --git a/en/docs/enterprise_tools/tutorial_detail_operation_gm.md b/en/docs/enterprise_tools/tutorial_detail_operation_gm.md
@@ -2,3 +2,4 @@
 
 <!-- TODO add console details fix type -->
 
+
diff --git a/en/docs/installation.md b/en/docs/installation.md
@@ -9,6 +9,7 @@ This section takes the construction of single group FISCO BCOS chain as an examp
 ```eval_rst
 .. note::
     - To update an existing chain, please refer to `compatibility <change_log/index.html>`_ chapter.
+    - To build OSCCA chain, please refer to ` <manual/guomi_crypto.html>`_ 。
     - It is similar to build a multi-group chain, interested can be referred to `here <manual/group_use_cases.html>`_ .
     - This section uses pre-compiled static `fisco-bcos` binaries which tested on CentOS 7 and Ubuntu 16.04 64bit.
     - `build_chain use docker <manual/build_chain.html#d-optional>`_

diff --git a/en/docs/manual/account.md b/en/docs/manual/account.md
@@ -27,7 +27,7 @@ curl -LO https://raw.githubusercontent.com/FISCO-BCOS/console/master/tools/get_a
 ```eval_rst
 .. note::
     - If the get_account.sh script cannot be downloaded for a long time due to network problems, try `curl -LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_account.sh && chmod u+x get_account.sh && bash get_account.sh -h`
-    - Please use `curl -LO https://www.fisco.com.cn/cdn/deps/tools/tassl.tar.gz`, and place in `~/.fisco/tassl`
+    - Please use `curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/tassl-1.0.2/tassl.tar.gz`, and place in `~/.fisco/tassl`
 ```
 
 If you use guomi version fisco, please execute below command to get `get_gm_account.sh`

diff --git a/en/docs/manual/cdn.md b/en/docs/manual/cdn.md
@@ -12,10 +12,9 @@ FISCO BCOS当前所有仓库源码位于[https://github.com/FISCO-BCOS/FISCO-BCO
 
 ### 二进制程序
 
-FISCO BCOS每个新版本发布会在GitHub的tag中提供对应的二进制程序和部署工具，同时在官网[https://www.fisco.com.cn](https://www.fisco.com.cn/cdn/fisco-bcos/releases/download)也会提供同样的二进制程序，官网通过CDN加速下载。当前所提供的二进制程序包括：
+FISCO BCOS每个新版本发布会在GitHub的tag中提供对应的二进制程序和部署工具，当前所提供的二进制程序包括：
 
 1. fisco-bcos.tar.gz ：静态二进制程序，支持CentOS 7 和Ubuntu 16.04以上版本
-1. fisco-bcos-gm.tar.gz ：国密版本的静态二进制程序，支持CentOS 7 和Ubuntu 16.04以上版本
 1. build_chain.sh ：对应版本的开发部署工具，依赖openssl和curl，支持CentOS 7/Ubuntu 16.04以上/macOS 10.15以上版本
 1. fisco-bcos-macOS.tar.gz ：对应macOS系统的二进制程序
 
@@ -41,34 +40,6 @@ FISCO BCOS控制台是一个交互式命令行工具，使用Java开发，代码
 curl -LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/download_console.sh && bash download_console.sh
 ```
 
-### 国密jar包官网CDN下载
-
-控制台可以通过替换solcJ包，实现对solidity 0.4/0.5的国密和非国密版本支持。参考这里[https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/console.html#jar](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/console.html#jar)，下面提供官网CDN下载地址。
-
-* 0.4版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.4.25.jar
-```
-
-* 0.5版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.5.2.jar
-```
-
-* 国密0.4版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.4.25-gm.jar
-```
-
-* 国密0.5版本合约编译jar包
-
-```bash
-curl -LO https://www.fisco.com.cn/cdn/deps/tools/solcj/solcJ-all-0.5.2-gm.jar
-```
-
 ### TASSL
 
 FISCO BCOS国密版本需要使用TASSL生成国密版本的证书，部署工具会自动从GitHub下载，解压后放置于~/.fisco/tassl，如果碰到下载失败，请尝试从[https://gitee.com/FISCO-BCOS/LargeFiles/blob/master/tools/tassl.tar.gz](https://gitee.com/FISCO-BCOS/LargeFiles/blob/master/tools/tassl.tar.gz)下载并解压后，放置于~/.fisco/tassl

diff --git a/en/docs/tutorial/sdk_application.md b/en/docs/tutorial/sdk_application.md
@@ -320,7 +320,7 @@ We provide a Java engineering project for development. First, get the Java engin
 
 ```eval_rst
 .. note::
-    - If the asset-app.tar.gz cannot be downloaded for a long time due to network problems, try `curl -LO https://www.fisco.com.cn/cdn/deps/tools/asset-app.tar.gz`
+    - If the asset-app.tar.gz cannot be downloaded for a long time due to network problems, try `curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/asset-app.tar.gz`
 ```
 
 The directory structure of the asset-app project is as follows: