Skip to content

K
kouling-admin
Commit 8e13891a authored by 刘松's avatar 刘松
Browse files
Options

complex things

parent 0d27eb51
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 24 deletions
app.js
View file @ 8e13891a
...@@ -15,6 +15,7 @@ const sessions = require('./db/mongo/session'); ...@@ -15,6 +15,7 @@ const sessions = require('./db/mongo/session');
const cron = require('./lib/cron'); const cron = require('./lib/cron');
const cron_gather = require('./lib/cron_gather'); const cron_gather = require('./lib/cron_gather');
const cron_auto = require('./lib/cron_auto'); const cron_auto = require('./lib/cron_auto');
const control = require('./lib/controller');
const options = { const options = {
useMongoClient: true useMongoClient: true
...@@ -23,7 +24,25 @@ const options = { ...@@ -23,7 +24,25 @@ const options = {
mongoose.connect(config.mongo, options); mongoose.connect(config.mongo, options);
console.log('MONGO CONNECT INFO: ', config.mongo); console.log('MONGO CONNECT INFO: ', config.mongo);
global.Promise = mongoose.Promise = require('bluebird'); global.Promise = mongoose.Promise = require('bluebird');
var expressWs = require('express-ws')(app);
app.ws('/echo', function(ws, req) {
console.dir('inini');
ws.on('message', function(msg) {
console.log(msg);
control.getDynamic(function(data){
try{
ws.send(data);
}catch(e){
console.dir(e);
}
});
});
ws.on('close', function(msg) {
console.log(msg);
//
});
});
app.use(logger('dev')); app.use(logger('dev'));
app.use(cookieParser('f7f926ad3fc8fe90eb4784643bc4d747')); app.use(cookieParser('f7f926ad3fc8fe90eb4784643bc4d747'));
app.use(session({secret: '5f1d65f27e370c36dfd845f6dc78b869'})); app.use(session({secret: '5f1d65f27e370c36dfd845f6dc78b869'}));
...@@ -52,6 +71,8 @@ app.use(routes); ...@@ -52,6 +71,8 @@ app.use(routes);
app.listen(config.port); app.listen(config.port);
console.log(process.env.NODE_ENV + 'server started on port ' + config.port); console.log(process.env.NODE_ENV + 'server started on port ' + config.port);
if(process.env.NODE_ENV === 'production'){ if(process.env.NODE_ENV === 'production'){
cron.start(); cron.start();
cron_gather.start(); cron_gather.start();
......
app/built/app.bundle.js
View file @ 8e13891a
This source diff could not be displayed because it is too large. You can view the blob instead.
app/jsx/setting/taopage.jsx
View file @ 8e13891a
...@@ -14,7 +14,7 @@ class Agent extends React.Component{ ...@@ -14,7 +14,7 @@ class Agent extends React.Component{
constructor(props){ constructor(props){
super(props); super(props);
console.dir(this.props); console.dir(this.props);
this.state= { links :[],status:'pending',pagination:{current:1,pageSize:500,total:1},modalVisible:false,username:'channel'}; this.state= { links :[],status:'pending',pagination:{current:1,pageSize:500,total:1},modalVisible:false,username:'channel',target:'target'};
} }
componentDidMount(){ componentDidMount(){
let pagination = this.state.pagination; let pagination = this.state.pagination;
...@@ -57,6 +57,7 @@ class Agent extends React.Component{ ...@@ -57,6 +57,7 @@ class Agent extends React.Component{
for(var k in values){ for(var k in values){
if(values[k]) values[k] = values[k].trim(); if(values[k]) values[k] = values[k].trim();
} }
values['select'] = this.state.target;
api('POST', 'link',values).then((res) => { api('POST', 'link',values).then((res) => {
if(res && res.result){ if(res && res.result){
self.setModalVisible(false); self.setModalVisible(false);
...@@ -66,6 +67,11 @@ class Agent extends React.Component{ ...@@ -66,6 +67,11 @@ class Agent extends React.Component{
} }
}); });
} }
handleTargetChange(e){
console.dir(e.target.value);
this.props.form.resetFields && this.props.form.resetFields();
this.setState({target:e.target.value})
}
exportData(){ exportData(){
//json2xlsx(data,{sheetName:"基础数据", filename : '基础数据'+moment().format('YYYYMMDD')+'.xlsx'}); //json2xlsx(data,{sheetName:"基础数据", filename : '基础数据'+moment().format('YYYYMMDD')+'.xlsx'});
...@@ -169,6 +175,15 @@ class Agent extends React.Component{ ...@@ -169,6 +175,15 @@ class Agent extends React.Component{
onCancel = { this.setModalVisible.bind(this,false) } onCancel = { this.setModalVisible.bind(this,false) }
> >
<Form onSubmit={this.handleSubmit.bind(this)} className="login-form"> <Form onSubmit={this.handleSubmit.bind(this)} className="login-form">
<FormItem
label="推广目标"
>
<Radio.Group defaultValue="target" onChange={this.handleTargetChange.bind(this)}>
<Radio.Button value="target">二合一链接</Radio.Button>
<Radio.Button value="quan">优惠券链接</Radio.Button>
<Radio.Button value="good">商品链接</Radio.Button>
</Radio.Group>
</FormItem>
<FormItem> <FormItem>
{getFieldDecorator('name', { {getFieldDecorator('name', {
rules: [{ required: true, message: '推广页名称不能为空' }], rules: [{ required: true, message: '推广页名称不能为空' }],
...@@ -176,13 +191,15 @@ class Agent extends React.Component{ ...@@ -176,13 +191,15 @@ class Agent extends React.Component{
<Input prefix={<span style={{ fontSize: 13 }}>推广名称</span>} placeholder="例如：商品页1" /> <Input prefix={<span style={{ fontSize: 13 }}>推广名称</span>} placeholder="例如：商品页1" />
)} )}
</FormItem> </FormItem>
<FormItem> {
{getFieldDecorator('quan', { this.state.target == 'good' ? <div></div> : <FormItem>
rules: [{ required: true, message: '优惠券链接不能为空' }], {getFieldDecorator('quan', {
})( rules: [{ required: true, message: '优惠券链接不能为空' }],
<Input prefix={<span style={{ fontSize: 13 }}>优惠券链接</span>} placeholder="例如：https://taoquan.taobao.com/coupon/unify_apply.htm?sellerId=2194810505&activityId=5c3186407cd441d48ecd2460815793e6" /> })(
)} <Input prefix={<span style={{ fontSize: 13 }}>优惠券链接</span>} placeholder="例如：https://taoquan.taobao.com/coupon/unify_apply.htm?sellerId=2194810505&activityId=5c3186407cd441d48ecd2460815793e6" />
</FormItem> )}
</FormItem>
}
<FormItem> <FormItem>
{getFieldDecorator('good', { {getFieldDecorator('good', {
rules: [{ required: true, message: '商品连接不能为空' }], rules: [{ required: true, message: '商品连接不能为空' }],
...@@ -190,14 +207,23 @@ class Agent extends React.Component{ ...@@ -190,14 +207,23 @@ class Agent extends React.Component{
<Input prefix={<span style={{ fontSize: 13 }}>商品连接</span>} placeholder="例如：https://detail.tmall.com/item.htm?id=40663494639" /> <Input prefix={<span style={{ fontSize: 13 }}>商品连接</span>} placeholder="例如：https://detail.tmall.com/item.htm?id=40663494639" />
)} )}
</FormItem> </FormItem>
<FormItem> {
this.state.target == 'good' ? <div></div> : <FormItem>
{getFieldDecorator('pid', { {getFieldDecorator('pid', {
rules: [{ required: true, message: 'pid不能为空' }], rules: [{ required: true, message: 'pid不能为空' }],
})( })(
<Input prefix={<span style={{ fontSize: 13 }}>PID</span>} placeholder="例如：mm_33320967_40070156_153504280" /> <Input prefix={<span style={{ fontSize: 13 }}>PID</span>} placeholder="例如：mm_33320967_40070156_153504280" />
)} )}
</FormItem> </FormItem>
<FormItem }
<FormItem>
{getFieldDecorator('title', {
rules: [{ required: false, message: '推广语不能为空' }],
})(
<Input prefix={<span style={{ fontSize: 13 }}>推广语</span>} placeholder="例如：推广语" />
)}
</FormItem>
{/* <FormItem
label="推广使用" label="推广使用"
> >
{getFieldDecorator('select')( {getFieldDecorator('select')(
...@@ -206,7 +232,7 @@ class Agent extends React.Component{ ...@@ -206,7 +232,7 @@ class Agent extends React.Component{
<Radio value="target">二合一链接</Radio> <Radio value="target">二合一链接</Radio>
</RadioGroup> </RadioGroup>
)} )}
</FormItem> </FormItem>*/}
<FormItem> <FormItem>
<Button type="primary" htmlType="submit" className="login-form-button"> <Button type="primary" htmlType="submit" className="login-form-button">
一键生成 一键生成
......
app/jsx/statistics/gather.jsx
View file @ 8e13891a
This diff is collapsed.
db/mongo/tao-link.js
View file @ 8e13891a
...@@ -9,7 +9,7 @@ const schema = mongoose.Schema({ ...@@ -9,7 +9,7 @@ const schema = mongoose.Schema({
}, },
quan: { quan: {
type: String, type: String,
required: true required: false
}, },
good:{ good:{
type: String, type: String,
...@@ -17,7 +17,7 @@ const schema = mongoose.Schema({ ...@@ -17,7 +17,7 @@ const schema = mongoose.Schema({
}, },
pid:{ pid:{
type: String, type: String,
required: true required: false
}, },
title:{ title:{
type: String, type: String,
......
db/mongo/tao-log-click.js 0 → 100644
View file @ 8e13891a
const mongoose = require('mongoose');
const {ObjectId} = mongoose.SchemaTypes;
const schema = mongoose.Schema({
info: {
type: String,
required: true
},
qd:{
type:ObjectId,
required: true,
ref:'tao-agent'
},
times: {
type:Number,
required: true
},
date:{
type:String,
required: true
},
}, {
timestamps: true
});
schema.index({qd: 1});
module.exports = mongoose.model('tao-log-click', schema);
lib/controller.js
View file @ 8e13891a
...@@ -5,6 +5,7 @@ const moment = require('moment'); ...@@ -5,6 +5,7 @@ const moment = require('moment');
const Log = require('../db/mongo/tao-log'); const Log = require('../db/mongo/tao-log');
const Kouling = require('../db/mongo/tao-kouling'); const Kouling = require('../db/mongo/tao-kouling');
const Link = require('../db/mongo/tao-link'); const Link = require('../db/mongo/tao-link');
const Click = require('../db/mongo/tao-log-click');
const Session = require('../db/mongo/session'); const Session = require('../db/mongo/session');
const Agent = require('../db/mongo/tao-agent'); const Agent = require('../db/mongo/tao-agent');
const Schedule = require('../db/mongo/tao-schedule'); const Schedule = require('../db/mongo/tao-schedule');
...@@ -105,7 +106,7 @@ exports.logs = async (req, res, next) => { ...@@ -105,7 +106,7 @@ exports.logs = async (req, res, next) => {
} }
exports.getIps = async(req,res,next) => { exports.getIps = async(req,res,next) => {
let now = moment().add(0,'hours').format('YYYYMMDD'); let now = moment().add(8,'hours').format('YYYYMMDD');
let { qd = 'all', date = now,limit = 100,skip = 0} = req.query; let { qd = 'all', date = now,limit = 100,skip = 0} = req.query;
if(!qd ) return res.status(400).send(not_full); if(!qd ) return res.status(400).send(not_full);
let sess = req.cookies['sess']; let sess = req.cookies['sess'];
...@@ -141,6 +142,8 @@ exports.getQdGatherData = async (req, res, next) => { ...@@ -141,6 +142,8 @@ exports.getQdGatherData = async (req, res, next) => {
let options = {limit:parseInt(limit),skip:parseInt(skip)*limit,sort}; let options = {limit:parseInt(limit),skip:parseInt(skip)*limit,sort};
let sess = req.cookies['sess']; let sess = req.cookies['sess'];
var qs = {}; var qs = {};
var clickData = {};
var date = moment().add(8,'hours').format('YYYYMMDD');
if(sess){ if(sess){
if(qd) if(qd)
qs['qd'] = qd; qs['qd'] = qd;
...@@ -148,7 +151,7 @@ exports.getQdGatherData = async (req, res, next) => { ...@@ -148,7 +151,7 @@ exports.getQdGatherData = async (req, res, next) => {
var session_body = await Session.findById(sess); var session_body = await Session.findById(sess);
if(session_body){ if(session_body){
var user = session_body.toJSON().user; var user = session_body.toJSON().user;
var match_qs = {date:moment().format('YYYYMMDD')}; var match_qs = {date:date};
var kl_qs = {status:'use'}; var kl_qs = {status:'use'};
//console.log(user); //console.log(user);
var list = []; var list = [];
...@@ -191,6 +194,23 @@ exports.getQdGatherData = async (req, res, next) => { ...@@ -191,6 +194,23 @@ exports.getQdGatherData = async (req, res, next) => {
var schedule = await Schedule.findById(item._id).populate('qd','user'); var schedule = await Schedule.findById(item._id).populate('qd','user');
list[i]['qd'] = schedule.toJSON().qd; list[i]['qd'] = schedule.toJSON().qd;
}); });
clickData = await Click.aggregate([
{
$match:{date:date}
},
{
$group:{
_id: "$qd",
sum:{ $sum:"$times" }
}
}
]);
clickData.forEach( async (item,i) => {
var qd = await Agent.findById(item._id).populate('qd','user');
//console.dir(qd.toJSON().user);
clickData[i]['_id'] = qd.toJSON().user;
});
none_tkls = await Nonetkl.find({date:match_qs['date']}).populate('qd','user').limit(1000); none_tkls = await Nonetkl.find({date:match_qs['date']}).populate('qd','user').limit(1000);
} }
console.dir(qs); console.dir(qs);
...@@ -198,7 +218,7 @@ exports.getQdGatherData = async (req, res, next) => { ...@@ -198,7 +218,7 @@ exports.getQdGatherData = async (req, res, next) => {
let total = await GatherData.count(qs,null); let total = await GatherData.count(qs,null);
let tkl_count = await Kouling.count(kl_qs,null); let tkl_count = await Kouling.count(kl_qs,null);
gatherDatas = gatherDatas.map(x => { var d = x.toJSON();d['date'] = dateFormat(d['date'],'YYYYMMDD'); return d;}); gatherDatas = gatherDatas.map(x => { var d = x.toJSON();d['date'] = dateFormat(d['date'],'YYYYMMDD'); return d;});
res.send({ status:'ok',result:gatherDatas,list:list,none_tkls:none_tkls,tkl_count:tkl_count,pagination:{total:total,skip:parseInt(skip)+1,limit:limit}}); res.send({ status:'ok',result:gatherDatas,clickData:clickData,list:list,none_tkls:none_tkls,tkl_count:tkl_count,pagination:{total:total,skip:parseInt(skip)+1,limit:limit}});
} }
else{ else{
res.status(400).send(not_login); res.status(400).send(not_login);
...@@ -209,6 +229,32 @@ exports.getQdGatherData = async (req, res, next) => { ...@@ -209,6 +229,32 @@ exports.getQdGatherData = async (req, res, next) => {
} }
exports.getDynamic = async(cb) => {
var date = moment().add(0,'hours').format('YYYYMMDD');
var list = await Log.aggregate([
{
$match:{date:date}
},
{
$group:{
_id:null,
sum:{ $sum:"$times" }
}
}]);
var clickData = await Click.aggregate([
{
$match:{date:date}
},
{
$group:{
_id:null,
sum:{ $sum:"$times" }
}
}]);
//console.dir({list:list,clickData});
cb && cb((list[0] && list[0].sum)+','+ (clickData[0]&&clickData[0].sum) +","+ moment().format('x'));
}
exports.putGatherData = async(req,res,next) => { exports.putGatherData = async(req,res,next) => {
let { dc_times = 0,id} = req.body; let { dc_times = 0,id} = req.body;
if(!id ) return res.status(400).send(not_full); if(!id ) return res.status(400).send(not_full);
...@@ -320,24 +366,31 @@ exports.getLinks = async (req, res, next) => { ...@@ -320,24 +366,31 @@ exports.getLinks = async (req, res, next) => {
} }
exports.createLink = async (req, res, next) => { exports.createLink = async (req, res, next) => {
let {quan,pid,good,name,select = 'target'} = req.body; var {quan,pid,good,name,select = 'target'} = req.body;
if(!pid || !good || !quan || !name ) console.dir((select == 'good' && !good) || (select == 'good' && (!pid || !good || !quan || !name)));
if((select == 'good' && !good) || (select != 'good' && (!pid || !good || !quan || !name)))
res.status(400).send(not_full); res.status(400).send(not_full);
else{ else{
try { try {
let quanQuery = urlArgs(url.parse(quan).query); let quanQuery = '';
if(select !== 'good' && quan) quanQuery = urlArgs(url.parse(quan).query);
let goodQuery = urlArgs(url.parse(good).query); let goodQuery = urlArgs(url.parse(good).query);
if(!pid || !goodQuery['id']) console.dir(goodQuery);
if(!goodQuery['id'])
res.status(400).send(not_full); res.status(400).send(not_full);
else{ else{
let goodInfo = await tao.getGood(goodQuery['id']); let goodInfo = await tao.getGood(goodQuery['id']);
let title = goodInfo['title']; let title = (req.body.title && req.body.title.length) ? req.body.title : goodInfo['title'];
let pic = goodInfo['pict_url'] || ''; let pic = goodInfo['pict_url'] || '';
let target = ''; let target = '';
console.dir(select);
if(select == 'target') if(select == 'target')
target = 'https://uland.taobao.com/coupon/edetail?activityId='+ quanQuery['activityId']+'&itemId='+goodQuery['id']+'&pid='+pid+'&dx=1&src=tkm_tkmwz'; target = 'https://uland.taobao.com/coupon/edetail?activityId='+ quanQuery['activityId']+'&itemId='+goodQuery['id']+'&pid='+pid+'&dx=1&src=tkm_tkmwz';
else if(select == 'good')
target = good;
if(select == 'quan')
target = quan; target = quan;
console.dir(target);
tao.saveLink({name,quan,pid,good,title,pic,target},function(e,result){ tao.saveLink({name,quan,pid,good,title,pic,target},function(e,result){
if(e) throw e; if(e) throw e;
res.send({result:'ok',result:result}) res.send({result:'ok',result:result})
......
package.json
View file @ 8e13891a
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"es6-promise": "^4.0.5", "es6-promise": "^4.0.5",
"eslint-plugin-react": "^7.1.0", "eslint-plugin-react": "^7.1.0",
"express": "^4.14.1", "express": "^4.14.1",
"express-ws": "^3.0.0",
"file-saver": "^1.3.3", "file-saver": "^1.3.3",
"jquery": "^3.2.1", "jquery": "^3.2.1",
"js-cookie": "^2.1.4", "js-cookie": "^2.1.4",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment