diff --git a/api/log/development.log b/api/log/development.log index bfe7a236..a75f6b88 100644 --- a/api/log/development.log +++ b/api/log/development.log @@ -10927,3 +10927,27 @@ headers: {} ' at Array.forEach ()' } >>>>>>> Stashed changes +2022-08-12 09:49:59.887 - debug: [FS-LOGGER] Init. +2022-08-12 09:49:59.963 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 09:49:59.963 - info: [FS-AUTH] Inject auth and api mv into router. +2022-08-12 09:50:02.270 - debug: [FS-LOGGER] Init. +2022-08-12 09:50:02.347 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 09:50:02.347 - info: [FS-AUTH] Inject auth and api mv into router. +2022-08-12 10:11:27.603 - debug: [FS-LOGGER] Init. +2022-08-12 10:11:27.679 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 10:11:27.680 - info: [FS-AUTH] Inject auth and api mv into router. +2022-08-12 10:29:27.908 - debug: [FS-LOGGER] Init. +2022-08-12 10:29:27.985 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 10:29:27.985 - info: [FS-AUTH] Inject auth and api mv into router. +2022-08-12 10:29:45.743 - debug: [FS-LOGGER] Init. +2022-08-12 10:29:45.819 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 10:29:45.819 - info: [FS-AUTH] Inject auth and api mv into router. +2022-08-12 10:29:47.156 - debug: [FS-LOGGER] Init. +2022-08-12 10:29:47.233 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 10:29:47.233 - info: [FS-AUTH] Inject auth and api mv into router. +2022-08-12 10:30:43.735 - debug: [FS-LOGGER] Init. +2022-08-12 10:30:43.811 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 10:30:43.812 - info: [FS-AUTH] Inject auth and api mv into router. +2022-08-12 10:36:36.953 - debug: [FS-LOGGER] Init. +2022-08-12 10:36:37.032 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-08-12 10:36:37.032 - info: [FS-AUTH] Inject auth and api mv into router. diff --git a/api/package.json b/api/package.json index ecc9e7dc..29272131 100644 --- a/api/package.json +++ b/api/package.json @@ -1,45 +1,45 @@ { - "name": "smart-emergency", - "version": "1.0.0", - "description": "fs smart emergency api", - "main": "server.js", - "scripts": { - "test": "set DEBUG=true&&\"node_modules/.bin/mocha\" --harmony --reporter spec app/test/*.test.js", - "start": "set NODE_ENV=development&&node server -p 4000 -g postgres://postgres://postgres:123@10.8.30.32:5432/highways4good -f http://localhost:14000 --qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5 --qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa --qnbkt dev-highways4good --qndmn http://rfkimpwbb.hn-bkt.clouddn.com", - "start:linux": "export NODE_ENV=development&&node server -p 4000 -g postgres://FashionAdmin:123456@10.8.30.39:5432/pm1", - "automate": "sequelize-automate -c sequelize-automate.config.js" - }, - "author": "", - "license": "MIT", - "repository": {}, - "dependencies": { - "@fs/attachment": "^1.0.0", - "archiver": "3.0.0", - "args": "^3.0.7", - "async-busboy": "^0.7.0", - "better-xlsx": "^0.7.6", - "crypto-js": "^4.0.0", - "file-saver": "^2.0.2", - "fs-web-server-scaffold": "^2.0.2", - "ioredis": "^4.19.4", - "kafka-node": "^2.2.3", - "koa-convert": "^1.2.0", - "koa-proxy": "^0.9.0", - "koa2-swagger-ui": "^5.3.0", - "md5-node": "^1.0.1", - "moment": "^2.24.0", - "path": "^0.12.7", - "path-to-regexp": "^3.0.0", - "pg": "^7.9.0", - "redis": "^3.1.2", - "request": "^2.88.2", - "rimraf": "^3.0.2", - "superagent": "^3.5.2", - "swagger-jsdoc": "^6.1.0", - "uuid": "^3.3.2", - "xlsx": "^0.16.9" - }, - "devDependencies": { - "mocha": "^6.0.2" - } + "name": "smart-emergency", + "version": "1.0.0", + "description": "fs smart emergency api", + "main": "server.js", + "scripts": { + "test": "set DEBUG=true&&\"node_modules/.bin/mocha\" --harmony --reporter spec app/test/*.test.js", + "start": "set NODE_ENV=development&&node server -p 4000 -g postgres://postgres://postgres:123@10.8.30.32:5432/highways4good -f http://localhost:14000 --qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5 --qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa --qnbkt dev-highways4good --qndmn http://rfkimpwbb.hn-bkt.clouddn.com", + "start:linux": "export NODE_ENV=development&&node server -p 4000 -g postgres://FashionAdmin:123456@10.8.30.39:5432/pm1", + "automate": "sequelize-automate -c sequelize-automate.config.js" + }, + "author": "", + "license": "MIT", + "repository": {}, + "dependencies": { + "@fs/attachment": "^1.0.0", + "archiver": "3.0.0", + "args": "^3.0.7", + "async-busboy": "^0.7.0", + "better-xlsx": "^0.7.6", + "crypto-js": "^4.0.0", + "file-saver": "^2.0.2", + "fs-web-server-scaffold": "^2.0.2", + "ioredis": "^4.19.4", + "kafka-node": "^2.2.3", + "koa-convert": "^1.2.0", + "koa-proxy": "^0.9.0", + "koa2-swagger-ui": "^5.3.0", + "md5-node": "^1.0.1", + "moment": "^2.24.0", + "path": "^0.12.7", + "path-to-regexp": "^3.0.0", + "pg": "^7.9.0", + "redis": "^3.1.2", + "request": "^2.88.2", + "rimraf": "^3.0.2", + "superagent": "^3.5.2", + "swagger-jsdoc": "^6.1.0", + "uuid": "^3.3.2", + "xlsx": "^0.16.9" + }, + "devDependencies": { + "mocha": "^6.0.2" + } } diff --git a/web/log/development.txt b/web/log/development.txt index 46e0b586..720ae50d 100644 --- a/web/log/development.txt +++ b/web/log/development.txt @@ -69873,3 +69873,9 @@ ' at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' + ' at processTicksAndRejections (internal/process/task_queues.js:84:21)' } +2022-08-12 09:48:32.452 - debug: [FS-LOGGER] Init. +2022-08-12 09:48:32.517 - info: [Router] Inject api: attachment/index +2022-08-12 10:13:00.182 - debug: [FS-LOGGER] Init. +2022-08-12 10:13:00.237 - info: [Router] Inject api: attachment/index +2022-08-12 10:36:42.015 - debug: [FS-LOGGER] Init. +2022-08-12 10:36:42.064 - info: [Router] Inject api: attachment/index diff --git a/web/package.json b/web/package.json index 548d6ed8..7cd3d607 100644 --- a/web/package.json +++ b/web/package.json @@ -6,7 +6,7 @@ "scripts": { "test": "mocha", "start": "cross-env NODE_ENV=development npm run start-params", - "start-params": "node server -p 5000 -u http://10.8.30.157:9119/ --qndmn http://rfkimpwbb.hn-bkt.clouddn.com", + "start-params": "node server -p 5000 -u http://localhost:14000 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com", "deploy": "export NODE_ENV=production&&npm run color && npm run build && node server", "build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js", "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js",