修改url消息

Author: kscript

README.md

@@ -1,5 +1,5 @@
 ## ks-mock
-一个mock服务端api的工具, 除模拟请求api接口数据外, 还提供了 https、触发鉴权、模拟请求错误、转发请求 的功能
+一个模拟服务端api的工具, 支持 https、触发鉴权、模拟接口、模拟请求错误、转发请求 等功能
 
 ## npm命令
 ``` npm

localhost.js

@@ -136,7 +136,7 @@ var rules = {
 };
 
 var getInfo = function (req, option, headers) {
-    var url = req._parsedUrl.pathname.replace(/^\//, '');
+    var url = req._parsedUrl.href.replace(/^\//, '');
     return {
         url: url,
         data: option.mockData[url],
@@ -176,7 +176,7 @@ var middlewares = jsonServer.defaults({
     static: path.resolve(__dirname, './public')
 });
 server$1.use(middlewares);
-var createServer = function (option) {
+var createServer = function (option, callback) {
     var config = option.https;
     if (config instanceof Object) {
         if (typeof config.key !== 'string' || typeof config.cert !== 'string' || config.key.length + config.cert.length === 0) {
@@ -188,13 +188,15 @@ var createServer = function (option) {
             console.log();
             console.log("\u5DF2\u542F\u52A8json-server\u670D\u52A1\u5668 https://localhost:" + option.port);
             console.log();
+            typeof callback == 'function' && callback();
         });
     }
     else {
         server$1.listen(option.port, function () {
             console.log();
             console.log("\u5DF2\u542F\u52A8json-server\u670D\u52A1\u5668 http://localhost:" + option.port);
             console.log();
+            typeof callback == 'function' && callback();
         });
     }
 };
@@ -207,7 +209,7 @@ var createServer = function (option) {
  * @param {boolean=} option.crossDomain - 是否跨域 (便于在不设置请求头时, 快速配置跨域)
  * @param {number=} port - 服务器端口
  */
-var Server$1 = function (option) {
+var Server$1 = function (option, callback) {
     option = Object.assign({
         port: 3030,
         crossDomain: true,
@@ -364,7 +366,7 @@ var Server$1 = function (option) {
         res.status(200).jsonp(body);
     };
     server$1.use(router);
-    createServer(option);
+    createServer(option, callback);
 };
 
 var config$1 = {

package.json

@@ -1,14 +1,15 @@
 {
   "name": "ks-mock",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "mock server 模拟后端API接口",
   "main": "index.js",
   "scripts": {
     "mock": "npm run bundle && node localhost",
     "prepublishOnly": "npm run bundle && npm run build",
     "bundle": "rollup -c -i ./src/localhost.ts -o localhost.js",
     "build": "rollup -c -i ./src/index.ts -o index.js",
-    "typedoc": "typedoc --options typedoc.ts"
+    "typedoc": "typedoc --options typedoc.ts",
+    "test": "jest"
   },
   "repository": {
     "type": "git",
@@ -28,6 +29,8 @@
   },
   "homepage": "https://github.com/kscript/mock#readme",
   "dependencies": {
+    "fs": "0.0.1-security",
+    "https": "^1.0.0",
     "json-server": "^0.14.0",
     "mockjs": "^1.0.1-beta3",
     "path": "^0.12.7",
@@ -36,8 +39,7 @@
   "devDependencies": {
     "@types/mocha": "^5.2.6",
     "@types/node": "^12.0.0",
-    "fs": "0.0.1-security",
-    "https": "^1.0.0",
+    "jest": "^24.9.0",
     "rollup-plugin-typescript": "^1.0.1",
     "tslib": "*",
     "typedoc": "^0.14.2",

src/server.ts

@@ -15,7 +15,7 @@ const middlewares = jsonServer.defaults({
 })
 
 server.use(middlewares)
-const createServer = (option: anyObject) => {
+const createServer = (option: anyObject, callback?: Function) => {
     let config = option.https
     if(config instanceof Object) {
         if (typeof config.key !== 'string' || typeof config.cert !== 'string' || config.key.length + config.cert.length === 0){
@@ -27,12 +27,14 @@ const createServer = (option: anyObject) => {
             console.log()
             console.log(`已启动json-server服务器 https://localhost:${option.port}`)
             console.log()
+            typeof callback == 'function' && callback();
         })
     } else {
         server.listen(option.port, () => {
             console.log()
             console.log(`已启动json-server服务器 http://localhost:${option.port}`)
             console.log()
+            typeof callback == 'function' && callback();
         })
     }
 }
@@ -45,7 +47,7 @@ const createServer = (option: anyObject) => {
  * @param {boolean=} option.crossDomain - 是否跨域 (便于在不设置请求头时, 快速配置跨域)
  * @param {number=} port - 服务器端口
  */
-const Server = option => {
+const Server = (option: anyObject, callback?: Function) => {
     option = Object.assign({
         port: 3030,
         crossDomain: true,
@@ -217,6 +219,6 @@ const Server = option => {
         res.status(200).jsonp(body)
     }
     server.use(router)
-    createServer(option);
+    createServer(option, callback);
 }
 export default Server

src/utils.ts

@@ -1,7 +1,7 @@
 import Mock from 'mockjs';
 
 export const getInfo = (req, option, headers) => {
-    let url = req._parsedUrl.pathname.replace(/^\//, '')
+    let url = req._parsedUrl.href.replace(/^\//, '')
     return {
         url,
         data: option.mockData[url],

tsconfig.json

@@ -11,6 +11,7 @@
     },
     "exclude": [
         "node_modules",
-        ".vscode"
+        ".vscode",
+        "**/*.test.ts"
     ]
 }