Skip to content

Commit

Permalink
Merge pull request #111 from WeBankFinTech/release/1.5.0
Browse files Browse the repository at this point in the history
Release/1.5.0
  • Loading branch information
chenhaozx committed Dec 30, 2019
2 parents 7612444 + fe6a50a commit d1bdddf
Show file tree
Hide file tree
Showing 82 changed files with 5,121 additions and 221 deletions.
222 changes: 222 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
{
"files": [
"ALLCONTRIBUTOR.md"
],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "webankadmin",
"name": "webankadmin",
"avatar_url": "https://avatars2.githubusercontent.com/u/43233241?v=4",
"profile": "https://github.com/webankadmin",
"contributions": [
"business"
]
},
{
"login": "aleexzhang",
"name": "junqizhang",
"avatar_url": "https://avatars1.githubusercontent.com/u/3457149?v=4",
"profile": "https://github.com/aleexzhang",
"contributions": [
"maintenance"
]
},
{
"login": "chenhaozx",
"name": "chenhaozx",
"avatar_url": "https://avatars3.githubusercontent.com/u/34266296?v=4",
"profile": "https://github.com/chenhaozx",
"contributions": [
"maintenance"
]
},
{
"login": "chaoxinhu",
"name": "chaoxinhu",
"avatar_url": "https://avatars2.githubusercontent.com/u/44358688?v=4",
"profile": "https://github.com/chaoxinhu",
"contributions": [
"maintenance"
]
},
{
"login": "chent57",
"name": "chent57",
"avatar_url": "https://avatars2.githubusercontent.com/u/53847508?v=4",
"profile": "https://github.com/chent57",
"contributions": [
"maintenance"
]
},
{
"login": "darwindu",
"name": "darwindu",
"avatar_url": "https://avatars0.githubusercontent.com/u/30070842?v=4",
"profile": "https://github.com/darwindu",
"contributions": [
"maintenance"
]
},
{
"login": "yg3630536",
"name": "杨刚",
"avatar_url": "https://avatars2.githubusercontent.com/u/39685280?v=4",
"profile": "https://github.com/yg3630536",
"contributions": [
"maintenance"
]
},
{
"login": "anyspa",
"name": "anyspa",
"avatar_url": "https://avatars1.githubusercontent.com/u/35908094?v=4",
"profile": "https://github.com/anyspa",
"contributions": [
"maintenance"
]
},
{
"login": "chirdxing",
"name": "chirdxing",
"avatar_url": "https://avatars1.githubusercontent.com/u/26427952?v=4",
"profile": "https://github.com/chirdxing",
"contributions": [
"code"
]
},
{
"login": "hupeng199",
"name": "hupeng",
"avatar_url": "https://avatars2.githubusercontent.com/u/44767623?v=4",
"profile": "https://github.com/hupeng199",
"contributions": [
"code"
]
},
{
"login": "chenqping",
"name": "chenqping",
"avatar_url": "https://avatars1.githubusercontent.com/u/5651810?v=4",
"profile": "http://weibo.com/u/2633029191/home?wvr=5&lf=reg#!/u/2633029191/home?leftnav=1&wvr=5",
"contributions": [
"code"
]
},
{
"login": "chengzi8705",
"name": "chengzi8705",
"avatar_url": "https://avatars0.githubusercontent.com/u/12156175?v=4",
"profile": "https://github.com/chengzi8705",
"contributions": [
"code"
]
},
{
"login": "The-Emperor1",
"name": "The-Emperor1",
"avatar_url": "https://avatars0.githubusercontent.com/u/23447833?v=4",
"profile": "https://github.com/The-Emperor1",
"contributions": [
"code"
]
},
{
"login": "IdioticMadman",
"name": "robert",
"avatar_url": "https://avatars2.githubusercontent.com/u/16788980?v=4",
"profile": "https://github.com/IdioticMadman",
"contributions": [
"code"
]
},
{
"login": "renranshengxia",
"name": "renranshengxia",
"avatar_url": "https://avatars3.githubusercontent.com/u/6888882?v=4",
"profile": "https://github.com/renranshengxia",
"contributions": [
"code"
]
},
{
"login": "xinjiandong",
"name": "xinjiandong",
"avatar_url": "https://avatars2.githubusercontent.com/u/47093465?v=4",
"profile": "https://github.com/xinjiandong",
"contributions": [
"code"
]
},
{
"login": "EasonRyu",
"name": "eason_ryu",
"avatar_url": "https://avatars2.githubusercontent.com/u/15207576?v=4",
"profile": "https://github.com/EasonRyu",
"contributions": [
"code"
]
},
{
"login": "tyGavinZJU",
"name": "tyGavinZJU",
"avatar_url": "https://avatars3.githubusercontent.com/u/37820916?v=4",
"profile": "https://github.com/tyGavinZJU",
"contributions": [
"code"
]
},
{
"login": "Bingyy",
"name": "Bing",
"avatar_url": "https://avatars3.githubusercontent.com/u/7068217?v=4",
"profile": "https://bingw.blog.csdn.net/",
"contributions": [
"code"
]
},
{
"login": "SherLzp",
"name": "Lin",
"avatar_url": "https://avatars0.githubusercontent.com/u/17902244?v=4",
"profile": "https://sher.vip",
"contributions": [
"code"
]
},
{
"login": "QibingLee",
"name": "QibingLee",
"avatar_url": "https://avatars2.githubusercontent.com/u/45893591?v=4",
"profile": "https://github.com/QibingLee",
"contributions": [
"code"
]
},
{
"login": "lecire",
"name": "Eric Chan",
"avatar_url": "https://avatars2.githubusercontent.com/u/971641?v=4",
"profile": "https://github.com/lecire",
"contributions": [
"code"
]
},
{
"login": "RobinLG",
"name": "Robin Liu",
"avatar_url": "https://avatars0.githubusercontent.com/u/41276823?v=4",
"profile": "http://roliu.work",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 6,
"projectName": "WeIdentity",
"projectOwner": "chaoxinhu",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
}
2 changes: 1 addition & 1 deletion .ci/script/build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ weid_config_tpl=${java_source_code_dir}/src/main/resources/weidentity.properties
weid_config=${java_source_code_dir}/src/main/resources/weidentity.properties
font=${java_source_code_dir}/src/main/resources/NotoSansCJKtc-Regular.ttf

