irext/private-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

private cloud update 2020-06-14

Browse Source 
1. completed i18n for private cloud (foreground and background)
2. fixed issues
This commit is contained in:
strawmanbobi
2020-06-14 11:56:18 +08:00
parent 7fc902a540
commit f94a89faef
28 changed files with 899 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
console/model/brand_dao.js
View File

@@ -4,19 +4,19 @@
*/
// global inclusion
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');
let orm = require('orm');
let dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
let logger = require('../mini_poem/logging/logger4js').helper;
let dateUtils = require('../mini_poem/utils/date_utils.js');
// local inclusion
var ErrorCode = require('../constants/error_code');
var Enums = require('../constants/enums');
let ErrorCode = require('../constants/error_code');
let Enums = require('../constants/enums');
var errorCode = new ErrorCode();
var enums = new Enums();
let errorCode = new ErrorCode();
let enums = new Enums();
var Brand = dbOrm.define('brand',
let Brand = dbOrm.define('brand',
{
id: Number,
name: String,
@@ -35,8 +35,8 @@ var Brand = dbOrm.define('brand',
);
Brand.createBrand = function(brand, callback) {
var date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
var newBrand = new Brand({
let date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
let newBrand = new Brand({
name: brand.name,
category_id: brand.category_id,
category_name: brand.category_name,

18
console/model/category_dao.js
View File

@@ -4,16 +4,16 @@
*/
// global inclusion
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');
let orm = require('orm');
let dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
let logger = require('../mini_poem/logging/logger4js').helper;
let dateUtils = require('../mini_poem/utils/date_utils.js');
// local inclusion
var ErrorCode = require('../constants/error_code');
var errorCode = new ErrorCode();
let ErrorCode = require('../constants/error_code');
let errorCode = new ErrorCode();
var Category = dbOrm.define('category',
let Category = dbOrm.define('category',
{
id: Number,
name: String,
@@ -29,8 +29,8 @@ var Category = dbOrm.define('category',
);
Category.createCategory = function(category, callback) {
var date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
var newCategory = new Category({
let date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
let newCategory = new Category({
name: category.name,
status: 1,
update_time: date,

16
console/model/city_dao.js
View File

@@ -4,15 +4,15 @@
*/
// global inclusion
var orm = require('orm');
var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
var logger = require('../mini_poem/logging/logger4js').helper;
let orm = require('orm');
let dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
let logger = require('../mini_poem/logging/logger4js').helper;
// local inclusion
var ErrorCode = require('../constants/error_code');
var errorCode = new ErrorCode();
let ErrorCode = require('../constants/error_code');
let errorCode = new ErrorCode();
var City = dbOrm.define('city',
let City = dbOrm.define('city',
{
id: Number,
code: String,
@@ -27,7 +27,7 @@ var City = dbOrm.define('city',
);
City.listProvinces = function(callback) {
var error = errorCode.SUCCESS;
let error = errorCode.SUCCESS;
dbOrm.driver.execQuery("SELECT * FROM city WHERE code LIKE '__0000'", function(getProvincesErr, result) {
if (getProvincesErr) {
logger.info("get provinces failed : " + getProvincesErr);
@@ -41,7 +41,7 @@ City.listProvinces = function(callback) {
};
City.listCities = function(provincePrefix, callback) {
var error = errorCode.SUCCESS;
let error = errorCode.SUCCESS;
// dbOrm is object of ORM
dbOrm.driver.execQuery("SELECT * FROM city WHERE code LIKE '" + provincePrefix + "__00' AND code NOT LIKE '__0000'", function(getCitiesErr, result) {
if (getCitiesErr) {

22
console/model/collect_remote_dao.js
View File

@@ -4,18 +4,18 @@
*/
// global inclusion
var orm = require('orm');
var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
var logger = require('../mini_poem/logging/logger4js').helper;
let orm = require('orm');
let dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
let logger = require('../mini_poem/logging/logger4js').helper;
// local inclusion
var ErrorCode = require('../constants/error_code');
var Enums = require('../constants/enums');
let ErrorCode = require('../constants/error_code');
let Enums = require('../constants/enums');
var errorCode = new ErrorCode();
var enums = new Enums();
let errorCode = new ErrorCode();
let enums = new Enums();
var CollectRemote = dbOrm.define('collect_remote',
let CollectRemote = dbOrm.define('collect_remote',
{
id: Number,
name: String,
@@ -40,8 +40,8 @@ var CollectRemote = dbOrm.define('collect_remote',
);
CollectRemote.createCollectRemote = function(collectRemote, callback) {
var date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
var newCollectRemote = new CollectRemote({
let date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
let newCollectRemote = new CollectRemote({
name: collectRemote.name,
category_id: collectRemote.category_id,
category_name: collectRemote.category_name,
@@ -153,7 +153,7 @@ CollectRemote.updateCollectRemote = function(collectRemoteID, newCollectRemote,
} else {
logger.info("get collectRemote by ID successfully in update collectRemote");
for (var prop in collectRemote) {
for (let prop in collectRemote) {
if (undefined !== newCollectRemote[prop] && null !== newCollectRemote[prop]) {
collectRemote[prop] = newCollectRemote[prop];
}

22
console/model/ir_protocol_dao.js
View File

@@ -4,19 +4,19 @@
*/
// global inclusion
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');
let orm = require('orm');
let dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
let logger = require('../mini_poem/logging/logger4js').helper;
let dateUtils = require('../mini_poem/utils/date_utils.js');
// local inclusion
var ErrorCode = require('../constants/error_code');
var errorCode = new ErrorCode();
let ErrorCode = require('../constants/error_code');
let errorCode = new ErrorCode();
var Enums = require('../constants/enums');
var enums = new Enums();
let Enums = require('../constants/enums');
let enums = new Enums();
var IRProtocol = dbOrm.define('ir_protocol',
let IRProtocol = dbOrm.define('ir_protocol',
{
id: Number,
name: String,
@@ -32,8 +32,8 @@ var IRProtocol = dbOrm.define('ir_protocol',
);
IRProtocol.createIRProtocol = function(protocol, callback) {
var date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
var newProtocol = new IRProtocol({
let date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
let newProtocol = new IRProtocol({
name: protocol.name,
status: protocol.status,
type: protocol.type,

29
console/model/remote_index_dao.js
View File

@@ -4,19 +4,19 @@
*/
// global inclusion
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');
let orm = require('orm');
let dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
let logger = require('../mini_poem/logging/logger4js').helper;
let dateUtils = require('../mini_poem/utils/date_utils.js');
// local inclusion
var ErrorCode = require('../constants/error_code');
var Enums = require('../constants/enums');
let ErrorCode = require('../constants/error_code');
let Enums = require('../constants/enums');
var errorCode = new ErrorCode();
var enums = new Enums();
let errorCode = new ErrorCode();
let enums = new Enums();
var RemoteIndex = dbOrm.define('remote_index',
let RemoteIndex = dbOrm.define('remote_index',
{
id: Number,
category_id: Number,
@@ -48,8 +48,8 @@ var RemoteIndex = dbOrm.define('remote_index',
);
RemoteIndex.createRemoteIndex = function(remoteIndex, callback) {
var date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
var newRemoteIndex = new RemoteIndex({
let date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
let newRemoteIndex = new RemoteIndex({
name: remoteIndex.name,
category_id: remoteIndex.category_id,
category_name: remoteIndex.category_name,
@@ -168,9 +168,8 @@ RemoteIndex.updateRemoteIndex = function(remoteIndexID, newRemoteIndex, callback
logger.error("get remoteIndex by ID error in update remote index : " + error);
callback(errorCode.FAILED, null);
} else {
var date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
logger.info("get remoteIndex by ID successfully in update remote index");
for (var prop in remoteIndex) {
let date = dateUtils.formatDate(new Date(), "yyyy-MM-dd hh:mm:ss");
for (let prop in remoteIndex) {
if (undefined != newRemoteIndex[prop] && null != newRemoteIndex[prop]) {
remoteIndex[prop] = newRemoteIndex[prop];
}
@@ -195,7 +194,6 @@ RemoteIndex.verifyRemoteIndex = function(remoteIndexID, status, callback) {
logger.error("get remoteIndex by ID error in verify remote index : " + error);
callback(errorCode.FAILED, null);
} else {
logger.info("get remoteIndex by ID successfully in verify remote index");
remoteIndex.status = status;
remoteIndex.save(function(error, updatedRemoteIndex) {
@@ -216,7 +214,6 @@ RemoteIndex.fallbackRemoteIndex = function(remoteIndexID, status, callback) {
logger.error("get remoteIndex by ID error in fallback remote index : " + error);
callback(errorCode.FAILED, null);
} else {
logger.info("get remoteIndex by ID successfully in fallback remote index");
remoteIndex.status = status;
remoteIndex.save(function(error, updatedRemoteIndex) {

12
console/model/stb_operator_dao.js
View File

@@ -4,15 +4,15 @@
*/
// global inclusion
var orm = require('orm');
var dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
var logger = require('../mini_poem/logging/logger4js').helper;
let orm = require('orm');
let dbOrm = require('../mini_poem/db/mysql/mysql_connection').mysqlDB;
let logger = require('../mini_poem/logging/logger4js').helper;
// local inclusion
var ErrorCode = require('../constants/error_code');
var errorCode = new ErrorCode();
let ErrorCode = require('../constants/error_code');
let errorCode = new ErrorCode();
var StbOperator = dbOrm.define('stb_operator',
let StbOperator = dbOrm.define('stb_operator',
{
id: Number,
operator_id: String,

18
console/model/virtual_remote_dao.js
View File

@@ -4,23 +4,23 @@
*/
// global inclusion
var kvConn = require('../mini_poem/db/mongodb/mongodb_connection');
var logger = require('../mini_poem/logging/logger4js').helper;
var Map = require('../mini_poem/mem/map');
let kvConn = require('../mini_poem/db/mongodb/mongodb_connection');
let logger = require('../mini_poem/logging/logger4js').helper;
let Map = require('../mini_poem/mem/map');
// local inclusion
var ErrorCode = require('../constants/error_code');
var errorCode = new ErrorCode();
let ErrorCode = require('../constants/error_code');
let errorCode = new ErrorCode();
var VirtualRemote = function() {
let VirtualRemote = function() {
};
var remoteMap = new Map();
let remoteMap = new Map();
VirtualRemote.prototype.findRemoteByKey = function(protocol, remote, remoteKey, code, callback) {
// traverse all collections per remote
var collectionName = remote + "_" + protocol;
var vRemote = remoteMap.get(collectionName);
let collectionName = remote + "_" + protocol;
let vRemote = remoteMap.get(collectionName);
if(null == vRemote) {
try {
vRemote = kvConn.defineByCollection(collectionName, {