更改证书

kscript · kscript · commit 87227de36287 · 2019-07-04T17:49:41.000+08:00
diff --git a/README.md b/README.md
@@ -123,6 +123,7 @@ module.exports = {
 | headConfig | object | null | 服务器请求头设置 |
 | crossDomain | boolean | true | 是否允许跨域 当 headConfig 不为空时, 忽略该项 |
 | port | number | 3030 | 端口号 |
+| https | object/undefined | undefined | https配置 |
 | rules | object | - | 路由重写规则, 参考 [json-server rewriter](https://github.com/typicode/json-server#rewriter-example) |
 | loginUrl | string | - | 登录地址, 如果配置了loginUrl, 那么除登录和public属性为true的接口外, 其它接口必须在登录之后才可以正常执行 |
 | logoutUrl | string | - | 退出登录地址 |
diff --git a/index.js b/index.js
@@ -4,7 +4,9 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var path = require('path');
 var jsonServer = _interopDefault(require('json-server'));
+var https = require('https');
 var Mock = _interopDefault(require('mockjs'));
+var fs = require('fs');
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -174,6 +176,28 @@ var middlewares = jsonServer.defaults({
     static: path.resolve(__dirname, './public')
 });
 server$1.use(middlewares);
+var createServer = function (option) {
+    var config = option.https;
+    if (config instanceof Object) {
+        if (typeof config.key !== 'string' || typeof config.cert !== 'string' || config.key.length + config.cert.length === 0) {
+            config.key = fs.readFileSync(path.join(__dirname, 'ssl/key.pem'));
+            config.cert = fs.readFileSync(path.join(__dirname, 'ssl/cert.pem'));
+            console.log("正在使用默认的证书配置");
+        }
+        https.createServer(config, server$1).listen(option.port, function () {
+            console.log();
+            console.log("\u5DF2\u542F\u52A8json-server\u670D\u52A1\u5668 https://localhost:" + option.port);
+            console.log();
+        });
+    }
+    else {
+        server$1.listen(option.port, function () {
+            console.log();
+            console.log("\u5DF2\u542F\u52A8json-server\u670D\u52A1\u5668 http://localhost:" + option.port);
+            console.log();
+        });
+    }
+};
 /**
  * 启动mock服务
  * @func
@@ -340,11 +364,7 @@ var Server$1 = function (option) {
         res.status(200).jsonp(body);
     };
     server$1.use(router);
-    server$1.listen(option.port, function () {
-        console.log();
-        console.log("\u5DF2\u542F\u52A8json-server\u670D\u52A1\u5668 http://localhost:" + option.port);
-        console.log();
-    });
+    createServer(option);
 };
 
 /**
diff --git a/localhost.js b/localhost.js
@@ -178,7 +178,12 @@ var middlewares = jsonServer.defaults({
 server$1.use(middlewares);
 var createServer = function (option) {
     var config = option.https;
-    if (config instanceof Object && config.key && config.cert) {
+    if (config instanceof Object) {
+        if (typeof config.key !== 'string' || typeof config.cert !== 'string' || config.key.length + config.cert.length === 0) {
+            config.key = fs.readFileSync(path.join(__dirname, 'ssl/key.pem'));
+            config.cert = fs.readFileSync(path.join(__dirname, 'ssl/cert.pem'));
+            console.log("正在使用默认的证书配置");
+        }
         https.createServer(config, server$1).listen(option.port, function () {
             console.log();
             console.log("\u5DF2\u542F\u52A8json-server\u670D\u52A1\u5668 https://localhost:" + option.port);
@@ -473,7 +478,7 @@ Server$1({
     loginUrl: 'login',
     logoutUrl: 'logout',
     https: {
-        key: fs.readFileSync('ssl/key.pem'),
-        cert: fs.readFileSync('ssl/cert.pem')
+    // key: fs.readFileSync('ssl/key.pem'),
+    // cert: fs.readFileSync('ssl/cert.pem')
     }
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ks-mock",
-  "version": "1.1.12",
+  "version": "1.1.15",
   "description": "mock server 模拟后端API接口",
   "main": "index.js",
   "scripts": {
diff --git a/src/localhost.ts b/src/localhost.ts
@@ -8,7 +8,7 @@ server({
   loginUrl: 'login',
   logoutUrl: 'logout',
   https: {
-    key: fs.readFileSync('ssl/key.pem'),
-    cert: fs.readFileSync('ssl/cert.pem')
+    // key: fs.readFileSync('ssl/key.pem'),
+    // cert: fs.readFileSync('ssl/cert.pem')
   }
 })
diff --git a/src/server.ts b/src/server.ts
@@ -5,6 +5,7 @@ import config from './config';
 import rules from './rules';
 import * as https from 'https';
 import { getInfo, mockResult, Http } from './utils'
+import * as  fs from 'fs';
 const request = require('request');
 const server = jsonServer.create()
 // 路径从根目录开始?
@@ -15,13 +16,18 @@ const middlewares = jsonServer.defaults({
 
 server.use(middlewares)
 const createServer = (option: anyObject) => {
-    let config = option.https;
-    if(config instanceof Object && config.key && config.cert) {
+    let config = option.https
+    if(config instanceof Object) {
+        if (typeof config.key !== 'string' || typeof config.cert !== 'string' || config.key.length + config.cert.length === 0){
+            config.key = fs.readFileSync(path.join(__dirname,'ssl/key.pem'))
+            config.cert = fs.readFileSync(path.join(__dirname,'ssl/cert.pem'))
+            console.log("正在使用默认的证书配置")
+        }
         https.createServer(config, server).listen(option.port, function() {
             console.log()
             console.log(`已启动json-server服务器 https://localhost:${option.port}`)
             console.log()
-        });
+        })
     } else {
         server.listen(option.port, () => {
             console.log()
diff --git a/ssl/cert.pem b/ssl/cert.pem
@@ -1,19 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDBjCCAe4CCQD1E5lGt+0q9jANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJj
-bjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMB4XDTE5MDcwNDA2MjgxOVoXDTI5MDcwMTA2MjgxOVowRTELMAkG
-A1UEBhMCY24xEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0
-IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKbuyeQ2niIAKDqyqXgx3wOaJXwuJ8mmx9o7xoG3ARWKskKzXe96l3t8VBhr9R/B
-qn0iKceThDBtimJMCzm5T1OXaR7L1ri1pM+SqVrWkvvLQdBrhDPH6js6zNYE92vO
-TSFZSk1DEpnNZZJZ2t/fxGqpS5C9dc9pr7goaBnUr2TCFbT+kwCxZ7gS8gwlHu++
-ZTygqyRLHpHtqFbLKRxKB+KAd0VSFMqsNQpzwmS0o+aByMs4oUvlhO0qxdRUzZwg
-0VfQF4QWkDPvM+LsQmLniyYc8tG1aQl5fn8Q1humN+6B5a+Sh0UrKYtSXii8Bw/K
-9yaeDBiR2mNXDfDuoRULSCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAJ2O0Kiyz
-no/gtCDAoTjz66t0yOOhNniA0y8ALowBnb8kfz0e2IXeO0lJ/a6mxlGjyWR9hUMc
-TdGdXs6PWc2D8UsW8C12jAbAhuW2oRTXWUTfNbN3Px5m07M+NXeN4jFAcKBV3qCF
-Bu26r1q2iD5Timuz9FE+wO2D4mZRynNz6q88mUV1uJ/CLAXygTmbovZ5Wvuo0Qp6
-KFgw84ruGUtyWoquYrx2nyuQu4AHqtbC7P+n4DrX/ZyE5Z5/LyE+DlK2ysCti0ef
-ipkamUdvL9B+NLfqK8RLJlQldp7B8WcZ66HPkoE9cEDELhchCuSvkImCmBLLLVfx
-CRpSyw3J/m+wdA==
+MIIDuzCCAqOgAwIBAgIJAPK2nWjUWhmUMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV
+BAYTAkNOMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxEDAOBgNVBAMMB2tzY3JpcHQxGzAZBgkqhkiG9w0BCQEW
+DDIwNDZAbGl2ZS5jbjAeFw0xOTA3MDQwOTI0MzNaFw0yOTA3MDEwOTI0MzNaMHQx
+CzAJBgNVBAYTAkNOMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxEDAOBgNVBAMMB2tzY3JpcHQxGzAZBgkqhkiG
+9w0BCQEWDDIwNDZAbGl2ZS5jbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMfy+H1zx+KXrTcSJNZoyrPH+BPBQkh80PUCi64ePbpnDXiKqRvlAYNF584s
+B19o/3/RJwtnOBWTqIfJMiSlCzXUFv2gIiKsmjVqSc5UybgGFmWCDo0V7QcQKiNP
+SirpWDTIJye7yPM/82qNZiBaFjafMNvuHiA/yiRjT1+Wge1iIubR3kni2aval86t
+MSA5zDznwby8CV049ll1i+otGqORvL4pV1uPkPCdrzZtYsc9cA7o/mAM8aFoA72u
+QQZyywtdOh2LXZupFW89sD1ZR0Fw8RlhmEwKVBVTZVIKS/7fQN5HN83TvBkC+8B4
+XLcx4PETIjCj3NDe2qYjrw5rD6kCAwEAAaNQME4wHQYDVR0OBBYEFAAymWfmE3fV
+dzpdSBy2lwNT/QNsMB8GA1UdIwQYMBaAFAAymWfmE3fVdzpdSBy2lwNT/QNsMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHwolfT3WFPzzSl3c1MurdjK
+TN4ZeZzo66+5JyKU2mhI1gfH/inyYwyaJstxtNpvw65XqYEXeACe7BZbr+Rpqvnk
+q5npvGzwr7toAGsFvGLnO6x+nrnqonH23Aq5zUQCmszTspqlHxYQBbore2SZAP4d
+BcIiD8D7pltcFfTA2DR2rKRFXyIzm1bCtGa3+nC0slZ1Yz1KR+iuzl1uhN6vyMHo
+2AqJAaL2AIWTyYWoNnDj0kPNyrxBp+y0iqQKDUQEscerdaNL7Mox0UAhBLC/H7tT
+KLz3a7IQOZ8Q5AJHW+drF7yvRCA8S38M3yNGXDDIYhzZxUpLUWMc03vPjGsDVJ0=
 -----END CERTIFICATE-----
diff --git a/ssl/key.pem b/ssl/key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ks-mock",`
`3`		`- "version": "1.1.12",`
	`3`	`+ "version": "1.1.15",`
`4`	`4`	`"description": "mock server 模拟后端API接口",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`