fangyeqing / xkl-interface · Commits

Go to a project

Authored by fangyeqing
Commit e19158316c50fadde1ba0ed0740d783985f21b80 1 parent cb6095fb

ADD:add https

Inline Side-by-side
Showing 7 changed files with 8 additions and 30 deletions
1 # xkl-interface程序说明 1 # xkl-interface程序说明
2 2
3 ## 部署 3 ## 部署
4 -139.129.166.85  
5 -  
6 -### https证书  
7 -  
8 -生成ssl证书${user.home}/.keystore，其中密码设置为xkl2016：  
9 -```  
10 -keytool -genkey -alias xkl-demo -keypass xkl2016 -keyalg RSA -keysize 1024 -validity 1024 -keystore ~/.keystore -storepass xkl2016 -dname "CN=139.129.166.85, OU=hanhezy, O=hanhezy, L=bj, ST=bj, C=cn"  
11 -```  
12 -查看生成的key  
13 -```  
14 -keytool -list -v -keystore .keystore -storepass xkl2016  
15 -``` 4 +139.129.166.85:8090
16 5
17 ### 部署 6 ### 部署
18 代码 7 代码
@@ -24,6 +13,7 @@ cd xkl-interface @@ -24,6 +13,7 @@ cd xkl-interface
24 启动 13 启动
25 ``` 14 ```
26 bin/start.sh 15 bin/start.sh
  16 +bin/start-https.sh
27 ``` 17 ```
28 停止 18 停止
29 ``` 19 ```
@@ -46,7 +36,7 @@ redis.password=r-m5e7cedd3124afd4:XIkaiLURedis2016 @@ -46,7 +36,7 @@ redis.password=r-m5e7cedd3124afd4:XIkaiLURedis2016
46 ``` 36 ```
47 ## 测试swagger界面 37 ## 测试swagger界面
48 浏览器访问： 38 浏览器访问：
49 -https://139.129.166.85:8090/ 39 +https://www.hanhezy.com:8090/
50 40
51 ## 测试用例地址 41 ## 测试用例地址
52 -http://gitlab.hanhezy.com/fyq/xkl-example 42 +http://gitlab.hanhezy.com/fyq/xkl-interface-example-all
No preview for this file type
1 server.port=8090 1 server.port=8090
2 2
3 -#server.ssl.key-store = ${user.home}/.keystore  
4 -#server.ssl.key-store-password = xkl2016  
5 -#server.ssl.key-password = xkl2016  
6 -  
7 #MySQL 3 #MySQL
8 #spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true 4 #spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
9 #spring.datasource.username=root 5 #spring.datasource.username=root
1 server.port=8090 1 server.port=8090
2 2
3 -#server.ssl.key-store = ${user.home}/.keystore  
4 -#server.ssl.key-store-password = xkl2016  
5 -#server.ssl.key-password = xkl2016  
6 -  
7 #MySQL 3 #MySQL
8 spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true 4 spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
9 spring.datasource.username=root 5 spring.datasource.username=root
1 server.port=8090 1 server.port=8090
2 2
3 -#server.ssl.key-store = ${user.home}/.keystore  
4 -#server.ssl.key-store-password = xkl2016  
5 -#server.ssl.key-password = xkl2016  
6 -  
7 #MySQL 3 #MySQL
8 spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true 4 spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
9 spring.datasource.username=hanhe 5 spring.datasource.username=hanhe
1 server.port=8090 1 server.port=8090
2 2
3 -server.ssl.key-store = ${user.home}/.keystore  
4 -server.ssl.key-store-password = xkl2016  
5 -server.ssl.key-password = xkl2016 3 +server.ssl.key-store = classpath:214021316500442.pfx
  4 +server.ssl.key-store-password = 214021316500442
  5 +server.ssl.keyStoreType = PKCS12
6 6
7 #MySQL 7 #MySQL
8 spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true 8 spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 if (url && url.length > 1) { 27 if (url && url.length > 1) {
28 url = decodeURIComponent(url[1]); 28 url = decodeURIComponent(url[1]);
29 } else { 29 } else {
30 - url = "https://139.129.166.85:8090/api-docs"; 30 + url = "https://www.hanhezy.com:8090/api-docs";
31 } 31 }
32 window.swaggerUi = new SwaggerUi({ 32 window.swaggerUi = new SwaggerUi({
33 url: url, 33 url: url,