Skip to content

Commit ccf10d7

Browse files
youwenbusiyouwenbusi
authored
Merge pull request #349 from youwenbusi/feature/reconstruction
final
2 parents 19da87d + 4fd0fb7 commit ccf10d7

File tree

263 files changed

+1663
-28614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+1663
-28614
lines changed

‎.ci/ca.crt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +0,0 @@
1-
-----BEGIN CERTIFICATE-----
2-
MIIDPTCCAiWgAwIBAgIJAMS6EqK879cHMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV
3-
BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe
4-
Fw0xOTA5MDYwMzI4MThaFw0yOTA5MDMwMzI4MThaMDUxDjAMBgNVBAMMBWNoYWlu
5-
MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI
6-
hvcNAQEBBQADggEPADCCAQoCggEBAMy81sz5eAudWDVvOSF4BRrdSZp+uWO8VJph
7-
e2eA1C7gFkd2259gSbvg8mBRivXu5hGvTbbKdFsiq732zixzGzRZ8kyYkUr2QqPy
8-
H8tFAjx+frBQXcBooVDYIPal59thPOuuJsVIWFGqgTnWJCqpymcAzdQAFJ3ebtwH
9-
jvlGW2WN6NJm5bEY5MObKn3391C+rRFVzqm01TRhUWzLczr4Ajv+HyuQheLq+FpY
10-
rKYMgcsXnYK023+VRuXJIc89Ph7JFWFthU8I30AL6BZWsGNZwT+VNkfaie2iMcaS
11-
UkQaLtEL1BVsxqborTljO43Yb9u5OZ4ihu2KFXvKN6GUcmii4fECAwEAAaNQME4w
12-
HQYDVR0OBBYEFAYOx+/OBQb7/EOgf5bKy1WBGfq8MB8GA1UdIwQYMBaAFAYOx+/O
13-
BQb7/EOgf5bKy1WBGfq8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
14-
AK7+Xa0MTi7DtE7czIFMJ5FL5lIZ+OX6heKngxE3pun37aFO3PEgQtvr9gutLzQX
15-
/Yiy8vY2lPtO7erHH6do3H5D6NlAMDsfh8CRuq4DeseNpinA4KwiFmvBEdsWxDI+
16-
qpyHYx3YOnE7wYbossg0+m+eDrFT0SdowY8zHI65qb0T+urtqMWG60dCcmOPe8+E
17-
mPL7JVuTLC0pQiQvVdhM9yyX2sgD8Bwmsw5SILQ9UdX7TVFN4VSuTUh2+DNiR4gt
18-
Umw9W6G7bSG2ZlDhwXesgJdzXcGoPR0j9z4kqf5vvnYCZETG7NZ6++EJ5byZqM49
19-
JaWJWp2OMDwm4e3nLPOS26g=
20-
-----END CERTIFICATE-----

