diff --git a/common/models/customer.js b/common/models/customer.js index ee308f8..3ca29b1 100644 --- a/common/models/customer.js +++ b/common/models/customer.js @@ -1,6 +1,7 @@ var console = process.console; module.exports = function(Customer) { Customer.getName =function(ctx,cb){ + console.tag('input').error(ctx); var respone = { "resultCode":"20000", "resultDescription":"Success", @@ -8,6 +9,7 @@ module.exports = function(Customer) { "Name": ctx.name } }; + console.tag('response').warning(respone); cb(null,respone); }; Customer.remoteMethod('getName',{ diff --git a/common/models/item.js b/common/models/item.js index 9639d1e..03fdbbd 100644 --- a/common/models/item.js +++ b/common/models/item.js @@ -1,5 +1,6 @@ var console = process.console; var unirest = require('unirest'); +var moment = require('moment'); module.exports = function(Item) { Item.disableRemoteMethod("create", true);// post Item.disableRemoteMethod("find", false);// get @@ -48,8 +49,7 @@ module.exports = function(Item) { var data = { "name":ctx }; - unirest.post("http://localhost:3000/api/AddChannels/getName").send(data).end(function(response){ - console.log(response.body); + unirest.post("http://localhost:3000/api/customer/getName").send(data).end(function(response){ cb(null,response.body) }); }; @@ -94,8 +94,20 @@ module.exports = function(Item) { "price": 0 },http: { source: 'body' }}, returns: {arg: 'data', type: 'object', root: true} + }); - }) + Item.Moment = function(cb){ + var this_time = { + "default": moment().format(), + "DD-MM-YYY":moment().format("DD-MM-YYYY"), + "HH:MM:SS":moment().format("HH:mm:ss") + }; + cb(null,this_time); + }; + Item.remoteMethod('Moment',{ + http:{path:'/Moment',verb:'get'}, + returns: {arg: 'data', type: 'object', root: true} + }) }; diff --git a/common/models/order.js b/common/models/order.js index bae3c76..7a2d5f3 100644 --- a/common/models/order.js +++ b/common/models/order.js @@ -8,7 +8,9 @@ module.exports = function(Order) { Order.disableRemoteMethod("create", true);// post Order.AddOrder = function(ctx,cb){ console.log(ctx); - findCustomer(ctx,cb,findItems) + findCustomer(ctx,cb,findItems); + + }; function findCustomer(ctx,cb,next){ console.tag('Input').log(ctx); @@ -52,7 +54,6 @@ module.exports = function(Order) { } }) } - Order.remoteMethod('AddOrder',{ http:{path:'/customer/:customer_id/item/:item_id',verb:'get'}, accepts: { arg: 'ctx', type: 'object', http: function(ctx) { diff --git a/package.json b/package.json index d94ffee..e5b9606 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "loopback-connector-mongodb": "^1.15.2", "loopback-connector-mysql": "^2.3.0", "loopback-datasource-juggler": "^2.39.0", + "moment": "^2.13.0", "path": "^0.12.7", "scribe-js": "^2.0.4", "serve-favicon": "^2.0.1", diff --git a/server/datasources.json b/server/datasources.json index 1377c47..78d9b3e 100644 --- a/server/datasources.json +++ b/server/datasources.json @@ -13,16 +13,6 @@ "user": "", "connector": "mongodb" }, - "account": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "account", - "password": "A83kKhoAH4jcEHMY", - "name": "account", - "user": "npm_account", - "connector": "mysql" - }, "radius": { "host": "server8.sourcecode.co.th", "port": 3306, @@ -32,75 +22,5 @@ "name": "radius", "user": "npm_radius", "connector": "mysql" - }, - "refill": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "refill", - "password": "Fe8Vf63LtdGQaFtd", - "name": "refill", - "user": "npm_refill", - "connector": "mysql" - }, - "smartquotation": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "smartquotation", - "password": "Bwa7Z6ZRosU4RuAH", - "name": "smartquotation", - "user": "npm_smtquot", - "connector": "mysql" - }, - "smartzone": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "smartzone", - "password": "pADobokFAoPC384B", - "name": "account", - "user": "npm_szv3", - "connector": "mysql" - }, - "smartzonev4": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "smartzonev4", - "password": "Q7TsWo7UNbCsi3sb", - "name": "smartzonev4", - "user": "npm_szv4", - "connector": "mysql" - }, - "thespecialdress": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "thespecialdress", - "password": "bXGhkLoTJ9atAx72", - "name": "thespecialdress", - "user": "npm_tsd", - "connector": "mysql" - }, - "thespecialdress_wp": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "thespecialdress_wp", - "password": "gAUmK7Jcvq4F7CUs", - "name": "thespecialdress_wp", - "user": "npm_tsdwp", - "connector": "mysql" - }, - "vtigercrm510": { - "host": "server8.sourcecode.co.th", - "port": 3306, - "url": "", - "database": "vtigercrm510", - "password": "X6UUfWM8GJEPBzv3", - "name": "vtigercrm510", - "user": "npm_vtiger", - "connector": "mysql" } } -- libgit2 0.21.2