From 65e146f12b9ea1a7e1d34a2f3f01fe3e21f5c578 Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Sat, 3 Dec 2016 20:48:20 +0800 Subject: [PATCH] integrated mini-poem for irext console --- .../mini_poem/db/mysql/mysql_connection.js | 2 +- src/web_console/model/admin_dao.js | 2 +- src/web_console/model/brand_dao.js | 2 +- src/web_console/model/category_dao.js | 22 +++++++++---------- src/web_console/model/city_dao.js | 2 +- src/web_console/model/ir_protocol_dao.js | 2 +- src/web_console/model/remote_index_dao.js | 2 +- src/web_console/model/stb_operator_dao.js | 2 +- src/web_console/script_npm.sh | 3 +++ src/web_console/work_unit/internal_logic.js | 2 +- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/web_console/mini_poem/db/mysql/mysql_connection.js b/src/web_console/mini_poem/db/mysql/mysql_connection.js index d108cc9..50c6817 100644 --- a/src/web_console/mini_poem/db/mysql/mysql_connection.js +++ b/src/web_console/mini_poem/db/mysql/mysql_connection.js @@ -3,9 +3,9 @@ * 2014-09-22 */ -require('../../configuration/constants'); var orm = require('orm'); var logger = require('../../logging/logger4js').helper; +require('../../configuration/constants'); var ormOpt; diff --git a/src/web_console/model/admin_dao.js b/src/web_console/model/admin_dao.js index 275fd19..d5a062c 100644 --- a/src/web_console/model/admin_dao.js +++ b/src/web_console/model/admin_dao.js @@ -4,7 +4,7 @@ */ // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB; var logger = require('../mini_poem/logging/logger4js').helper; diff --git a/src/web_console/model/brand_dao.js b/src/web_console/model/brand_dao.js index bcf662f..c465896 100644 --- a/src/web_console/model/brand_dao.js +++ b/src/web_console/model/brand_dao.js @@ -4,7 +4,7 @@ */ // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB; var logger = require('../mini_poem/logging/logger4js').helper; var dateUtils = require('../mini_poem/utils/date_utils.js'); diff --git a/src/web_console/model/category_dao.js b/src/web_console/model/category_dao.js index 139751b..3f8bb39 100644 --- a/src/web_console/model/category_dao.js +++ b/src/web_console/model/category_dao.js @@ -4,7 +4,7 @@ */ // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB; var logger = require('../mini_poem/logging/logger4js').helper; var dateUtils = require('../mini_poem/utils/date_utils.js'); @@ -27,7 +27,7 @@ var Category = dbOrm.define('category', } ); -Category.createCategory = function(category, callback) { +Category.createCategory = function (category, callback) { var date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss"); var newCategory = new Category({ name: category.name, @@ -36,8 +36,8 @@ Category.createCategory = function(category, callback) { name_en: category.name_en, name_tw: category.name_tw }); - newCategory.save(function(error, createdCategory) { - if(error) { + newCategory.save(function (error, createdCategory) { + if (error) { logger.error('failed to create category : ' + error); callback(errorCode.FAILED, null); } else { @@ -47,7 +47,7 @@ Category.createCategory = function(category, callback) { }); }; -Category.findCategoryByConditions = function(conditions, callback) { +Category.findCategoryByConditions = function (conditions, callback) { Category.find(conditions) .run(function (error, categories) { if (error) { @@ -60,8 +60,8 @@ Category.findCategoryByConditions = function(conditions, callback) { }); }; -Category.listCategories = function(conditions, from, count, sortField, callback) { - if("id" == sortField && 0 != from) { +Category.listCategories = function (conditions, from, count, sortField, callback) { + if ("id" == sortField && 0 != from) { conditions.id = orm.gt(from); Category.find(conditions).limit(parseInt(count)).orderRaw("?? ASC", [sortField]) .run(function (listCategoriesErr, categories) { @@ -88,8 +88,8 @@ Category.listCategories = function(conditions, from, count, sortField, callback) }; -Category.getCategoryByID = function(categoryID, callback) { - Category.get(categoryID, function(error, category) { +Category.getCategoryByID = function (categoryID, callback) { + Category.get(categoryID, function (error, category) { if (error) { logger.error("get category by ID error : " + error); callback(errorCode.FAILED, null); @@ -101,8 +101,8 @@ Category.getCategoryByID = function(categoryID, callback) { }; /* For internal use only */ -Category.listRemoteCategories = function(conditions, from, count, sortField, callback) { - if("id" == sortField && 0 != from) { +Category.listRemoteCategories = function (conditions, from, count, sortField, callback) { + if ("id" == sortField && 0 != from) { conditions.id = orm.gt(from); Category.find(conditions).limit(parseInt(count)).orderRaw("?? ASC", [sortField]) .run(function (listCategoriesErr, categories) { diff --git a/src/web_console/model/city_dao.js b/src/web_console/model/city_dao.js index e4bcaec..e53fabe 100644 --- a/src/web_console/model/city_dao.js +++ b/src/web_console/model/city_dao.js @@ -4,7 +4,7 @@ */ // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB; var logger = require('../mini_poem/logging/logger4js').helper; diff --git a/src/web_console/model/ir_protocol_dao.js b/src/web_console/model/ir_protocol_dao.js index 75d3fde..eff1192 100644 --- a/src/web_console/model/ir_protocol_dao.js +++ b/src/web_console/model/ir_protocol_dao.js @@ -4,7 +4,7 @@ */ // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB; var logger = require('../mini_poem/logging/logger4js').helper; var dateUtils = require('../mini_poem/utils/date_utils.js'); diff --git a/src/web_console/model/remote_index_dao.js b/src/web_console/model/remote_index_dao.js index 83ed947..8ea3005 100644 --- a/src/web_console/model/remote_index_dao.js +++ b/src/web_console/model/remote_index_dao.js @@ -4,7 +4,7 @@ */ // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB; var logger = require('../mini_poem/logging/logger4js').helper; var dateUtils = require('../mini_poem/utils/date_utils.js'); diff --git a/src/web_console/model/stb_operator_dao.js b/src/web_console/model/stb_operator_dao.js index 8657763..a680f46 100644 --- a/src/web_console/model/stb_operator_dao.js +++ b/src/web_console/model/stb_operator_dao.js @@ -4,7 +4,7 @@ */ // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB; var logger = require('../mini_poem/logging/logger4js').helper; diff --git a/src/web_console/script_npm.sh b/src/web_console/script_npm.sh index e95db16..e2bec29 100644 --- a/src/web_console/script_npm.sh +++ b/src/web_console/script_npm.sh @@ -44,4 +44,7 @@ npm install aliyun-sdk echo "npm install nodemailer" npm install nodemailer@0.7 +echo "npm install ali-oss" +npm install ali-oss + echo "npm install done" \ No newline at end of file diff --git a/src/web_console/work_unit/internal_logic.js b/src/web_console/work_unit/internal_logic.js index ae2c43c..9777e5b 100644 --- a/src/web_console/work_unit/internal_logic.js +++ b/src/web_console/work_unit/internal_logic.js @@ -8,7 +8,7 @@ fs = require('fs'); var crypto = require('crypto'); // global inclusion -var orm = require('../mini_poem/node_modules/orm'); +var orm = require('orm'); var Constants = require('../mini_poem/configuration/constants'); var PythonCaller = require('../mini_poem/external/python_caller'); var OSS = require('../mini_poem/data_set/ali_oss.js');