From fb7c06afa6befca6d0525451cb419f9871c85001 Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Sun, 13 Nov 2016 13:52:57 +0800 Subject: [PATCH] reformatted encoding algorithm --- src/ir_decoder/irda_decode.c | 30 ++- src/ir_decoder/irda_main.c | 3 +- src/ir_decoder/irda_tv_parse_protocol.c | 9 +- src/ir_decoder/irda_utils.c | 4 - src/ir_encoder/irda_ac_encode.py | 2 +- src/ir_encoder/irda_tv_protocol.py | 2 +- src/ir_encoder/irda_tv_protocol_hex.py | 4 +- .../configuration/system_configs.js | 143 +++------- src/web_console/irext_console.js | 9 +- .../mini-poem/configuration/constants.js | 17 +- src/web_console/routes/certificate_routes.js | 8 +- src/web_console/routes/internal_routes.js | 48 ++-- src/web_console/routes/push_routes.js | 8 +- src/web_console/routes/stat_routes.js | 8 +- src/web_console/script_compiler.sh | 2 +- src/web_console/script_npm.sh | 4 + .../services/certificate_service.js | 2 +- src/web_console/services/internal_service.js | 2 +- src/web_console/services/stat_service.js | 2 +- src/web_console/web/code/index.html | 12 +- src/web_console/web/code/js/remote.js | 48 ++-- src/web_console/web/css/cover.css | 163 ++++++++++++ src/web_console/web/doc/index.html | 250 +++++++++--------- src/web_console/web/error/auth_error.html | 6 +- src/web_console/web/error/confirm_pw.html | 6 +- src/web_console/web/index.html | 131 ++++----- src/web_console/web/index_1.html | 87 ++++++ src/web_console/web/js/index.js | 6 +- src/web_console/web/js/ui.js | 2 +- src/web_console/web/push/index.html | 4 +- src/web_console/web/push/js/push.js | 4 +- src/web_console/web/stat/index.html | 8 +- src/web_console/web/stat/js/stat.js | 12 +- src/web_console/web/version/index.html | 6 +- src/web_console/web/version/js/version.js | 24 +- src/web_console/web/welcome/index.html | 4 +- src/web_console/web/welcome/js/welcome.js | 6 +- .../work_unit/certificate_logic.js | 8 +- src/web_console/work_unit/internal_logic.js | 42 ++- src/web_console/work_unit/stat_logic.js | 10 +- 40 files changed, 663 insertions(+), 483 deletions(-) create mode 100644 src/web_console/web/css/cover.css create mode 100644 src/web_console/web/index_1.html diff --git a/src/ir_decoder/irda_decode.c b/src/ir_decoder/irda_decode.c index 7b0be10..aae8a5b 100644 --- a/src/ir_decoder/irda_decode.c +++ b/src/ir_decoder/irda_decode.c @@ -83,7 +83,7 @@ lp_apply_ac_parameter apply_table[AC_APPLY_MAX] = void free_pirda(void); #endif -///////////////////////////////////////////////// Air Conditioner Begin ///////////////////////////////////////////////// +///////////////////////////////////////////////// AC Begin ///////////////////////////////////////////////// INT8 binary_parse_offset() { @@ -509,7 +509,9 @@ INT8 irda_ac_lib_parse() { IR_PRINTF("\nparse mode 2\n"); context->mode2.len = tags[i].len >> 1; - if (IR_DECODE_FAILED == parse_common_ac_parameter(&tags[i], context->mode2.comp_data, AC_MODE_MAX, AC_PARAMETER_TYPE_1)) + if (IR_DECODE_FAILED == + parse_common_ac_parameter(&tags[i], + context->mode2.comp_data, AC_MODE_MAX, AC_PARAMETER_TYPE_1)) { return IR_DECODE_FAILED; } @@ -518,7 +520,9 @@ INT8 irda_ac_lib_parse() { IR_PRINTF("\nparse speed 2\n"); context->speed2.len = tags[i].len >> 1; - if (IR_DECODE_FAILED == parse_common_ac_parameter(&tags[i], context->speed2.comp_data, AC_WS_MAX, AC_PARAMETER_TYPE_1)) + if (IR_DECODE_FAILED == + parse_common_ac_parameter(&tags[i], + context->speed2.comp_data, AC_WS_MAX, AC_PARAMETER_TYPE_1)) { return IR_DECODE_FAILED; } @@ -864,11 +868,13 @@ INT8 apply_temperature(remote_ac_status_t ac_status, UINT8 function_code) { if(IR_DECODE_FAILED == apply_ac_temperature(context, ac_status.acTemp)) { - if(function_code == AC_FUNCTION_TEMPERATURE_UP /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_UP)*/) + if(function_code == AC_FUNCTION_TEMPERATURE_UP + /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_UP)*/) { return IR_DECODE_FAILED; } - else if(function_code == AC_FUNCTION_TEMPERATURE_DOWN /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_DOWN)*/) + else if(function_code == AC_FUNCTION_TEMPERATURE_DOWN + /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_DOWN)*/) { return IR_DECODE_FAILED; } @@ -877,11 +883,13 @@ INT8 apply_temperature(remote_ac_status_t ac_status, UINT8 function_code) else { // if this level is in black list, do not send IR wave if user want to apply this function - if(function_code == AC_FUNCTION_TEMPERATURE_UP /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_UP)*/) + if(function_code == AC_FUNCTION_TEMPERATURE_UP + /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_UP)*/) { return IR_DECODE_FAILED; } - else if(function_code == AC_FUNCTION_TEMPERATURE_DOWN /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_DOWN)*/) + else if(function_code == AC_FUNCTION_TEMPERATURE_DOWN + /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_DOWN)*/) { return IR_DECODE_FAILED; } @@ -890,11 +898,13 @@ INT8 apply_temperature(remote_ac_status_t ac_status, UINT8 function_code) else { // if this level is in black list, do not send IR wave if user want to apply this function - if(function_code == AC_FUNCTION_TEMPERATURE_UP /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_UP)*/) + if(function_code == AC_FUNCTION_TEMPERATURE_UP + /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_UP)*/) { return IR_DECODE_FAILED; } - else if(function_code == AC_FUNCTION_TEMPERATURE_DOWN /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_DOWN)*/) + else if(function_code == AC_FUNCTION_TEMPERATURE_DOWN + /*&& FALSE == has_function(context, AC_FUNCTION_TEMPERATURE_DOWN)*/) { return IR_DECODE_FAILED; } @@ -1165,7 +1175,7 @@ INT8 get_supported_wind_direction(UINT8* supported_wind_direction) } } -///////////////////////////////////////////////// Air Conditioner End ///////////////////////////////////////////////// +///////////////////////////////////////////////// AC End ////////////////////////////////////////////////// ///////////////////////////////////////////////// TV Begin ///////////////////////////////////////////////// INT8 irda_tv_lib_open(UINT8 *binary, UINT16 binary_length) diff --git a/src/ir_decoder/irda_main.c b/src/ir_decoder/irda_main.c index 5541bbf..771fcf1 100644 --- a/src/ir_decoder/irda_main.c +++ b/src/ir_decoder/irda_main.c @@ -172,7 +172,8 @@ INT8 decode_as_ac(const char* file_name) case '6': if (IR_DECODE_SUCCEEDED == get_temperature_range(ac_status.acMode, &min_temperature, &max_temperature)) { - IR_PRINTF("\nsupported temperature range in mode %d = %d, %d\n", ac_status.acMode, min_temperature, max_temperature); + IR_PRINTF("\nsupported temperature range in mode %d = %d, %d\n", + ac_status.acMode, min_temperature, max_temperature); } need_control = FALSE; break; diff --git a/src/ir_decoder/irda_tv_parse_protocol.c b/src/ir_decoder/irda_tv_parse_protocol.c index c489f94..ca37506 100644 --- a/src/ir_decoder/irda_tv_parse_protocol.c +++ b/src/ir_decoder/irda_tv_parse_protocol.c @@ -361,15 +361,18 @@ static void print_irda_time(irda_data_t *data, UINT8 keyindex, UINT16 *irda_time if (irda_decode_flag == IRDA_DECODE_1_BIT) { - process_decode_number(keycode, data, 1, irda_time); // '0','1' + // for binary formatted code + process_decode_number(keycode, data, 1, irda_time); } else if (irda_decode_flag == IRDA_DECODE_2_BITS) { - process_decode_number(keycode, data, 2, irda_time); // '0','1','2','3' + // for quanternary formatted code + process_decode_number(keycode, data, 2, irda_time); } else if (irda_decode_flag == IRDA_DECODE_4_BITS) { - process_decode_number(keycode, data, 4, irda_time); // '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F', + // for hexadecimal formatted code + process_decode_number(keycode, data, 4, irda_time); } } } diff --git a/src/ir_decoder/irda_utils.c b/src/ir_decoder/irda_utils.c index 7b3a45d..094f5aa 100644 --- a/src/ir_decoder/irda_utils.c +++ b/src/ir_decoder/irda_utils.c @@ -8,13 +8,9 @@ Description: This file provides generic utils for IRDA algorithms Revision log: * 2016-10-01: created by strawmanbobi **************************************************************************************************/ -#include #include "include/irda_utils.h" -/* -*0123456789abcdef/0123456789ABCDEF -*/ UINT8 char_to_hex(char chr) { UINT8 value = 0; diff --git a/src/ir_encoder/irda_ac_encode.py b/src/ir_encoder/irda_ac_encode.py index be51dab..f9f7843 100644 --- a/src/ir_encoder/irda_ac_encode.py +++ b/src/ir_encoder/irda_ac_encode.py @@ -73,7 +73,7 @@ def create_binary(ac_device): tags_max_size[i] = ac_device.tags[j].len; find = 1 break - + if find == 0: f_head.write(struct.pack("H", 0xffff)) # f.write(ac_device) diff --git a/src/ir_encoder/irda_tv_protocol.py b/src/ir_encoder/irda_tv_protocol.py index 83d02b5..49732c7 100644 --- a/src/ir_encoder/irda_tv_protocol.py +++ b/src/ir_encoder/irda_tv_protocol.py @@ -115,7 +115,7 @@ def printProtocol(file): else: mode = 1 - print "{%d, \"%s\", %d, %d, %s}" % (index, i.getAttribute('bits'), \ + print "{%d, \"%s\", %d, %d, %s}" % (index, i.getAttribute('bits'), lsb, mode, i.firstChild.data) flag = IRDAData(int(i.getAttribute('bits')), lsb, mode, int(i.firstChild.data)) irda_frame.append(flag) diff --git a/src/ir_encoder/irda_tv_protocol_hex.py b/src/ir_encoder/irda_tv_protocol_hex.py index f6b6432..376aed8 100644 --- a/src/ir_encoder/irda_tv_protocol_hex.py +++ b/src/ir_encoder/irda_tv_protocol_hex.py @@ -97,7 +97,9 @@ def printProtocol(file): mode = 0 flag = 0 irda_frame = [] - flag_tab_dict = {"boot": 0, "stop": 1, "separator": 2, "one": 3, "zero": 4, "flip": 5, "two": 6, "three": 7, "four": 8, "five": 9, "six": 10, "seven": 11, "eight": 12, "nine": 13, "A": 14, "B": 15, "C": 16, "D": 17, "E": 18, "F": 19} + flag_tab_dict = {"boot": 0, "stop": 1, "separator": 2, "one": 3, "zero": 4, "flip": 5, "two": 6, "three": 7, + "four": 8, "five": 9, "six": 10, "seven": 11, "eight": 12, "nine": 13, + "A": 14, "B": 15, "C": 16, "D": 17, "E": 18, "F": 19} for i in frame[0].childNodes: if i.nodeType == i.ELEMENT_NODE: index += 1 diff --git a/src/web_console/configuration/system_configs.js b/src/web_console/configuration/system_configs.js index 1756c32..e00d74d 100644 --- a/src/web_console/configuration/system_configs.js +++ b/src/web_console/configuration/system_configs.js @@ -10,120 +10,55 @@ exports.setupEnvironment = function () { var env = process.env.NODE_ENV || 'development'; ENV = env; if (undefined == typeof env || null == env || "" == env || enums.APP_PRODUCTION_MODE == env) { - console.log("production mode"); - console.log("configuring MySQL db connection ability..."); - MYSQL_DB_SERVER_ADDRESS = "rm-bp11c9w1bz8q47zzx.mysql.rds.aliyuncs.com"; - MYSQL_DB_NAME = "ucon_generic"; - MYSQL_DB_USER = "uconrds"; - MYSQL_DB_PASSWORD = "ucon923"; - - console.log("configuring MongoDB kv connection ability..."); - MONGO_DB_SERVER_ADDRESS = "127.0.0.1"; - MONGO_DB_NAME = "yuekong_remote_code"; - MONGO_DB_USER = "yuekong"; - MONGO_DB_PASSWORD = "yuekong"; - - console.log("configuring kv storage ability..."); - OSS_HOST = "oss-cn-hangzhou.aliyuncs.com"; - OSS_PORT = "80"; - OSS_APP_ID = "f6bWxSdkNyu9FlyC"; - OSS_APP_SECRET = "nO2bzv8yETA6TwPsYNFlYpWRT867Zg"; - - console.log("configuring external PYTHON path"); - FILE_TEMP_PATH = "/root/rc_extension"; - PYTHON_PATH = "/usr/bin/python"; - - console.log("configuring external server connection ability..."); - LISTEN_PORT = "8300"; - MAIN_SERVER_ADDRESS = "yuekongdev.wicp.net"; - MAIN_SERVER_PORT = LISTEN_PORT; - - console.log("configuring cache ability..."); - MEMCACHED_HOST = "127.0.0.1"; - MEMCACHED_PORT = "11211"; - MEMCACHED_SASL_USER = ""; - MEMCACHED_SASL_PASSWORD = ""; - - console.log("configuring push credential"); - PUSH_APP_KEY = "b5e8e6123de67977dcb9813a"; - PUSH_APP_SECRET = "38c6aecde1c7f82c741b4a2a"; - } else if (enums.APP_DEVELOPMENT_MODE == env) { - console.log("develop mode"); - console.log("configuring MySQL db connection ability..."); - MYSQL_DB_SERVER_ADDRESS = "127.0.0.1"; - MYSQL_DB_NAME = "ucon_generic"; + MYSQL_DB_SERVER_ADDRESS = "localhost"; + MYSQL_DB_NAME = "irext"; MYSQL_DB_USER = "root"; MYSQL_DB_PASSWORD = "root"; - - console.log("configuring MongoDB kv connection ability..."); - MONGO_DB_SERVER_ADDRESS = "127.0.0.1"; - MONGO_DB_NAME = "yuekong_remote_code"; - MONGO_DB_USER = "yuekong"; - MONGO_DB_PASSWORD = "yuekong"; - - console.log("configuring kv storage ability..."); - OSS_HOST = "oss-cn-hangzhou.aliyuncs.com"; + OSS_HOST = ""; OSS_PORT = "80"; - OSS_APP_ID = "f6bWxSdkNyu9FlyC"; - OSS_APP_SECRET = "nO2bzv8yETA6TwPsYNFlYpWRT867Zg"; - - console.log("configuring external PYTHON path"); + OSS_APP_ID = ""; + OSS_APP_SECRET = ""; + FILE_TEMP_PATH = "~/home/strawmanbobi/rc_extension"; + PYTHON_PATH = "/usr/bin/python"; + LISTEN_PORT = "8300"; + MAIN_SERVER_ADDRESS = "localhost"; + MAIN_SERVER_PORT = 80; + REDIS_HOST = "localhost"; + REDIS_PORT = "6379"; + REDIS_PASSWORD = ""; + } else if (enums.APP_DEVELOPMENT_MODE == env) { + MYSQL_DB_SERVER_ADDRESS = "localhost"; + MYSQL_DB_NAME = "irext"; + MYSQL_DB_USER = "root"; + MYSQL_DB_PASSWORD = "root"; + OSS_HOST = ""; + OSS_PORT = "80"; + OSS_APP_ID = ""; + OSS_APP_SECRET = ""; FILE_TEMP_PATH = "D:/rc_extension"; PYTHON_PATH = "C:/Python27/python.exe"; - - console.log("configuring external server connection ability..."); LISTEN_PORT = "8300"; - MAIN_SERVER_ADDRESS = "192.168.1.170"; - MAIN_SERVER_PORT = LISTEN_PORT; - - console.log("configuring cache ability..."); - MEMCACHED_HOST = "127.0.0.1"; - MEMCACHED_PORT = "11211"; - MEMCACHED_SASL_USER = ""; - MEMCACHED_SASL_PASSWORD = ""; - - console.log("configuring push credential"); - PUSH_APP_KEY = "b5e8e6123de67977dcb9813a"; - PUSH_APP_SECRET = "38c6aecde1c7f82c741b4a2a"; + MAIN_SERVER_ADDRESS = "localhost"; + MAIN_SERVER_PORT = 80; + REDIS_HOST = "localhost"; + REDIS_PORT = "6379"; + REDIS_PASSWORD = ""; } else if (enums.APP_USERDEBUG_MODE == env) { - console.log("user debug mode"); - console.log("configuring MySQL db connection ability..."); - MYSQL_DB_SERVER_ADDRESS = "127.0.0.1"; - MYSQL_DB_NAME = "ucon_generic"; + MYSQL_DB_SERVER_ADDRESS = "localhost"; + MYSQL_DB_NAME = "irext"; MYSQL_DB_USER = "root"; MYSQL_DB_PASSWORD = "root"; - - console.log("configuring MongoDB kv connection ability..."); - MONGO_DB_SERVER_ADDRESS = "127.0.0.1"; - MONGO_DB_NAME = "yuekong_remote_code"; - MONGO_DB_USER = "yuekong"; - MONGO_DB_PASSWORD = "yuekong"; - - console.log("configuring kv storage ability..."); - OSS_HOST = "oss-cn-hangzhou.aliyuncs.com"; + OSS_HOST = ""; OSS_PORT = "80"; - OSS_APP_ID = "f6bWxSdkNyu9FlyC"; - OSS_APP_SECRET = "nO2bzv8yETA6TwPsYNFlYpWRT867Zg"; - - console.log("configuring external PYTHON path"); - FILE_TEMP_PATH = "/root/rc_extension"; - PYTHON_PATH = "/usr/bin/python"; - - console.log("configuring external server connection ability..."); + OSS_APP_ID = ""; + OSS_APP_SECRET = ""; + FILE_TEMP_PATH = "D:/rc_extension"; + PYTHON_PATH = "C:/Python27/python.exe"; LISTEN_PORT = "8300"; - MAIN_SERVER_ADDRESS = "yuekongdev.wicp.net"; - MAIN_SERVER_PORT = LISTEN_PORT; - - console.log("configuring cache ability..."); - MEMCACHED_HOST = "127.0.0.1"; - MEMCACHED_PORT = "11211"; - MEMCACHED_SASL_USER = ""; - MEMCACHED_SASL_PASSWORD = ""; - - console.log("configuring push credential"); - PUSH_APP_KEY = "b5e8e6123de67977dcb9813a"; - PUSH_APP_SECRET = "38c6aecde1c7f82c741b4a2a"; - } else { - console.log("runtime mode err : " + env); + MAIN_SERVER_ADDRESS = "localhost"; + MAIN_SERVER_PORT = 80; + REDIS_HOST = "localhost"; + REDIS_PORT = "6379"; + REDIS_PASSWORD = ""; } }; \ No newline at end of file diff --git a/src/web_console/irext_console.js b/src/web_console/irext_console.js index 94ed868..8a68118 100644 --- a/src/web_console/irext_console.js +++ b/src/web_console/irext_console.js @@ -40,17 +40,12 @@ var dbConn = require('./mini-poem/db/mysql/mysql_connection'); console.log("initializing MySQL connection to : " + MYSQL_DB_SERVER_ADDRESS + ":" + MYSQL_DB_NAME); dbConn.setMySQLParameter(MYSQL_DB_SERVER_ADDRESS, MYSQL_DB_NAME, MYSQL_DB_USER, MYSQL_DB_PASSWORD); -// the following statements is automatically generated according to system configuration -var kvConn = require('./mini-poem/db/mongodb/mongodb_connection'); -console.log('initializing MongoDB connection to : ' + MONGO_DB_SERVER_ADDRESS + ":" + MONGO_DB_NAME); -kvConn.setMongoDBParameter(MONGO_DB_SERVER_ADDRESS, MONGO_DB_NAME, MONGO_DB_USER, MONGO_DB_PASSWORD); - require('./routes'); var certificateLogic = require('./work_unit/certificate_logic.js'); // kick start the engine -System.startup(app, serverListenPort, "UCON Console V1.7.3"); +System.startup(app, serverListenPort, "irext Console V0.0.1"); ////////////////// middleware ////////////////// function tokenValidation (req, res, next) { @@ -60,7 +55,7 @@ function tokenValidation (req, res, next) { var menu3 = req.url.indexOf("stat/index.html"); var menu4 = req.url.indexOf("push/index.html"); - if (req.url.indexOf("/yuekong/int") != -1) { + if (req.url.indexOf("/irext/int") != -1) { var contentType = req.get("content-type"); if (null != contentType && contentType.indexOf("multipart/form-data") != -1) { next(); diff --git a/src/web_console/mini-poem/configuration/constants.js b/src/web_console/mini-poem/configuration/constants.js index e649037..1b97dd9 100644 --- a/src/web_console/mini-poem/configuration/constants.js +++ b/src/web_console/mini-poem/configuration/constants.js @@ -30,11 +30,11 @@ global.MONGO_DB_USER = null; global.MONGO_DB_PASSWORD = null; // data_set : Aliyun-OSS -global.OSS_HOST = "oss-cn-hangzhou.aliyuncs.com"; +global.OSS_HOST = "default_host"; global.OSS_PORT = "80"; -global.OSS_APP_ID = "T82nbipHSESmHzd8"; -global.OSS_APP_SECRET = "SOweQ8UVwCwPr2NC8EC89EOeKJc5Um"; -global.BUCKET_NAME = "strawmanbobi-beats"; +global.OSS_APP_ID = ""; +global.OSS_APP_SECRET = ""; +global.BUCKET_NAME = "default_bucket"; // cache : memcached global.MEMCACHED_HOST = ""; @@ -42,13 +42,16 @@ global.MEMCACHED_PORT = ""; global.MEMCACHED_SASL_USER = ""; global.MEMCACHED_SASL_PASSWORD = ""; +// cache : redis +global.REDIS_HOST = ""; +global.REDIS_PORT = ""; +global.REDIS_PASSWORD = ""; + // sns : Weixin global.WEIXIN_APP_ID = ""; global.WEIXIN_APP_SECRET = ""; global.WEIXIN_TOKEN = ""; -// sns : facebook - // external : python path global.PYTHON_PATH = ""; @@ -57,7 +60,7 @@ global.PUSH_APP_KEY = ""; global.PUSH_APP_SECRET = ""; // generic server configuration -global.SERVER_LISTEN_PORT = "8080"; +global.SERVER_LISTEN_PORT = "80"; global.SERVER_ADDRESS = "127.0.0.1"; // OSS direct download bucket name diff --git a/src/web_console/routes/certificate_routes.js b/src/web_console/routes/certificate_routes.js index d363f2f..ac99527 100644 --- a/src/web_console/routes/certificate_routes.js +++ b/src/web_console/routes/certificate_routes.js @@ -6,8 +6,8 @@ var app = require('../irext_console.js'); var certificateService = require('../services/certificate_service.js'); -app.get('/yuekong/certificate/confirm_pw', certificateService.confirmPassword); +app.get('/irext/certificate/confirm_pw', certificateService.confirmPassword); -app.post('/yuekong/certificate/admin_login', certificateService.adminLogin); -app.post('/yuekong/certificate/token_verify', certificateService.verifyToken); -app.post('/yuekong/certificate/change_pw', certificateService.changePassword); \ No newline at end of file +app.post('/irext/certificate/admin_login', certificateService.adminLogin); +app.post('/irext/certificate/token_verify', certificateService.verifyToken); +app.post('/irext/certificate/change_pw', certificateService.changePassword); \ No newline at end of file diff --git a/src/web_console/routes/internal_routes.js b/src/web_console/routes/internal_routes.js index 5289029..bf4274a 100644 --- a/src/web_console/routes/internal_routes.js +++ b/src/web_console/routes/internal_routes.js @@ -6,34 +6,34 @@ var app = require('../irext_console.js'); var intService = require('../services/internal_service.js'); -app.get('/yuekong/int/list_provinces', intService.listProvinces); -app.get('/yuekong/int/list_cities', intService.listCities); -app.get('/yuekong/int/list_operators', intService.listOperators); -app.get('/yuekong/int/list_categories', intService.listCategories); -app.get('/yuekong/int/list_brands', intService.listBrands); -app.get('/yuekong/int/list_ir_protocols', intService.listIRProtocols); -app.get('/yuekong/int/list_remote_indexes', intService.listRemoteIndexes); -app.get('/yuekong/int/search_remote_indexes', intService.searchRemoteIndexes); +app.get('/irext/int/list_provinces', intService.listProvinces); +app.get('/irext/int/list_cities', intService.listCities); +app.get('/irext/int/list_operators', intService.listOperators); +app.get('/irext/int/list_categories', intService.listCategories); +app.get('/irext/int/list_brands', intService.listBrands); +app.get('/irext/int/list_ir_protocols', intService.listIRProtocols); +app.get('/irext/int/list_remote_indexes', intService.listRemoteIndexes); +app.get('/irext/int/search_remote_indexes', intService.searchRemoteIndexes); -app.get('/yuekong/int/list_unpublished_brands', intService.listUnpublishedBrands); -app.get('/yuekong/int/list_unpublished_remote_indexes', intService.listUnpublishedRemoteIndexes); +app.get('/irext/int/list_unpublished_brands', intService.listUnpublishedBrands); +app.get('/irext/int/list_unpublished_remote_indexes', intService.listUnpublishedRemoteIndexes); -app.get('/yuekong/int/list_versions', intService.listVersions); +app.get('/irext/int/list_versions', intService.listVersions); -app.post('/yuekong/int/create_remote_index', intService.createRemoteIndex); -app.post('/yuekong/int/delete_remote_index', intService.deleteRemoteIndex); -app.post('/yuekong/int/verify_remote_index', intService.verifyRemoteIndex); -app.post('/yuekong/int/fallback_remote_index', intService.fallbackRemoteIndex); -app.post('/yuekong/int/publish_remote_index', intService.publishRemoteIndex); +app.post('/irext/int/create_remote_index', intService.createRemoteIndex); +app.post('/irext/int/delete_remote_index', intService.deleteRemoteIndex); +app.post('/irext/int/verify_remote_index', intService.verifyRemoteIndex); +app.post('/irext/int/fallback_remote_index', intService.fallbackRemoteIndex); +app.post('/irext/int/publish_remote_index', intService.publishRemoteIndex); -app.post('/yuekong/int/create_brand', intService.createBrand); -app.post('/yuekong/int/publish_brands', intService.publishBrands); +app.post('/irext/int/create_brand', intService.createBrand); +app.post('/irext/int/publish_brands', intService.publishBrands); -app.post('/yuekong/int/create_protocol', intService.createProtocol); +app.post('/irext/int/create_protocol', intService.createProtocol); -app.post('/yuekong/int/create_version', intService.createVersion); -app.post('/yuekong/int/delete_version', intService.deleteVersion); -app.post('/yuekong/int/verify_version', intService.verifyVersion); -app.post('/yuekong/int/fallback_version', intService.fallbackVersion); -app.post('/yuekong/int/publish_version', intService.publishVersion); +app.post('/irext/int/create_version', intService.createVersion); +app.post('/irext/int/delete_version', intService.deleteVersion); +app.post('/irext/int/verify_version', intService.verifyVersion); +app.post('/irext/int/fallback_version', intService.fallbackVersion); +app.post('/irext/int/publish_version', intService.publishVersion); diff --git a/src/web_console/routes/push_routes.js b/src/web_console/routes/push_routes.js index 11e7dd6..5ddacbb 100644 --- a/src/web_console/routes/push_routes.js +++ b/src/web_console/routes/push_routes.js @@ -6,8 +6,8 @@ var app = require('../yk_console.js'); var pushService = require('../services/push_service.js'); -app.get('/yuekong/push/list_mobiles', pushService.listMobiles); -app.get('/yuekong/push/list_push_messages', pushService.listPushMessages); +app.get('/irext/push/list_mobiles', pushService.listMobiles); +app.get('/irext/push/list_push_messages', pushService.listPushMessages); -app.post('/yuekong/push/push_to_peer', pushService.pushToPeer); -app.post('/yuekong/push/broadcast', pushService.broadcast); \ No newline at end of file +app.post('/irext/push/push_to_peer', pushService.pushToPeer); +app.post('/irext/push/broadcast', pushService.broadcast); \ No newline at end of file diff --git a/src/web_console/routes/stat_routes.js b/src/web_console/routes/stat_routes.js index 71482a8..e7be06c 100644 --- a/src/web_console/routes/stat_routes.js +++ b/src/web_console/routes/stat_routes.js @@ -5,7 +5,7 @@ var app = require('../irext_console.js'); var statService = require('../services/stat_service.js'); -app.get('/yuekong/stat/generic_count', statService.genericCount); -app.get('/yuekong/stat/stat_categories', statService.statCategories); -app.get('/yuekong/stat/stat_brands', statService.statBrands); -app.get('/yuekong/stat/stat_cities', statService.statCities); \ No newline at end of file +app.get('/irext/stat/generic_count', statService.genericCount); +app.get('/irext/stat/stat_categories', statService.statCategories); +app.get('/irext/stat/stat_brands', statService.statBrands); +app.get('/irext/stat/stat_cities', statService.statCities); \ No newline at end of file diff --git a/src/web_console/script_compiler.sh b/src/web_console/script_compiler.sh index 2d0974c..ddbb456 100644 --- a/src/web_console/script_compiler.sh +++ b/src/web_console/script_compiler.sh @@ -1,5 +1,5 @@ SOURCE="." -TARGET="$POEM_APPLICATION/yuekong_console" +TARGET="$POEM_APPLICATION/irext_console" MODULE_API="./web/api_doc/js/" function deploy() diff --git a/src/web_console/script_npm.sh b/src/web_console/script_npm.sh index 72de534..45cbaba 100644 --- a/src/web_console/script_npm.sh +++ b/src/web_console/script_npm.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # run this script before you setup the irext web console echo "running script of npm install needed by irext..." @@ -43,4 +44,7 @@ npm install aliyun-sdk echo "npm install nodemailer" npm install nodemailer +echo "npm install mongoose" +npm install mongoose + echo "npm install done" \ No newline at end of file diff --git a/src/web_console/services/certificate_service.js b/src/web_console/services/certificate_service.js index ea80897..b13b196 100644 --- a/src/web_console/services/certificate_service.js +++ b/src/web_console/services/certificate_service.js @@ -82,7 +82,7 @@ exports.changePassword = function (req, res) { * function : Confirm password change * parameter : id of Adminstrator * new password fetch ID - * return : redirection to UCON data center + * return : redirection to irext data center */ exports.confirmPassword = function (req, res) { var id = req.query.id; diff --git a/src/web_console/services/internal_service.js b/src/web_console/services/internal_service.js index 98b9ba3..c8e51d2 100644 --- a/src/web_console/services/internal_service.js +++ b/src/web_console/services/internal_service.js @@ -236,7 +236,7 @@ exports.listUnpublishedRemoteIndexes = function (req, res) { }; /* - * function : List published version of UCON + * function : List published version of irext * parameter : version_type * upload date * purpose diff --git a/src/web_console/services/stat_service.js b/src/web_console/services/stat_service.js index d679d16..b49c0f7 100644 --- a/src/web_console/services/stat_service.js +++ b/src/web_console/services/stat_service.js @@ -24,7 +24,7 @@ var enums = new Enums(); var errorCode = new ErrorCode(); /* - * function : Count remote of UCON remote and device + * function : Count remote of irext remote and device * parameter : stat_type * return : Customized statistics response */ diff --git a/src/web_console/web/code/index.html b/src/web_console/web/code/index.html index 5b57578..d14c1f0 100644 --- a/src/web_console/web/code/index.html +++ b/src/web_console/web/code/index.html @@ -6,9 +6,9 @@ - + - UCON 控制台 + irext 控制台 @@ -114,7 +114,7 @@
- 点这里下载测试专用APP + 点这里下载测试专用APP
@@ -130,7 +130,7 @@
+ action="/irext/int/create_remote_index" target="post_iframe">
优先排序 @@ -321,7 +321,7 @@
@@ -520,7 +520,7 @@
+ action="/irext/int/create_protocol" target="post_protocol_iframe">

添加协议

diff --git a/src/web_console/web/code/js/remote.js b/src/web_console/web/code/js/remote.js index 4575983..92ad87d 100644 --- a/src/web_console/web/code/js/remote.js +++ b/src/web_console/web/code/js/remote.js @@ -134,13 +134,13 @@ function loadRemoteList(isSearch, remoteMap) { var url; if (isSearch && remoteMap) { - url = "/yuekong/int/search_remote_indexes?remote_map="+remoteMap+"&from=0&count=2000&id="+id+"&token="+token; + url = "/irext/int/search_remote_indexes?remote_map="+remoteMap+"&from=0&count=2000&id="+id+"&token="+token; } else { if(currentFilterCategory.id == 3) { - url = "/yuekong/int/list_remote_indexes?category_id="+currentFilterCategory.id+"&city_code="+currentFilterCity.code+ + url = "/irext/int/list_remote_indexes?category_id="+currentFilterCategory.id+"&city_code="+currentFilterCity.code+ "&from=0&count=100&id="+id+"&token="+token; } else { - url = "/yuekong/int/list_remote_indexes?category_id="+currentFilterCategory.id+"&brand_id="+currentFilterBrand.id+ + url = "/irext/int/list_remote_indexes?category_id="+currentFilterCategory.id+"&brand_id="+currentFilterBrand.id+ "&from=0&count=100&id="+id+"&token="+token; } } @@ -416,7 +416,7 @@ function createRemote() { " deviceBannedVersion = " + deviceBannedVersion + ", protector = " + protector); var form = $('#remote_upload_form'); - form.attr('action', '/yuekong/int/create_remote_index?id='+id+"&token="+token); + form.attr('action', '/irext/int/create_remote_index?id='+id+"&token="+token); //form.attr('method', 'post'); //form.attr('encoding', 'multipart/form-data'); //form.attr('enctype', 'multipart/form-data'); @@ -466,7 +466,7 @@ function deleteRemote() { } $.ajax({ - url: "/yuekong/int/delete_remote_index?id="+id+"&token="+token, + url: "/irext/int/delete_remote_index?id="+id+"&token="+token, type: "POST", dataType: "json", data: remoteToDelete, @@ -518,7 +518,7 @@ function fallbackRemote() { break; } $.ajax({ - url: "/yuekong/int/fallback_remote_index?id="+id+"&token="+token, + url: "/irext/int/fallback_remote_index?id="+id+"&token="+token, type: "POST", dataType: "json", data: remoteToFallback, @@ -578,7 +578,7 @@ function verifyRemote() { break; } $.ajax({ - url: "/yuekong/int/verify_remote_index?pass="+pass+"&id="+id+"&token="+token, + url: "/irext/int/verify_remote_index?pass="+pass+"&id="+id+"&token="+token, type: "POST", dataType: "json", data: remoteToVerify, @@ -610,7 +610,7 @@ function publishBrands() { $("#publish_hint").empty(); $("#publish_hint").append('正在发布新增品牌，请稍候...'); $.ajax({ - url: "/yuekong/int/publish_brands?id="+id+"&token="+token, + url: "/irext/int/publish_brands?id="+id+"&token="+token, type: "POST", timeout: 200000, success: function (response) { @@ -634,7 +634,7 @@ function publishBrands() { function publishRemoteIndexes() { $.ajax({ - url: "/yuekong/int/publish_remote_index?id="+id+"&token="+token, + url: "/irext/int/publish_remote_index?id="+id+"&token="+token, type: "POST", timeout: 200000, success: function (response) { @@ -683,7 +683,7 @@ function createBrand() { } $.ajax({ - url: "/yuekong/int/create_brand?id="+id+"&token="+token, + url: "/irext/int/create_brand?id="+id+"&token="+token, type: "POST", data: { category_id : currentCategory.id, @@ -731,7 +731,7 @@ function createProtocol() { ", protocolType = " + protocolType); var form = $('#protocol_upload_form'); - form.attr('action', '/yuekong/int/create_protocol?id='+id+"&token="+token); + form.attr('action', '/irext/int/create_protocol?id='+id+"&token="+token); //form.attr('method', 'post'); //form.attr('encoding', 'multipart/form-data'); //form.attr('enctype', 'multipart/form-data'); @@ -757,7 +757,7 @@ function initializeRadioTypes() { function initializeProtocols() { $.ajax({ - url: "/yuekong/int/list_ir_protocols?from=0&count=200&id="+id+"&token="+token, + url: "/irext/int/list_ir_protocols?from=0&count=200&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -784,7 +784,7 @@ function initializeProtocols() { function initializeCategories() { $.ajax({ - url: "/yuekong/int/list_categories?from=0&count=200&id="+id+"&token="+token, + url: "/irext/int/list_categories?from=0&count=200&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -817,7 +817,7 @@ function initializeCategories() { function initializeProvince() { $.ajax({ - url: "/yuekong/int/list_provinces?id="+id+"&token="+token, + url: "/irext/int/list_provinces?id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -847,7 +847,7 @@ function initializeProvince() { function initializeCity() { var provincePrefix = currentProvince.code.substring(0, 2); $.ajax({ - url: "/yuekong/int/list_cities?province_prefix="+provincePrefix+"&id="+id+"&token="+token, + url: "/irext/int/list_cities?province_prefix="+provincePrefix+"&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -890,7 +890,7 @@ function initializeCity() { function initializeOperator() { $.ajax({ - url: "/yuekong/int/list_operators?city_code="+currentCity.code+"&from=0&count=50&id="+id+"&token="+token, + url: "/irext/int/list_operators?city_code="+currentCity.code+"&from=0&count=50&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -932,7 +932,7 @@ function initializeOperator() { function initializeBrands() { $.ajax({ - url: "/yuekong/int/list_brands?category_id="+currentCategory.id+"&from=0&count=300&id="+id+"&token="+token, + url: "/irext/int/list_brands?category_id="+currentCategory.id+"&from=0&count=300&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -963,7 +963,7 @@ function initializeBrands() { function initializeFilterCategories() { $.ajax({ - url: "/yuekong/int/list_categories?from=0&count=200&id="+id+"&token="+token, + url: "/irext/int/list_categories?from=0&count=200&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -992,7 +992,7 @@ function initializeFilterCategories() { function initializeFilterProvince() { $.ajax({ - url: "/yuekong/int/list_provinces?id="+id+"&token="+token, + url: "/irext/int/list_provinces?id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -1022,7 +1022,7 @@ function initializeFilterProvince() { function initializeFilterCity() { var provincePrefix = currentFilterProvince.code.substring(0, 2); $.ajax({ - url: "/yuekong/int/list_cities?province_prefix="+provincePrefix+"&id="+id+"&token="+token, + url: "/irext/int/list_cities?province_prefix="+provincePrefix+"&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -1052,7 +1052,7 @@ function initializeFilterCity() { function initializeFilterBrands() { $.ajax({ - url: "/yuekong/int/list_brands?category_id="+currentFilterCategory.id+"&from=0&count=300&id="+id+"&token="+token, + url: "/irext/int/list_brands?category_id="+currentFilterCategory.id+"&from=0&count=300&id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -1438,7 +1438,7 @@ function onPublishRemote() { function getUnpublishedBrands() { $.ajax({ - url: "/yuekong/int/list_unpublished_brands?id="+id+"&token="+token, + url: "/irext/int/list_unpublished_brands?id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -1458,7 +1458,7 @@ function getUnpublishedBrands() { function getUnpublishedRemoteIndexes() { $.ajax({ - url: "/yuekong/int/list_unpublished_remote_indexes?id="+id+"&token="+token, + url: "/irext/int/list_unpublished_remote_indexes?id="+id+"&token="+token, dataType: 'JSON', type: 'GET', timeout: 20000, @@ -1477,7 +1477,7 @@ function getUnpublishedRemoteIndexes() { } function downloadBin() { - var downloadURL = "http://yuekong-code-ii-debug.oss-cn-hangzhou.aliyuncs.com/ykir_"; + var downloadURL = "http://irext-code-ii-debug.oss-cn-hangzhou.aliyuncs.com/ykir_"; if(null == selectedRemote) { popUpHintDialog('请先选中一个遥控器索引'); return; diff --git a/src/web_console/web/css/cover.css b/src/web_console/web/css/cover.css new file mode 100644 index 0000000..a1fa52e --- /dev/null +++ b/src/web_console/web/css/cover.css @@ -0,0 +1,163 @@ +/* + * Globals + */ + +/* Links */ +a, +a:focus, +a:hover { + color: #fff; +} + +/* Custom default button */ +.btn-default, +.btn-default:hover, +.btn-default:focus { + color: #333; + text-shadow: none; /* Prevent inheritence from `body` */ + background-color: #fff; + border: 1px solid #fff; +} + + +/* + * Base structure + */ + +html, +body { + height: 100%; + background-color: #27A; +} +body { + color: #fff; + text-align: center; + text-shadow: 0 1px 3px rgba(0,0,0,.5); +} + +/* Extra markup and styles for table-esque vertical and horizontal centering */ +.site-wrapper { + display: table; + width: 100%; + height: 100%; /* For at least Firefox */ + min-height: 100%; + -webkit-box-shadow: inset 0 0 100px rgba(0,0,0,.5); + box-shadow: inset 0 0 100px rgba(0,0,0,.5); +} +.site-wrapper-inner { + display: table-cell; + vertical-align: top; +} +.cover-container { + margin-right: auto; + margin-left: auto; +} + +/* Padding for spacing */ +.inner { + padding: 30px; +} + + +/* + * Header + */ +.masthead-brand { + margin-top: 10px; + margin-bottom: 10px; +} + +.masthead-nav > li { + display: inline-block; +} +.masthead-nav > li + li { + margin-left: 20px; +} +.masthead-nav > li > a { + padding-right: 0; + padding-left: 0; + font-size: 16px; + font-weight: bold; + color: #fff; /* IE8 proofing */ + color: rgba(255,255,255,.75); + border-bottom: 2px solid transparent; +} +.masthead-nav > li > a:hover, +.masthead-nav > li > a:focus { + background-color: transparent; + border-bottom-color: #a9a9a9; + border-bottom-color: rgba(255,255,255,.25); +} +.masthead-nav > .active > a, +.masthead-nav > .active > a:hover, +.masthead-nav > .active > a:focus { + color: #fff; + border-bottom-color: #fff; +} + +@media (min-width: 768px) { + .masthead-brand { + float: left; + } + .masthead-nav { + float: right; + } +} + + +/* + * Cover + */ + +.cover { + padding: 0 20px; +} +.cover .btn-lg { + padding: 10px 20px; + font-weight: bold; +} + + +/* + * Footer + */ + +.mastfoot { + color: #999; /* IE8 proofing */ + color: rgba(255,255,255,.5); +} + + +/* + * Affix and center + */ + +@media (min-width: 768px) { + /* Pull out the header and footer */ + .masthead { + position: fixed; + top: 0; + } + .mastfoot { + position: fixed; + bottom: 0; + } + /* Start the vertical centering */ + .site-wrapper-inner { + vertical-align: middle; + } + /* Handle the widths */ + .masthead, + .mastfoot, + .cover-container { + width: 100%; /* Must be percentage or pixels for horizontal alignment */ + } +} + +@media (min-width: 992px) { + .masthead, + .mastfoot, + .cover-container { + width: 60%; + } +} diff --git a/src/web_console/web/doc/index.html b/src/web_console/web/doc/index.html index 4b64bde..fe6f5b1 100644 --- a/src/web_console/web/doc/index.html +++ b/src/web_console/web/doc/index.html @@ -6,7 +6,7 @@ - + UCON服务器逻辑接口文档 V2.4 @@ -185,11 +185,11 @@ - + - + @@ -197,13 +197,13 @@ - -
WebService服务器测试环境URLhttp://yuekongdev.wicp.net:8200http://irextdev.wicp.net:8200
WebService服务器生产环境URLhttp://api.yuekong.com.cn:8200http://api.irext.com.cn:8200
工厂服务器URL
Query参数示例http://yuekongdev.wicp.net:8200/yuekong/device/get_device_by_id?device_id=1 + http://irextdev.wicp.net:8200/irext/device/get_device_by_id?device_id=1
Form参数示例http://yuekongdev.wicp.net:8200/yuekong/device/register_device?password=098f6bcd4621d373cade4e83&op_flag=0x01
- 表单参数: { name: 'UCON-XXXXX', pdsn: 'P000000000000001', ip_address: '192.168.1.101', version: '1.0.0' } + 		http://irextdev.wicp.net:8200/irext/device/register_device?password=098f6bcd4621d373cade4e83&op_flag=0x01
+ 表单参数: { name: 'irext-XXXXX', pdsn: 'P000000000000001', ip_address: '192.168.1.101', version: '1.0.0' }
@@ -220,7 +220,7 @@ URL - /yuekong/device_validation/create_device_validation + /irext/device_validation/create_device_validation 请求类型 @@ -252,7 +252,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/device_validation/create_device_validation?pdsn=P000000000000001 + http://irextdev.wicp.net:8200/irext/device_validation/create_device_validation?pdsn=P000000000000001 @@ -267,7 +267,7 @@ URL - /yuekong/device/register_device + /irext/device/register_device 请求类型 @@ -309,8 +309,8 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/device/register_device?op_flag=0x01&password=098f6bcd4621d373cade4e83
- 表单参数(newDevice): { "pdsn" : "P000000000000001", "name" : "UCON-XXXXXX", "ip_address" : "192.168.1.102", "version" : "1.1.0" } + http://irextdev.wicp.net:8200/irext/device/register_device?op_flag=0x01&password=098f6bcd4621d373cade4e83
+ 表单参数(newDevice): { "pdsn" : "P000000000000001", "name" : "irext-XXXXXX", "ip_address" : "192.168.1.102", "version" : "1.1.0" } @@ -335,7 +335,7 @@ URL - /yuekong/device/update_device_by_pdsn + /irext/device/update_device_by_pdsn 请求类型 @@ -377,8 +377,8 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/device/update_device_by_pdsn?token=098f6bcd4621d373cade4e83&psdn=P000000000000001
- 表单参数(newDevice): { "name" : "UCON-XXXXXX", "ip_address" : "192.168.1.102", "version" : "1.1.0" }
+ http://irextdev.wicp.net:8200/irext/device/update_device_by_pdsn?token=098f6bcd4621d373cade4e83&psdn=P000000000000001
+ 表单参数(newDevice): { "name" : "irext-XXXXXX", "ip_address" : "192.168.1.102", "version" : "1.1.0" }
数据结构: Device @@ -398,7 +398,7 @@ URL - /yuekong/device/get_device_by_pdsn + /irext/device/get_device_by_pdsn 请求类型 @@ -430,7 +430,7 @@ 示例 - /yuekong/device/get_device_by_pdsn?pdsn=P000000000000001
+ /irext/device/get_device_by_pdsn?pdsn=P000000000000001
@@ -450,7 +450,7 @@ URL - /yuekong/device/create_device_instance + /irext/device/create_device_instance 请求类型 @@ -482,8 +482,8 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/device/create_device_instance
- 表单参数(newDeviceInstance): { "pdsn" : "P000000000000001", "name" : "UCON-XXXXXX", "ip_address" : "192.168.1.102", "version" : "V1.0.0", "mobile_id": "2" } + http://irextdev.wicp.net:8200/irext/device/create_device_instance
+ 表单参数(newDeviceInstance): { "pdsn" : "P000000000000001", "name" : "irext-XXXXXX", "ip_address" : "192.168.1.102", "version" : "V1.0.0", "mobile_id": "2" } @@ -503,7 +503,7 @@ URL - /yuekong/device/update_device_instance + /irext/device/update_device_instance 请求类型 @@ -545,7 +545,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/device/update_device_instance?pdsn=P000000000000001&token=098f6bcd4621d373cade4e83
+ http://irextdev.wicp.net:8200/irext/device/update_device_instance?pdsn=P000000000000001&token=098f6bcd4621d373cade4e83
表单参数(newDeviceInstance): { "name" : "我的底座", "ip_address" : "192.168.1.102", "version" : "V1.0.0", "mobile_id": "xxxxxxxxxx", "user_open_id" : "wx_123456789", "user_name" : "strawmanbobi:" } @@ -568,7 +568,7 @@ URL - /yuekong/device/list_device_instances + /irext/device/list_device_instances 请求类型 @@ -600,7 +600,7 @@ 示例 - /yuekong/device/list_device_instances?mobile_id=2
+ /irext/device/list_device_instances?mobile_id=2
@@ -615,7 +615,7 @@ URL - /yuekong/device/get_device_instance + /irext/device/get_device_instance 请求类型 @@ -652,7 +652,7 @@ 示例 - /yuekong/device/get_device_instance?mobile_id=xxxxxx&pdsn=P000000000000001
+ /irext/device/get_device_instance?mobile_id=xxxxxx&pdsn=P000000000000001
@@ -669,7 +669,7 @@ URL - /yuekong/remote/list_categories + /irext/remote/list_categories 请求类型 @@ -711,7 +711,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_categories?from=0&count=20&pdsn=S000000000000001
+ http://irextdev.wicp.net:8200/irext/remote/list_categories?from=0&count=20&pdsn=S000000000000001
@@ -726,7 +726,7 @@ URL - /yuekong/remote/list_brands + /irext/remote/list_brands 请求类型 @@ -773,7 +773,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_brands?category_id=1&from=0&count=20&pdsn=S000000000000001
+ http://irextdev.wicp.net:8200/irext/remote/list_brands?category_id=1&from=0&count=20&pdsn=S000000000000001
@@ -788,7 +788,7 @@ URL - /yuekong/remote/list_popular_brands + /irext/remote/list_popular_brands 请求类型 @@ -825,7 +825,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_popular_brands?category_id=1&pdsn=S000000000000001
+ http://irextdev.wicp.net:8200/irext/remote/list_popular_brands?category_id=1&pdsn=S000000000000001
@@ -841,7 +841,7 @@ URL - /yuekong/remote/list_remote_indexes + /irext/remote/list_remote_indexes 请求类型 @@ -898,9 +898,9 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_remote_indexes?category_id=1&brand_id=1&from=0&count=20&pdsn=S000000000000001
+ http://irextdev.wicp.net:8200/irext/remote/list_remote_indexes?category_id=1&brand_id=1&from=0&count=20&pdsn=S000000000000001
或者 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_remote_indexes?category_id=3&city_code=320100&from=0&count=20 + http://irextdev.wicp.net:8200/irext/remote/list_remote_indexes?category_id=3&city_code=320100&from=0&count=20 @@ -922,7 +922,7 @@ URL - /yuekong/remote/count_user_remote_indexes + /irext/remote/count_user_remote_indexes 请求类型 @@ -974,9 +974,9 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_user_remote_indexes?sns_id=oVlSbwQlWG0kJhrw68gpQ9WZDL94&sns_type=0&mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4
+ http://irextdev.wicp.net:8200/irext/remote/list_user_remote_indexes?sns_id=oVlSbwQlWG0kJhrw68gpQ9WZDL94&sns_type=0&mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4
或者 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_user_remote_indexes?mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4 + http://irextdev.wicp.net:8200/irext/remote/list_user_remote_indexes?mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4 @@ -999,7 +999,7 @@ URL - /yuekong/remote/list_user_remote_indexes + /irext/remote/list_user_remote_indexes 请求类型 @@ -1051,9 +1051,9 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_user_remote_indexes?sns_id=oVlSbwQlWG0kJhrw68gpQ9WZDL94&sns_type=0&mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4
+ http://irextdev.wicp.net:8200/irext/remote/list_user_remote_indexes?sns_id=oVlSbwQlWG0kJhrw68gpQ9WZDL94&sns_type=0&mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4
或者 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_user_remote_indexes?mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4 + http://irextdev.wicp.net:8200/irext/remote/list_user_remote_indexes?mobile_id=7b7951d5e08d9d11b71084ddf869ecea&remote_version=V2.2.4 @@ -1077,7 +1077,7 @@ URL - /yuekong/remote/match_remote + /irext/remote/match_remote 请求类型 @@ -1118,7 +1118,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/match_remote
+ http://irextdev.wicp.net:8200/irext/remote/match_remote
表单参数(matchObj): { "category_id" : "1", "brand_id" : "2", "city_code" : "", "key" : "POWER", "code" : [9048,4420,598,1612,598,520,572,520,...] } @@ -1175,7 +1175,7 @@ 示例 - http://yuekongdev.wicp.net:8200/rb/ykir_upd6121g_remote_box_164.bin
+ http://irextdev.wicp.net:8200/rb/ykir_upd6121g_remote_box_164.bin
@@ -1192,7 +1192,7 @@ URL - /yuekong/remote/create_remote_instance + /irext/remote/create_remote_instance 请求类型 @@ -1224,7 +1224,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/create_remote_instance
+ http://irextdev.wicp.net:8200/irext/remote/create_remote_instance
表单参数(remote_instance):
{ "rsn":"098f6bcd4621d373cade4e83", "device_pdsn":"P000000000000001", "device_ip":"192.168.1.102", "is_bound" : "1", "mobile_id" : "098f6bcd4621d373cade4e83", "user_open_id":"wx_123456789", "user_name":"strawmanbobi", "mac_address" : "11:22:33:44:55:66", "remote_instance_type" : "2" }(默认和底座配对)
或者 @@ -1260,7 +1260,7 @@ URL - /yuekong/remote/rename_remote_instance + /irext/remote/rename_remote_instance 请求类型 @@ -1296,7 +1296,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/rename_remote_instance?name=UCON&remote_instance_id=1 + http://irextdev.wicp.net:8200/irext/remote/rename_remote_instance?name=irext&remote_instance_id=1 @@ -1311,7 +1311,7 @@ URL - /yuekong/remote/update_remote_instance + /irext/remote/update_remote_instance 请求类型 @@ -1347,7 +1347,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/update_remote_instance?remote_instance_id=1
+ http://irextdev.wicp.net:8200/irext/remote/update_remote_instance?remote_instance_id=1
表单参数(remote_instance):
{ "rsn":"098f6bcd4621d373cade4e83", "device_pdsn":"P000000000000001", "device_ip":"192.168.1.102", "is_bound" : "1", "mobile_id" : "098f6bcd4621d373cade4e83", "user_open_id":"wx_123456789", "user_name":"strawmanbobi", "mac_address" : "11:22:33:44:55:66", "remote_instance_type" : "2" }(默认和底座配对)
或者 @@ -1367,7 +1367,7 @@ URL - /yuekong/remote/list_remote_instances + /irext/remote/list_remote_instances 请求类型 @@ -1399,7 +1399,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_remote_instances?mobile_id=098f6bcd4621d373cade4e83 + http://irextdev.wicp.net:8200/irext/remote/list_remote_instances?mobile_id=098f6bcd4621d373cade4e83 @@ -1421,7 +1421,7 @@ URL - /yuekong/remote/reset_remote_instance + /irext/remote/reset_remote_instance 请求类型 @@ -1452,7 +1452,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/reset_remote_instance?remote_instance_id=2 + http://irextdev.wicp.net:8200/irext/remote/reset_remote_instance?remote_instance_id=2 @@ -1475,7 +1475,7 @@ URL - /yuekong/remote/bind_remote_instance + /irext/remote/bind_remote_instance 请求类型 @@ -1511,7 +1511,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/bind_remote_instance?device_pdsn=P000000000000001&remote_instance_id=1 + http://irextdev.wicp.net:8200/irext/remote/bind_remote_instance?device_pdsn=P000000000000001&remote_instance_id=1 @@ -1526,7 +1526,7 @@ URL - /yuekong/remote/create_remote + /irext/remote/create_remote 请求类型 @@ -1558,7 +1558,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/create_remote
+ http://irextdev.wicp.net:8200/irext/remote/create_remote
表单参数(remote):
{ "device_pdsn":"", "rsn":"098f6bcd4621d373cade4e83", "name":"客厅空调", "category_id" : "1", "brand_id" : "2", "category_name":"空调", "brand_name":"奥克斯", "city_code" : "", "create_type":"0", "mac_address": "11:22:33:44:55:66", "remote_number":"1", "identifier":"xxxxxxx" }
@@ -1594,7 +1594,7 @@ URL - /yuekong/remote/update_remote + /irext/remote/update_remote 请求类型 @@ -1630,7 +1630,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/update_remote?remote_id=1
+ http://irextdev.wicp.net:8200/irext/remote/update_remote?remote_id=1
表单参数(remote):
{ "device_pdsn":"", "rsn":"098f6bcd4621d373cade4e83", "name":"客厅空调", "category_id" : "1", "brand_id" : "2", "category_name":"空调", "brand_name":"奥克斯", "city_code" : "", "create_type":"0" }
@@ -1662,7 +1662,7 @@ URL - /yuekong/remote/delete_remote + /irext/remote/delete_remote 请求类型 @@ -1693,7 +1693,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/delete_remote?remote_id=1
+ http://irextdev.wicp.net:8200/irext/remote/delete_remote?remote_id=1
@@ -1708,7 +1708,7 @@ URL - /yuekong/remote/list_remotes + /irext/remote/list_remotes 请求类型 @@ -1750,7 +1750,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_remotes?remote_instance_id=1&from=0&count=8 + http://irextdev.wicp.net:8200/irext/remote/list_remotes?remote_instance_id=1&from=0&count=8 @@ -1771,7 +1771,7 @@ URL - /yuekong/remote/list_remotes_by_room + /irext/remote/list_remotes_by_room 请求类型 @@ -1818,7 +1818,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_remotes_by_room?sirius_id=098f6bcd4621d373cade4e83cade4e83&room_id=1&from=0&count=20 + http://irextdev.wicp.net:8200/irext/remote/list_remotes_by_room?sirius_id=098f6bcd4621d373cade4e83cade4e83&room_id=1&from=0&count=20 @@ -1842,7 +1842,7 @@ URL - /yuekong/remote/list_remotes_by_room_and_category + /irext/remote/list_remotes_by_room_and_category 请求类型 @@ -1894,7 +1894,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_remotes_by_room_and_category?sirius_id=098f6bcd4621d373cade4e83cade4e83&room_id=1&category_id=1&from=0&count=20 + http://irextdev.wicp.net:8200/irext/remote/list_remotes_by_room_and_category?sirius_id=098f6bcd4621d373cade4e83cade4e83&room_id=1&category_id=1&from=0&count=20 @@ -1918,7 +1918,7 @@ URL - /yuekong/remote/create_remote_relationship + /irext/remote/create_remote_relationship 请求类型 @@ -1950,7 +1950,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/create_remote_relationship
+ http://irextdev.wicp.net:8200/irext/remote/create_remote_relationship
表单参数(remote_relationship):
{ "remote_id":"1", "remote_map":"upd6121g_box_201", "remote_id":"2", "remote_map":"upd6121g_tv_300", } @@ -1974,7 +1974,7 @@ URL - /yuekong/remote/get_remote_relationship + /irext/remote/get_remote_relationship 请求类型 @@ -2006,7 +2006,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/get_remote_relationship?remote_id=1
+ http://irextdev.wicp.net:8200/irext/remote/get_remote_relationship?remote_id=1
@@ -2028,7 +2028,7 @@ URL - /yuekong/remote/delete_remote_relationship + /irext/remote/delete_remote_relationship 请求类型 @@ -2059,7 +2059,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/delete_remote_relationship?remote_id=1
+ http://irextdev.wicp.net:8200/irext/remote/delete_remote_relationship?remote_id=1
@@ -2080,7 +2080,7 @@ URL - /yuekong/remote/get_remote_info + /irext/remote/get_remote_info 请求类型 @@ -2112,7 +2112,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/get_remote_info?remote_id=2 + http://irextdev.wicp.net:8200/irext/remote/get_remote_info?remote_id=2 @@ -2129,7 +2129,7 @@ URL - /yuekong/subscription/create_subscription + /irext/subscription/create_subscription 请求类型 @@ -2171,7 +2171,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/subscription/create_subscription?pdsn=P000000000000001&token=098f6bcd4621d373cade4e83cade4e83
+ http://irextdev.wicp.net:8200/irext/subscription/create_subscription?pdsn=P000000000000001&token=098f6bcd4621d373cade4e83cade4e83
表单参数(subscription):
电视机、机顶盒等命令码：
{ "sub_time":"2015-06-01 18:00:00", "device_pdsn":"P000000000000001", "remote_id":"ykir_tc9012f_remote_tv_291", "remote_keys":"0,0,10,5", "remote_index_type":"0", "category_id":"2", "remote_no":"1", "mobile_id": "xxxxxxxxxxxxxxxxxx", "user_id":"xxxxxx", "remote_instance_id":"1", "remote_name":"客厅电视机", "remote_status":"1" }
@@ -2183,12 +2183,12 @@ 建议和备注 下面为APP客户端实现预约的基本方法：
- 0. 预约必须在APP添加了UCON CENTER之后进行，由于在添加UCON CENTER时，在后台数据库device_instance表中(详细请参考/yuekong/device/create_device_instance接口)根据mobile_id字段获取已经添加的UCON Center设备，为所有和此手机相关的设备生成预约
+ 0. 预约必须在APP添加了UCON CENTER之后进行，由于在添加UCON CENTER时，在后台数据库device_instance表中(详细请参考/irext/device/create_device_instance接口)根据mobile_id字段获取已经添加的UCON Center设备，为所有和此手机相关的设备生成预约
1. 每调用一个接口，只为一个底座生成一条预约，如果有多个底座和此APP关联，需要调用此接口多次
2. Query参数中的pdsn和body参数中的device_pdsn均表示本次要为某个特定PDSN的UCON Center生成
3. remote_id为选中家电遥控器的码库文件前缀 (protocol + remote) 字段组合(码库文件名去掉.bin扩展名)，remote_no因为历史原因，这里其实代表remote表的外键，表示唯一的一个remote(家电遥控器，例如：客厅电视机、卧室空调等)
4. 目前只有经由码库下载进行配置的家电才可预约，自学习的不支持预约，需要在APP界面和流程上进行限制处理
- 5. 底座版本为V1.0.0及以下，不支持预约空调，底座版本可使用/yuekong/device/list_device_instances接口进行版本号查询
+ 5. 底座版本为V1.0.0及以下，不支持预约空调，底座版本可使用/irext/device/list_device_instances接口进行版本号查询
6. remote_keys根据家电类型不同，格式也不相同，空调属于一类；电视机、机顶盒等属于一类
7. 空调类型的预约，remote_keys恒为5个数组组成，用逗号分割，分别含义是：“电源, 温度, 模式, 风速, 是否扫风”，每个字段枚举如下：
a) 电源：0-打开，1-关闭
@@ -2246,7 +2246,7 @@ URL - /yuekong/subscription/update_subscription + /irext/subscription/update_subscription 请求类型 @@ -2283,7 +2283,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/subscription/update_subscription?subscription_id=1
+ http://irextdev.wicp.net:8200/irext/subscription/update_subscription?subscription_id=1
表单参数(subscription):
电视机、机顶盒等命令码：
{ "sub_time":"2015-06-01 18:00:00", "device_pdsn":"P000000000000001", "remote_id":"ykir_tc9012f_remote_tv_291", "remote_keys":"0,0,10,5", "remote_index_type":"0", "category_id":"2", "remote_no":"1", "mobile_id": "xxxxxxxxxxxxxxxxxx", "user_id":"xxxxxx", "remote_instance_id":"1", "remote_name":"客厅电视机", "remote_status":"1" }
@@ -2295,12 +2295,12 @@ 建议和备注 下面为APP客户端实现预约的基本方法：
- 0. 预约必须在APP添加了UCON CENTER之后进行，由于在添加UCON CENTER时，在后台数据库device_instance表中(详细请参考/yuekong/device/create_device_instance接口)根据mobile_id字段获取已经添加的UCON Center设备，为所有和此手机相关的设备生成预约
+ 0. 预约必须在APP添加了UCON CENTER之后进行，由于在添加UCON CENTER时，在后台数据库device_instance表中(详细请参考/irext/device/create_device_instance接口)根据mobile_id字段获取已经添加的UCON Center设备，为所有和此手机相关的设备生成预约
1. 每调用一个接口，只为一个底座生成一条预约，如果有多个底座和此APP关联，需要调用此接口多次
2. Query参数中的pdsn和body参数中的device_pdsn均表示本次要为某个特定PDSN的UCON Center生成
3. remote_id为选中家电遥控器的码库文件前缀 (protocol + remote) 字段组合(码库文件名去掉.bin扩展名)，remote_no因为历史原因，这里其实代表remote表的外键，表示唯一的一个remote(家电遥控器，例如：客厅电视机、卧室空调等)
4. 目前只有经由码库下载进行配置的家电才可预约，自学习的不支持预约，需要在APP界面和流程上进行限制处理
- 5. 底座版本为V1.0.0及以下，不支持预约空调，底座版本可使用/yuekong/device/list_device_instances接口进行版本号查询
+ 5. 底座版本为V1.0.0及以下，不支持预约空调，底座版本可使用/irext/device/list_device_instances接口进行版本号查询
6. remote_keys根据家电类型不同，格式也不相同，空调属于一类；电视机、机顶盒等属于一类
7. 空调类型的预约，remote_keys恒为5个数组组成，用逗号分割，分别含义是：“电源, 温度, 模式, 风速, 是否扫风”，每个字段枚举如下：
a) 电源：0-打开，1-关闭
@@ -2357,7 +2357,7 @@ URL - /yuekong/subscription/list_subscriptions + /irext/subscription/list_subscriptions 请求类型 @@ -2399,7 +2399,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/subscription/list_subscriptions?mobile_id=xxxxxxxxxxxxxxxx
+ http://irextdev.wicp.net:8200/irext/subscription/list_subscriptions?mobile_id=xxxxxxxxxxxxxxxx
@@ -2416,7 +2416,7 @@ URL - /yuekong/mobile/update_mobile + /irext/mobile/update_mobile 请求类型 @@ -2448,7 +2448,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/mobile/update_mobile + http://irextdev.wicp.net:8200/irext/mobile/update_mobile @@ -2471,7 +2471,7 @@ URL - /yuekong/mobile/get_mobile_by_mobile_id + /irext/mobile/get_mobile_by_mobile_id 请求类型 @@ -2503,7 +2503,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/mobile/get_mobile_by_pdsn?mobile_id=0123456
+ http://irextdev.wicp.net:8200/irext/mobile/get_mobile_by_pdsn?mobile_id=0123456
@@ -2520,7 +2520,7 @@ URL - /yuekong/user/register_user + /irext/user/register_user 请求类型 @@ -2557,7 +2557,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/user/register_user
+ http://irextdev.wicp.net:8200/irext/user/register_user
表单参数: { "name":"strawmanbobi", "weixin_id":"1234567", "avatar_url":"http://www.baidu.com/1.jpg" } @@ -2573,7 +2573,7 @@ URL - /yuekong/user/bind_mobile_to_user + /irext/user/bind_mobile_to_user 请求类型 @@ -2614,7 +2614,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/user/bind_mobile_to_user?mobile_id=7b7951d5e08d9d11b71084ddf869ecea&sns_id=oVlSbwQlWG0kJhrw68gpQ9WZDL94&sns_type=0
+ http://irextdev.wicp.net:8200/irext/user/bind_mobile_to_user?mobile_id=7b7951d5e08d9d11b71084ddf869ecea&sns_id=oVlSbwQlWG0kJhrw68gpQ9WZDL94&sns_type=0
@@ -2629,7 +2629,7 @@ URL - /yuekong/user/weixin_access_token + /irext/user/weixin_access_token 请求类型 @@ -2661,7 +2661,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/user/weixin_access_token
+ http://irextdev.wicp.net:8200/irext/user/weixin_access_token
表单参数: { "app_id":"1234567890", "auth_code":"1234567890" } @@ -2677,7 +2677,7 @@ URL - /yuekong/user/weixin_get_user_info + /irext/user/weixin_get_user_info 请求类型 @@ -2709,7 +2709,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/user/weixin_get_user_info
+ http://irextdev.wicp.net:8200/irext/user/weixin_get_user_info
表单参数: { "access_token":"1234567890", "openid":"1234567890" }
备注：无需传入lang参数，默认就是简体中文，将来如果需要英文和繁体中文另加 @@ -2726,7 +2726,7 @@ URL - /yuekong/user/get_weixin_share_wording + /irext/user/get_weixin_share_wording 请求类型 @@ -2762,7 +2762,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/user/get_weixin_share_wording?mobile_id=1234567890
+ http://irextdev.wicp.net:8200/irext/user/get_weixin_share_wording?mobile_id=1234567890
表单参数: { "name":"strawmanbobi", "weixin_id":"1234567890" } @@ -2780,7 +2780,7 @@ URL - /yuekong/stat/create_stat + /irext/stat/create_stat 请求类型 @@ -2812,7 +2812,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/stat/create_stat
+ http://irextdev.wicp.net:8200/irext/stat/create_stat
表单参数: { stat_type: '0', remote_pdsn: 'P000000000000001', uda: ['1451533320','1451533321','1451533322','1451533323'], uop：[], mobile_id: '1', user_id: 'wx_1234567890', longitude: '12345.12345', latitude: '12345.12345' } @@ -2838,7 +2838,7 @@ URL - /yuekong/push/notify_app + /irext/push/notify_app 请求类型 @@ -2869,7 +2869,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/push/notify_app
+ http://irextdev.wicp.net:8200/irext/push/notify_app
表单参数: { from_peer: '0', to_peer: '7b7951d5e08d9d11b71084ddf869ecea', message: '1' } @@ -2893,7 +2893,7 @@ URL - /yuekong/room/update_room + /irext/room/update_room 请求类型 @@ -2924,7 +2924,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/room/update_room
+ http://irextdev.wicp.net:8200/irext/room/update_room
表单参数: { name: '书房', user_id: '0123456789', mobile_id: '0123456789' } @@ -2948,7 +2948,7 @@ URL - /yuekong/room/list_rooms + /irext/room/list_rooms 请求类型 @@ -2994,7 +2994,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/room/list_rooms?user_id=0123456789&mobile_id=0123456789&from=0&count=10 + http://irextdev.wicp.net:8200/irext/room/list_rooms?user_id=0123456789&mobile_id=0123456789&from=0&count=10 @@ -3018,7 +3018,7 @@ URL - /yuekong/version/get_latest_version + /irext/version/get_latest_version 请求类型 @@ -3065,7 +3065,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/version/get_latest_version?type=0&sub_type=0&remote_type=0&come_from=0
+ http://irextdev.wicp.net:8200/irext/version/get_latest_version?type=0&sub_type=0&remote_type=0&come_from=0
@@ -3089,7 +3089,7 @@ URL - /yuekong/switch/get_switch + /irext/switch/get_switch 请求类型 @@ -3121,7 +3121,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/switch/get_switch?target_device=0
+ http://irextdev.wicp.net:8200/irext/switch/get_switch?target_device=0
@@ -3136,7 +3136,7 @@ URL - /yuekong/version/update_update_record + /irext/version/update_update_record 请求类型 @@ -3168,7 +3168,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/version/update_update_record
+ http://irextdev.wicp.net:8200/irext/version/update_update_record
表单参数: { "src_remote_version" : " V1.3.0", "dest_remote_version": "V2.2.4", "remote_update_status":"1", "updater_id": "12345", "updater_type": "1", "target_pdsn":"S000000000000002"} @@ -3180,7 +3180,7 @@ 2. 如果是给底座升级（底座静默升级），必须填入 src_device_version，dest_device_version，device_update_status 三个字段
3. 无论是给遥控器还是给底座升级，都必须填入updater_type，updater_id 和 target_pdsn 字段
4. 输入参数 updater_type 的说明：0-UCON底座, 1-PC端升级助手, 2-Web, 3-售后升级板, 4-Android APP, 5-iOS APP
- 5. 如果 updater_type 是 UCON 底座，那么 updater_id 为自身PDSN；如果是 APP，那么 updater_id 为 mobile_id；如果是 PC，那么 updater_id 为 PC CPU_ID + 5. 如果 updater_type 是 irext 底座，那么 updater_id 为自身PDSN；如果是 APP，那么 updater_id 为 mobile_id；如果是 PC，那么 updater_id 为 PC CPU_ID @@ -3195,7 +3195,7 @@ URL - /yuekong/version/list_update_records + /irext/version/list_update_records 请求类型 @@ -3237,13 +3237,13 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/version/list_update_records?updater_id=P000000000000001&from=0&count=10 + http://irextdev.wicp.net:8200/irext/version/list_update_records?updater_id=P000000000000001&from=0&count=10 建议和备注 - 1. 如果 updater_type 是 UCON 底座，那么 updater_id 为自身PDSN；如果是 APP，那么 updater_id 为 mobile_id；如果是 PC，那么 updater_id 为 PC CPU_ID + 1. 如果 updater_type 是 irext 底座，那么 updater_id 为自身PDSN；如果是 APP，那么 updater_id 为 mobile_id；如果是 PC，那么 updater_id 为 PC CPU_ID @@ -3258,7 +3258,7 @@ URL - /yuekong/city/list_provinces + /irext/city/list_provinces 请求类型 @@ -3290,7 +3290,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/remote/list_provinces?pdsn=S000000000000001
+ http://irextdev.wicp.net:8200/irext/remote/list_provinces?pdsn=S000000000000001
@@ -3306,7 +3306,7 @@ URL - /yuekong/city/list_cities + /irext/city/list_cities 请求类型 @@ -3343,7 +3343,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/city/list_cities?province_prefix=32&pdsn=S000000000000001
+ http://irextdev.wicp.net:8200/irext/city/list_cities?province_prefix=32&pdsn=S000000000000001
@@ -3359,7 +3359,7 @@ URL - /yuekong/city/list_covered_cities + /irext/city/list_covered_cities 请求类型 @@ -3396,7 +3396,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/city/list_covered_cities?from=0&count=50
+ http://irextdev.wicp.net:8200/irext/city/list_covered_cities?from=0&count=50
@@ -3412,7 +3412,7 @@ URL - /yuekong/operator/list_operators + /irext/operator/list_operators 请求类型 @@ -3454,7 +3454,7 @@ 示例 - http://yuekongdev.wicp.net:8200/yuekong/operator/list_operators?city_code=320100&from=0&count=20
+ http://irextdev.wicp.net:8200/irext/operator/list_operators?city_code=320100&from=0&count=20
diff --git a/src/web_console/web/error/auth_error.html b/src/web_console/web/error/auth_error.html index 7d5abe5..2c2fa36 100644 --- a/src/web_console/web/error/auth_error.html +++ b/src/web_console/web/error/auth_error.html @@ -6,9 +6,9 @@ - + - UCON 控制台 + irext 控制台 @@ -27,7 +27,7 @@
-

此页面由悦控智能维护 UCON

+

irext.net

diff --git a/src/web_console/web/error/confirm_pw.html b/src/web_console/web/error/confirm_pw.html index 94120ab..c4d90b4 100644 --- a/src/web_console/web/error/confirm_pw.html +++ b/src/web_console/web/error/confirm_pw.html @@ -6,9 +6,9 @@ - + - UCON 控制台 + irext 控制台 @@ -31,7 +31,7 @@
-

此页面由悦控智能维护 UCON

+

irext.net

diff --git a/src/web_console/web/index.html b/src/web_console/web/index.html index 08b2a76..007a13f 100644 --- a/src/web_console/web/index.html +++ b/src/web_console/web/index.html @@ -1,87 +1,70 @@ + - - - - - - UCON 控制台 - - - - + + + + Cover Template for Bootstrap + + + + -
-
-

UCON 数据控制台

-
-
- -
-
- - - -