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/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..cd04661 100644
--- a/src/web_console/web/code/index.html
+++ b/src/web_console/web/code/index.html
@@ -88,7 +88,7 @@
-