From 4194d3693ad5144f22b0cd1c10f4b5c210023058 Mon Sep 17 00:00:00 2001 From: qwdarrenyin <550459364@qq.com> Date: Thu, 25 Jul 2019 20:08:19 +0800 Subject: [PATCH 1/2] update README.md to english link --- README.md | 23 ++++++++++++----------- doc/README_CN.md | 15 ++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 062fbd64..e5908764 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ English / [中文](doc/README_CN.md) [![GitHub All Releases](https://img.shields.io/github/downloads/FISCO-BCOS/console/total.svg)](https://github.com/FISCO-BCOS/console) --- -The console is an important interactive client tool of [FISCO BCOS 2.0](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/). The console has a wealth of commands, including querying blockchain status, managing blockchain nodes, deploying and invoking contracts. +The console is an important interactive client tool of [FISCO BCOS 2.0](https://fisco-bcos-documentation.readthedocs.io/en/latest/). The console has a wealth of commands, including querying blockchain status, managing blockchain nodes, deploying and invoking contracts. ## Features @@ -20,7 +20,7 @@ The console is an important interactive client tool of [FISCO BCOS 2.0](https:// ## Usage -- You can download a tar file and decompress it to enjoy console. See [console manual](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/console.html) for more details. +- You can download a tar file and decompress it to enjoy console. See [console manual](https://fisco-bcos-documentation.readthedocs.io/en/latest/docs/manual/console.html) for more details. ## Source Installation ``` @@ -31,22 +31,23 @@ $ ./gradlew build If you install successfully, it produces the `dist` directory. ## Configuration -Please see the [documentation](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/console.html#id11) about configurating for the console. Have fun. +Please see the [documentation](https://fisco-bcos-documentation.readthedocs.io/en/latest/docs/manual/console.html#id11) about configurating for the console. Have fun. -## Developing & Contributing +## Code Contribution - Star our Github. - Pull requests. See [CONTRIBUTING](CONTRIBUTING.md). - [Ask questions](https://github.com/FISCO-BCOS/console/issues). -- Discuss in [WeChat group](doc/images/WeChatQR.jpeg) or [Gitter](https://gitter.im/fisco-bcos/Lobby). -## Community -By the end of 2018, Financial Blockchain Shenzhen Consortium (FISCO) has attracted and admitted more than 100 members from 6 sectors including banking, fund management, securities brokerage, insurance, regional equity exchanges, and financial information service companies. The first members include the following organizations: Beyondsoft, Huawei, Shenzhen Securities Communications, Digital China, Forms Syntron, Tencent, WeBank, Yuexiu FinTech. +## Join Our Community -- Join our WeChat [![Scan](https://img.shields.io/badge/style-Scan_QR_Code-green.svg?logo=wechat&longCache=false&style=social&label=Group)](doc/images/WeChatQR.jpeg) +The FISCO BCOS community is one of the most active open-source blockchain communities in China. It provides long-term technical support for both institutional and individual developers and users of FISCO BCOS. Thousands of technical enthusiasts from numerous industry sectors have joined this community, studying and using FISCO BCOS platform. If you are also interested, you are most welcome to join us for more support and fun. -- Discuss in [![Gitter](https://img.shields.io/badge/style-on_gitter-green.svg?logo=gitter&longCache=false&style=social&label=Chat)](https://gitter.im/fisco-bcos/Lobby) +![](https://media.githubusercontent.com/media/FISCO-BCOS/LargeFiles/master/images/QR_image_en.png) -- Read news by [![](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&label=Follow@FiscoBcos)](https://twitter.com/FiscoBcos) +## License +![license](https://img.shields.io/badge/license-Apache%20v2-blue.svg) -- Mail us at [![](https://img.shields.io/twitter/url/http/shields.io.svg?logo=Gmail&style=social&label=service@fisco.com.cn)](mailto:service@fisco.com.cn) \ No newline at end of file + + +All contributions are made under the [Apache License 2.0](http://www.apache.org/licenses/). See [LICENSE](LICENSE). diff --git a/doc/README_CN.md b/doc/README_CN.md index f267e5ad..000bebd1 100644 --- a/doc/README_CN.md +++ b/doc/README_CN.md @@ -38,16 +38,17 @@ $ ./gradlew build - 点亮我们的小星星(点击项目左上方Star按钮)。 - 提交代码(Pull requests)，参考我们的[代码贡献流程](CONTRIBUTING_CN.md)。 - [提问和提交BUG](https://github.com/FISCO-BCOS/console/issues)。 -- 在[微信群](images/WeChatQR.jpeg)和[Gitter](https://gitter.im/fisco-bcos/Lobby)参与讨论。 -## 社区生态 +## 加入我们的社区 -**金链盟**开源工作组，获得金链盟成员机构的广泛认可，并由专注于区块链底层技术研发的成员机构及开发者牵头开展工作。其中首批成员包括以下单位(排名不分先后): 博彦科技、华为、深证通、神州数码、四方精创、腾讯、微众银行、越秀金科。 +FISCO BCOS开源社区是国内活跃的开源社区，社区长期为机构和个人开发者提供各类支持与帮助。已有来自各行业的数千名技术爱好者在研究和使用FISCO BCOS。如您对FISCO BCOS开源技术及应用感兴趣，欢迎加入社区获得更多支持与帮助。 -- 微信群：[![Scan](https://img.shields.io/badge/style-Scan_QR_Code-green.svg?logo=wechat&longCache=false&style=social&label=Group)](images/WeChatQR.jpeg) -- Gitter：[![Gitter](https://img.shields.io/badge/style-on_gitter-green.svg?logo=gitter&longCache=false&style=social&label=Chat)](https://gitter.im/fisco-bcos/Lobby) +![](https://media.githubusercontent.com/media/FISCO-BCOS/LargeFiles/master/images/QR_image.png) -- Twitter：[![](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&label=Follow@FiscoBcos)](https://twitter.com/FiscoBcos) -- e-mail：[![](https://img.shields.io/twitter/url/http/shields.io.svg?logo=Gmail&style=social&label=service@fisco.com.cn)](mailto:service@fisco.com.cn) +## License + +![license](https://img.shields.io/badge/license-Apache%20v2-blue.svg) + +Web3SDK的开源协议为[Apache License 2.0](http://www.apache.org/licenses/). 详情参考[LICENSE](../LICENSE)。 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9d01c9d3..da7ec74c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip From f35b8893f6a9593f65d501061f62f12c221044ed Mon Sep 17 00:00:00 2001 From: JimmyShi22 <417711026@qq.com> Date: Wed, 18 Sep 2019 22:02:35 +0800 Subject: [PATCH 2/2] update web3sdk snapshot version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7dc0ca45..98cc5075 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ check.dependsOn.remove(verifyGoogleJavaFormat) // In this section you declare the dependencies for your production and test code dependencies { // compile group: "org.fisco-bcos", name: "web3sdk", version: "2.0.31-SNAPSHOT", changing: true - compile group: 'org.fisco-bcos', name: 'web3sdk', version: '2.1.0.07-SNAPSHOT' + compile group: 'org.fisco-bcos', name: 'web3sdk', version: '2.1.0.08-SNAPSHOT' compile group: 'org.slf4j', name:'slf4j-log4j12', version:'1.7.25' compile group: 'org.jline', name: 'jline', version: '3.12.0' compile group: 'io.bretty', name: 'console-table-builder', version: '1.2'