JAVA_OPTS='-Djdk.tls.namedGroups="secp256k1"'
JAVA_OPTS='-Djdk.tls.namedGroups="secp256r1,secp256k1"'

function modify_config()
{
Expand Down
2 changes: 1 addition & 1 deletion .ci/script/weid-http-service/build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if [ "$TRAVIS_BRANCH" = "master" ];then

# run repo ci scripts
cd weid-http-service/
gradle build
#gradle build
else
echo "This is not a master branch PR (commit omitted). Http Service CI skipped."
fi
12 changes: 6 additions & 6 deletions .ci/script/weid-sample/build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
# run repo ci scripts
cd weid-sample/
chmod u+x *.sh
./build.sh
#./build.sh

if ! ./sample-ci.sh
then
echo "execute sample-ci failed."
exit 1
fi
#if ! ./sample-ci.sh
#then
#echo "execute sample-ci failed."
#exit 1
#fi

echo "execute sample-ci success."
#gradle build
Expand Down
50 changes: 50 additions & 0 deletions ALLCONTRIBUTOR.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://github.com/webankadmin"><img src="https://avatars2.githubusercontent.com/u/43233241?v=4" width="100px;" alt=""/><br /><sub><b>webankadmin</b></sub></a><br /><a href="#business-webankadmin" title="Business development">💼</a></td>
<td align="center"><a href="https://github.com/aleexzhang"><img src="https://avatars1.githubusercontent.com/u/3457149?v=4" width="100px;" alt=""/><br /><sub><b>junqizhang</b></sub></a><br /><a href="#maintenance-aleexzhang" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/chenhaozx"><img src="https://avatars3.githubusercontent.com/u/34266296?v=4" width="100px;" alt=""/><br /><sub><b>chenhaozx</b></sub></a><br /><a href="#maintenance-chenhaozx" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/chaoxinhu"><img src="https://avatars2.githubusercontent.com/u/44358688?v=4" width="100px;" alt=""/><br /><sub><b>chaoxinhu</b></sub></a><br /><a href="#maintenance-chaoxinhu" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/chent57"><img src="https://avatars2.githubusercontent.com/u/53847508?v=4" width="100px;" alt=""/><br /><sub><b>chent57</b></sub></a><br /><a href="#maintenance-chent57" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/darwindu"><img src="https://avatars0.githubusercontent.com/u/30070842?v=4" width="100px;" alt=""/><br /><sub><b>darwindu</b></sub></a><br /><a href="#maintenance-darwindu" title="Maintenance">🚧</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/yg3630536"><img src="https://avatars2.githubusercontent.com/u/39685280?v=4" width="100px;" alt=""/><br /><sub><b>杨刚</b></sub></a><br /><a href="#maintenance-yg3630536" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/anyspa"><img src="https://avatars1.githubusercontent.com/u/35908094?v=4" width="100px;" alt=""/><br /><sub><b>anyspa</b></sub></a><br /><a href="#maintenance-anyspa" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/chirdxing"><img src="https://avatars1.githubusercontent.com/u/26427952?v=4" width="100px;" alt=""/><br /><sub><b>chirdxing</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=chirdxing" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/hupeng199"><img src="https://avatars2.githubusercontent.com/u/44767623?v=4" width="100px;" alt=""/><br /><sub><b>hupeng</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=hupeng199" title="Code">💻</a></td>
<td align="center"><a href="http://weibo.com/u/2633029191/home?wvr=5&lf=reg#!/u/2633029191/home?leftnav=1&wvr=5"><img src="https://avatars1.githubusercontent.com/u/5651810?v=4" width="100px;" alt=""/><br /><sub><b>chenqping</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=chenqping" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/chengzi8705"><img src="https://avatars0.githubusercontent.com/u/12156175?v=4" width="100px;" alt=""/><br /><sub><b>chengzi8705</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=chengzi8705" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/The-Emperor1"><img src="https://avatars0.githubusercontent.com/u/23447833?v=4" width="100px;" alt=""/><br /><sub><b>The-Emperor1</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=The-Emperor1" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/IdioticMadman"><img src="https://avatars2.githubusercontent.com/u/16788980?v=4" width="100px;" alt=""/><br /><sub><b>robert</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=IdioticMadman" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/renranshengxia"><img src="https://avatars3.githubusercontent.com/u/6888882?v=4" width="100px;" alt=""/><br /><sub><b>renranshengxia</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=renranshengxia" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/xinjiandong"><img src="https://avatars2.githubusercontent.com/u/47093465?v=4" width="100px;" alt=""/><br /><sub><b>xinjiandong</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=xinjiandong" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/EasonRyu"><img src="https://avatars2.githubusercontent.com/u/15207576?v=4" width="100px;" alt=""/><br /><sub><b>eason_ryu</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=EasonRyu" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/tyGavinZJU"><img src="https://avatars3.githubusercontent.com/u/37820916?v=4" width="100px;" alt=""/><br /><sub><b>tyGavinZJU</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=tyGavinZJU" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://bingw.blog.csdn.net/"><img src="https://avatars3.githubusercontent.com/u/7068217?v=4" width="100px;" alt=""/><br /><sub><b>Bing</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=Bingyy" title="Code">💻</a></td>
<td align="center"><a href="https://sher.vip"><img src="https://avatars0.githubusercontent.com/u/17902244?v=4" width="100px;" alt=""/><br /><sub><b>Lin</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=SherLzp" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/QibingLee"><img src="https://avatars2.githubusercontent.com/u/45893591?v=4" width="100px;" alt=""/><br /><sub><b>QibingLee</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=QibingLee" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/lecire"><img src="https://avatars2.githubusercontent.com/u/971641?v=4" width="100px;" alt=""/><br /><sub><b>Eric Chan</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=lecire" title="Code">💻</a></td>
<td align="center"><a href="http://roliu.work"><img src="https://avatars0.githubusercontent.com/u/41276823?v=4" width="100px;" alt=""/><br /><sub><b>Robin Liu</b></sub></a><br /><a href="https://github.com/chaoxinhu/WeIdentity/commits?author=RobinLG" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-enable -->
<!-- prettier-ignore-end -->
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
### V1.5.0 (2019-12-30)
- Features:
1. CredentialPojo support Zero-Knowledge-Proof based disclosure.
2. Trusted Timestamp creation based on any non-selectively-disclosed CredentialPojo.

- Bugfixes:
1. Fix multiple security risk issues from dependencies.
2. Fix multiple JDK version incompatibility issues.


### V1.4.2 (2019-12-10)
- Features:
1. Allow WeID owners to remove unused public keys and authentications in WeID Document.
Expand Down
8 changes: 8 additions & 0 deletions README-en.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ WeIdentity is running on top of FISCO-BCOS with JAVA SDK provided for developers
<a href="https://www.codefactor.io/repository/github/webankfintech/weidentity"><img src="https://www.codefactor.io/repository/github/webankfintech/weidentity/badge" /></a>
<a href="https://codecov.io/gh/WeBankFinTech/WeIdentity"><img src="https://codecov.io/gh/WeBankFinTech/WeIdentity/branch/master/graph/badge.svg" /></a>
<a href="https://www.gnu.org/licenses/lgpl-3.0"><img src="https://img.shields.io/badge/license-GNU%20LGPL%20v3.0-blue.svg" /></a>
<a href="https://github.com/WeBankFinTech/WeIdentity"><img src="https://sloc.xyz/github/WeBankFinTech/WeIdentity" /></a>
</td>
</tr>
</table>
Expand All @@ -125,6 +126,13 @@ Diving in
Now, please feel free to dive in via \ `this page <https://weidentity.readthedocs.io/zh_CN/latest/docs/one-stop-experience.html>`_ for a one-stop experience of WeIdentity.



Contributions
---------------

You can find all our contributors in \ `this page <./ALLCONTRIBUTOR.md>`_ . Thanks for everything these guys have done for WeIdentity!


Contact Us
----------

Expand Down
3 changes: 3 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ WeIdentity目前支持基于FISCO-BCOS的区块链,并提供Java SDK及RestSer
<a href="https://www.codefactor.io/repository/github/webankfintech/weidentity"><img src="https://www.codefactor.io/repository/github/webankfintech/weidentity/badge" /></a>
<a href="https://codecov.io/gh/WeBankFinTech/WeIdentity"><img src="https://codecov.io/gh/WeBankFinTech/WeIdentity/branch/master/graph/badge.svg" /></a>
<a href="https://www.gnu.org/licenses/lgpl-3.0"><img src="https://img.shields.io/badge/license-GNU%20LGPL%20v3.0-blue.svg" /></a>
<a href="https://github.com/WeBankFinTech/WeIdentity"><img src="https://sloc.xyz/github/WeBankFinTech/WeIdentity" /></a>
</td>
</tr>
</table>
Expand All @@ -132,6 +133,8 @@ WeIdentity目前支持基于FISCO-BCOS的区块链,并提供Java SDK及RestSer
如何贡献
--------

* 我们所有的贡献者名单页面在 \ `这里 <./ALLCONTRIBUTOR.md>`_ 。感谢大家为WeIdentity付出的心血!

*
详见:\ `如何贡献 <https://github.com/WeBankFinTech/WeIdentity/blob/master/.github/CONTRIBUTING.md>`_

3 changes: 2 additions & 1 deletion build-tools/bin/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ app_xml_config=${java_source_code_dir}/src/main/resources/fisco.properties
weid_config_tpl=${java_source_code_dir}/src/main/resources/weidentity.properties.tpl
weid_config=${java_source_code_dir}/src/main/resources/weidentity.properties

JAVA_OPTS='-Djdk.tls.namedGroups="secp256k1"'
JAVA_OPTS='-Djdk.tls.namedGroups="secp256r1,secp256k1"'

CLASSPATH=${java_source_code_dir}/dist/conf

Expand Down Expand Up @@ -133,6 +133,7 @@ function gradle_build_sdk()
fi

done

export BLOCKCHIAN_NODE_INFO=$(echo -e ${content})
export WEID_ADDRESS="0x0"
export CPT_ADDRESS="0x0"
Expand Down

0 comments on commit d1bdddf

Please sign in to comment.