diff --git a/README.md b/README.md index 4050437b..5c18b6bd 100644 --- a/README.md +++ b/README.md @@ -14,25 +14,21 @@ - [java security](http://docs.oracle.com/javase/8/docs/technotes/guides/security/index.html)——hash、签名、密钥对及证书管理均采用jdk内置方法 ## 安装 -- install [jdk8+](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) +- install [zuluJdk11+](https://www.azul.com/downloads/zulu-community/?&architecture=x86-64-bit&package=jdk) - install [Python](http://www.python.org/downloads/) - install [Scala](https://www.scala-lang.org/download/) - install [SBT](http://www.scala-sbt.org/release/docs/Setup.html) -- install [Scala IDE](http://scala-ide.org/) +- install [Idea IDE](https://www.jetbrains.com/idea/download/#section=windows) - install [keystore-explorer](http://keystore-explorer.org/) ——用于生成密钥对的工具,非必须 - install [protobuf editor](https://github.com/Enide/polyglot-maven-editors)——编辑protobuf定义工具，非必须 ## 运行 -- `git clone https://gitee.com/BTAJL/repchain.git` -下载项目到本地 -- `sbt` -在项目的根目录下下载项目依赖项，可以配置仓库或者使用阿里镜像 -- `compile` -编译成Protocol Buffer Scala类 -- `eclipse` -生成eclipse工程文件 -- 打开 Scala IDE, File->Import->Existing Projects,导入项目 -- 右键单击 rep.app.Repchain.scala,Run As->Scala Application(单机组网4个节点) +- ` 下载项目到本地` + - git clone https://gitee.com/BTAJL/repchain.git +- `导入` + - 打开Idea IDE，File->New->Project or Project from VersionControl + - 使用Idea的sbt插件导入 +- 右键单击 rep.app.Repchain.scala，Run 'RepChain'(单机组网4个节点) - 运行配置VM参数 -Dlogback.configurationFile=conf/logback.xml (使logback配置生效) - 查看实时图 http://localhost:8081/web/g1.html - 查看API http://localhost:8081/swagger/index.html @@ -44,7 +40,7 @@ ## 打包 - assembly -打包成jar包，进行分布式部署 + - 打包成jar包，进行分布式部署 ## 论坛社区 - http://bbs.repchain.net.cn/ diff --git a/jks/121000005l35120456.node1.cer b/jks/121000005l35120456.node1.cer index 2de35e9c..6494e835 100644 --- a/jks/121000005l35120456.node1.cer +++ b/jks/121000005l35120456.node1.cer @@ -1,11 +1,9 @@ -----BEGIN CERTIFICATE----- -MIIBmjCCAT+gAwIBAgIEXIn07TAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATEwHhcNMTkwMzE0MDYzMDA1WhcNMjAwMzEz -MDYzMDA1WjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATEw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAASlh+oDBPdwHEkpQT4/g4RX9ubP7jMM2Qod -iFtsnv+ObQ3dxfQN/S515ePssn3HjPCwfzR3S1KY4O9vFtH1Jql9MAoGCCqGSM49 -BAMCA0kAMEYCIQCG2NFkYx06oWahUDflmXDkoXyTBIvjnA/M2yJlou3RIQIhAJcA -1X1djf5oGPc+6GYh9g4YhQ59HxV3p6kAEuRI13PP +MIIBTDCB9KADAgECAgRd7wBCMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBMTAeFw0xOTEyMTAwMjE3Mzha +Fw0yMDEyMDkwMjE3MzhaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJu7PT4Z +s5hqqNha9SrP60TecIDVYGry0v6ayV5lP8w5FJ2UtRECrpUxuoO2pfaHfxyYIXCZ +A8w7YaZU0s4CEfcwCgYIKoZIzj0EAwIDRwAwRAIgcAxkxmiNexPx8CF+DvII7168 +eeVcfsJwoMcFFLKCWrECICSIkc9vC6Vwze3s2UwBuIiSlwNxZ0YDJcdlbcmESWHy -----END CERTIFICATE----- diff --git a/jks/121000005l35120456.node1.jks b/jks/121000005l35120456.node1.jks index 6433080f..acb35dc2 100644 Binary files a/jks/121000005l35120456.node1.jks and b/jks/121000005l35120456.node1.jks differ diff --git a/jks/12110107bi45jh675g.node2.cer b/jks/12110107bi45jh675g.node2.cer index b35d52d7..1e9c7149 100644 --- a/jks/12110107bi45jh675g.node2.cer +++ b/jks/12110107bi45jh675g.node2.cer @@ -1,11 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBmTCCAT+gAwIBAgIEXIn2LzAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATIwHhcNMTkwMzE0MDYzNTI3WhcNMjAwMzEz -MDYzNTI3WjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATIw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAAQbGHprzZj8UABd4LFvAoFVPFc/xDkWybEJ -oF3iey/BvIVvBrB92xskV8ULlOt+qjQGIz0SdRiCrqs+YacCAo/xMAoGCCqGSM49 -BAMCA0gAMEUCIDdarnwrREWGu3YQMvcFItU3e5X9J7kwgVw3uvZg77r0AiEAgIhG -TTVwdvjjewyeOXoVT/emsGz314jZJTYbtzoZiv8= +MIIBTTCB9KADAgECAgRd7wDfMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBMjAeFw0xOTEyMTAwMjIwMTVa +Fw0yMDEyMDkwMjIwMTVaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIqbpyaG +r7ST/JsS86YBzlG/S3WqyXBCk00OvUfGcynwJt8m0vUnj8Z5QxNtsTUtMilzVayn +B7dVpeM1rFB/bGEwCgYIKoZIzj0EAwIDSAAwRQIhAKzfA6yHLF57HoEk+aVRCVpv +vAvvQZuHKkYdzS7/TeXjAiBCtWh8sRO4kXjn9e8H0GHxmt+zQPHTr5UJt0b47BDB +lg== -----END CERTIFICATE----- diff --git a/jks/12110107bi45jh675g.node2.jks b/jks/12110107bi45jh675g.node2.jks index c70a1716..4a94631e 100644 Binary files a/jks/12110107bi45jh675g.node2.jks and b/jks/12110107bi45jh675g.node2.jks differ diff --git a/jks/122000002n00123567.node3.cer b/jks/122000002n00123567.node3.cer index e8483ed3..2a36cf5c 100644 --- a/jks/122000002n00123567.node3.cer +++ b/jks/122000002n00123567.node3.cer @@ -1,11 +1,9 @@ -----BEGIN CERTIFICATE----- -MIIBmTCCAT+gAwIBAgIEXIn6vTAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATMwHhcNMTkwMzE0MDY1NDUzWhcNMjAwMzEz -MDY1NDUzWjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATMw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAASdBDKlL7mW1NEfYDDb63d6O3/MueUT0Czr -bzcmLhrDvRyIO2fHl/zR/qrNy76cuRi7EednNO/G7qTemnJQqC9oMAoGCCqGSM49 -BAMCA0gAMEUCIEXfvQcCZsnBiCWEPV0gWmxnhBbRRXE9oirBwb4J0Tu+AiEAk7Z8 -3MRWR022p7AYeshwIXpaDlIu3N4VxatMHh3rs5I= +MIIBTDCB9KADAgECAgRd7wElMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBMzAeFw0xOTEyMTAwMjIxMjVa +Fw0yMDEyMDkwMjIxMjVaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHemUcIh +MpmOiWcbw5BBorqD+0LHaBzYVyKeYj2Sk3HR1M/JIb3R40xHEQbJPdb3SrgClSt6 +LBiYiNENQBBJLw0wCgYIKoZIzj0EAwIDRwAwRAIgHX8epaHLqyPcNEj+fdD9zn/u +j8juebSZq42IRBAYTm0CICy+hKIZyVkNxPjV3tR+k+DjaWrDFSio57VuBbD8Cwvx -----END CERTIFICATE----- diff --git a/jks/122000002n00123567.node3.jks b/jks/122000002n00123567.node3.jks index fec7ff42..1dee0d81 100644 Binary files a/jks/122000002n00123567.node3.jks and b/jks/122000002n00123567.node3.jks differ diff --git a/jks/921000005k36123789.node4.cer b/jks/921000005k36123789.node4.cer index c968d737..d6527b03 100644 --- a/jks/921000005k36123789.node4.cer +++ b/jks/921000005k36123789.node4.cer @@ -1,11 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBmjCCAT+gAwIBAgIEXIn75TAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATQwHhcNMTkwMzE0MDY1OTQ5WhcNMjAwMzEz -MDY1OTQ5WjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATQw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAAQy8jrMgX4TF/iuA42wEpYr82qIzBVFZmoJ -dyQTu2Pu5Ot4Jfg1sa/ibY4fxXX/Rc2bN8U0+88A7JiEqa0pRAQUMAoGCCqGSM49 -BAMCA0kAMEYCIQDLBrE3v62ztcucfxZ27M0JqcgKWKT1Cow3JyCLZnhAQwIhANaQ -Iv1SgKX7fnhR3lga4IKdaFK6bpW/9YnDUsQ22kFL +MIIBTTCB9KADAgECAgRd7wFdMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBNDAeFw0xOTEyMTAwMjIyMjFa +Fw0yMDEyMDkwMjIyMjFaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBNDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAjzZaK8 +UAvLLIpYgH3IVoezCK/sOz+BG1vb19BEdhbPJA/r1xBuDKG1DK9qIVSbAvfHrioH +NiceJs6Mym9TgYcwCgYIKoZIzj0EAwIDSAAwRQIgcaGwPxUC//H+yQFRq16m9aZp +aYwh+NwRs1SQ9USC170CIQCgTXpMxcTbfsKWiPY7QsTGCHn/c0+XS3nVIR2FWno5 +Bg== -----END CERTIFICATE----- diff --git a/jks/921000005k36123789.node4.jks b/jks/921000005k36123789.node4.jks index 0cdd00a8..d800f08d 100644 Binary files a/jks/921000005k36123789.node4.jks and b/jks/921000005k36123789.node4.jks differ diff --git a/jks/921000006e0012v696.node5.cer b/jks/921000006e0012v696.node5.cer index 14df0a3d..431d255e 100644 --- a/jks/921000006e0012v696.node5.cer +++ b/jks/921000006e0012v696.node5.cer @@ -1,11 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBmTCCAT+gAwIBAgIEXIn8QzAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATUwHhcNMTkwMzE0MDcwMTIzWhcNMjAwMzEz -MDcwMTIzWjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATUw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAASRkmXqNawcVmoRYCRbxxuGMEhBkNi7mB6E -THeC+CzOw/G7spOXst4AEEcZwNwnu4yBsTI61O59+wWWoVzJMCfHMAoGCCqGSM49 -BAMCA0gAMEUCIDUg9XvYS5gYplD2XpQIs2yYyG9yC3CYDVU3oHEbAhmgAiEA0857 -jWV0BsnABl2+s/P/WYEuZWixQuO2YNGpwVG/u7g= +MIIBTTCB9KADAgECAgRd7wGTMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBNTAeFw0xOTEyMTAwMjIzMTVa +Fw0yMDEyMDkwMjIzMTVaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBNTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNVDTgfE +OQaHL8uQd6Zb4VqQQOuuz/f12zIKQ9QcMaRs87H1o3JBoydjUHSV6e60tXtHt1Ty +vaswF9EfMooKpaYwCgYIKoZIzj0EAwIDSAAwRQIhAIHfXVE5IuR73YubAG2gvtZS +BHb0TBNri/dYEiCTYP6JAiBBpr0Ssf468NQo74ZjpZmnPBQ88fQApE9RA5WGPAY0 +iA== -----END CERTIFICATE----- diff --git a/jks/921000006e0012v696.node5.jks b/jks/921000006e0012v696.node5.jks index fc482966..16ea9030 100644 Binary files a/jks/921000006e0012v696.node5.jks and b/jks/921000006e0012v696.node5.jks differ diff --git a/jks/951002007l78123233.super_admin.cer b/jks/951002007l78123233.super_admin.cer index fffa1f05..9dd55204 100644 --- a/jks/951002007l78123233.super_admin.cer +++ b/jks/951002007l78123233.super_admin.cer @@ -1,12 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBrjCCAVOgAwIBAgIEXIn9HTAKBggqhkjOPQQDAjBgMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxFDASBgNVBAMMC3N1cGVyX2FkbWluMB4XDTE5MDMxNDA3MDUw -MVoXDTIwMDMxMzA3MDUwMVowYDELMAkGA1UEBhMCY24xCzAJBgNVBAgMAmJqMQsw -CQYDVQQHDAJiajERMA8GA1UECgwIcmVwY2hhaW4xDjAMBgNVBAsMBWlzY2FzMRQw -EgYDVQQDDAtzdXBlcl9hZG1pbjBWMBAGByqGSM49AgEGBSuBBAAKA0IABBLsxfk6 -B86BFI3ij2YJylNGzxXNRQb45mZPNfVAkQf0hImHJMP+EgCK7UfJqa1U970ZslSC -VTDxNyrb5wfLOIMwCgYIKoZIzj0EAwIDSQAwRgIhANUOIZN0YmYxbtmUlJeMaeEe -b2STEd2Z07l1WBUN+mN9AiEAqKXR2Z/F+t0lWELgO4I+fxHiw+GIBYYLlsRVy4zZ -vvU= +MIIBYzCCAQigAwIBAgIEXe8B6zAKBggqhkjOPQQDAjA5MREwDwYDVQQKDAhyZXBj +aGFpbjEOMAwGA1UECwwFaXNjYXMxFDASBgNVBAMMC3N1cGVyX2FkbWluMB4XDTE5 +MTIxMDAyMjQ0M1oXDTIwMTIwOTAyMjQ0M1owOTERMA8GA1UECgwIcmVwY2hhaW4x +DjAMBgNVBAsMBWlzY2FzMRQwEgYDVQQDDAtzdXBlcl9hZG1pbjBZMBMGByqGSM49 +AgEGCCqGSM49AwEHA0IABK9m+cb8jaYQ+ts/hK4INuQbOwAwoIhVa3uaRxsOsgoR ++QaPuwcZAIbGWSa9bn8oGjSBDQutmE5XONbdiDwPRtwwCgYIKoZIzj0EAwIDSQAw +RgIhAKZto+39OFced9YDaXYkOLrLcKD+8RbF57vzHpJrnFd1AiEAhNEK8MOsAlhM +eRZmlXsq4KsvQFs+Wav9N9qJ+GGRpCs= -----END CERTIFICATE----- diff --git a/jks/951002007l78123233.super_admin.jks b/jks/951002007l78123233.super_admin.jks index 5df71ae5..afea547c 100644 Binary files a/jks/951002007l78123233.super_admin.jks and b/jks/951002007l78123233.super_admin.jks differ diff --git a/jks/certs/121000005l35120456.node1.cer b/jks/certs/121000005l35120456.node1.cer index 2de35e9c..6494e835 100644 --- a/jks/certs/121000005l35120456.node1.cer +++ b/jks/certs/121000005l35120456.node1.cer @@ -1,11 +1,9 @@ -----BEGIN CERTIFICATE----- -MIIBmjCCAT+gAwIBAgIEXIn07TAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATEwHhcNMTkwMzE0MDYzMDA1WhcNMjAwMzEz -MDYzMDA1WjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATEw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAASlh+oDBPdwHEkpQT4/g4RX9ubP7jMM2Qod -iFtsnv+ObQ3dxfQN/S515ePssn3HjPCwfzR3S1KY4O9vFtH1Jql9MAoGCCqGSM49 -BAMCA0kAMEYCIQCG2NFkYx06oWahUDflmXDkoXyTBIvjnA/M2yJlou3RIQIhAJcA -1X1djf5oGPc+6GYh9g4YhQ59HxV3p6kAEuRI13PP +MIIBTDCB9KADAgECAgRd7wBCMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBMTAeFw0xOTEyMTAwMjE3Mzha +Fw0yMDEyMDkwMjE3MzhaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJu7PT4Z +s5hqqNha9SrP60TecIDVYGry0v6ayV5lP8w5FJ2UtRECrpUxuoO2pfaHfxyYIXCZ +A8w7YaZU0s4CEfcwCgYIKoZIzj0EAwIDRwAwRAIgcAxkxmiNexPx8CF+DvII7168 +eeVcfsJwoMcFFLKCWrECICSIkc9vC6Vwze3s2UwBuIiSlwNxZ0YDJcdlbcmESWHy -----END CERTIFICATE----- diff --git a/jks/certs/12110107bi45jh675g.node2.cer b/jks/certs/12110107bi45jh675g.node2.cer index b35d52d7..1e9c7149 100644 --- a/jks/certs/12110107bi45jh675g.node2.cer +++ b/jks/certs/12110107bi45jh675g.node2.cer @@ -1,11 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBmTCCAT+gAwIBAgIEXIn2LzAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATIwHhcNMTkwMzE0MDYzNTI3WhcNMjAwMzEz -MDYzNTI3WjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATIw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAAQbGHprzZj8UABd4LFvAoFVPFc/xDkWybEJ -oF3iey/BvIVvBrB92xskV8ULlOt+qjQGIz0SdRiCrqs+YacCAo/xMAoGCCqGSM49 -BAMCA0gAMEUCIDdarnwrREWGu3YQMvcFItU3e5X9J7kwgVw3uvZg77r0AiEAgIhG -TTVwdvjjewyeOXoVT/emsGz314jZJTYbtzoZiv8= +MIIBTTCB9KADAgECAgRd7wDfMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBMjAeFw0xOTEyMTAwMjIwMTVa +Fw0yMDEyMDkwMjIwMTVaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIqbpyaG +r7ST/JsS86YBzlG/S3WqyXBCk00OvUfGcynwJt8m0vUnj8Z5QxNtsTUtMilzVayn +B7dVpeM1rFB/bGEwCgYIKoZIzj0EAwIDSAAwRQIhAKzfA6yHLF57HoEk+aVRCVpv +vAvvQZuHKkYdzS7/TeXjAiBCtWh8sRO4kXjn9e8H0GHxmt+zQPHTr5UJt0b47BDB +lg== -----END CERTIFICATE----- diff --git a/jks/certs/122000002n00123567.node3.cer b/jks/certs/122000002n00123567.node3.cer index e8483ed3..2a36cf5c 100644 --- a/jks/certs/122000002n00123567.node3.cer +++ b/jks/certs/122000002n00123567.node3.cer @@ -1,11 +1,9 @@ -----BEGIN CERTIFICATE----- -MIIBmTCCAT+gAwIBAgIEXIn6vTAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATMwHhcNMTkwMzE0MDY1NDUzWhcNMjAwMzEz -MDY1NDUzWjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATMw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAASdBDKlL7mW1NEfYDDb63d6O3/MueUT0Czr -bzcmLhrDvRyIO2fHl/zR/qrNy76cuRi7EednNO/G7qTemnJQqC9oMAoGCCqGSM49 -BAMCA0gAMEUCIEXfvQcCZsnBiCWEPV0gWmxnhBbRRXE9oirBwb4J0Tu+AiEAk7Z8 -3MRWR022p7AYeshwIXpaDlIu3N4VxatMHh3rs5I= +MIIBTDCB9KADAgECAgRd7wElMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBMzAeFw0xOTEyMTAwMjIxMjVa +Fw0yMDEyMDkwMjIxMjVaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHemUcIh +MpmOiWcbw5BBorqD+0LHaBzYVyKeYj2Sk3HR1M/JIb3R40xHEQbJPdb3SrgClSt6 +LBiYiNENQBBJLw0wCgYIKoZIzj0EAwIDRwAwRAIgHX8epaHLqyPcNEj+fdD9zn/u +j8juebSZq42IRBAYTm0CICy+hKIZyVkNxPjV3tR+k+DjaWrDFSio57VuBbD8Cwvx -----END CERTIFICATE----- diff --git a/jks/certs/921000005k36123789.node4.cer b/jks/certs/921000005k36123789.node4.cer index c968d737..d6527b03 100644 --- a/jks/certs/921000005k36123789.node4.cer +++ b/jks/certs/921000005k36123789.node4.cer @@ -1,11 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBmjCCAT+gAwIBAgIEXIn75TAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATQwHhcNMTkwMzE0MDY1OTQ5WhcNMjAwMzEz -MDY1OTQ5WjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATQw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAAQy8jrMgX4TF/iuA42wEpYr82qIzBVFZmoJ -dyQTu2Pu5Ot4Jfg1sa/ibY4fxXX/Rc2bN8U0+88A7JiEqa0pRAQUMAoGCCqGSM49 -BAMCA0kAMEYCIQDLBrE3v62ztcucfxZ27M0JqcgKWKT1Cow3JyCLZnhAQwIhANaQ -Iv1SgKX7fnhR3lga4IKdaFK6bpW/9YnDUsQ22kFL +MIIBTTCB9KADAgECAgRd7wFdMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBNDAeFw0xOTEyMTAwMjIyMjFa +Fw0yMDEyMDkwMjIyMjFaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBNDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAjzZaK8 +UAvLLIpYgH3IVoezCK/sOz+BG1vb19BEdhbPJA/r1xBuDKG1DK9qIVSbAvfHrioH +NiceJs6Mym9TgYcwCgYIKoZIzj0EAwIDSAAwRQIgcaGwPxUC//H+yQFRq16m9aZp +aYwh+NwRs1SQ9USC170CIQCgTXpMxcTbfsKWiPY7QsTGCHn/c0+XS3nVIR2FWno5 +Bg== -----END CERTIFICATE----- diff --git a/jks/certs/921000006e0012v696.node5.cer b/jks/certs/921000006e0012v696.node5.cer index 14df0a3d..431d255e 100644 --- a/jks/certs/921000006e0012v696.node5.cer +++ b/jks/certs/921000006e0012v696.node5.cer @@ -1,11 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBmTCCAT+gAwIBAgIEXIn8QzAKBggqhkjOPQQDAjBWMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxCjAIBgNVBAMMATUwHhcNMTkwMzE0MDcwMTIzWhcNMjAwMzEz -MDcwMTIzWjBWMQswCQYDVQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJq -MREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UECwwFaXNjYXMxCjAIBgNVBAMMATUw -VjAQBgcqhkjOPQIBBgUrgQQACgNCAASRkmXqNawcVmoRYCRbxxuGMEhBkNi7mB6E -THeC+CzOw/G7spOXst4AEEcZwNwnu4yBsTI61O59+wWWoVzJMCfHMAoGCCqGSM49 -BAMCA0gAMEUCIDUg9XvYS5gYplD2XpQIs2yYyG9yC3CYDVU3oHEbAhmgAiEA0857 -jWV0BsnABl2+s/P/WYEuZWixQuO2YNGpwVG/u7g= +MIIBTTCB9KADAgECAgRd7wGTMAoGCCqGSM49BAMCMC8xETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEKMAgGA1UEAwwBNTAeFw0xOTEyMTAwMjIzMTVa +Fw0yMDEyMDkwMjIzMTVaMC8xETAPBgNVBAoMCHJlcGNoYWluMQ4wDAYDVQQLDAVp +c2NhczEKMAgGA1UEAwwBNTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNVDTgfE +OQaHL8uQd6Zb4VqQQOuuz/f12zIKQ9QcMaRs87H1o3JBoydjUHSV6e60tXtHt1Ty +vaswF9EfMooKpaYwCgYIKoZIzj0EAwIDSAAwRQIhAIHfXVE5IuR73YubAG2gvtZS +BHb0TBNri/dYEiCTYP6JAiBBpr0Ssf468NQo74ZjpZmnPBQ88fQApE9RA5WGPAY0 +iA== -----END CERTIFICATE----- diff --git a/jks/certs/951002007l78123233.super_admin.cer b/jks/certs/951002007l78123233.super_admin.cer index fffa1f05..9dd55204 100644 --- a/jks/certs/951002007l78123233.super_admin.cer +++ b/jks/certs/951002007l78123233.super_admin.cer @@ -1,12 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBrjCCAVOgAwIBAgIEXIn9HTAKBggqhkjOPQQDAjBgMQswCQYDVQQGEwJjbjEL -MAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwG -A1UECwwFaXNjYXMxFDASBgNVBAMMC3N1cGVyX2FkbWluMB4XDTE5MDMxNDA3MDUw -MVoXDTIwMDMxMzA3MDUwMVowYDELMAkGA1UEBhMCY24xCzAJBgNVBAgMAmJqMQsw -CQYDVQQHDAJiajERMA8GA1UECgwIcmVwY2hhaW4xDjAMBgNVBAsMBWlzY2FzMRQw -EgYDVQQDDAtzdXBlcl9hZG1pbjBWMBAGByqGSM49AgEGBSuBBAAKA0IABBLsxfk6 -B86BFI3ij2YJylNGzxXNRQb45mZPNfVAkQf0hImHJMP+EgCK7UfJqa1U970ZslSC -VTDxNyrb5wfLOIMwCgYIKoZIzj0EAwIDSQAwRgIhANUOIZN0YmYxbtmUlJeMaeEe -b2STEd2Z07l1WBUN+mN9AiEAqKXR2Z/F+t0lWELgO4I+fxHiw+GIBYYLlsRVy4zZ -vvU= +MIIBYzCCAQigAwIBAgIEXe8B6zAKBggqhkjOPQQDAjA5MREwDwYDVQQKDAhyZXBj +aGFpbjEOMAwGA1UECwwFaXNjYXMxFDASBgNVBAMMC3N1cGVyX2FkbWluMB4XDTE5 +MTIxMDAyMjQ0M1oXDTIwMTIwOTAyMjQ0M1owOTERMA8GA1UECgwIcmVwY2hhaW4x +DjAMBgNVBAsMBWlzY2FzMRQwEgYDVQQDDAtzdXBlcl9hZG1pbjBZMBMGByqGSM49 +AgEGCCqGSM49AwEHA0IABK9m+cb8jaYQ+ts/hK4INuQbOwAwoIhVa3uaRxsOsgoR ++QaPuwcZAIbGWSa9bn8oGjSBDQutmE5XONbdiDwPRtwwCgYIKoZIzj0EAwIDSQAw +RgIhAKZto+39OFced9YDaXYkOLrLcKD+8RbF57vzHpJrnFd1AiEAhNEK8MOsAlhM +eRZmlXsq4KsvQFs+Wav9N9qJ+GGRpCs= -----END CERTIFICATE----- diff --git a/jks/mytruststore.jks b/jks/mytruststore.jks index 211f9c85..fc3c7c7d 100644 Binary files a/jks/mytruststore.jks and b/jks/mytruststore.jks differ diff --git a/jks_ca/121000005l35120456.node1.jks b/jks_ca/121000005l35120456.node1.jks new file mode 100644 index 00000000..d63cb2ea Binary files /dev/null and b/jks_ca/121000005l35120456.node1.jks differ diff --git a/jks_ca/12110107bi45jh675g.node2.jks b/jks_ca/12110107bi45jh675g.node2.jks new file mode 100644 index 00000000..2f3884ad Binary files /dev/null and b/jks_ca/12110107bi45jh675g.node2.jks differ diff --git a/jks_ca/122000002n00123567.node3.jks b/jks_ca/122000002n00123567.node3.jks new file mode 100644 index 00000000..b71f149e Binary files /dev/null and b/jks_ca/122000002n00123567.node3.jks differ diff --git a/jks_ca/921000005k36123789.node4.jks b/jks_ca/921000005k36123789.node4.jks new file mode 100644 index 00000000..556e73d8 Binary files /dev/null and b/jks_ca/921000005k36123789.node4.jks differ diff --git a/jks_ca/921000006e0012v696.node5.jks b/jks_ca/921000006e0012v696.node5.jks new file mode 100644 index 00000000..09f871ce Binary files /dev/null and b/jks_ca/921000006e0012v696.node5.jks differ diff --git a/jks_ca/951002007l78123233.super_admin.jks b/jks_ca/951002007l78123233.super_admin.jks new file mode 100644 index 00000000..1a53f27a Binary files /dev/null and b/jks_ca/951002007l78123233.super_admin.jks differ diff --git a/jks_ca/cacerts b/jks_ca/cacerts new file mode 100644 index 00000000..71c44cd2 Binary files /dev/null and b/jks_ca/cacerts differ diff --git a/jks_ca/certs/121000005l35120456.node1.cer b/jks_ca/certs/121000005l35120456.node1.cer new file mode 100644 index 00000000..0a2cee85 --- /dev/null +++ b/jks_ca/certs/121000005l35120456.node1.cer @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIBVjCB/KADAgECAgRd8FknMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +OTExWhcNMjAxMjEwMDI0OTExWjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBW5vZGUxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEqLo9CXvQ/ZbpuA/M644S3sfnPtsg0IttOa1yGyEyxPHwuO3X9J2MOhO1DEq/ +CSgwof8iuQ2RHnA798Ix7SQIZzAKBggqhkjOPQQDAgNJADBGAiEAw8UB0hqesZKW +NCqZ51kbGq2nxI4jvGYgij1E/Jm4+fUCIQDbTXWRf0TpjYnnCcAhyxSCGlrjnoIj +oldevvXCFhh9eg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FjlMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +ODA1WhcNMjAxMjEwMDI0ODA1WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEnWb6C7xEIwgDEm8TVP94eyeDkykKRnC27rrRSd+k7+M3aDUPYzDvgOQplThX +l0cHeiWNULwVnfJjNqUyVBN3WTAKBggqhkjOPQQDAgNIADBFAiALUEUiEUySNBh/ +M8Yy9MZhLE/xBHY8Q0d3erPeFwX7zwIhAOZublAk8sSS5037mzQcFjm6f4pIAb29 +4gEWsQQocHGV +-----END CERTIFICATE----- diff --git a/jks_ca/certs/12110107bi45jh675g.node2.cer b/jks_ca/certs/12110107bi45jh675g.node2.cer new file mode 100644 index 00000000..0270f187 --- /dev/null +++ b/jks_ca/certs/12110107bi45jh675g.node2.cer @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIBVjCB/KADAgECAgRd8Fq+MAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI1 +NTU4WhcNMjAxMjEwMDI1NTU4WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBW5vZGUyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAE1UF23vURqGh/I/qF2Nu1JZTPsAMqZXtRrMeAfZ3HAA5EEtrvN9XDX8dWzVvI +cnFDVENEAmmhBY+TnD0p0JkXGDAKBggqhkjOPQQDAgNJADBGAiEAmQYrNxTszBRK +PnSI+BXyrnzDlWxcUEObDh7YglgiPo8CIQCXrVIV+Vib1aQuPxxkdZ5gDAj1BZzL +eXCyawEcEoyBTw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FjlMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +ODA1WhcNMjAxMjEwMDI0ODA1WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEnWb6C7xEIwgDEm8TVP94eyeDkykKRnC27rrRSd+k7+M3aDUPYzDvgOQplThX +l0cHeiWNULwVnfJjNqUyVBN3WTAKBggqhkjOPQQDAgNIADBFAiALUEUiEUySNBh/ +M8Yy9MZhLE/xBHY8Q0d3erPeFwX7zwIhAOZublAk8sSS5037mzQcFjm6f4pIAb29 +4gEWsQQocHGV +-----END CERTIFICATE----- diff --git a/jks_ca/certs/122000002n00123567.node3.cer b/jks_ca/certs/122000002n00123567.node3.cer new file mode 100644 index 00000000..4e1b939b --- /dev/null +++ b/jks_ca/certs/122000002n00123567.node3.cer @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIBVDCB/KADAgECAgRd8FrnMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI1 +NjM5WhcNMjAxMjEwMDI1NjM5WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBW5vZGUzMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAE7u1fRVED7v3mdvHiaAZbf/HcYPwRw6EB0qnl4GDj0l5WFoetrn+rV9oR3iw9 +HNghSWiTmWdlUHY9Yp3q+GcnjzAKBggqhkjOPQQDAgNHADBEAiALZejrggAz0n7Y +YxKYjkF5BWBNOjVsrYfDYehSDahb+gIgWiEKqNgEwXKUpQXt30N80Yb2ZeufGJZO +bfQ+7mv+c1M= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FjlMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +ODA1WhcNMjAxMjEwMDI0ODA1WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEnWb6C7xEIwgDEm8TVP94eyeDkykKRnC27rrRSd+k7+M3aDUPYzDvgOQplThX +l0cHeiWNULwVnfJjNqUyVBN3WTAKBggqhkjOPQQDAgNIADBFAiALUEUiEUySNBh/ +M8Yy9MZhLE/xBHY8Q0d3erPeFwX7zwIhAOZublAk8sSS5037mzQcFjm6f4pIAb29 +4gEWsQQocHGV +-----END CERTIFICATE----- diff --git a/jks_ca/certs/921000005k36123789.node4.cer b/jks_ca/certs/921000005k36123789.node4.cer new file mode 100644 index 00000000..b0f8fd3d --- /dev/null +++ b/jks_ca/certs/921000005k36123789.node4.cer @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIBVjCB/KADAgECAgRd8FsPMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI1 +NzE5WhcNMjAxMjEwMDI1NzE5WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBW5vZGU0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAETTaKhd0mdSXfrtYKYlyHmrnxE/eTQqpNUrFxhyXplqhp0rpjYbSM0kpZSSM5 +5a4e4fCcZSLrx7qBGJrpQbnb/zAKBggqhkjOPQQDAgNJADBGAiEApUjqEWj+02vM +WC0t44OXrKbqBHOhxR6k+BPyBM8sCzgCIQCWaOY4aZEWkYtsLczWp8wR+xqM9kqD +vRpty2kdQVps+g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FjlMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +ODA1WhcNMjAxMjEwMDI0ODA1WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEnWb6C7xEIwgDEm8TVP94eyeDkykKRnC27rrRSd+k7+M3aDUPYzDvgOQplThX +l0cHeiWNULwVnfJjNqUyVBN3WTAKBggqhkjOPQQDAgNIADBFAiALUEUiEUySNBh/ +M8Yy9MZhLE/xBHY8Q0d3erPeFwX7zwIhAOZublAk8sSS5037mzQcFjm6f4pIAb29 +4gEWsQQocHGV +-----END CERTIFICATE----- diff --git a/jks_ca/certs/921000006e0012v696.node5.cer b/jks_ca/certs/921000006e0012v696.node5.cer new file mode 100644 index 00000000..325e4b3d --- /dev/null +++ b/jks_ca/certs/921000006e0012v696.node5.cer @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FtYMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI1 +ODMyWhcNMjAxMjEwMDI1ODMyWjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBW5vZGU1MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEASPMg3T5RxEmclptDZP1I24rQKENZjAZdjjptu2+q9HAIyEhg5wWEsUYEFLj +Kc8cPZTjt//x6IeaW8cMMcKwfTAKBggqhkjOPQQDAgNIADBFAiAomWGLt0Bzo37N +PljL4BEpL8ty+DQ2sh3kH9ZlIP9msAIhAI7q7vvc28LKK8OsSBVYdmFHmZxfJLfo +D0vrJlaP5naM +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FjlMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +ODA1WhcNMjAxMjEwMDI0ODA1WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEnWb6C7xEIwgDEm8TVP94eyeDkykKRnC27rrRSd+k7+M3aDUPYzDvgOQplThX +l0cHeiWNULwVnfJjNqUyVBN3WTAKBggqhkjOPQQDAgNIADBFAiALUEUiEUySNBh/ +M8Yy9MZhLE/xBHY8Q0d3erPeFwX7zwIhAOZublAk8sSS5037mzQcFjm6f4pIAb29 +4gEWsQQocHGV +-----END CERTIFICATE----- diff --git a/jks_ca/certs/951002007l78123233.super_admin.cer b/jks_ca/certs/951002007l78123233.super_admin.cer new file mode 100644 index 00000000..1a1fc9e7 --- /dev/null +++ b/jks_ca/certs/951002007l78123233.super_admin.cer @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIBXDCCAQKgAwIBAgIEXfBnhDAKBggqhkjOPQQDAjAzMREwDwYDVQQKDAhyZXBj +aGFpbjEOMAwGA1UECwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MB4XDTE5MTIxMTAz +NTAyOFoXDTIwMTIxMDAzNTAyOFowOTERMA8GA1UECgwIcmVwY2hhaW4xDjAMBgNV +BAsMBWlzY2FzMRQwEgYDVQQDDAtzdXBlcl9hZG1pbjBZMBMGByqGSM49AgEGCCqG +SM49AwEHA0IABD63wpu3DEYo4EQN1p+IqCO3H2zaskh3gxaOWQM6hvQnyRpuQD4a +lV3eUouAooTO1YJyTNe/SIYCTVnHRv49lZowCgYIKoZIzj0EAwIDSAAwRQIhAJUs +C3pHUuMN2yRfpvjeKPgsPYxo+vzk56lIoP/qb8g0AiACuPOGx0tchoM7kBJo5el1 +gZsvDnRy59oHebbpN04qrw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FjlMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +ODA1WhcNMjAxMjEwMDI0ODA1WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEnWb6C7xEIwgDEm8TVP94eyeDkykKRnC27rrRSd+k7+M3aDUPYzDvgOQplThX +l0cHeiWNULwVnfJjNqUyVBN3WTAKBggqhkjOPQQDAgNIADBFAiALUEUiEUySNBh/ +M8Yy9MZhLE/xBHY8Q0d3erPeFwX7zwIhAOZublAk8sSS5037mzQcFjm6f4pIAb29 +4gEWsQQocHGV +-----END CERTIFICATE----- diff --git a/jks_ca/certs/trust.cer b/jks_ca/certs/trust.cer new file mode 100644 index 00000000..d712d0ee --- /dev/null +++ b/jks_ca/certs/trust.cer @@ -0,0 +1,10 @@ +-----BEGIN CERTIFICATE----- +MIIBVTCB/KADAgECAgRd8FjlMAoGCCqGSM49BAMCMDMxETAPBgNVBAoMCHJlcGNo +YWluMQ4wDAYDVQQLDAVpc2NhczEOMAwGA1UEAwwFdHJ1c3QwHhcNMTkxMjExMDI0 +ODA1WhcNMjAxMjEwMDI0ODA1WjAzMREwDwYDVQQKDAhyZXBjaGFpbjEOMAwGA1UE +CwwFaXNjYXMxDjAMBgNVBAMMBXRydXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEnWb6C7xEIwgDEm8TVP94eyeDkykKRnC27rrRSd+k7+M3aDUPYzDvgOQplThX +l0cHeiWNULwVnfJjNqUyVBN3WTAKBggqhkjOPQQDAgNIADBFAiALUEUiEUySNBh/ +M8Yy9MZhLE/xBHY8Q0d3erPeFwX7zwIhAOZublAk8sSS5037mzQcFjm6f4pIAb29 +4gEWsQQocHGV +-----END CERTIFICATE----- diff --git a/jks_ca/mytrust b/jks_ca/mytrust new file mode 100644 index 00000000..c405a3a2 Binary files /dev/null and b/jks_ca/mytrust differ diff --git a/jks_ca/mytruststore.jks b/jks_ca/mytruststore.jks new file mode 100644 index 00000000..e6185c75 Binary files /dev/null and b/jks_ca/mytruststore.jks differ diff --git a/jks_ca/p12s/121000005l35120456.node1.p12 b/jks_ca/p12s/121000005l35120456.node1.p12 new file mode 100644 index 00000000..e6250117 Binary files /dev/null and b/jks_ca/p12s/121000005l35120456.node1.p12 differ diff --git a/jks_ca/p12s/12110107bi45jh675g.node2.p12 b/jks_ca/p12s/12110107bi45jh675g.node2.p12 new file mode 100644 index 00000000..21c5511b Binary files /dev/null and b/jks_ca/p12s/12110107bi45jh675g.node2.p12 differ diff --git a/jks_ca/p12s/122000002n00123567.node3.p12 b/jks_ca/p12s/122000002n00123567.node3.p12 new file mode 100644 index 00000000..f7ad7505 Binary files /dev/null and b/jks_ca/p12s/122000002n00123567.node3.p12 differ diff --git a/jks_ca/p12s/921000005k36123789.node4.p12 b/jks_ca/p12s/921000005k36123789.node4.p12 new file mode 100644 index 00000000..7d3550b0 Binary files /dev/null and b/jks_ca/p12s/921000005k36123789.node4.p12 differ diff --git a/jks_ca/p12s/921000006e0012v696.node5.p12 b/jks_ca/p12s/921000006e0012v696.node5.p12 new file mode 100644 index 00000000..6e8f6ba0 Binary files /dev/null and b/jks_ca/p12s/921000006e0012v696.node5.p12 differ diff --git a/jks_ca/p12s/super_admin.p12 b/jks_ca/p12s/super_admin.p12 new file mode 100644 index 00000000..18fd7065 Binary files /dev/null and b/jks_ca/p12s/super_admin.p12 differ diff --git a/jks_ca/p12s/trust.p12 b/jks_ca/p12s/trust.p12 new file mode 100644 index 00000000..0f6e79ee Binary files /dev/null and b/jks_ca/p12s/trust.p12 differ diff --git a/jks_ca/trust b/jks_ca/trust new file mode 100644 index 00000000..5597172e Binary files /dev/null and b/jks_ca/trust differ diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 85834193..db3f077c 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -8,7 +8,7 @@ akka { actor { - serialize-messages = on + serialize-messages = off serialize-creators = off enable-additional-serialization-bindings = on allow-java-serialization = off @@ -41,17 +41,20 @@ akka { netty.ssl.security { key-store = "jks/121000005l35120456.node1.jks" - trust-store = "jks/mytruststore.jks" + trust-store = "jks/mytruststore.jks" // 加载信任列表证书用的_tls1.3 +// trust-store = "jks/mytrust" // ssl用的_ca + trust-store-mm = "jks/mytruststore.jks" // 加载信任列表证书用的_origin key-store-password = "123" key-password = "123" - trust-store-password = "changeme" + trust-store-password = "changeme" // 加载信任列表证书用的_tls1.3 +// trust-store-password = "changeit" // ssl用的_ca + trust-store-password-mm = "changeme" // 加载信任列表证书用的_origin - protocol = "TLSv1.2" - - enabled-algorithms = [TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256] - - random-number-generator = "AES128CounterSecureRNG" + protocol = "TLSv1.3" + enabled-algorithms = [TLS_AES_128_GCM_SHA256] +// require-mutual-authentication = on + random-number-generator = "SecureRandom" } } //创世块 diff --git a/src/main/scala/rep/app/RepChain_Multi.scala b/src/main/scala/rep/app/RepChain_Multi.scala index adfc75b7..192bc74c 100644 --- a/src/main/scala/rep/app/RepChain_Multi.scala +++ b/src/main/scala/rep/app/RepChain_Multi.scala @@ -68,8 +68,8 @@ object RepChain_Multi { nodes += sys1 // 可以根据自己的需要将nodelist.length改成对应的节点数 - for (i <- 1 to 4) { - Thread.sleep(500) + for (i <- 1 to args(0).toInt) { + Thread.sleep(1000) val sysN = new ClusterSystem(nodelist(i), InitType.MULTI_INIT, true) sysN.init //初始化（参数和配置信息） diff --git a/src/main/scala/rep/crypto/cert/ImpECDSASigner.scala b/src/main/scala/rep/crypto/cert/ImpECDSASigner.scala index bfc12a40..29ee899c 100644 --- a/src/main/scala/rep/crypto/cert/ImpECDSASigner.scala +++ b/src/main/scala/rep/crypto/cert/ImpECDSASigner.scala @@ -26,7 +26,7 @@ import rep.storage._ import scala.collection.mutable import com.fasterxml.jackson.core.Base64Variants import java.security.cert.X509Certificate -import javax.xml.bind.DatatypeConverter +//import javax.xml.bind.DatatypeConverter import java.util.ArrayList import java.util.List import sun.security.ec.ECPublicKeyImpl diff --git a/src/main/scala/rep/network/module/ModuleManager.scala b/src/main/scala/rep/network/module/ModuleManager.scala index 6d1c8ee8..04a2ff46 100644 --- a/src/main/scala/rep/network/module/ModuleManager.scala +++ b/src/main/scala/rep/network/module/ModuleManager.scala @@ -177,8 +177,8 @@ class ConfigerHelper(conf: Config, tag: String, dbTag: String) { private def authInitByCfg(sysTag: String): Unit = { val mykeyPath = conf.getString("akka.remote.netty.ssl.security.base-path") + sysTag + ".jks" val psw = conf.getString("akka.remote.netty.ssl.security.key-store-password") - val trustPath = conf.getString("akka.remote.netty.ssl.security.trust-store") - val trustPwd = conf.getString("akka.remote.netty.ssl.security.trust-store-password") + val trustPath = conf.getString("akka.remote.netty.ssl.security.trust-store-mm") + val trustPwd = conf.getString("akka.remote.netty.ssl.security.trust-store-password-mm") authInit(sysTag, mykeyPath, psw, trustPath, trustPwd) } diff --git a/src/test/scala/rep/storage/test/modifyWorldState.scala b/src/test/scala/rep/storage/test/modifyWorldState.scala index 531cb899..ef52fbb4 100644 --- a/src/test/scala/rep/storage/test/modifyWorldState.scala +++ b/src/test/scala/rep/storage/test/modifyWorldState.scala @@ -1,39 +1,18 @@ package rep.storage.test +import rep.storage.IdxPrefix.WorldStateKeyPreFix import rep.storage.ImpDataAccess -import org.json4s.{ DefaultFormats, jackson } -import org.json4s.native.Serialization.{ write, writePretty } -import rep.protos.peer.CertId -import rep.protos.peer.Signature -import java.util.Date - -import rep.crypto.Sha256 -import scala.collection.mutable -import rep.storage.util.pathUtil -import scala.math._ - -import java.io.File; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; //import scala.collection.immutable._ -import java.nio.ByteBuffer -import rep.storage.util.pathUtil - -import scalapb.json4s.JsonFormat -import org.json4s.{DefaultFormats, Formats, jackson} -import org.json4s.jackson.JsonMethods._ -import org.json4s.DefaultFormats._ - -import scala.collection.mutable.{ArrayBuffer,LinkedHashMap} import rep.utils.SerializeUtils.serialise -import _root_.com.google.protobuf.ByteString +import rep.utils.SerializeUtils.deserialise object modifyWorldState extends App { val da1 = ImpDataAccess.GetDataAccess("121000005l35120456.node1") - val key = "" + val preKey = WorldStateKeyPreFix + "ContractAssetsTPL" + "_" + val key = "121000005l35120456" val value = 3 - da1.Put(key, serialise(value)) + da1.Put(preKey + key, serialise(value)) + println(deserialise(da1.Get(preKey + key))) } \ No newline at end of file