diff --git a/src/web_console/data/db/irext_private_20161204.sql b/src/web_console/data/db/irext_private_sql_20161204.sql similarity index 100% rename from src/web_console/data/db/irext_private_20161204.sql rename to src/web_console/data/db/irext_private_sql_20161204.sql diff --git a/src/web_console/irext_console.js b/src/web_console/irext_console.js index 93c5ba5..0cf4641 100644 --- a/src/web_console/irext_console.js +++ b/src/web_console/irext_console.js @@ -80,6 +80,7 @@ function tokenValidation (req, res, next) { // request of content type of multipart/form-data would be validated inside each service next(); } else { + console.log("adminID = " + adminID + ", token = " + token); certificateLogic.verifyTokenWorkUnit(adminID, token, function(validateTokenErr) { if(errorCode.SUCCESS.code != validateTokenErr.code) { var fakeResponse = { diff --git a/src/web_console/model/category_dao.js b/src/web_console/model/category_dao.js index f63d8bc..c8ab785 100644 --- a/src/web_console/model/category_dao.js +++ b/src/web_console/model/category_dao.js @@ -28,7 +28,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, @@ -49,7 +49,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) { @@ -62,8 +62,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) { @@ -90,8 +90,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); @@ -103,8 +103,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/services/certificate_service.js b/src/web_console/services/certificate_service.js index 04f4b20..0d343c4 100644 --- a/src/web_console/services/certificate_service.js +++ b/src/web_console/services/certificate_service.js @@ -5,12 +5,12 @@ // system inclusion var constants = require('../mini_poem/configuration/constants'); +var logger = require('../mini_poem/logging/logger4js').helper; // local inclusion var ServiceResponse = require('../response/service_response.js'); var LoginResponse = require('../response/login_response.js'); -var logger = require('../mini_poem/logging/logger4js').helper; var certificateLogic = require('../work_unit/certificate_logic.js'); diff --git a/src/web_console/services/internal_service.js b/src/web_console/services/internal_service.js index d0a0b01..7dfcb7b 100644 --- a/src/web_console/services/internal_service.js +++ b/src/web_console/services/internal_service.js @@ -5,6 +5,8 @@ // system inclusion var constants = require('../mini_poem/configuration/constants'); +var logger = require('../mini_poem/logging/logger4js').helper; + var formidable = require('formidable'); var fs = require('fs'); @@ -17,8 +19,6 @@ var CityResponse = require('../response/city_response.js'); var OperatorResponse = require('../response/operator_response.js'); var RemoteIndexResponse = require('../response/remote_index_response.js'); -var logger = require('../mini_poem/logging/logger4js').helper; - var internalLogic = require('../work_unit/internal_logic.js'); var Enums = require('../constants/enums'); @@ -437,7 +437,7 @@ exports.createProtocol = function (req, res) { }).on('error', function(err) { logger.error("formidable parse form error : " + err); res.send("" + - " " + + "" + "
协议文件提交失败
" + "" + ""); @@ -458,18 +458,19 @@ exports.createProtocol = function (req, res) { internalLogic.createProtocolWorkUnit(protocol, filePath, contentType, adminID, function (createProtocolErr) { if(errorCode.SUCCESS.code == createProtocolErr.code) { res.send("" + - " " + + "" + "
协议文件提交成功
" + "" + ""); + res.end(); } else { res.send("" + - " " + + "" + "
协议文件提交失败
" + "" + ""); + res.end(); } - res.end(); }); } }); diff --git a/src/web_console/services/stat_service.js b/src/web_console/services/stat_service.js index 7813a2e..172cdce 100644 --- a/src/web_console/services/stat_service.js +++ b/src/web_console/services/stat_service.js @@ -5,6 +5,8 @@ // system inclusion var constants = require('../mini_poem/configuration/constants'); +var logger = require('../mini_poem/logging/logger4js').helper; + var formidable = require('formidable'); var fs = require('fs'); @@ -13,7 +15,6 @@ var ServiceResponse = require('../response/service_response.js'); var StatResponse = require('../response/stat_response.js'); var IntegerResponse = require('../response/integer_response'); -var logger = require('../mini_poem/logging/logger4js').helper; var statLogic = require('../work_unit/stat_logic.js'); diff --git a/src/web_console/web/code/index.html b/src/web_console/web/code/index.html index 257534a..aff4606 100644 --- a/src/web_console/web/code/index.html +++ b/src/web_console/web/code/index.html @@ -22,10 +22,7 @@

IRext

@@ -88,7 +85,7 @@
- + diff --git a/src/web_console/web/code/js/code_index.js b/src/web_console/web/code/js/code_index.js index 8319533..051b07e 100644 --- a/src/web_console/web/code/js/code_index.js +++ b/src/web_console/web/code/js/code_index.js @@ -86,9 +86,6 @@ $(document).ready(function() { id = localStorage.getItem(LS_KEY_ID); token = localStorage.getItem(LS_KEY_TOKEN); client = getParameter('client'); - if (null != client && client == 'console') { - hideSidebar(); - } // showMenu(id, token, 'remote'); initializeSelectors(); @@ -1763,5 +1760,5 @@ function translateToTC(textID, targetTextID) { } function gotoIndex() { - window.location = '../index.html?admin_id='+id+'&token='+token; + window.location = '../'; } \ No newline at end of file diff --git a/src/web_console/web/doc/css/api_doc.css b/src/web_console/web/doc/css/api_doc.css deleted file mode 100644 index 8aa0b0b..0000000 --- a/src/web_console/web/doc/css/api_doc.css +++ /dev/null @@ -1,8 +0,0 @@ -body { - font-family: 微软雅黑, Arial -} - -.starter-template { - padding: 40px 15px; - text-align: center; -} diff --git a/src/web_console/web/doc/js/doc.js b/src/web_console/web/doc/js/doc.js deleted file mode 100644 index c4c718b..0000000 --- a/src/web_console/web/doc/js/doc.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Created by Strawmanbobi - * 2016-12-01 - */ - -var id, token; -var LS_KEY_ID = "user_name"; -var LS_KEY_TOKEN = "token"; - -$(document).ready(function() { - id = localStorage.getItem(LS_KEY_ID); - token = localStorage.getItem(LS_KEY_TOKEN); - showMenu(id, token, "doc"); -}); - -$("#menu_toggle").click(function(e) { - e.preventDefault(); - $("#wrapper").toggleClass("toggled"); -}); - -function navigation(anchor) { - $.mobile.navigate("#"+anchor); -} \ No newline at end of file diff --git a/src/web_console/web/index.html b/src/web_console/web/index.html index 13f41d1..f49e6a3 100644 --- a/src/web_console/web/index.html +++ b/src/web_console/web/index.html @@ -16,111 +16,25 @@
-

IRext

- - -
-
-

IRext

-

开源家用电器红外的编码、解码和索引方案.

-
-

看看数据先

-
-
-
-
-
-

红外编码

-

基于XML的编码输入语言

-

支持远程录入

-

支持红外分析仪插件

-
-
-

红外解码

-

支持多种平台下的解码

-

极小的内存开销

-

高性能解码

-
-
-

码库索引

-

利用Web控制台录入码库

-

规范的码库审核和发布流程

-

支持协议扩充

-
+
+ -
-
-
-

码库支持

-

支持13种电器类型

-

支持数百个品牌

-

支持上万种型号家电

-
-
-

扩展功能

-

支持基于开源硬件的IR学习

-

提供远程编码服务

-

代码完全开源

-
-
-

易于上手

-

仅需几步就能移植到您的项目

-

Web服务接口文档

-

提供开放式控制台和示例代码

-
-
-
- -
-

Strawmanbobi, 2016

-
+
- -