‎.ci/node.crt‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.ci/node.key‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.ci/script/build-ci.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function modify_config()
4747
cp ${java_source_code_dir}/ecdsa_key ${java_source_code_dir}/src/test/resources/
4848
fi
4949
cp ${java_source_code_dir}/.ci/ca.crt ${java_source_code_dir}/src/test/resources
50-
cp ${java_source_code_dir}/.ci/node.crt ${java_source_code_dir}/src/test/resources
51-
cp ${java_source_code_dir}/.ci/node.key ${java_source_code_dir}/src/test/resources
50+
cp ${java_source_code_dir}/.ci/sdk.crt ${java_source_code_dir}/src/test/resources
51+
cp ${java_source_code_dir}/.ci/sdk.key ${java_source_code_dir}/src/test/resources
5252
cp ${java_source_code_dir}/NotoSansCJKtc-Regular.ttf ${java_source_code_dir}/src/main/resources
5353
cp ${java_source_code_dir}/NotoSansCJKtc-Regular.ttf ${java_source_code_dir}/src/test/resources
5454
cp -r ${java_source_code_dir}/src/main/resources/WeDPR_dynamic_lib ${java_source_code_dir}/src/test/resources
@@ -60,8 +60,8 @@ function gradle_build_sdk()
6060
{
6161
#run gradle build
6262
cp ${java_source_code_dir}/.ci/ca.crt ${java_source_code_dir}/src/main/resources
63-
cp ${java_source_code_dir}/.ci/node.crt ${java_source_code_dir}/src/main/resources
64-
cp ${java_source_code_dir}/.ci/node.key ${java_source_code_dir}/src/main/resources
63+
cp ${java_source_code_dir}/.ci/sdk.crt ${java_source_code_dir}/src/main/resources
64+
cp ${java_source_code_dir}/.ci/sdk.key ${java_source_code_dir}/src/main/resources
6565

6666
export FISCO_BCOS_VERSION="2"
6767
export CNS_PROFILE_ACTIVE="ci"

‎.ci/script/weid-build-tools/build-ci.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
3737

3838
# copy blockchain cfg files
3939
cp .ci/ca.crt weid-build-tools/resources/
40-
cp .ci/node.crt weid-build-tools/resources/
41-
cp .ci/node.key weid-build-tools/resources/
40+
cp .ci/sdk.crt weid-build-tools/resources/
41+
cp .ci/sdk.key weid-build-tools/resources/
4242

4343
# run repo ci scripts
4444
cd weid-build-tools/

‎.ci/script/weid-http-service/build-ci.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
3333
cp src/main/resources/* weid-http-service/src/test/resources/
3434
cp .ci/ca.crt weid-http-service/src/test/resources/
3535
cp .ci/ca.crt weid-http-service/src/main/resources/
36-
cp .ci/node.crt weid-http-service/src/test/resources/
37-
cp .ci/node.crt weid-http-service/src/main/resources/
38-
cp .ci/node.key weid-http-service/src/test/resources/
39-
cp .ci/node.key weid-http-service/src/main/resources/
36+
cp .ci/sdk.crt weid-http-service/src/test/resources/
37+
cp .ci/sdk.crt weid-http-service/src/main/resources/
38+
cp .ci/sdk.key weid-http-service/src/test/resources/
39+
cp .ci/sdk.key weid-http-service/src/main/resources/
4040

4141
# run repo ci scripts
4242
cd weid-http-service/

‎.ci/script/weid-sample/build-ci.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
3535
cp src/main/resources/fisco.properties weid-sample/src/main/resources/
3636
cp src/main/resources/weidentity.properties weid-sample/src/main/resources/
3737
cp .ci/ca.crt weid-sample/src/main/resources/
38-
cp .ci/node.crt weid-sample/src/main/resources/
39-
cp .ci/node.key weid-sample/src/main/resources/
38+
cp .ci/sdk.crt weid-sample/src/main/resources/
39+
cp .ci/sdk.key weid-sample/src/main/resources/
4040

4141
# run repo ci scripts
4242
cd weid-sample/

‎.ci/sdk.crt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIBeDCCAR6gAwIBAgIJALkdvuWSdhvfMAoGCCqGSM49BAMCMDcxDzANBgNVBAMM
3+
BmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MCAX
4+
DTIyMDMyMzA5MTM0NFoYDzIxMjIwMjI3MDkxMzQ0WjAxMQwwCgYDVQQDDANzZGsx
5+
EzARBgNVBAoMCmZpc2NvLWJjb3MxDDAKBgNVBAsMA3NkazBWMBAGByqGSM49AgEG
6+
BSuBBAAKA0IABEhQrhgxPHQIGOW7V12Jv+7BzKnheZYPIPbqMR/993QGKqk/5u3+
7+
FyVE2xEGlXa/agLUU2JhmD9yH3nlKR/agfWjGjAYMAkGA1UdEwQCMAAwCwYDVR0P
8+
BAQDAgXgMAoGCCqGSM49BAMCA0gAMEUCIFzn+OXMvv8yD3jzKjb7ccLfPMoUxUZB
9+
pHHmaeaxfamBAiEA6vK2UJivk2j1bxV3NnqTKtDqCwzRHkEAD55iId/mU50=
10+
-----END CERTIFICATE-----
11+
-----BEGIN CERTIFICATE-----
12+
MIIBcDCCARagAwIBAgIJAKybOwjnSONHMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
13+
BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAeFw0y
14+
MjAzMjMwOTEzNDRaFw0zMjAzMjAwOTEzNDRaMDcxDzANBgNVBAMMBmFnZW5jeTET
15+
MBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MFYwEAYHKoZIzj0C
16+
AQYFK4EEAAoDQgAEtaOfgPeNxIkIftVUjvOccocHx4LWnr8lIyT62IKNQPXtDi8U
17+
cJ/0ZaO1btA9lBP4v7YYXVS08iAPvbwwkd002aMQMA4wDAYDVR0TBAUwAwEB/zAK
18+
BggqhkjOPQQDAgNIADBFAiEA1bFbIlVgMr7pbS1VO4UgMnVSPKt1M5115niCdgfU
19+
b1UCIHXSu/stpU+2FWD6HwKRWZQ7VQu/m3qxWpg/+a/S/roM
20+
-----END CERTIFICATE-----
21+
-----BEGIN CERTIFICATE-----
22+
MIIBVzCB/wIJAKoq+vyUmlMJMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMMBWNoYWlu
23+
MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAgFw0yMjAzMjMw
24+
OTEzNDRaGA8yMTIyMDIyNzA5MTM0NFowNTEOMAwGA1UEAwwFY2hhaW4xEzARBgNV
25+
BAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMFYwEAYHKoZIzj0CAQYFK4EE
26+
AAoDQgAEZC0Gxxlvd4jLugWP/usLPQYWvXYWjMHSwF/U2ZQeYklf85r3GaqP6HV2
27+
yEnvDuaemDxMPItzy5cHzjfSBrif5TAKBggqhkjOPQQDAgNHADBEAiA4or46kQ4R
28+
IKQZQyjbL+JvHsj5nMLyaHe4esX9xRVwTQIgI0P7B7XJd8qX8qZqgp2hWbVNdtN/
29+
7W1/jYj/9NjJysE=
30+
-----END CERTIFICATE-----

‎.ci/sdk.key‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgsT4z8MIQvU/QnUhRsz9b
3+
YUx609vYlghhWRiyekMbIaChRANCAARIUK4YMTx0CBjlu1ddib/uwcyp4XmWDyD2
4+
6jEf/fd0BiqpP+bt/hclRNsRBpV2v2oC1FNiYZg/ch955Skf2oH1
5+
-----END PRIVATE KEY-----

‎.idea/.gitignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)