diff --git a/code/apps/models/AdminModel.py b/code/apps/models/AdminModel.py index 47c05ca..0509223 100644 --- a/code/apps/models/AdminModel.py +++ b/code/apps/models/AdminModel.py @@ -2,7 +2,7 @@ # @Author: smallevil # @Date: 2020-11-24 10:48:40 # @Last Modified by: smallevil -# @Last Modified time: 2020-11-27 02:26:56 +# @Last Modified time: 2020-11-27 19:00:27 import hashlib from .TBDB import TBDB @@ -30,6 +30,9 @@ def adminLogin(self, nick, passwd): def getUserInfoByID(self, userID): return self._db.getUserInfoByID(userID) + def getLinkInfoByID(self, linkID): + return self._db.getLinkInfoByID(linkID) + #添加短链接 def addLinkInfo(self, userID, url, domain, tag): urlmd5 = self.md5(url) @@ -104,4 +107,7 @@ def statBrowser(self, linkID, date): def statAddr(self, linkID, date): return self._db.statAddr(linkID, date) + def statViewHistory(self, linkID, date, start, limit): + return self._db.statViewHistory(linkID, date, start, limit) + diff --git a/code/apps/models/TBDB.py b/code/apps/models/TBDB.py index 32d13d3..16b52bb 100644 --- a/code/apps/models/TBDB.py +++ b/code/apps/models/TBDB.py @@ -2,7 +2,7 @@ # @Author: smallevil # @Date: 2020-11-24 10:48:40 # @Last Modified by: smallevil -# @Last Modified time: 2020-11-27 17:28:53 +# @Last Modified time: 2020-11-27 18:50:50 import records from hashids import Hashids @@ -66,6 +66,20 @@ def getLinkInfoByKey(self, key): else: return None + #根据key得到短链信息 + def getLinkInfoByID(self, linkID): + if not linkID: + return None + + params = {'id':linkID} + sql = "select * from link_info where link_id=:id" + rows = self._conn.query(sql, **params) + row = rows.first(as_dict=True) + if row: + return row + else: + return None + #根据urlmd5判断是否已添加 def getLinkInfoByMD5(self, userID, urlmd5): if not urlmd5 or not userID: @@ -267,6 +281,25 @@ def statAddr(self, linkID, date): rows = self._conn.query(sql, **params) return rows.all(as_dict=True) + def statViewHistory(self, linkID, date, start, limit): + limitDate = str(arrow.get(date, 'YYYYMMDD').format('YYYY-MM-DD')) + params = {'link_id':linkID, 'date':limitDate, 'start':start, 'limit':limit} + + if self._dbType: + sql = "select * from link_record where link_id=:link_id and record_date>=:date order by record_id desc limit :start, :limit" + else: + sql = "select * from link_record where link_id=:link_id and record_date>=:date order by record_id desc limit :limit offset :start" + + info = {} + rows = self._conn.query(sql, **params) + info['list'] = rows.all(as_dict=True) + + sql = "select count(*) as total from link_record where link_id=:link_id and record_date>=:date" + rows = self._conn.query(sql, **params) + row = rows.first(as_dict=True) + info['total'] = row['total'] + + return info diff --git a/code/apps/templates/admin/add.html b/code/apps/templates/admin/add.html index 50527e1..905d858 100644 --- a/code/apps/templates/admin/add.html +++ b/code/apps/templates/admin/add.html @@ -25,7 +25,7 @@
- + diff --git a/code/apps/templates/admin/stat_addr.html b/code/apps/templates/admin/stat_addr.html index eca720f..cb7e489 100644 --- a/code/apps/templates/admin/stat_addr.html +++ b/code/apps/templates/admin/stat_addr.html @@ -24,10 +24,18 @@
+
{{ tplData.link_info.link_tag }} +
+ {% for info in tplData.urls %} + {{ info.link_tag }} + {% endfor %} +
+
PV统计 平台统计 环境统计 地区统计 + 浏览记录
今日 近7天 @@ -59,5 +67,17 @@
+ diff --git a/code/apps/templates/admin/stat_browser.html b/code/apps/templates/admin/stat_browser.html index d41c538..c7de7d7 100644 --- a/code/apps/templates/admin/stat_browser.html +++ b/code/apps/templates/admin/stat_browser.html @@ -24,10 +24,18 @@
+
{{ tplData.link_info.link_tag }} +
+ {% for info in tplData.urls %} + {{ info.link_tag }} + {% endfor %} +
+
PV统计 平台统计 环境统计 地区统计 + 浏览记录
今日 近7天 @@ -59,5 +67,17 @@
+ diff --git a/code/apps/templates/admin/stat_platform.html b/code/apps/templates/admin/stat_platform.html index 1b93055..3c92c22 100644 --- a/code/apps/templates/admin/stat_platform.html +++ b/code/apps/templates/admin/stat_platform.html @@ -24,10 +24,18 @@
+
{{ tplData.link_info.link_tag }} +
+ {% for info in tplData.urls %} + {{ info.link_tag }} + {% endfor %} +
+
PV统计 平台统计 环境统计 地区统计 + 浏览记录
今日 近7天 @@ -59,5 +67,17 @@
+ diff --git a/code/apps/templates/admin/stat_pv.html b/code/apps/templates/admin/stat_pv.html index d56f645..f1c53e8 100644 --- a/code/apps/templates/admin/stat_pv.html +++ b/code/apps/templates/admin/stat_pv.html @@ -24,10 +24,18 @@
+
{{ tplData.link_info.link_tag }} +
+ {% for info in tplData.urls %} + {{ info.link_tag }} + {% endfor %} +
+
PV统计 平台统计 环境统计 地区统计 + 浏览记录
今日 近7天 @@ -64,4 +72,17 @@ + diff --git a/code/apps/templates/admin/stat_view_history.html b/code/apps/templates/admin/stat_view_history.html new file mode 100644 index 0000000..9fe65cf --- /dev/null +++ b/code/apps/templates/admin/stat_view_history.html @@ -0,0 +1,137 @@ + + + + + + + + +浏览记录 + + + + + + + + + {% include '/admin/top_banner.html' %} + +
+ {% include '/admin/left_menu.html' %} +
+ + + + +
+
+
{{ tplData.link_info.link_tag }} +
+ {% for info in tplData.urls %} + {{ info.link_tag }} + {% endfor %} +
+
+ PV统计 + 平台统计 + 环境统计 + 地区统计 + 浏览记录 +
+ 今日 + 近7天 + 近30日 +
+
+
+ + + + + + + + + + + + + + + + {% for info in tplData.list.list %} + + + + + + + + + + {% endfor %} + + + + + +
时间IP地址类型平台环境设备
{{ info.record_ctime }} + {{ info.record_ip }} + + {{ info.record_country }}/{{ info.record_province }}/{{ info.record_city }} + + {% if info.record_ua_type == 1 %} + 机器人 + {% elif info.record_ua_type == 2 %} + PC + {% elif info.record_ua_type == 3 %} + 平板 + {% elif info.record_ua_type == 4 %} + 手机 + {% else %} + 未知 + {% endif %} + {{ info.record_platform }}{{ info.record_browser }}{{ info.record_device }}
+ +
+
+
+ + + + diff --git a/code/apps/views/admin.py b/code/apps/views/admin.py index 20d4363..5f44e59 100644 --- a/code/apps/views/admin.py +++ b/code/apps/views/admin.py @@ -2,7 +2,7 @@ # @Author: smallevil # @Date: 2020-11-24 10:48:40 # @Last Modified by: smallevil -# @Last Modified time: 2020-11-27 15:37:44 +# @Last Modified time: 2020-11-27 19:02:18 from flask import Blueprint, render_template, redirect, session, request, current_app import functools @@ -121,13 +121,13 @@ def adminAdd(): domain = request.form.get('domain') tag = request.form.get('tag') - if url and domain: + if url and domain and tag: model = AdminModel(current_app.config['DATABASE_URI']) ret = model.addLinkInfo(session.get('uid'), url, domain, tag) if ret: return redirect('/admin/urls/page/1') else: - return redirect('/error?msg=' + urllib.quote('url和域名必选')) + return redirect('/error?msg=' + urllib.quote('所有选项必填')) return redirect('/admin/add') @@ -186,13 +186,19 @@ def adminUrls(page): @admin.route('/statpv/link_id//date/', methods=['GET']) @isLogin def adminStatPV(linkID, date): - rets = {'link_id':linkID, 'list':[]} model = AdminModel(current_app.config['DATABASE_URI']) + linkInfo = model.getLinkInfoByID(linkID) + if linkInfo['user_id'] != session['uid']: + return redirect('/error?msg=' + urllib.quote('非法操作')) + + rets = {'link_id':linkID, 'list':[]} rets['list'] = model.statPV(linkID, date) rets['date'] = date rets['date1'] = str(arrow.now().format('YYYYMMDD')) rets['date7'] = str(arrow.now().shift(days=-1).format('YYYYMMDD')) rets['date30'] = str(arrow.now().shift(days=-30).format('YYYYMMDD')) + rets['urls'] = model.getUrlsByUserID(session['uid'], 0, 10)['list'] + rets['link_info'] = linkInfo return render_template('/admin/stat_pv.html', tplData=rets) @@ -200,13 +206,19 @@ def adminStatPV(linkID, date): @admin.route('/statplatform/link_id//date/', methods=['GET']) @isLogin def adminStatPlatform(linkID, date): - rets = {'link_id':linkID, 'list':[]} model = AdminModel(current_app.config['DATABASE_URI']) + linkInfo = model.getLinkInfoByID(linkID) + if linkInfo['user_id'] != session['uid']: + return redirect('/error?msg=' + urllib.quote('非法操作')) + + rets = {'link_id':linkID, 'link_info':linkInfo, 'list':[]} rets['list'] = model.statPlatform(linkID, date) rets['date'] = date rets['date1'] = str(arrow.now().format('YYYYMMDD')) rets['date7'] = str(arrow.now().shift(days=-1).format('YYYYMMDD')) rets['date30'] = str(arrow.now().shift(days=-30).format('YYYYMMDD')) + rets['urls'] = model.getUrlsByUserID(session['uid'], 0, 10)['list'] + return render_template('/admin/stat_platform.html', tplData=rets) @@ -214,27 +226,97 @@ def adminStatPlatform(linkID, date): @admin.route('/statbrowser/link_id//date/', methods=['GET']) @isLogin def adminStatBrowser(linkID, date): - rets = {'link_id':linkID, 'list':[]} model = AdminModel(current_app.config['DATABASE_URI']) + linkInfo = model.getLinkInfoByID(linkID) + if linkInfo['user_id'] != session['uid']: + return redirect('/error?msg=' + urllib.quote('非法操作')) + + rets = {'link_id':linkID, 'link_info':linkInfo, 'list':[]} rets['list'] = model.statBrowser(linkID, date) rets['date'] = date rets['date1'] = str(arrow.now().format('YYYYMMDD')) rets['date7'] = str(arrow.now().shift(days=-1).format('YYYYMMDD')) rets['date30'] = str(arrow.now().shift(days=-30).format('YYYYMMDD')) + rets['urls'] = model.getUrlsByUserID(session['uid'], 0, 10)['list'] + return render_template('/admin/stat_browser.html', tplData=rets) #环境统计 @admin.route('/stataddr/link_id//date/', methods=['GET']) @isLogin def adminStatAddr(linkID, date): - rets = {'link_id':linkID, 'list':[]} model = AdminModel(current_app.config['DATABASE_URI']) + linkInfo = model.getLinkInfoByID(linkID) + if linkInfo['user_id'] != session['uid']: + return redirect('/error?msg=' + urllib.quote('非法操作')) + + rets = {'link_id':linkID, 'link_info':linkInfo, 'list':[]} rets['list'] = model.statAddr(linkID, date) rets['date'] = date rets['date1'] = str(arrow.now().format('YYYYMMDD')) rets['date7'] = str(arrow.now().shift(days=-1).format('YYYYMMDD')) rets['date30'] = str(arrow.now().shift(days=-30).format('YYYYMMDD')) + rets['urls'] = model.getUrlsByUserID(session['uid'], 0, 10)['list'] + return render_template('/admin/stat_addr.html', tplData=rets) +#历史记录 +@admin.route('/statviewhistory/link_id//date//page/', methods=['GET']) +@isLogin +def adminStatViewHistory(linkID, date, page): + model = AdminModel(current_app.config['DATABASE_URI']) + linkInfo = model.getLinkInfoByID(linkID) + if linkInfo['user_id'] != session['uid']: + return redirect('/error?msg=' + urllib.quote('非法操作')) + + if not page: + page = 1 + + if page < 1: + page = 1 + + limit = 10 + start = (page - 1) * limit + + rets = {'link_id':linkID, 'link_info':linkInfo, 'list':[]} + rets['list'] = model.statViewHistory(linkID, date, start, limit) + rets['date'] = date + rets['date1'] = str(arrow.now().format('YYYYMMDD')) + rets['date7'] = str(arrow.now().shift(days=-1).format('YYYYMMDD')) + rets['date30'] = str(arrow.now().shift(days=-30).format('YYYYMMDD')) + rets['urls'] = model.getUrlsByUserID(session['uid'], 0, 10)['list'] + + #以下简化模板判断 + totalPage = math.ceil(rets['list']['total'] / (limit * 1.0)) + + minPage = page - 2 + if page - 2 < 1: + minPage = 1 + maxPage = 5 + else: + maxPage = page + 2 + + if maxPage > totalPage: + maxPage = totalPage + minPage = totalPage - 4 + if minPage < 1: + minPage = 1 + + rets['min_page'] = int(minPage) + rets['max_page'] = int(maxPage) + rets['total_page'] = int(totalPage) + rets['page'] = page + + rets['pre_page'] = True + if page <= minPage: + rets['pre_page'] = False + + rets['next_page'] = True + if page >= maxPage: + rets['next_page'] = False + + return render_template('/admin/stat_view_history.html', tplData=rets) + + diff --git a/code/apps/views/front.py b/code/apps/views/front.py index fbf523b..2f1e833 100644 --- a/code/apps/views/front.py +++ b/code/apps/views/front.py @@ -2,7 +2,7 @@ # @Author: smallevil # @Date: 2020-11-24 10:48:40 # @Last Modified by: smallevil -# @Last Modified time: 2020-11-27 17:30:42 +# @Last Modified time: 2020-11-27 18:12:40 import arrow, urllib import geoip2.database @@ -47,8 +47,6 @@ def frontIndex(key): url = linkInfo['link_url'] - print(key,linkInfo) - ua = request.headers.get("User-Agent") referrer = request.referrer if not referrer: