diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 48221cf..7003f78 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,12 @@ - - + + + + - + @@ -154,9 +178,10 @@ @@ -199,6 +224,19 @@ + + + + + + + + + + + + + @@ -217,6 +255,13 @@ + + + + + + + @@ -243,10 +288,10 @@ + - @@ -327,7 +372,14 @@ @@ -343,7 +395,7 @@ - + @@ -358,7 +410,7 @@ - + @@ -382,37 +434,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -721,20 +742,52 @@ - + - - + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/models/log/AppAccessLog.py b/common/models/log/AppAccessLog.py new file mode 100644 index 0000000..68be444 --- /dev/null +++ b/common/models/log/AppAccessLog.py @@ -0,0 +1,19 @@ +# coding: utf-8 +from sqlalchemy import BigInteger, Column, DateTime, Integer, String, Text +from sqlalchemy.schema import FetchedValue +from application import db + + + +class AppAccessLog(db.Model): + __tablename__ = 'app_access_log' + + id = db.Column(db.Integer, primary_key=True) + uid = db.Column(db.BigInteger, nullable=False, index=True, server_default=db.FetchedValue()) + referer_url = db.Column(db.String(255), nullable=False, server_default=db.FetchedValue()) + target_url = db.Column(db.String(255), nullable=False, server_default=db.FetchedValue()) + query_params = db.Column(db.Text, nullable=False) + ua = db.Column(db.String(255), nullable=False, server_default=db.FetchedValue()) + ip = db.Column(db.String(32), nullable=False, server_default=db.FetchedValue()) + note = db.Column(db.String(1000), nullable=False, server_default=db.FetchedValue()) + created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue()) diff --git a/common/models/log/AppErrorLog.py b/common/models/log/AppErrorLog.py new file mode 100644 index 0000000..84ef848 --- /dev/null +++ b/common/models/log/AppErrorLog.py @@ -0,0 +1,15 @@ +# coding: utf-8 +from sqlalchemy import Column, DateTime, Integer, String, Text +from sqlalchemy.schema import FetchedValue +from application import db + + +class AppErrorLog(db.Model): + __tablename__ = 'app_error_log' + + id = db.Column(db.Integer, primary_key=True) + referer_url = db.Column(db.String(255), nullable=False, server_default=db.FetchedValue()) + target_url = db.Column(db.String(255), nullable=False, server_default=db.FetchedValue()) + query_params = db.Column(db.Text, nullable=False) + content = db.Column(db.String, nullable=False) + created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue()) diff --git a/web/controllers/account/Account.py b/web/controllers/account/Account.py index 280a73f..36ce28c 100644 --- a/web/controllers/account/Account.py +++ b/web/controllers/account/Account.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- from flask import Blueprint,request,redirect from common.libs.Helper import ops_render,iPagination +from common.libs.UrlManager import UrlManager from common.models.User import User +from common.models.log.AppAccessLog import AppAccessLog route_account = Blueprint( 'account_page',__name__ ) from application import app,db @route_account.route( "/index" ) @@ -31,7 +33,20 @@ def index(): @route_account.route( "/info" ) def info(): - return ops_render( "account/info.html" ) + resp_data = {} + req = request.args + uid = int(req.get('id', 0)) + reback_url = UrlManager.buildUrl("/account/index") + if uid < 1: + return redirect(reback_url) + + info = User.query.filter_by(uid=uid).first() + if not info: + return redirect(reback_url) + + resp_data['info'] = info + + return ops_render("account/info.html", resp_data) @route_account.route( "/set" ) def set(): diff --git a/web/templates/account/info.html b/web/templates/account/info.html index 7efdd57..d889be9 100644 --- a/web/templates/account/info.html +++ b/web/templates/account/info.html @@ -1,22 +1,12 @@ {% extends "common/layout_main.html" %} {% block content %} -
-
-
- -
-
-
+{% include "common/tab_account.html" %}
- + 编辑

账户信息

@@ -28,9 +18,9 @@
-

姓名：gfddf

-

手机：dfgdd

-

邮箱：dfgdg

+

姓名：{{ info.nickname }}

+

手机：{{ info.mobile }}

+

邮箱：{{ info.email }}

@@ -56,7 +46,17 @@ - 暂无数据 + {% if access_list %} + {% for item in access_list %} + + {{ item.created_time }} + {{ item.target_url }} + + + {% endfor %} + {% else %} + 暂无数据~~ + {% endif %}
diff --git a/web/templates/common/tab_account.html b/web/templates/common/tab_account.html new file mode 100644 index 0000000..0da244b --- /dev/null +++ b/web/templates/common/tab_account.html @@ -0,0 +1,11 @@ +
+
+
+ +
+
+
\ No newline at end of file