Merge branch 'addHttps' into 'master'

ADD:add https

增加https

See merge request !12

 # xkl-interface程序说明
 # xkl-interface程序说明
 
 
 ## 部署
 ## 部署
-139.129.166.85
-
-### https证书
-
-生成ssl证书${user.home}/.keystore，其中密码设置为xkl2016：
-```
-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"
-```
-查看生成的key
-```
-keytool -list -v -keystore .keystore -storepass xkl2016
-```
+139.129.166.85:8090
 
 
 ### 部署
 ### 部署
 代码
 代码
@@ -24,6 +13,7 @@ cd xkl-interface
 启动
 启动
 ```
 ```
 bin/start.sh
 bin/start.sh
+bin/start-https.sh
 ```
 ```
 停止
 停止
 ```
 ```
@@ -46,7 +36,7 @@ redis.password=r-m5e7cedd3124afd4:XIkaiLURedis2016
 ```
 ```
 ## 测试swagger界面
 ## 测试swagger界面
 浏览器访问：  
 浏览器访问：  
-https://139.129.166.85:8090/
+https://www.hanhezy.com:8090/
 
 
 ## 测试用例地址
 ## 测试用例地址
-http://gitlab.hanhezy.com/fyq/xkl-example
+http://gitlab.hanhezy.com/fyq/xkl-interface-example-all

 server.port=8090
 server.port=8090
 
 
-#server.ssl.key-store = ${user.home}/.keystore
-#server.ssl.key-store-password = xkl2016
-#server.ssl.key-password = xkl2016
-
 #MySQL
 #MySQL
 #spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
 #spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
 #spring.datasource.username=root
 #spring.datasource.username=root

 server.port=8090
 server.port=8090
 
 
-#server.ssl.key-store = ${user.home}/.keystore
-#server.ssl.key-store-password = xkl2016
-#server.ssl.key-password = xkl2016
-
 #MySQL
 #MySQL
 spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
 spring.datasource.url=jdbc:mysql://localhost:3306/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
 spring.datasource.username=root
 spring.datasource.username=root

 server.port=8090
 server.port=8090
 
 
-#server.ssl.key-store = ${user.home}/.keystore
-#server.ssl.key-store-password = xkl2016
-#server.ssl.key-password = xkl2016
-
 #MySQL
 #MySQL
 spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
 spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
 spring.datasource.username=hanhe
 spring.datasource.username=hanhe

 server.port=8090
 server.port=8090
 
 
-server.ssl.key-store = ${user.home}/.keystore
-server.ssl.key-store-password = xkl2016
-server.ssl.key-password = xkl2016
+server.ssl.key-store = classpath:214021316500442.pfx
+server.ssl.key-store-password = 214021316500442
+server.ssl.keyStoreType = PKCS12
 
 
 #MySQL
 #MySQL
 spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
 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 @@
       if (url && url.length > 1) {
       if (url && url.length > 1) {
         url = decodeURIComponent(url[1]);
         url = decodeURIComponent(url[1]);
       } else {
       } else {
-        url = "https://139.129.166.85:8090/api-docs";
+        url = "https://www.hanhezy.com:8090/api-docs";
       }
       }
       window.swaggerUi = new SwaggerUi({
       window.swaggerUi = new SwaggerUi({
         url: url,
         url: url,