add gm tls support

build/pack.sh

@@ -21,7 +21,7 @@ fi
 echo "--------------- 开始编译打包 ---------------"
 
 cd $DEPLOY_DIR
-echo "当前目录：`pwd`"
+echo "当前目录：$(pwd)"
 
 #初始化变量 SKIP_TESTS；
 if [ ! $SKIP_TESTS ]

core

@@ -1 +1 @@
-Subproject commit 97f0839d82430462f85e4a510db612db5f2daaf8
+Subproject commit b68923932c2397d619217b42e042221bfeb8d7cf

deploy/deploy-gateway/pom.xml

@@ -45,6 +45,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<includeSystemScope>true</includeSystemScope>
+				</configuration>
 				<!-- <executions> <execution> <goals> <goal>repackage</goal> </goals>
 					</execution> </executions> -->
 			</plugin>

deploy/deploy-gateway/src/main/resources/assembly.xml

@@ -24,6 +24,7 @@
             <outputDirectory>docs</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>
+
     </fileSets>
     <dependencySets>
         <dependencySet>

deploy/deploy-gateway/src/main/resources/config/application-gw.properties

@@ -2,14 +2,27 @@
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain
 
-# SSL
-server.ssl.protocol=
-server.ssl.enabled-protocols=
-server.ssl.ciphers=
+# TLS
 server.ssl.key-store=
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=
 server.ssl.key-store-password=
+server.ssl.protocol=
+server.ssl.enabled-protocols=
+server.ssl.ciphers=
 server.ssl.trust-store=
 server.ssl.trust-store-password=
-server.ssl.trust-store-type=JKS
+server.ssl.trust-store-type=JKS
+server.ssl.hostNameVerifier=NO-OP
+
+#GM TLSÅäÖÃ
+#ÆôÓÃÌõ¼þ: http.secure=true && server.ssl.protocol=GMSSLv1.1
+#ʾÀý:
+#server.ssl.key-store=cert/sm2.node0.both.pfx
+#server.ssl.key-store-type=PKCS12
+#server.ssl.key-alias=
+#server.ssl.key-store-password=12345678
+#server.ssl.protocol=GMSSLv1.1
+#server.ssl.hostNameVerifier=NO-OP
+#server.ssl.enabled-protocols=TLSv1.2,GMSSLv1.1
+#server.ssl.ciphers=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,ECC_SM4_CBC_SM3,ECDHE_SM4_GCM_SM3,ECDHE_SM4_CBC_SM3

deploy/deploy-peer/src/main/resources/assembly.xml

@@ -24,6 +24,10 @@
             <outputDirectory>docs</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/../../libs/utils/utils-sm-tls/lib</directory>
+            <outputDirectory>libs</outputDirectory>
+        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>

deploy/deploy-peer/src/main/resources/config/application-peer.properties

@@ -5,13 +5,27 @@ server.compression.mime-types=application/json,application/xml,text/html,text/xm
 # 管理服务TLS配置
 server.ssl.enabled=false
 server.ssl.client-auth=none
-server.ssl.protocol=
-server.ssl.enabled-protocols=
-server.ssl.ciphers=
 server.ssl.key-store=
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=
 server.ssl.key-store-password=
 server.ssl.trust-store=
 server.ssl.trust-store-password=
-server.ssl.trust-store-type=JKS
+server.ssl.trust-store-type=JKS
+server.ssl.protocol=
+server.ssl.enabled-protocols=
+server.ssl.ciphers=
+server.ssl.hostNameVerifier=NO-OP
+
+#GM TLS配置
+#启用条件: server.ssl.enabled=true && server.ssl.protocol=GMSSLv1.1
+#示例:
+#server.ssl.enabled=true
+#server.ssl.key-store=cert/sm2.node0.both.pfx
+#server.ssl.key-store-type=PKCS12
+#server.ssl.key-alias=
+#server.ssl.key-store-password=12345678
+#server.ssl.protocol=GMSSLv1.1
+#server.ssl.hostNameVerifier=NO-OP
+#server.ssl.enabled-protocols=TLSv1.2,GMSSLv1.1
+#server.ssl.ciphers=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,ECC_SM4_CBC_SM3,ECDHE_SM4_GCM_SM3,ECDHE_SM4_CBC_SM3

libs/bft-smart

@@ -1 +1 @@
-Subproject commit 73f80091f432201a5d6793a13098f5e8560901e9
+Subproject commit 6392c0e98e8bfea0dcd0dea6c0e4e372bb404848

libs/httpservice

@@ -1 +1 @@
-Subproject commit 5257ed25bc6b89af413842739d06f8923e40ab14
+Subproject commit 2d1f81dcc672cd34ea7ddcee882a0ddc1453075c

libs/utils

@@ -1 +1 @@
-Subproject commit df08741c65808d5f36ca032152b0bcc341a5a409
+Subproject commit 633eb609c0874b2fdfb772edd6c73c7123fca0fa

project

@@ -1 +1 @@
-Subproject commit db4db74cc03d3a45d01a85893665372a6fd95bbc
+Subproject commit 8e39c385db8bcb484da7a134ec2721bfe59726e1

tree.txt

@@ -1,26 +0,0 @@
-[INFO] Scanning for projects...
-[WARNING] 
-[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:jdchain-parent:pom:1.1.4.RELEASE
-[WARNING] 'parent.relativePath' of POM com.jd.blockchain:jdchain-dependencies:1.1.4.RELEASE (F:\gitCode\jdchain-all\jdchain\project\dependencies\pom.xml) points at com.jd.blockchain:jdchain-project instead of org.springframework.boot:spring-boot-starter-parent, please verify your project structure @ com.jd.blockchain:jdchain-dependencies:1.1.4.RELEASE, F:\gitCode\jdchain-all\jdchain\project\dependencies\pom.xml, line 6, column 10
-[WARNING] 
-[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:bft-smart:jar:0.6.1.RELEASE
-[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 89, column 12
-[WARNING] 
-[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:bft-smart:jar:0.6.1.RELEASE
-[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 89, column 12
-[WARNING] 
-[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:bft-smart:jar:0.6.1.RELEASE
-[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 89, column 12
-[WARNING] 
-[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
-[WARNING] 
-[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
-[WARNING] 
-[ERROR] [ERROR] Project 'com.jd.blockchain:utils-serialize:1.2.1.RELEASE' is duplicated in the reactor @ 
-[ERROR] Project 'com.jd.blockchain:utils-serialize:1.2.1.RELEASE' is duplicated in the reactor -> [Help 1]
-[ERROR] 
-[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
-[ERROR] Re-run Maven using the -X switch to enable full debug logging.
-[ERROR] 
-[ERROR] For more information about the errors and possible solutions, please read the following articles:
-[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/DuplicateProjectException