typespeed 2.3.2 → 2.3.4

package/.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: Tests
+'on': ["push"]
+
+jobs:
+  test:
+    name: 'Test TypeSpeed'
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+      rabbitmq:
+        image: rabbitmq:3.8
+        env:
+          RABBITMQ_DEFAULT_USER: guest
+          RABBITMQ_DEFAULT_PASS: guest
+        ports:
+          - 5672
+    steps:
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 18
+      - uses: actions/checkout@v2
+      - name: Setup MySQL
+        run: |
+          sudo /etc/init.d/mysql start
+          mysql -e 'CREATE DATABASE test;USE test; \
+          CREATE TABLE `user` (`id` int(11) NOT NULL AUTO_INCREMENT,`name` varchar(100) DEFAULT NULL,PRIMARY KEY (`id`)) \
+          ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;SHOW TABLES;' -uroot -proot
+      - name: 'Cache node_modules'
+        uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-v18-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-v18-
+      - name: Install Dependencies
+        run: npm install
+      - name: Run Tests with Coverage
+        run: npm run test-with-coverage
+        env:
+          LOCAL_HOST: localhost
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

package/README.md

@@ -5,11 +5,12 @@
 [![last commit](https://img.shields.io/github/last-commit/speedphp/typespeed)](https://github.com/SpeedPHP/typespeed/commits/main)
 [![downloads](https://badgen.net/npm/dt/typespeed?color=pink)](https://www.npmjs.com/package/typespeed)
 [![license](https://badgen.net/github/license/speedphp/typespeed)](https://github.com/SpeedPHP/typespeed/blob/main/LICENSE)
+[![codecov](https://codecov.io/gh/SpeedPHP/typespeed/branch/main/graph/badge.svg?token=9HNUXNVTQD)](https://codecov.io/gh/SpeedPHP/typespeed)
 
 ### 特点
 
 - 遵循 MIT 许可的开源项目。
-- 提供 22 个 TypeScript 装饰器，这些装饰器构成了完整的 Web 框架功能，包括对象管理、Web 路由、数据库操作等。
+- 提供 30 个 TypeScript 装饰器，这些装饰器构成了完整的 Web 框架功能，包括对象管理、Web 路由、数据库操作等。
 - 通过命令行脚手架，可以快速创建项目，零配置启动。
 - 基于依赖注入、AOP、中间件和启动扫描等编程理念开发实现。
 - 底层采用 ExpressJS 实现，提供稳定、快速的 Web 服务。

package/app/src/aop-test.class.ts

@@ -1,4 +1,4 @@
-import { before, log, component, after } from "../../";
+import { before, log, component, after } from "../../src/typespeed";
 import FirstPage from "./first-page.class";
 
 @component

package/app/src/config-development.json

@@ -1,20 +1,23 @@
 {
-    "server": {
-        "port": "8081"
-    },
-    "database": {
-        "host": "localhost",
-        "port": "4455",
-        "name": "test"
-    },
     "view": {
         "engine": "mustache",
         "path": "/app/src/views",
         "suffix": "html"
     },
+    "mysql": {
+        "host": "127.0.0.1",
+        "user": "root",
+        "password": "root",
+        "database": "test"
+    },
+    "redis": {
+        "host": "127.0.0.1",
+        "port": "6379",
+        "db": 0
+    },
     "rabbitmq": {
         "protocol": "amqp",
-        "hostname": "localhost",
+        "hostname": "127.0.0.1",
         "port": 5672,
         "username": "guest",
         "password": "guest"

package/app/src/custom-log.class.ts

@@ -1,5 +1,5 @@
 import * as tracer from "tracer";
-import { bean, LogFactory } from "../../";
+import { bean, LogFactory } from "../../src/typespeed";
 
 export default class CustomLog extends LogFactory {
     private logger = tracer.console({

package/app/src/first-page.class.ts

@@ -1,5 +1,5 @@
 //import * as jwttoken from "jsonwebtoken";
-import { log, component, getMapping } from "../../";
+import { log, component, getMapping } from "../../src/typespeed";
 
 @component
 export default class FirstPage {

package/app/src/jwt-authentication.class.ts

@@ -1,4 +1,4 @@
-import { AuthenticationFactory, bean, config } from "../../";
+import { AuthenticationFactory, bean, config } from "../../src/typespeed";
 import express from "express";
 import { expressjwt, GetVerificationKey } from "express-jwt";
 import * as jwt from 'jsonwebtoken';
@@ -23,8 +23,8 @@ export default class JwtAuthentication extends AuthenticationFactory {
                 if (err) {
                     //next(err);
                 }
-                next();
             });
         }
+        next();
     }
 }

package/app/src/main.ts

@@ -1,4 +1,4 @@
-import { app, log, autoware, ServerFactory } from "../../";
+import { app, log, autoware, ServerFactory } from "../../src/typespeed";
 //import * as basicAuth from "express-basic-auth"
 let appServer = null;
 

package/app/src/second-page.class.ts

@@ -1,4 +1,4 @@
-import { getMapping, postMapping, upload, jwt, log, component } from "../../";
+import { getMapping, postMapping, upload, jwt, log, component } from "../../src/typespeed";
 
 @component
 export default class SecondPage {

package/app/src/test-database.class.ts

@@ -1,4 +1,4 @@
-import { insert, update, select, param, resultType, cache, CacheFactory, getMapping, component, log, autoware } from "../../";
+import { insert, update, select, param, resultType, cache, CacheFactory, getMapping, component, log, autoware } from "../../src/typespeed";
 import UserDto from "./entities/user-dto.class";
 
 @component
@@ -11,24 +11,22 @@ export default class TestDatabase {
     async insert(req, res) {
         const id = req.query.id || 1;
         const newId = await this.addRow("new name " + id, id);
-        log("Insert newId: " + newId);
-        res.send("Insert success");
+        res.send("Insert success: " + newId);
     }
 
     @getMapping("/db/insert2")
     async insertByObject(req, res) {
         const newId = await this.addRowByObject({
-            "id": Math.ceil(Math.random() * 1000), "name": "new name 25"
+            "id": req.query.id, "name": "new name " + req.query.id
         });
-        log("Insert newId: " + newId);
-        res.send("Insert success");
+        res.send("Insert success: " + newId);
     }
 
     @getMapping("/db/update")
     async update(req, res) {
-        const affectedRows = await this.editRow();
+        const affectedRows = await this.editRow(req.query.id);
         log("Update rows: " + affectedRows);
-        res.send("update success");
+        res.send("update success: " + affectedRows);
     }
 
     @getMapping("/db/select")
@@ -38,17 +36,15 @@ export default class TestDatabase {
         res.send(rows);
     }
 
-    @getMapping("/db/select1")
+    @getMapping("/db/select-row")
     async selectById(req, res) {
-        const row = await this.findRow(req.query.id || 1);
-        log("select rows: " + row);
+        const row = await this.findRow(req.query.id);
         res.send(row);
     }
 
     @getMapping("/db/select-user")
     async selectUser(req, res) {
         const users: UserDto[] = await this.findUsers();
-        log("select users: " + users);
         res.send(users);
     }
 
@@ -69,8 +65,8 @@ export default class TestDatabase {
     @insert("Insert into `user` (id, name) values (#{id}, #{name})")
     private async addRowByObject(myParams: object) { }
 
-    @update("Update `user` set `name` = 'test5' where id = 5")
-    private async editRow() { }
+    @update("Update `user` set `name` = 'test5' where id = #{id}")
+    private async editRow(@param("id") id: number) { }
 
     @select("Select * from `user`")
     private async selectRow() { }

package/app/src/test-log.class.ts

@@ -1,4 +1,4 @@
-import { component, getMapping, error } from "../../";
+import { component, getMapping, error } from "../../src/typespeed";
 
 @component
 export default class TestLog {

package/app/src/test-mq.class.ts

@@ -1,4 +1,4 @@
-import { component, getMapping, autoware, log, RabbitMQ, rabbitListener } from "../../";
+import { component, getMapping, autoware, log, RabbitMQ, rabbitListener } from "../../src/typespeed";
 import { connect } from "amqplib";
 
 
@@ -16,51 +16,6 @@ export default class TestMq {
     @getMapping("/mq/sendByMQClass")
     async sendByMQClass() {
         this.rabbitMQ.send("myqueues", "hello world, by MQClass");
-        return "sent by MQClass";
-    }
-
-    @getMapping("/mq/sendByQueue")
-    async sendMq() {
-        const queue = 'myqueues';
-        const text = "hello world, by queue";
-        const connection = await connect({
-            protocol: 'amqp',
-            hostname: 'localhost',
-            port: 5672,
-            username: 'guest',
-            password: 'guest'
-        });
-        const channel = await connection.createChannel();
-        await channel.assertQueue(queue);
-        channel.sendToQueue(queue, Buffer.from(text));
-        await channel.close();
-        return "sent by queue";
-    }
-
-    @getMapping("/mq/sendByExchange")
-    async sendMq2() {
-        const exchange = 'myexchanges';
-        const text = "hello world, by exchange";
-        const connection = await connect('amqp://localhost');
-        const channel = await connection.createChannel();
-        await channel.checkExchange(exchange);
-        channel.publish(exchange, '', Buffer.from(text));
-        await channel.close();
-        return "sent by exchange";
-    }
-
-    @getMapping("/mq/listen")
-    async testMq() {
-        const connection = await connect('amqp://localhost');
-        const channel = await connection.createChannel();
-        const queue = 'myqueues';
-        const queue2 = 'myqueues2';
-        await channel.checkQueue(queue);
-        await channel.checkQueue(queue2);
-        await channel.consume(queue, (message) => {
-        }, { noAck: true });
-        await channel.consume(queue2, (message) => {
-        }, { noAck: true });
-        return "ok";
+        return "Sent by MQClass";
     }
 }

package/app/src/test-orm.class.ts

@@ -1,4 +1,4 @@
-import { resource, component, log, autoware, schedule, getMapping, postMapping, Redis } from "../../";
+import { resource, component, log, autoware, schedule, getMapping, postMapping, Redis } from "../../src/typespeed";
 import UserModel from "./user-model.class";
 
 @component

package/app/src/test-request.class.ts

@@ -1,4 +1,4 @@
-import { component, getMapping, postMapping, log, req, res, reqQuery, reqBody, reqForm, reqParam } from "../../";
+import { component, getMapping, postMapping, log, req, res, reqQuery, reqBody, reqForm, reqParam } from "../../src/typespeed";
 import MutilUsers from "./entities/mutil-users.class";
 import UserDto from "./entities/user-dto.class";
 

package/app/src/user-model.class.ts

@@ -1,4 +1,4 @@
-import { log, Model } from "../../";
+import { log, Model } from "../../src/typespeed";
 import UserDto from "./entities/user-dto.class";
 
 export default class UserModel extends Model {
@@ -20,7 +20,7 @@ export default class UserModel extends Model {
     }
 
     async newUsers() {
-        const newId = Math.ceil(Math.random() * 1000);
+        const newId = this.random(1000, 2000);
         await this.create([
             new UserDto(newId, "UserDto " + newId),
             new UserDto(newId+1, "UserDto " + (newId+1)),
@@ -43,4 +43,8 @@ export default class UserModel extends Model {
         const effectRows = await this.update({ id: id }, { name: name });
         return effectRows;
     }
+
+    private random(min, max) {
+        return Math.round(Math.random() * (max - min)) + min;
+    }
 }

package/dist/typespeed.d.ts

@@ -199,7 +199,7 @@ declare abstract class ServerFactory {
      * 启动 Web 服务
      * @param port 端口号
      */
-    abstract start(port: number): any;
+    abstract start(port: number, callback?: Function): any;
 }
 /**日志工厂类 */
 declare abstract class LogFactory {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "typespeed",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*.ts --exit",
-    "test-with-coverage": "nyc --reporter=text npm test",
+    "test-with-coverage": "nyc --reporter=lcov npm test",
     "start": "ts-node --transpile-only app/src/main.ts",
     "build": "tsc -p .",
     "postbuild": "cp src/typespeed.d.ts dist/typespeed.d.ts && cp -r src/default/pages dist/default/pages && cp -r src/scaffold/templates dist/scaffold/templates",

package/src/typespeed.d.ts

@@ -199,7 +199,7 @@ declare abstract class ServerFactory {
      * 启动 Web 服务
      * @param port 端口号
      */
-    abstract start(port: number): any;
+    abstract start(port: number, callback?: Function): any;
 }
 /**日志工厂类 */
 declare abstract class LogFactory {

package/test/database.test.ts

@@ -1,19 +1,22 @@
+
 const chaiObj = require('chai');
 chaiObj.use(require("chai-http"));
 const expect = chaiObj.expect;
 describe("Test Database", () => {
+    const randomId = random(3000, 5000);
+    const testAddr = `http://${process.env.LOCAL_HOST || "localhost"}:8081`;
     const testDatabase = [
         {
-            "url": "/db/insert?id=" + Math.ceil(Math.random() * 1000),
-            "expect": "Insert success",
+            "url": "/db/insert?id=" + randomId,
+            "expect": "Insert success: " + randomId,
         },
         {
-            "url": "/db/insert2",
-            "expect": "Insert success",
+            "url": "/db/insert2?id=" + (randomId + 1),
+            "expect": "Insert success: " + (randomId + 1),
         },
         {
-            "url": "/db/update",
-            "expect": "update success",
+            "url": "/db/update?id=" + randomId,
+            "expect": "update success: 1",
         },
         {
             "url": "/db/set-cache?value=zzz",
@@ -26,22 +29,22 @@ describe("Test Database", () => {
     ]
     testDatabase.forEach((testRequest) => {
         it(testRequest.url, (done) => {
-            chaiObj.request("http://localhost:8081").get(testRequest.url).end((err, res) => {
+            chaiObj.request(testAddr).get(testRequest.url).end((err, res) => {
                 chaiObj.assert.equal(testRequest.expect, res.text);
                 return done();
             });
         });
     });
-    it("/db/select1", (done) => {
-        chaiObj.request("http://localhost:8081").get("/db/select1").end((err, res) => {
+    it("/db/select-row", (done) => {
+        chaiObj.request(testAddr).get("/db/select-row?id=" + randomId).end((err, res) => {
             const dataList = JSON.parse(res.text);
             expect(dataList).to.be.an('array');
-            expect(dataList[0]).to.have.property("id").which.is.a("number").equal(1);
+            expect(dataList[0]).to.have.property("id").which.is.a("number").equal(randomId);
             done();
         });
     });
     it("/db/select", (done) => {
-        chaiObj.request("http://localhost:8081").get("/db/select").end((err, res) => {
+        chaiObj.request(testAddr).get("/db/select").end((err, res) => {
             const dataList = JSON.parse(res.text);
             expect(dataList).to.be.an('array');
             expect(dataList[0]).to.have.property('id');
@@ -49,7 +52,7 @@ describe("Test Database", () => {
         });
     });
     it("/db/select-user", (done) => {
-        chaiObj.request("http://localhost:8081").get("/db/select-user").end((err, res) => {
+        chaiObj.request(testAddr).get("/db/select-user").end((err, res) => {
             const dataList = JSON.parse(res.text);
             expect(dataList).to.be.an('array');
             expect(dataList[0]).to.have.property('id');
@@ -58,4 +61,8 @@ describe("Test Database", () => {
     });
 });
 
+function random(min, max) {
+    return Math.round(Math.random() * (max - min)) + min;
+}
+
 export {};

package/test/first-page.test.ts

@@ -2,6 +2,7 @@ const chaiObj = require('chai');
 chaiObj.use(require("chai-http"));
 
 describe("Test First page", () => {
+    const testAddr = `http://${process.env.LOCAL_HOST || "localhost"}:8081`;
     const firstPageRequests = [
         {
             "url": "/first",
@@ -29,7 +30,7 @@ describe("Test First page", () => {
     ]
     firstPageRequests.forEach((testRequest) => {
         it(testRequest.url, (done) => {
-            chaiObj.request("http://localhost:8081").get(testRequest.url).end((err, res) => {
+            chaiObj.request(testAddr).get(testRequest.url).end((err, res) => {
                 chaiObj.assert.equal(testRequest.expect, res.text);
                 return done();
             });

package/test/hooks.ts

@@ -1,10 +1,12 @@
 let appClose;
-before(() => {
+before(function () {
+    this.timeout(50000);
     appClose = require("../app/src/main");
 });
 
-after(() => {
+after((done) => {
     if(appClose != null){
         appClose.default();
     }
+    done();
 });

package/test/mq.test.ts

@@ -5,27 +5,10 @@ chaiObj.use(require("chai-http"));
 const expect = chaiObj.expect;
 
 describe("Test RabbitMQ", () => {
-    it("/mq/listen", (done) => {
-        chaiObj.request("http://localhost:8081").get("/mq/listen").end((err, res) => {
-            expect(res.text).to.be.equal("ok");
-            done();
-        });
-    });
+    const testAddr = `http://${process.env.LOCAL_HOST || "localhost"}:8081`;
     it("/mq/sendByMQClass", (done) => {
-        chaiObj.request("http://localhost:8081").get("/mq/sendByMQClass").end((err, res) => {
-            expect(res.text).to.be.equal("sent by MQClass");
-            done();
-        });
-    });
-    it("/mq/sendByQueue", (done) => {
-        chaiObj.request("http://localhost:8081").get("/mq/sendByQueue").end((err, res) => {
-            expect(res.text).to.be.equal("sent by queue");
-            done();
-        });
-    });
-    it("/mq/sendByExchange", (done) => {
-        chaiObj.request("http://localhost:8081").get("/mq/sendByExchange").end((err, res) => {
-            expect(res.text).to.be.equal("sent by exchange");
+        chaiObj.request(testAddr).get("/mq/sendByMQClass").end((err, res) => {
+            expect(res.text).to.be.equal("Sent by MQClass");
             done();
         });
     });

package/test/orm.test.ts

@@ -3,56 +3,57 @@ chaiObj.use(require("chai-http"));
 const expect = chaiObj.expect;
 
 describe("Test Request Paramters", () => {
+    const testAddr = `http://${process.env.LOCAL_HOST || "localhost"}:8081`;
     it("/redis", (done) => {
-        chaiObj.request("http://localhost:8081").get("/redis").end((err, res) => {
+        chaiObj.request(testAddr).get("/redis").end((err, res) => {
             expect(res.text).to.be.equal("get from redis: " + "Hello World");
             done();
         });
     });
     it("/orm/first", (done) => {
-        chaiObj.request("http://localhost:8081").get("/orm/first").end((err, res) => {
+        chaiObj.request(testAddr).get("/orm/first").end((err, res) => {
             expect(res.text).to.be.equal("first test, to getUsers");
             done();
         });
     });
     it("/orm/one", (done) => {
-        chaiObj.request("http://localhost:8081").get("/orm/one?id=1").end((err, res) => {
+        chaiObj.request(testAddr).get("/orm/one?id=1").end((err, res) => {
             expect(res.text).to.be.equal("find one test, to getUser");
             done();
         });
     });
     it("/orm/delete", (done) => {
-        chaiObj.request("http://localhost:8081").get("/orm/delete?id=0").end((err, res) => {
+        chaiObj.request(testAddr).get("/orm/delete?id=0").end((err, res) => {
             expect(res.text).to.be.equal("remove user, results: remove rows: 0");
             done();
         });
     });
     it("/orm/count", (done) => {
-        chaiObj.request("http://localhost:8081").get("/orm/count").end((err, res) => {
+        chaiObj.request(testAddr).get("/orm/count").end((err, res) => {
             expect(JSON.parse(res.text)).to.have.property("count").which.is.a("number").above(0);
             done();
         });
     });
     it("/orm/new", (done) => {
-        chaiObj.request("http://localhost:8081").get("/orm/new").end((err, res) => {
+        chaiObj.request(testAddr).get("/orm/new").end((err, res) => {
             expect(JSON.parse(res.text)).to.have.property("newId").which.is.a("number").above(0);
             done();
         });
     });
     it("/orm/page/calculate", (done) => {
-        chaiObj.request("http://localhost:8081").get("/orm/page/calculate").end((err, res) => {
+        chaiObj.request(testAddr).get("/orm/page/calculate").end((err, res) => {
             expect(JSON.parse(res.text)).to.have.property("totalPage").which.is.a("number").equal(38);
             done();
         });
     });
     it("/orm/pages", (done) => {
-        chaiObj.request("http://localhost:8081").get("/orm/pages/1").end((err, res) => {
+        chaiObj.request(testAddr).get("/orm/pages/1").end((err, res) => {
             expect(JSON.parse(res.text)).is.a("array").lengthOf(3);
             done();
         });
     });
     it("/orm/edit", (done) => {
-        chaiObj.request("http://localhost:8081").post("/orm/edit")
+        chaiObj.request(testAddr).post("/orm/edit")
             .type("form")
             .send({ id: 1, name: "new name" })
             .end((err, res) => {

package/test/request.test.ts

@@ -5,14 +5,15 @@ chaiObj.use(require("chai-http"));
 const expect = chaiObj.expect;
 
 describe("Test Request Paramters", () => {
+    const testAddr = `http://${process.env.LOCAL_HOST || "localhost"}:8081`;
     it("/request/res", (done) => {
-        chaiObj.request("http://localhost:8081").get("/request/res").end((err, res) => {
+        chaiObj.request(testAddr).get("/request/res").end((err, res) => {
             expect(res.text).to.be.equal("test res");
             done();
         });
     });
     it("/request/query", (done) => {
-        chaiObj.request("http://localhost:8081").get("/request/query?id=100").end((err, res) => {
+        chaiObj.request(testAddr).get("/request/query?id=100").end((err, res) => {
             expect(res.text).to.be.equal(JSON.stringify(
                 new MutilUsers("group", [new UserDto(1, "name"), new UserDto(2, "name")]
             )));
@@ -21,7 +22,7 @@ describe("Test Request Paramters", () => {
     });
     it("/request/body", (done) => {
         const sendUser = new UserDto(100, "name100");
-        chaiObj.request("http://localhost:8081").post("/request/body")
+        chaiObj.request(testAddr).post("/request/body")
             .send(sendUser)
             .end((err, res) => {
             expect(res.text).to.be.equal(JSON.stringify(new MutilUsers("group", [sendUser])));
@@ -30,7 +31,7 @@ describe("Test Request Paramters", () => {
     });
     it("/request/form", (done) => {
         const sendName = "name200";
-        chaiObj.request("http://localhost:8081").post("/request/form")
+        chaiObj.request(testAddr).post("/request/form")
             .type("form")
             .send({ name: sendName })
             .end((err, res) => {
@@ -40,7 +41,7 @@ describe("Test Request Paramters", () => {
     });
     it("/request/param", (done) => {
         const sendId = 200;
-        chaiObj.request("http://localhost:8081").get("/request/param/" + sendId).end((err, res) => {
+        chaiObj.request(testAddr).get("/request/param/" + sendId).end((err, res) => {
             expect(res.text).to.be.equal("test param: " + sendId);
             done();
         });

package/test/second-page.test.ts

@@ -1,34 +1,33 @@
 import * as jwttoken from "jsonwebtoken";
 import * as fs from "fs";
 const chaiObj = require('chai');
-
 chaiObj.use(require("chai-http"));
 
-
 describe("Test Sencond Page", () => {
+    const testAddr = `http://${process.env.LOCAL_HOST || "localhost"}:8081`;
     it("/second/setCookie", (done) => {
-        chaiObj.request("http://localhost:8081").get("/second/setCookie").end((err, res) => {
+        chaiObj.request(testAddr).get("/second/setCookie").end((err, res) => {
             chaiObj.assert.equal(res.headers["set-cookie"].includes("name=zzz; Path=/"), true);
             done();
         });
     });
     it("/second/getCookie", (done) => {
         const cookieSet = "mycookie"
-        chaiObj.request("http://localhost:8081").get("/second/getCookie")
+        chaiObj.request(testAddr).get("/second/getCookie")
             .set("Cookie", "name=" + cookieSet).end((err, res) => {
                 chaiObj.assert.equal(res.text, "getCookie: " + cookieSet);
                 done();
             });
     });
     it("/second/testSession", (done) => {
-        chaiObj.request("http://localhost:8081").get("/second/testSession").end((err, res) => {
+        chaiObj.request(testAddr).get("/second/testSession").end((err, res) => {
             chaiObj.assert.equal(res.text, "testForSession: 1");
             done();
         });
     });
     it("/upload", (done) => {
         const uploadfile = "./app/static/k.jpg";
-        chaiObj.request("http://localhost:8081").post("/upload")
+        chaiObj.request(testAddr).post("/upload")
             .set('Content-Type', 'multipart/form-data')
             .attach("file", uploadfile)
             .end((err, res) => {
@@ -39,7 +38,7 @@ describe("Test Sencond Page", () => {
     it("/form", (done) => {
         const token = jwttoken.sign({ foo: 'bar' }, 'shhhhhhared-secret');
         const fileContents = fs.readFileSync("./app/src/views/upload.html", "utf8");
-        chaiObj.request("http://localhost:8081").post("/form")
+        chaiObj.request(testAddr).post("/form")
             .set({ "Authorization": `Bearer ${token}` })
             .end((err, res) => {
                 chaiObj.assert.equal(res.text, fileContents);