From f3675a8f11664413a7a63ea949cf918a60ab14ae Mon Sep 17 00:00:00 2001
From: strawmanbobi <strawmanbobi@163.com>
Date: Sat, 3 Dec 2016 22:38:00 +0800
Subject: [PATCH] transplanted mini_poem for irext console

---
 src/web_console/mini_poem/data_set/ali_oss.js | 71 -------------------
 src/web_console/script_npm.sh                 |  9 +--
 src/web_console/work_unit/internal_logic.js   |  1 -
 3 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 src/web_console/mini_poem/data_set/ali_oss.js
 mode change 100644 => 100755 src/web_console/script_npm.sh

diff --git a/src/web_console/mini_poem/data_set/ali_oss.js b/src/web_console/mini_poem/data_set/ali_oss.js
deleted file mode 100644
index 4be7a77..0000000
--- a/src/web_console/mini_poem/data_set/ali_oss.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Created by Strawmanbobi
- * 2014-08-30
- */
-
-// 'use strict';
-
-require('../configuration/constants');
-var ErrorCode = require('../configuration/error_code');
-var Enums = require('../configuration/enums');
-
-var stringUtils = require('../utils/string_utils');
-// deprecated
-// var AliOSS = require('oss-client');
-var AliOSS = require('ali-oss');
-var OssWrapper = require('ali-oss').Wrapper;
-var logger = require('../logging/logger4js').helper;
-
-var errorCode = new ErrorCode();
-var enums = new Enums();
-
-var OSS = function(_region, _bucket, _accessKey, _accessSecret) {
-    this.option = {
-        region: _region,
-        bucket: _bucket,
-        accessKeyId: _accessKey || OSS_APP_ID,
-        accessKeySecret: _accessSecret,
-    };
-    this.client = new OssWrapper(this.option);
-}
-
-OSS.prototype.saveObjectFromBinary = function(objectID, bufferContent, contentType, callback) {
-    var randomID = stringUtils.randomChar(16);
-    console.log("object ID = " + objectID);
-    if(null == objectID) {
-        objectID = objectID || (null != contentType &&
-        '' != contentType &&
-        contentType.indexOf("/") >= 0) ?
-        randomID + '.' + contentType.substr(contentType.lastIndexOf('/') + 1) :
-            randomID;
-    }
-    this.client.put(objectID, bufferContent).then(function (val) {
-        console.log('result: %j', val);
-        callback(errorCode.SUCCESS, objectID);
-    }).catch (function (err) {
-        console.log('error: %j', err);
-        callback(errorCode.FAILED, null);
-    });
-};
-
-OSS.prototype.getObjectByID = function(objectID, filePath, callback) {
-    this.client.get(objectID, filePath).then(function (val) {
-        console.log('result: %j', val);
-        callback(errorCode.SUCCESS, filePath);
-    }).catch (function (err) {
-        console.log('error: %j', err);
-        callback(errorCode.FAILED, null);
-    });
-};
-
-OSS.prototype.serveObjectByID = function(objectID, filePath, callback) {
-    this.client.get(objectID, filePath).then(function (val) {
-        console.log('result: %j', val);
-        callback(errorCode.SUCCESS, filePath);
-    }).catch (function (err) {
-        console.log('error: %j', err);
-        callback(errorCode.FAILED, null);
-    });
-};
-
-module.exports = OSS;
\ No newline at end of file
diff --git a/src/web_console/script_npm.sh b/src/web_console/script_npm.sh
old mode 100644
new mode 100755
index e2bec29..3e464ae
--- a/src/web_console/script_npm.sh
+++ b/src/web_console/script_npm.sh
@@ -29,9 +29,6 @@ npm install orm
 echo "npm install python-shell"
 npm install python-shell
 
-echo "npm install oss-client"
-npm install oss-client
-
 echo "npm install request"
 npm install request
 
@@ -44,7 +41,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 node-mysql"
+npm install mysql
 
-echo "npm install done"
\ No newline at end of file
+echo "npm install done"
diff --git a/src/web_console/work_unit/internal_logic.js b/src/web_console/work_unit/internal_logic.js
index 9777e5b..2c0b00b 100644
--- a/src/web_console/work_unit/internal_logic.js
+++ b/src/web_console/work_unit/internal_logic.js
@@ -11,7 +11,6 @@ var crypto = require('crypto');
 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');
 
 var Category = require('../model/category_dao.js');
 var Brand = require('../model/brand_dao.js');