From 735d97bb26937078355e2395905ee87979d402fb Mon Sep 17 00:00:00 2001 From: freegolang Date: Fri, 12 Jan 2024 23:01:04 +0800 Subject: [PATCH 01/29] add vue api --- libs/common.py | 15 +++---- web/base.py | 19 +++++++++ web/dataTableHandler.py | 91 +++++++++++++++++++++-------------------- web/main.py | 75 +++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 52 deletions(-) diff --git a/libs/common.py b/libs/common.py index 5b03b14..55cd8dd 100644 --- a/libs/common.py +++ b/libs/common.py @@ -21,24 +21,25 @@ MYSQL_HOST = os.environ.get('MYSQL_HOST') if (os.environ.get('MYSQL_HOST') != No MYSQL_USER = os.environ.get('MYSQL_USER') if (os.environ.get('MYSQL_USER') != None) else "root" MYSQL_PWD = os.environ.get('MYSQL_PWD') if (os.environ.get('MYSQL_PWD') != None) else "mysqldb" MYSQL_DB = os.environ.get('MYSQL_DB') if (os.environ.get('MYSQL_DB') != None) else "stock_data" -MYSQL_PORT = os.environ.get('MYSQL_PORT') if (os.environ.get('MYSQL_PORT') != None) else "3306" print("MYSQL_HOST :", MYSQL_HOST, ",MYSQL_USER :", MYSQL_USER, ",MYSQL_DB :", MYSQL_DB) -MYSQL_CONN_URL = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":" + MYSQL_PORT + "/" + MYSQL_DB + "?charset=utf8mb4" +MYSQL_CONN_URL = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":3306/" + MYSQL_DB + "?charset=utf8mb4" print("MYSQL_CONN_URL :", MYSQL_CONN_URL) __version__ = "2.0.0" # 每次发布时候更新。 def engine(): - engine = create_engine(MYSQL_CONN_URL) - #encoding='utf8', convert_unicode=True) + engine = create_engine( + MYSQL_CONN_URL, + encoding='utf8', convert_unicode=True) return engine def engine_to_db(to_db): - MYSQL_CONN_URL_NEW = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":" + MYSQL_PORT + "/" + to_db + "?charset=utf8mb4" - engine = create_engine(MYSQL_CONN_URL_NEW) - #encoding='utf8', convert_unicode=True) + MYSQL_CONN_URL_NEW = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":3306/" + to_db + "?charset=utf8mb4" + engine = create_engine( + MYSQL_CONN_URL_NEW, + encoding='utf8', convert_unicode=True) return engine # 通过数据库链接 engine。 diff --git a/web/base.py b/web/base.py index 0c249f4..8c8700a 100755 --- a/web/base.py +++ b/web/base.py @@ -4,9 +4,28 @@ import tornado.web import libs.stock_web_dic as stock_web_dic import libs.common as common +import logging #基础handler，主要负责检查mysql的数据库链接。 class BaseHandler(tornado.web.RequestHandler): + def set_default_headers(self): + headers = self.request.headers + # logging.info('head的类型：',type(headers)) + origin = headers.get('origin',None) + logging.info("######################## BaseHandler ########################") + logging.info(origin) + + if origin != None and origin.find("localhost") > 0: + self.set_header("Access-Control-Allow-Credentials", "true") + self.set_header("Access-Control-Allow-Origin",origin) + self.set_header("Access-Control-Allow-Methods", "POST, GET, PUT, DELETE, OPTIONS") + self.set_header("Access-Control-Allow-Headers", "x-token, authorization, Authorization, Content-Type, Access-Control-Allow-Origin, Access-Control-Allow-Headers, X-Requested-By, Access-Control-Allow-Methods") + self.set_header("Access-Control-Expose-Headers", "Cache-Control, Content-Language, Content-Type, Expires, Last-Modified, Pragma") + # 同时定义一个option方法 + def options(self): + self.set_status(204) + self.finish() + @property def db(self): try: diff --git a/web/dataTableHandler.py b/web/dataTableHandler.py index c65e309..e58fd1f 100755 --- a/web/dataTableHandler.py +++ b/web/dataTableHandler.py @@ -29,12 +29,12 @@ WEB_EASTMONEY_URL = u""" eastmoney_name = "查看股票" -# 获得页面数据。 +# 获得页面数据，进入页面中。 class GetStockHtmlHandler(webBase.BaseHandler): @gen.coroutine def get(self): name = self.get_argument("table_name", default=None, strip=False) - stockWeb = stock_web_dic.STOCK_WEB_DATA_MAP[name] + tableInfo = stock_web_dic.STOCK_WEB_DATA_MAP[name] # self.uri_ = ("self.request.url:", self.request.uri) # print self.uri_ date_now = datetime.datetime.now() @@ -45,20 +45,20 @@ class GetStockHtmlHandler(webBase.BaseHandler): try: # 增加columns 字段中的【查看股票 东方财富】 - logging.info(eastmoney_name in stockWeb.column_names) - if eastmoney_name in stockWeb.column_names: - tmp_idx = stockWeb.column_names.index(eastmoney_name) + logging.info(eastmoney_name in tableInfo.column_names) + if eastmoney_name in tableInfo.column_names: + tmp_idx = tableInfo.column_names.index(eastmoney_name) logging.info(tmp_idx) try: # 防止重复插入数据。可能会报错。 - stockWeb.columns.remove("eastmoney_url") + tableInfo.columns.remove("eastmoney_url") except Exception as e: print("error :", e) - stockWeb.columns.insert(tmp_idx, "eastmoney_url") + tableInfo.columns.insert(tmp_idx, "eastmoney_url") except Exception as e: print("error :", e) logging.info("####################GetStockHtmlHandlerEnd") - self.render("stock_web.html", stockWeb=stockWeb, date_now=date_now_str, + self.render("tableInfo.html", tableInfo=tableInfo, date_now=date_now_str, pythonStockVersion=common.__version__, leftMenu=webBase.GetLeftMenu(self.request.uri)) @@ -66,18 +66,17 @@ class GetStockHtmlHandler(webBase.BaseHandler): # 获得股票数据内容。 class GetStockDataHandler(webBase.BaseHandler): def get(self): - + logging.info("######################## GetStockDataHandler ########################") # 获得分页参数。 start_param = self.get_argument("start", default=0, strip=False) length_param = self.get_argument("length", default=10, strip=False) print("page param:", length_param, start_param) - name_param = self.get_argument("name", default=None, strip=False) + name_param = self.get_argument("name", default="stock_zh_ah_name", strip=False) type_param = self.get_argument("type", default=None, strip=False) - stock_web = stock_web_dic.STOCK_WEB_DATA_MAP[name_param] + tableInfo = stock_web_dic.STOCK_WEB_DATA_MAP[name_param] - # https://datatables.net/manual/server-side self.set_header('Content-Type', 'application/json;charset=UTF-8') order_by_column = [] order_by_dir = [] @@ -104,12 +103,15 @@ class GetStockDataHandler(webBase.BaseHandler): # 找到字符串 str_val = val[0].decode("utf-8") if str_val != "": # 字符串。 - search_by_column.append(stock_web.columns[int_idx]) + search_by_column.append(tableInfo.columns[int_idx]) search_by_data.append(val[0].decode("utf-8")) # bytes转换字符串 # 打印日志。 search_sql = "" search_idx = 0 + + logging.info("################# search_by_column #################") + logging.info(search_by_column) logging.info(search_by_data) for item in search_by_column: @@ -122,7 +124,7 @@ class GetStockDataHandler(webBase.BaseHandler): search_sql = search_sql + " AND `%s` = '%s' " % (item, val) search_idx = search_idx + 1 - # print("stockWeb :", stock_web) + # print("tableInfo :", stock_web) order_by_sql = "" # 增加排序。 if len(order_by_column) != 0 and len(order_by_dir) != 0: @@ -130,7 +132,7 @@ class GetStockDataHandler(webBase.BaseHandler): idx = 0 for key in order_by_column: # 找到排序字段和dir。 - col_tmp = stock_web.columns[key] + col_tmp = tableInfo.columns[key] dir_tmp = order_by_dir[idx] if idx != 0: order_by_sql += " ,cast(`%s` as decimal) %s" % (col_tmp, dir_tmp) @@ -142,45 +144,44 @@ class GetStockDataHandler(webBase.BaseHandler): if int(length_param) > 0: limit_sql = " LIMIT %s , %s " % (start_param, length_param) sql = " SELECT * FROM `%s` %s %s %s " % ( - stock_web.table_name, search_sql, order_by_sql, limit_sql) - count_sql = " SELECT count(1) as num FROM `%s` %s " % (stock_web.table_name, search_sql) + tableInfo.table_name, search_sql, order_by_sql, limit_sql) + count_sql = " SELECT count(1) as num FROM `%s` %s " % (tableInfo.table_name, search_sql) logging.info("select sql : " + sql) logging.info("count sql : " + count_sql) stock_web_list = self.db.query(sql) - for tmp_obj in (stock_web_list): - logging.info("####################") - if type_param == "editor": - tmp_obj["DT_RowId"] = tmp_obj[stock_web.columns[0]] - # logging.info(tmp_obj) - try: - # 增加columns 字段中的【东方财富】 - logging.info("eastmoney_name : %s " % eastmoney_name) - if eastmoney_name in stock_web.column_names: - tmp_idx = stock_web.column_names.index(eastmoney_name) - - code_tmp = tmp_obj["code"] - # 判断上海还是 深圳，东方财富 接口要求。 - if code_tmp.startswith("6"): - code_tmp = "SH" + code_tmp - else: - code_tmp = "SZ" + code_tmp - - tmp_url = WEB_EASTMONEY_URL % (tmp_obj["code"], tmp_obj["code"], code_tmp) - tmp_obj["eastmoney_url"] = tmp_url - logging.info(tmp_idx) - logging.info(tmp_obj["eastmoney_url"]) - # logging.info(type(tmp_obj)) - # tmp.column_names.insert(tmp_idx, eastmoney_name) - except Exception as e: - print("error :", e) - stock_web_size = self.db.query(count_sql) - logging.info("stockWebList size : %s " % stock_web_size) + logging.info("tableInfoList size : %s " % stock_web_size) + + # 动态表格展示： + table_columns = [] + try: + tmp_len = len(tableInfo.columns) + logging.info("ableInfo.columns tmp_len : %s " % tmp_len) + # 循环数据，转换成对象，放入到数组中，方便前端 vue table 循环使用。 + for tmp_idx in range(0, tmp_len): + logging.info(tmp_idx) + + column = tableInfo.columns[tmp_idx] + column_name = tableInfo.column_names[tmp_idx] + + tpm_column_obj = { + "column": column, + "columnName" : column_name + } + table_columns.append(tpm_column_obj) + + except Exception as e: + print("error :", e) obj = { + "code": 20000, + "message": "success", "draw": 0, + "tableName" : tableInfo.name, + "tableColumns": table_columns, + "total": stock_web_size[0]["num"], "recordsTotal": stock_web_size[0]["num"], "recordsFiltered": stock_web_size[0]["num"], "data": stock_web_list diff --git a/web/main.py b/web/main.py index d32af45..44526d9 100755 --- a/web/main.py +++ b/web/main.py @@ -18,6 +18,7 @@ import pandas as pd import numpy as np import akshare as ak import bokeh as bh +import json class Application(tornado.web.Application): def __init__(self): @@ -25,6 +26,8 @@ class Application(tornado.web.Application): # 设置路由 (r"/", HomeHandler), (r"/stock/", HomeHandler), + (r"/stock/package_verison", PackageVersionHandler),# 包版本 + (r"/stock/menu_list", MenuListHandler), # 菜单接口 (r"/test_akshare", TestHandler),# 测试页面，做写js 测试。 (r"/test2", Test2Handler),# 测试页面，做写js 测试。 # 使用datatable 展示报表数据模块。 @@ -52,6 +55,78 @@ class Application(tornado.web.Application): user=common.MYSQL_USER, password=common.MYSQL_PWD) +# 获得包版本 handler。 +class PackageVersionHandler(webBase.BaseHandler): + @gen.coroutine + def get(self): + pandasVersion = pd.__version__ + numpyVersion = np.__version__ + akshareVersion = ak.__version__ + bokehVersion = bh.__version__ + # 返回包的版本信息。 + obj = { + "code": 20000, + "message": "success", + "pandasVersion" : pandasVersion, + "numpyVersion" : numpyVersion, + "akshareVersion" : akshareVersion, + "bokehVersion" : bokehVersion, + "stockstatsVersion": "0.3.2" + } + # logging.info("####################") + # logging.info(obj) + self.write(json.dumps(obj)) + + +# 获得菜单列表数据 handler。 +class MenuListHandler(webBase.BaseHandler): + @gen.coroutine + def get(self): + + leftMenuList = stock_web_dic.STOCK_WEB_DATA_LIST + out_data = [] + menu_name = '' + menu_children = [] + index = 0 + for table_info in leftMenuList: + print(table_info.name) + index = index + 1 + # 使用 children 作为二级菜单。 + tmp_menu = { + "name": table_info.name, + "path": "/stock/table/" + table_info.table_name + } + menu_children.append(tmp_menu) + + # 使用 type作为 一级目录 + if menu_name != table_info.type or index == len(leftMenuList): + # 进行数据循环 + if menu_name != '' : + if index != len(leftMenuList): + menu_children.pop() # 删除当前的节点信息。 + tmp_children = list(menu_children) + tmp_menu2 = { + "name": menu_name, + "path": "#", + "children": tmp_children + } + # 下一个数据清空和放置。 + menu_children = [] + menu_children.append(tmp_menu) + + out_data.append(tmp_menu2) + menu_name = table_info.type + + obj = { + "code": 20000, + "message": "success", + "data": out_data + } + print(out_data) + # self.write(json.dumps(o + self.write(json.dumps(obj)) + + # 首页handler。 class HomeHandler(webBase.BaseHandler): @gen.coroutine -- Gitee From 1d466801c4c78dfd691aa9baff5e435130724c2c Mon Sep 17 00:00:00 2001 From: freegolang Date: Sat, 28 Dec 2024 00:21:35 +0800 Subject: [PATCH 02/29] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0install=20docker?= =?UTF-8?q?=20=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 304f546..7b8de3b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,18 @@ https://gitee.com/pythonstock/stock ### 项目部署放到docker-compose + +```bash + +# 下载 docker +curl -fsSL https://get.docker.com -o get-docker.sh +sh get-docker.sh + +# +curl -L "https://www.ghproxy.cn/https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + +``` + 单独的项目部署脚本维护： https://gitee.com/pythonstock/docker-compose -- Gitee From 47c2c41596f4f6f7c07155c6115ec62306265087 Mon Sep 17 00:00:00 2001 From: freegolang Date: Wed, 1 Jan 2025 09:31:34 +0800 Subject: [PATCH 03/29] =?UTF-8?q?fix:=20=E6=9E=B6=E6=9E=84=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=8D=87=E7=BA=A7=E5=88=B0?= =?UTF-8?q?3.0=20=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BD=BF=E7=94=A8=20vue=20?= =?UTF-8?q?=E7=9A=84ui=20=E8=BF=9B=E8=A1=8C=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {docs => backend/docs}/1-todo-2020-12-06.md | 0 {docs => backend/docs}/git-push-tag.md | 0 {jobs => backend/jobs}/18h_daily_job.py | 0 {jobs => backend/jobs}/README.txt | 0 {jobs => backend/jobs}/aps_job.py | 0 {jobs => backend/jobs}/basic_job.py | 0 {jobs => backend/jobs}/cron.daily/run_daily | 0 {jobs => backend/jobs}/cron.hourly/run_hourly | 0 .../jobs}/cron.minutely/run_1minute | 0 .../jobs}/cron.monthly/run_monthly | 0 {jobs => backend/jobs}/daily_job.py | 0 .../jobs}/guess_indicators_daily_job.py | 0 .../jobs}/guess_rsrs_daily_job.py | 0 {jobs => backend/jobs}/quarter_job.py | 0 .../jobs}/restart_mnist_serving.sh | 0 {jobs => backend/jobs}/restart_web.sh | 0 {jobs => backend/jobs}/run_init.sh | 0 {jobs => backend/jobs}/run_jupyter.sh | 0 {jobs => backend/jobs}/run_web.sh | 0 {jobs => backend/jobs}/start_mariadb.sh | 0 .../test_akshare/test_stock_zh_a_daily.py | 0 .../test_akshare/test_stock_zh_a_spot.py | 0 .../test_akshare/test_stock_zh_index_spot.py | 0 {libs => backend/libs}/common.py | 0 {libs => backend/libs}/stock_web_dic.py | 0 {libs => backend/libs}/stock_web_dic.py.bk | 0 {old_jobs => backend/old_jobs}/README.md | 0 .../guess_indicators_lite_buy_daily_job.py | 0 .../guess_indicators_lite_sell_daily_job.py | 0 .../old_jobs}/guess_period_daily_job.py | 0 .../old_jobs}/guess_return_daily_job.py | 0 .../old_jobs}/guess_sklearn_ma_daily_job.py | 0 .../supervisor}/example_supervisord_conf | 0 .../supervisor}/supervisord.conf | 0 {web => backend/web}/README.md | 0 {web => backend/web}/base.py | 0 {web => backend/web}/chartHandler.py | 0 {web => backend/web}/dataEditorHandler.py | 0 {web => backend/web}/dataIndicatorsHandler.py | 0 {web => backend/web}/dataTableHandler.py | 0 {web => backend/web}/demo-chart.py | 0 {web => backend/web}/main.py | 0 {web => backend/web}/minstServingHandler.py | 0 {web => backend/web}/static/css/ace.min.css | 0 .../web}/static/css/bokeh-tables.min.css | 0 .../web}/static/css/bokeh-widgets.min.css | 0 {web => backend/web}/static/css/bokeh.min.css | 0 .../static/css/bootstrap-colorpicker.min.css | 0 .../static/css/bootstrap-datepicker3.min.css | 0 .../css/bootstrap-datetimepicker.min.css | 0 .../static/css/bootstrap-timepicker.min.css | 0 .../web}/static/css/bootstrap.min.css | 0 .../static/css/buttons.dataTables.min.css | 0 .../web}/static/css/chosen.min.css | 0 .../web}/static/css/daterangepicker.min.css | 0 .../web}/static/css/editor.dataTables.min.css | 0 .../web}/static/css/font-awesome.min.css | 0 .../web}/static/css/fonts.googleapis.com.css | 0 .../web}/static/css/jquery-ui.custom.min.css | 0 .../web}/static/css/jquery-ui.min.css | 0 .../web}/static/css/select.dataTables.min.css | 0 .../4.5.0/css/font-awesome.min.css | 0 .../4.5.0/fonts/fontawesome-webfont.ttf | Bin .../4.5.0/fonts/fontawesome-webfont.woff | Bin .../4.5.0/fonts/fontawesome-webfont.woff2 | Bin ...HCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff | Bin ...uBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff | Bin .../web}/static/img/diff-n-bokeh.png | Bin .../web}/static/img/stock-show-01.jpg | Bin .../web}/static/img/stock2-001.png | Bin .../web}/static/img/stock2-002.png | Bin .../web}/static/img/stock2-003.png | Bin ...6\344\277\241\346\224\257\344\273\230.jpg" | Bin .../web}/static/js/ace-elements.min.js | 0 .../web}/static/js/ace-extra.min.js | 0 {web => backend/web}/static/js/ace.min.js | 0 .../web}/static/js/autosize.min.js | 0 .../web}/static/js/bokeh-api.min.js | 0 .../web}/static/js/bokeh-gl.min.js | 0 .../web}/static/js/bokeh-tables.min.js | 0 .../web}/static/js/bokeh-widgets.min.js | 0 {web => backend/web}/static/js/bokeh.min.js | 0 {web => backend/web}/static/js/bootbox.js | 0 .../static/js/bootstrap-datepicker.min.js | 0 .../static/js/bootstrap-datepicker.zh-CN.js | 0 .../static/js/bootstrap-datetimepicker.min.js | 0 .../static/js/bootstrap-timepicker.min.js | 0 .../web}/static/js/bootstrap.min.js | 0 .../web}/static/js/buttons.colVis.min.js | 0 .../web}/static/js/buttons.html5.min.js | 0 .../web}/static/js/buttons.print.min.js | 0 .../web}/static/js/chosen.jquery.min.js | 0 .../web}/static/js/dataTables.buttons.min.js | 0 .../web}/static/js/dataTables.editor.min.js | 0 .../web}/static/js/dataTables.select.min.js | 0 .../web}/static/js/datatables.Chinese.json | 0 .../web}/static/js/daterangepicker.min.js | 0 {web => backend/web}/static/js/draw.js | 0 .../web}/static/js/grid.locale-en.js | 0 {web => backend/web}/static/js/holder.min.js | 0 .../web}/static/js/jquery-2.1.4.min.js | 0 .../web}/static/js/jquery-ui.custom.min.js | 0 .../web}/static/js/jquery-ui.min.js | 0 .../web}/static/js/jquery.colorbox.min.js | 0 .../js/jquery.dataTables.bootstrap.min.js | 0 .../web}/static/js/jquery.dataTables.min.js | 0 .../web}/static/js/jquery.validate.min.js | 0 {web => backend/web}/static/js/moment.min.js | 0 {web => backend/web}/static/update_bokeh.sh | 0 .../web}/templates/bokeh_embed.html | 0 .../web}/templates/common/footer.html | 0 .../web}/templates/common/header.html | 0 .../web}/templates/common/left_menu.html | 0 .../web}/templates/common/meta.html | 0 .../web}/templates/data_editor.html | 0 {web => backend/web}/templates/index.html | 0 .../web}/templates/layout/default.html | 0 .../templates/layout/indicators-main.html | 0 .../web}/templates/layout/indicators.html | 0 .../web}/templates/layout/main.html | 0 .../web}/templates/layout/single_default.html | 0 .../web}/templates/layout/single_main.html | 0 .../web}/templates/minst_serving.html | 0 .../web}/templates/stock_chart.html | 0 .../web}/templates/stock_indicators.html | 0 {web => backend/web}/templates/stock_web.html | 0 {web => backend/web}/templates/test.html | 0 {web => backend/web}/templates/test2.html | 0 {web => backend/web}/test_thread.py | 0 {web => backend/web}/test_thread_v2.py | 0 {web => backend/web}/tornado_bokeh_embed.py | 0 docker-compose/.gitignore | 14 + docker-compose/LICENSE | 201 ++++++++++ docker-compose/README.md | 60 +++ docker-compose/build_stock.sh | 16 + docker-compose/dev-docker-compose.yml | 66 +++ docker-compose/docker-compose-v2.0.yml | 57 +++ docker-compose/docker-compose.yml | 62 +++ docker-compose/docker/DevDockerfile | 103 +++++ .../docker/Dockerfile | 90 +++-- docker-compose/docker/README.md | 35 ++ build.sh => docker-compose/docker/build.sh | 7 +- docker-compose/mysql/init.sql | 45 +++ docker-compose/mysql/my.cnf | 38 ++ docker-compose/nginx.conf | 47 +++ frontend/.eslintignore | 5 + frontend/.gitignore | 16 + frontend/LICENSE | 21 + frontend/README.md | 34 ++ frontend/babel.config.js | 14 + frontend/jest.config.js | 24 ++ frontend/jsconfig.json | 9 + frontend/mock/index.js | 57 +++ frontend/mock/mock-server.js | 81 ++++ frontend/mock/table.js | 29 ++ frontend/mock/user.js | 84 ++++ frontend/mock/utils.js | 25 ++ frontend/package.json | 64 +++ frontend/postcss.config.js | 8 + frontend/public/favicon.ico | Bin 0 -> 67646 bytes frontend/public/index.html | 17 + frontend/src/App.vue | 11 + frontend/src/api/article.js | 41 ++ frontend/src/api/menu.js | 12 + frontend/src/api/package.js | 10 + frontend/src/api/table.js | 9 + frontend/src/api/user.js | 24 ++ frontend/src/assets/404_images/404.png | Bin 0 -> 98071 bytes frontend/src/assets/404_images/404_cloud.png | Bin 0 -> 4766 bytes frontend/src/components/Breadcrumb/index.vue | 78 ++++ frontend/src/components/Hamburger/index.vue | 44 ++ frontend/src/components/Pagination/index.vue | 101 +++++ frontend/src/components/SvgIcon/index.vue | 62 +++ frontend/src/directive/el-table/adaptive.js | 41 ++ frontend/src/directive/el-table/index.js | 13 + frontend/src/directive/waves/index.js | 13 + frontend/src/directive/waves/waves.css | 26 ++ frontend/src/directive/waves/waves.js | 72 ++++ frontend/src/icons/index.js | 9 + frontend/src/icons/svg/dashboard.svg | 1 + frontend/src/icons/svg/example.svg | 1 + frontend/src/icons/svg/eye-open.svg | 1 + frontend/src/icons/svg/eye.svg | 1 + frontend/src/icons/svg/form.svg | 1 + frontend/src/icons/svg/link.svg | 1 + frontend/src/icons/svg/nested.svg | 1 + frontend/src/icons/svg/password.svg | 1 + frontend/src/icons/svg/table.svg | 1 + frontend/src/icons/svg/tree.svg | 1 + frontend/src/icons/svg/user.svg | 1 + frontend/src/icons/svgo.yml | 22 + frontend/src/layout/components/AppMain.vue | 40 ++ frontend/src/layout/components/Navbar.vue | 139 +++++++ .../layout/components/Sidebar/FixiOSBug.js | 26 ++ .../src/layout/components/Sidebar/Item.vue | 41 ++ .../src/layout/components/Sidebar/Link.vue | 43 ++ .../src/layout/components/Sidebar/Logo.vue | 82 ++++ .../layout/components/Sidebar/SidebarItem.vue | 95 +++++ .../src/layout/components/Sidebar/index.vue | 56 +++ frontend/src/layout/components/index.js | 3 + frontend/src/layout/index.vue | 93 +++++ frontend/src/layout/mixin/ResizeHandler.js | 45 +++ frontend/src/main.js | 44 ++ frontend/src/permission.js | 64 +++ frontend/src/router/index.js | 128 ++++++ frontend/src/settings.js | 16 + frontend/src/store/getters.js | 8 + frontend/src/store/index.js | 19 + frontend/src/store/modules/app.js | 48 +++ frontend/src/store/modules/settings.js | 32 ++ frontend/src/store/modules/user.js | 97 +++++ frontend/src/styles/element-ui.scss | 49 +++ frontend/src/styles/index.scss | 65 +++ frontend/src/styles/mixin.scss | 28 ++ frontend/src/styles/sidebar.scss | 226 +++++++++++ frontend/src/styles/transition.scss | 48 +++ frontend/src/styles/variables.scss | 25 ++ frontend/src/utils/auth.js | 15 + frontend/src/utils/get-page-title.js | 10 + frontend/src/utils/index.js | 117 ++++++ frontend/src/utils/request.js | 86 ++++ frontend/src/utils/scroll-to.js | 58 +++ frontend/src/utils/validate.js | 20 + frontend/src/vendor/Export2Excel.js | 220 ++++++++++ frontend/src/views/404.vue | 228 +++++++++++ frontend/src/views/dashboard/index.vue | 101 +++++ frontend/src/views/form/index.vue | 85 ++++ frontend/src/views/login/index.vue | 237 +++++++++++ frontend/src/views/nested/menu1/index.vue | 7 + .../src/views/nested/menu1/menu1-1/index.vue | 7 + .../src/views/nested/menu1/menu1-2/index.vue | 7 + .../nested/menu1/menu1-2/menu1-2-1/index.vue | 5 + .../nested/menu1/menu1-2/menu1-2-2/index.vue | 5 + .../src/views/nested/menu1/menu1-3/index.vue | 5 + frontend/src/views/nested/menu2/index.vue | 5 + frontend/src/views/table/complex-table.vue | 379 ++++++++++++++++++ frontend/src/views/table/index.vue | 274 +++++++++++++ frontend/src/views/tree/index.vue | 78 ++++ frontend/tests/unit/.eslintrc.js | 5 + .../tests/unit/components/Breadcrumb.spec.js | 98 +++++ .../tests/unit/components/Hamburger.spec.js | 18 + .../tests/unit/components/SvgIcon.spec.js | 22 + frontend/tests/unit/utils/formatTime.spec.js | 30 ++ frontend/tests/unit/utils/param2Obj.spec.js | 14 + frontend/tests/unit/utils/parseTime.spec.js | 35 ++ frontend/tests/unit/utils/validate.spec.js | 17 + frontend/vue.config.js | 123 ++++++ startStock.sh | 81 ---- 248 files changed, 5763 insertions(+), 117 deletions(-) rename {docs => backend/docs}/1-todo-2020-12-06.md (100%) rename {docs => backend/docs}/git-push-tag.md (100%) rename {jobs => backend/jobs}/18h_daily_job.py (100%) rename {jobs => backend/jobs}/README.txt (100%) rename {jobs => backend/jobs}/aps_job.py (100%) rename {jobs => backend/jobs}/basic_job.py (100%) rename {jobs => backend/jobs}/cron.daily/run_daily (100%) rename {jobs => backend/jobs}/cron.hourly/run_hourly (100%) rename {jobs => backend/jobs}/cron.minutely/run_1minute (100%) rename {jobs => backend/jobs}/cron.monthly/run_monthly (100%) rename {jobs => backend/jobs}/daily_job.py (100%) rename {jobs => backend/jobs}/guess_indicators_daily_job.py (100%) rename {jobs => backend/jobs}/guess_rsrs_daily_job.py (100%) rename {jobs => backend/jobs}/quarter_job.py (100%) rename {jobs => backend/jobs}/restart_mnist_serving.sh (100%) rename {jobs => backend/jobs}/restart_web.sh (100%) rename {jobs => backend/jobs}/run_init.sh (100%) rename {jobs => backend/jobs}/run_jupyter.sh (100%) rename {jobs => backend/jobs}/run_web.sh (100%) rename {jobs => backend/jobs}/start_mariadb.sh (100%) rename {jobs => backend/jobs}/test_akshare/test_stock_zh_a_daily.py (100%) rename {jobs => backend/jobs}/test_akshare/test_stock_zh_a_spot.py (100%) rename {jobs => backend/jobs}/test_akshare/test_stock_zh_index_spot.py (100%) rename {libs => backend/libs}/common.py (100%) rename {libs => backend/libs}/stock_web_dic.py (100%) rename {libs => backend/libs}/stock_web_dic.py.bk (100%) rename {old_jobs => backend/old_jobs}/README.md (100%) rename {old_jobs => backend/old_jobs}/guess_indicators_lite_buy_daily_job.py (100%) rename {old_jobs => backend/old_jobs}/guess_indicators_lite_sell_daily_job.py (100%) rename {old_jobs => backend/old_jobs}/guess_period_daily_job.py (100%) rename {old_jobs => backend/old_jobs}/guess_return_daily_job.py (100%) rename {old_jobs => backend/old_jobs}/guess_sklearn_ma_daily_job.py (100%) rename {supervisor => backend/supervisor}/example_supervisord_conf (100%) rename {supervisor => backend/supervisor}/supervisord.conf (100%) rename {web => backend/web}/README.md (100%) rename {web => backend/web}/base.py (100%) rename {web => backend/web}/chartHandler.py (100%) rename {web => backend/web}/dataEditorHandler.py (100%) rename {web => backend/web}/dataIndicatorsHandler.py (100%) rename {web => backend/web}/dataTableHandler.py (100%) rename {web => backend/web}/demo-chart.py (100%) rename {web => backend/web}/main.py (100%) rename {web => backend/web}/minstServingHandler.py (100%) rename {web => backend/web}/static/css/ace.min.css (100%) rename {web => backend/web}/static/css/bokeh-tables.min.css (100%) rename {web => backend/web}/static/css/bokeh-widgets.min.css (100%) rename {web => backend/web}/static/css/bokeh.min.css (100%) rename {web => backend/web}/static/css/bootstrap-colorpicker.min.css (100%) rename {web => backend/web}/static/css/bootstrap-datepicker3.min.css (100%) rename {web => backend/web}/static/css/bootstrap-datetimepicker.min.css (100%) rename {web => backend/web}/static/css/bootstrap-timepicker.min.css (100%) rename {web => backend/web}/static/css/bootstrap.min.css (100%) rename {web => backend/web}/static/css/buttons.dataTables.min.css (100%) rename {web => backend/web}/static/css/chosen.min.css (100%) rename {web => backend/web}/static/css/daterangepicker.min.css (100%) rename {web => backend/web}/static/css/editor.dataTables.min.css (100%) rename {web => backend/web}/static/css/font-awesome.min.css (100%) rename {web => backend/web}/static/css/fonts.googleapis.com.css (100%) rename {web => backend/web}/static/css/jquery-ui.custom.min.css (100%) rename {web => backend/web}/static/css/jquery-ui.min.css (100%) rename {web => backend/web}/static/css/select.dataTables.min.css (100%) rename {web => backend/web}/static/font-awesome/4.5.0/css/font-awesome.min.css (100%) rename {web => backend/web}/static/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf (100%) rename {web => backend/web}/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff (100%) rename {web => backend/web}/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2 (100%) rename {web => backend/web}/static/font-awesome/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff (100%) rename {web => backend/web}/static/font-awesome/opensans/v13/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff (100%) rename {web => backend/web}/static/img/diff-n-bokeh.png (100%) rename {web => backend/web}/static/img/stock-show-01.jpg (100%) rename {web => backend/web}/static/img/stock2-001.png (100%) rename {web => backend/web}/static/img/stock2-002.png (100%) rename {web => backend/web}/static/img/stock2-003.png (100%) rename "web/static/img/\346\224\257\344\273\230\345\256\235--\345\276\256\344\277\241\346\224\257\344\273\230.jpg" => "backend/web/static/img/\346\224\257\344\273\230\345\256\235--\345\276\256\344\277\241\346\224\257\344\273\230.jpg" (100%) rename {web => backend/web}/static/js/ace-elements.min.js (100%) rename {web => backend/web}/static/js/ace-extra.min.js (100%) rename {web => backend/web}/static/js/ace.min.js (100%) rename {web => backend/web}/static/js/autosize.min.js (100%) rename {web => backend/web}/static/js/bokeh-api.min.js (100%) rename {web => backend/web}/static/js/bokeh-gl.min.js (100%) rename {web => backend/web}/static/js/bokeh-tables.min.js (100%) rename {web => backend/web}/static/js/bokeh-widgets.min.js (100%) rename {web => backend/web}/static/js/bokeh.min.js (100%) rename {web => backend/web}/static/js/bootbox.js (100%) rename {web => backend/web}/static/js/bootstrap-datepicker.min.js (100%) rename {web => backend/web}/static/js/bootstrap-datepicker.zh-CN.js (100%) rename {web => backend/web}/static/js/bootstrap-datetimepicker.min.js (100%) rename {web => backend/web}/static/js/bootstrap-timepicker.min.js (100%) rename {web => backend/web}/static/js/bootstrap.min.js (100%) rename {web => backend/web}/static/js/buttons.colVis.min.js (100%) rename {web => backend/web}/static/js/buttons.html5.min.js (100%) rename {web => backend/web}/static/js/buttons.print.min.js (100%) rename {web => backend/web}/static/js/chosen.jquery.min.js (100%) rename {web => backend/web}/static/js/dataTables.buttons.min.js (100%) rename {web => backend/web}/static/js/dataTables.editor.min.js (100%) rename {web => backend/web}/static/js/dataTables.select.min.js (100%) rename {web => backend/web}/static/js/datatables.Chinese.json (100%) rename {web => backend/web}/static/js/daterangepicker.min.js (100%) rename {web => backend/web}/static/js/draw.js (100%) rename {web => backend/web}/static/js/grid.locale-en.js (100%) rename {web => backend/web}/static/js/holder.min.js (100%) rename {web => backend/web}/static/js/jquery-2.1.4.min.js (100%) rename {web => backend/web}/static/js/jquery-ui.custom.min.js (100%) rename {web => backend/web}/static/js/jquery-ui.min.js (100%) rename {web => backend/web}/static/js/jquery.colorbox.min.js (100%) rename {web => backend/web}/static/js/jquery.dataTables.bootstrap.min.js (100%) rename {web => backend/web}/static/js/jquery.dataTables.min.js (100%) rename {web => backend/web}/static/js/jquery.validate.min.js (100%) rename {web => backend/web}/static/js/moment.min.js (100%) rename {web => backend/web}/static/update_bokeh.sh (100%) rename {web => backend/web}/templates/bokeh_embed.html (100%) rename {web => backend/web}/templates/common/footer.html (100%) rename {web => backend/web}/templates/common/header.html (100%) rename {web => backend/web}/templates/common/left_menu.html (100%) rename {web => backend/web}/templates/common/meta.html (100%) rename {web => backend/web}/templates/data_editor.html (100%) rename {web => backend/web}/templates/index.html (100%) rename {web => backend/web}/templates/layout/default.html (100%) rename {web => backend/web}/templates/layout/indicators-main.html (100%) rename {web => backend/web}/templates/layout/indicators.html (100%) rename {web => backend/web}/templates/layout/main.html (100%) rename {web => backend/web}/templates/layout/single_default.html (100%) rename {web => backend/web}/templates/layout/single_main.html (100%) rename {web => backend/web}/templates/minst_serving.html (100%) rename {web => backend/web}/templates/stock_chart.html (100%) rename {web => backend/web}/templates/stock_indicators.html (100%) rename {web => backend/web}/templates/stock_web.html (100%) rename {web => backend/web}/templates/test.html (100%) rename {web => backend/web}/templates/test2.html (100%) rename {web => backend/web}/test_thread.py (100%) rename {web => backend/web}/test_thread_v2.py (100%) rename {web => backend/web}/tornado_bokeh_embed.py (100%) create mode 100644 docker-compose/.gitignore create mode 100644 docker-compose/LICENSE create mode 100644 docker-compose/README.md create mode 100755 docker-compose/build_stock.sh create mode 100644 docker-compose/dev-docker-compose.yml create mode 100644 docker-compose/docker-compose-v2.0.yml create mode 100644 docker-compose/docker-compose.yml create mode 100644 docker-compose/docker/DevDockerfile rename Dockerfile => docker-compose/docker/Dockerfile (41%) create mode 100644 docker-compose/docker/README.md rename build.sh => docker-compose/docker/build.sh (69%) create mode 100644 docker-compose/mysql/init.sql create mode 100644 docker-compose/mysql/my.cnf create mode 100644 docker-compose/nginx.conf create mode 100644 frontend/.eslintignore create mode 100644 frontend/.gitignore create mode 100644 frontend/LICENSE create mode 100644 frontend/README.md create mode 100644 frontend/babel.config.js create mode 100644 frontend/jest.config.js create mode 100644 frontend/jsconfig.json create mode 100644 frontend/mock/index.js create mode 100644 frontend/mock/mock-server.js create mode 100644 frontend/mock/table.js create mode 100644 frontend/mock/user.js create mode 100644 frontend/mock/utils.js create mode 100644 frontend/package.json create mode 100644 frontend/postcss.config.js create mode 100644 frontend/public/favicon.ico create mode 100644 frontend/public/index.html create mode 100644 frontend/src/App.vue create mode 100644 frontend/src/api/article.js create mode 100644 frontend/src/api/menu.js create mode 100644 frontend/src/api/package.js create mode 100644 frontend/src/api/table.js create mode 100644 frontend/src/api/user.js create mode 100644 frontend/src/assets/404_images/404.png create mode 100644 frontend/src/assets/404_images/404_cloud.png create mode 100644 frontend/src/components/Breadcrumb/index.vue create mode 100644 frontend/src/components/Hamburger/index.vue create mode 100644 frontend/src/components/Pagination/index.vue create mode 100644 frontend/src/components/SvgIcon/index.vue create mode 100644 frontend/src/directive/el-table/adaptive.js create mode 100644 frontend/src/directive/el-table/index.js create mode 100644 frontend/src/directive/waves/index.js create mode 100644 frontend/src/directive/waves/waves.css create mode 100644 frontend/src/directive/waves/waves.js create mode 100644 frontend/src/icons/index.js create mode 100644 frontend/src/icons/svg/dashboard.svg create mode 100644 frontend/src/icons/svg/example.svg create mode 100644 frontend/src/icons/svg/eye-open.svg create mode 100644 frontend/src/icons/svg/eye.svg create mode 100644 frontend/src/icons/svg/form.svg create mode 100644 frontend/src/icons/svg/link.svg create mode 100644 frontend/src/icons/svg/nested.svg create mode 100644 frontend/src/icons/svg/password.svg create mode 100644 frontend/src/icons/svg/table.svg create mode 100644 frontend/src/icons/svg/tree.svg create mode 100644 frontend/src/icons/svg/user.svg create mode 100644 frontend/src/icons/svgo.yml create mode 100644 frontend/src/layout/components/AppMain.vue create mode 100644 frontend/src/layout/components/Navbar.vue create mode 100644 frontend/src/layout/components/Sidebar/FixiOSBug.js create mode 100644 frontend/src/layout/components/Sidebar/Item.vue create mode 100644 frontend/src/layout/components/Sidebar/Link.vue create mode 100644 frontend/src/layout/components/Sidebar/Logo.vue create mode 100644 frontend/src/layout/components/Sidebar/SidebarItem.vue create mode 100644 frontend/src/layout/components/Sidebar/index.vue create mode 100644 frontend/src/layout/components/index.js create mode 100644 frontend/src/layout/index.vue create mode 100644 frontend/src/layout/mixin/ResizeHandler.js create mode 100644 frontend/src/main.js create mode 100644 frontend/src/permission.js create mode 100644 frontend/src/router/index.js create mode 100644 frontend/src/settings.js create mode 100644 frontend/src/store/getters.js create mode 100644 frontend/src/store/index.js create mode 100644 frontend/src/store/modules/app.js create mode 100644 frontend/src/store/modules/settings.js create mode 100644 frontend/src/store/modules/user.js create mode 100644 frontend/src/styles/element-ui.scss create mode 100644 frontend/src/styles/index.scss create mode 100644 frontend/src/styles/mixin.scss create mode 100644 frontend/src/styles/sidebar.scss create mode 100644 frontend/src/styles/transition.scss create mode 100644 frontend/src/styles/variables.scss create mode 100644 frontend/src/utils/auth.js create mode 100644 frontend/src/utils/get-page-title.js create mode 100644 frontend/src/utils/index.js create mode 100644 frontend/src/utils/request.js create mode 100644 frontend/src/utils/scroll-to.js create mode 100644 frontend/src/utils/validate.js create mode 100644 frontend/src/vendor/Export2Excel.js create mode 100644 frontend/src/views/404.vue create mode 100644 frontend/src/views/dashboard/index.vue create mode 100644 frontend/src/views/form/index.vue create mode 100644 frontend/src/views/login/index.vue create mode 100644 frontend/src/views/nested/menu1/index.vue create mode 100644 frontend/src/views/nested/menu1/menu1-1/index.vue create mode 100644 frontend/src/views/nested/menu1/menu1-2/index.vue create mode 100644 frontend/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue create mode 100644 frontend/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue create mode 100644 frontend/src/views/nested/menu1/menu1-3/index.vue create mode 100644 frontend/src/views/nested/menu2/index.vue create mode 100644 frontend/src/views/table/complex-table.vue create mode 100644 frontend/src/views/table/index.vue create mode 100644 frontend/src/views/tree/index.vue create mode 100644 frontend/tests/unit/.eslintrc.js create mode 100644 frontend/tests/unit/components/Breadcrumb.spec.js create mode 100644 frontend/tests/unit/components/Hamburger.spec.js create mode 100644 frontend/tests/unit/components/SvgIcon.spec.js create mode 100644 frontend/tests/unit/utils/formatTime.spec.js create mode 100644 frontend/tests/unit/utils/param2Obj.spec.js create mode 100644 frontend/tests/unit/utils/parseTime.spec.js create mode 100644 frontend/tests/unit/utils/validate.spec.js create mode 100644 frontend/vue.config.js delete mode 100755 startStock.sh diff --git a/docs/1-todo-2020-12-06.md b/backend/docs/1-todo-2020-12-06.md similarity index 100% rename from docs/1-todo-2020-12-06.md rename to backend/docs/1-todo-2020-12-06.md diff --git a/docs/git-push-tag.md b/backend/docs/git-push-tag.md similarity index 100% rename from docs/git-push-tag.md rename to backend/docs/git-push-tag.md diff --git a/jobs/18h_daily_job.py b/backend/jobs/18h_daily_job.py similarity index 100% rename from jobs/18h_daily_job.py rename to backend/jobs/18h_daily_job.py diff --git a/jobs/README.txt b/backend/jobs/README.txt similarity index 100% rename from jobs/README.txt rename to backend/jobs/README.txt diff --git a/jobs/aps_job.py b/backend/jobs/aps_job.py similarity index 100% rename from jobs/aps_job.py rename to backend/jobs/aps_job.py diff --git a/jobs/basic_job.py b/backend/jobs/basic_job.py similarity index 100% rename from jobs/basic_job.py rename to backend/jobs/basic_job.py diff --git a/jobs/cron.daily/run_daily b/backend/jobs/cron.daily/run_daily similarity index 100% rename from jobs/cron.daily/run_daily rename to backend/jobs/cron.daily/run_daily diff --git a/jobs/cron.hourly/run_hourly b/backend/jobs/cron.hourly/run_hourly similarity index 100% rename from jobs/cron.hourly/run_hourly rename to backend/jobs/cron.hourly/run_hourly diff --git a/jobs/cron.minutely/run_1minute b/backend/jobs/cron.minutely/run_1minute similarity index 100% rename from jobs/cron.minutely/run_1minute rename to backend/jobs/cron.minutely/run_1minute diff --git a/jobs/cron.monthly/run_monthly b/backend/jobs/cron.monthly/run_monthly similarity index 100% rename from jobs/cron.monthly/run_monthly rename to backend/jobs/cron.monthly/run_monthly diff --git a/jobs/daily_job.py b/backend/jobs/daily_job.py similarity index 100% rename from jobs/daily_job.py rename to backend/jobs/daily_job.py diff --git a/jobs/guess_indicators_daily_job.py b/backend/jobs/guess_indicators_daily_job.py similarity index 100% rename from jobs/guess_indicators_daily_job.py rename to backend/jobs/guess_indicators_daily_job.py diff --git a/jobs/guess_rsrs_daily_job.py b/backend/jobs/guess_rsrs_daily_job.py similarity index 100% rename from jobs/guess_rsrs_daily_job.py rename to backend/jobs/guess_rsrs_daily_job.py diff --git a/jobs/quarter_job.py b/backend/jobs/quarter_job.py similarity index 100% rename from jobs/quarter_job.py rename to backend/jobs/quarter_job.py diff --git a/jobs/restart_mnist_serving.sh b/backend/jobs/restart_mnist_serving.sh similarity index 100% rename from jobs/restart_mnist_serving.sh rename to backend/jobs/restart_mnist_serving.sh diff --git a/jobs/restart_web.sh b/backend/jobs/restart_web.sh similarity index 100% rename from jobs/restart_web.sh rename to backend/jobs/restart_web.sh diff --git a/jobs/run_init.sh b/backend/jobs/run_init.sh similarity index 100% rename from jobs/run_init.sh rename to backend/jobs/run_init.sh diff --git a/jobs/run_jupyter.sh b/backend/jobs/run_jupyter.sh similarity index 100% rename from jobs/run_jupyter.sh rename to backend/jobs/run_jupyter.sh diff --git a/jobs/run_web.sh b/backend/jobs/run_web.sh similarity index 100% rename from jobs/run_web.sh rename to backend/jobs/run_web.sh diff --git a/jobs/start_mariadb.sh b/backend/jobs/start_mariadb.sh similarity index 100% rename from jobs/start_mariadb.sh rename to backend/jobs/start_mariadb.sh diff --git a/jobs/test_akshare/test_stock_zh_a_daily.py b/backend/jobs/test_akshare/test_stock_zh_a_daily.py similarity index 100% rename from jobs/test_akshare/test_stock_zh_a_daily.py rename to backend/jobs/test_akshare/test_stock_zh_a_daily.py diff --git a/jobs/test_akshare/test_stock_zh_a_spot.py b/backend/jobs/test_akshare/test_stock_zh_a_spot.py similarity index 100% rename from jobs/test_akshare/test_stock_zh_a_spot.py rename to backend/jobs/test_akshare/test_stock_zh_a_spot.py diff --git a/jobs/test_akshare/test_stock_zh_index_spot.py b/backend/jobs/test_akshare/test_stock_zh_index_spot.py similarity index 100% rename from jobs/test_akshare/test_stock_zh_index_spot.py rename to backend/jobs/test_akshare/test_stock_zh_index_spot.py diff --git a/libs/common.py b/backend/libs/common.py similarity index 100% rename from libs/common.py rename to backend/libs/common.py diff --git a/libs/stock_web_dic.py b/backend/libs/stock_web_dic.py similarity index 100% rename from libs/stock_web_dic.py rename to backend/libs/stock_web_dic.py diff --git a/libs/stock_web_dic.py.bk b/backend/libs/stock_web_dic.py.bk similarity index 100% rename from libs/stock_web_dic.py.bk rename to backend/libs/stock_web_dic.py.bk diff --git a/old_jobs/README.md b/backend/old_jobs/README.md similarity index 100% rename from old_jobs/README.md rename to backend/old_jobs/README.md diff --git a/old_jobs/guess_indicators_lite_buy_daily_job.py b/backend/old_jobs/guess_indicators_lite_buy_daily_job.py similarity index 100% rename from old_jobs/guess_indicators_lite_buy_daily_job.py rename to backend/old_jobs/guess_indicators_lite_buy_daily_job.py diff --git a/old_jobs/guess_indicators_lite_sell_daily_job.py b/backend/old_jobs/guess_indicators_lite_sell_daily_job.py similarity index 100% rename from old_jobs/guess_indicators_lite_sell_daily_job.py rename to backend/old_jobs/guess_indicators_lite_sell_daily_job.py diff --git a/old_jobs/guess_period_daily_job.py b/backend/old_jobs/guess_period_daily_job.py similarity index 100% rename from old_jobs/guess_period_daily_job.py rename to backend/old_jobs/guess_period_daily_job.py diff --git a/old_jobs/guess_return_daily_job.py b/backend/old_jobs/guess_return_daily_job.py similarity index 100% rename from old_jobs/guess_return_daily_job.py rename to backend/old_jobs/guess_return_daily_job.py diff --git a/old_jobs/guess_sklearn_ma_daily_job.py b/backend/old_jobs/guess_sklearn_ma_daily_job.py similarity index 100% rename from old_jobs/guess_sklearn_ma_daily_job.py rename to backend/old_jobs/guess_sklearn_ma_daily_job.py diff --git a/supervisor/example_supervisord_conf b/backend/supervisor/example_supervisord_conf similarity index 100% rename from supervisor/example_supervisord_conf rename to backend/supervisor/example_supervisord_conf diff --git a/supervisor/supervisord.conf b/backend/supervisor/supervisord.conf similarity index 100% rename from supervisor/supervisord.conf rename to backend/supervisor/supervisord.conf diff --git a/web/README.md b/backend/web/README.md similarity index 100% rename from web/README.md rename to backend/web/README.md diff --git a/web/base.py b/backend/web/base.py similarity index 100% rename from web/base.py rename to backend/web/base.py diff --git a/web/chartHandler.py b/backend/web/chartHandler.py similarity index 100% rename from web/chartHandler.py rename to backend/web/chartHandler.py diff --git a/web/dataEditorHandler.py b/backend/web/dataEditorHandler.py similarity index 100% rename from web/dataEditorHandler.py rename to backend/web/dataEditorHandler.py diff --git a/web/dataIndicatorsHandler.py b/backend/web/dataIndicatorsHandler.py similarity index 100% rename from web/dataIndicatorsHandler.py rename to backend/web/dataIndicatorsHandler.py diff --git a/web/dataTableHandler.py b/backend/web/dataTableHandler.py similarity index 100% rename from web/dataTableHandler.py rename to backend/web/dataTableHandler.py diff --git a/web/demo-chart.py b/backend/web/demo-chart.py similarity index 100% rename from web/demo-chart.py rename to backend/web/demo-chart.py diff --git a/web/main.py b/backend/web/main.py similarity index 100% rename from web/main.py rename to backend/web/main.py diff --git a/web/minstServingHandler.py b/backend/web/minstServingHandler.py similarity index 100% rename from web/minstServingHandler.py rename to backend/web/minstServingHandler.py diff --git a/web/static/css/ace.min.css b/backend/web/static/css/ace.min.css similarity index 100% rename from web/static/css/ace.min.css rename to backend/web/static/css/ace.min.css diff --git a/web/static/css/bokeh-tables.min.css b/backend/web/static/css/bokeh-tables.min.css similarity index 100% rename from web/static/css/bokeh-tables.min.css rename to backend/web/static/css/bokeh-tables.min.css diff --git a/web/static/css/bokeh-widgets.min.css b/backend/web/static/css/bokeh-widgets.min.css similarity index 100% rename from web/static/css/bokeh-widgets.min.css rename to backend/web/static/css/bokeh-widgets.min.css diff --git a/web/static/css/bokeh.min.css b/backend/web/static/css/bokeh.min.css similarity index 100% rename from web/static/css/bokeh.min.css rename to backend/web/static/css/bokeh.min.css diff --git a/web/static/css/bootstrap-colorpicker.min.css b/backend/web/static/css/bootstrap-colorpicker.min.css similarity index 100% rename from web/static/css/bootstrap-colorpicker.min.css rename to backend/web/static/css/bootstrap-colorpicker.min.css diff --git a/web/static/css/bootstrap-datepicker3.min.css b/backend/web/static/css/bootstrap-datepicker3.min.css similarity index 100% rename from web/static/css/bootstrap-datepicker3.min.css rename to backend/web/static/css/bootstrap-datepicker3.min.css diff --git a/web/static/css/bootstrap-datetimepicker.min.css b/backend/web/static/css/bootstrap-datetimepicker.min.css similarity index 100% rename from web/static/css/bootstrap-datetimepicker.min.css rename to backend/web/static/css/bootstrap-datetimepicker.min.css diff --git a/web/static/css/bootstrap-timepicker.min.css b/backend/web/static/css/bootstrap-timepicker.min.css similarity index 100% rename from web/static/css/bootstrap-timepicker.min.css rename to backend/web/static/css/bootstrap-timepicker.min.css diff --git a/web/static/css/bootstrap.min.css b/backend/web/static/css/bootstrap.min.css similarity index 100% rename from web/static/css/bootstrap.min.css rename to backend/web/static/css/bootstrap.min.css diff --git a/web/static/css/buttons.dataTables.min.css b/backend/web/static/css/buttons.dataTables.min.css similarity index 100% rename from web/static/css/buttons.dataTables.min.css rename to backend/web/static/css/buttons.dataTables.min.css diff --git a/web/static/css/chosen.min.css b/backend/web/static/css/chosen.min.css similarity index 100% rename from web/static/css/chosen.min.css rename to backend/web/static/css/chosen.min.css diff --git a/web/static/css/daterangepicker.min.css b/backend/web/static/css/daterangepicker.min.css similarity index 100% rename from web/static/css/daterangepicker.min.css rename to backend/web/static/css/daterangepicker.min.css diff --git a/web/static/css/editor.dataTables.min.css b/backend/web/static/css/editor.dataTables.min.css similarity index 100% rename from web/static/css/editor.dataTables.min.css rename to backend/web/static/css/editor.dataTables.min.css diff --git a/web/static/css/font-awesome.min.css b/backend/web/static/css/font-awesome.min.css similarity index 100% rename from web/static/css/font-awesome.min.css rename to backend/web/static/css/font-awesome.min.css diff --git a/web/static/css/fonts.googleapis.com.css b/backend/web/static/css/fonts.googleapis.com.css similarity index 100% rename from web/static/css/fonts.googleapis.com.css rename to backend/web/static/css/fonts.googleapis.com.css diff --git a/web/static/css/jquery-ui.custom.min.css b/backend/web/static/css/jquery-ui.custom.min.css similarity index 100% rename from web/static/css/jquery-ui.custom.min.css rename to backend/web/static/css/jquery-ui.custom.min.css diff --git a/web/static/css/jquery-ui.min.css b/backend/web/static/css/jquery-ui.min.css similarity index 100% rename from web/static/css/jquery-ui.min.css rename to backend/web/static/css/jquery-ui.min.css diff --git a/web/static/css/select.dataTables.min.css b/backend/web/static/css/select.dataTables.min.css similarity index 100% rename from web/static/css/select.dataTables.min.css rename to backend/web/static/css/select.dataTables.min.css diff --git a/web/static/font-awesome/4.5.0/css/font-awesome.min.css b/backend/web/static/font-awesome/4.5.0/css/font-awesome.min.css similarity index 100% rename from web/static/font-awesome/4.5.0/css/font-awesome.min.css rename to backend/web/static/font-awesome/4.5.0/css/font-awesome.min.css diff --git a/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf b/backend/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf rename to backend/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf diff --git a/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff b/backend/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff similarity index 100% rename from web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff rename to backend/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff diff --git a/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2 b/backend/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2 rename to backend/web/static/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2 diff --git a/web/static/font-awesome/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff b/backend/web/static/font-awesome/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff similarity index 100% rename from web/static/font-awesome/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff rename to backend/web/static/font-awesome/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff diff --git a/web/static/font-awesome/opensans/v13/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff b/backend/web/static/font-awesome/opensans/v13/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff similarity index 100% rename from web/static/font-awesome/opensans/v13/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff rename to backend/web/static/font-awesome/opensans/v13/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff diff --git a/web/static/img/diff-n-bokeh.png b/backend/web/static/img/diff-n-bokeh.png similarity index 100% rename from web/static/img/diff-n-bokeh.png rename to backend/web/static/img/diff-n-bokeh.png diff --git a/web/static/img/stock-show-01.jpg b/backend/web/static/img/stock-show-01.jpg similarity index 100% rename from web/static/img/stock-show-01.jpg rename to backend/web/static/img/stock-show-01.jpg diff --git a/web/static/img/stock2-001.png b/backend/web/static/img/stock2-001.png similarity index 100% rename from web/static/img/stock2-001.png rename to backend/web/static/img/stock2-001.png diff --git a/web/static/img/stock2-002.png b/backend/web/static/img/stock2-002.png similarity index 100% rename from web/static/img/stock2-002.png rename to backend/web/static/img/stock2-002.png diff --git a/web/static/img/stock2-003.png b/backend/web/static/img/stock2-003.png similarity index 100% rename from web/static/img/stock2-003.png rename to backend/web/static/img/stock2-003.png diff --git "a/web/static/img/\346\224\257\344\273\230\345\256\235--\345\276\256\344\277\241\346\224\257\344\273\230.jpg" "b/backend/web/static/img/\346\224\257\344\273\230\345\256\235--\345\276\256\344\277\241\346\224\257\344\273\230.jpg" similarity index 100% rename from "web/static/img/\346\224\257\344\273\230\345\256\235--\345\276\256\344\277\241\346\224\257\344\273\230.jpg" rename to "backend/web/static/img/\346\224\257\344\273\230\345\256\235--\345\276\256\344\277\241\346\224\257\344\273\230.jpg" diff --git a/web/static/js/ace-elements.min.js b/backend/web/static/js/ace-elements.min.js similarity index 100% rename from web/static/js/ace-elements.min.js rename to backend/web/static/js/ace-elements.min.js diff --git a/web/static/js/ace-extra.min.js b/backend/web/static/js/ace-extra.min.js similarity index 100% rename from web/static/js/ace-extra.min.js rename to backend/web/static/js/ace-extra.min.js diff --git a/web/static/js/ace.min.js b/backend/web/static/js/ace.min.js similarity index 100% rename from web/static/js/ace.min.js rename to backend/web/static/js/ace.min.js diff --git a/web/static/js/autosize.min.js b/backend/web/static/js/autosize.min.js similarity index 100% rename from web/static/js/autosize.min.js rename to backend/web/static/js/autosize.min.js diff --git a/web/static/js/bokeh-api.min.js b/backend/web/static/js/bokeh-api.min.js similarity index 100% rename from web/static/js/bokeh-api.min.js rename to backend/web/static/js/bokeh-api.min.js diff --git a/web/static/js/bokeh-gl.min.js b/backend/web/static/js/bokeh-gl.min.js similarity index 100% rename from web/static/js/bokeh-gl.min.js rename to backend/web/static/js/bokeh-gl.min.js diff --git a/web/static/js/bokeh-tables.min.js b/backend/web/static/js/bokeh-tables.min.js similarity index 100% rename from web/static/js/bokeh-tables.min.js rename to backend/web/static/js/bokeh-tables.min.js diff --git a/web/static/js/bokeh-widgets.min.js b/backend/web/static/js/bokeh-widgets.min.js similarity index 100% rename from web/static/js/bokeh-widgets.min.js rename to backend/web/static/js/bokeh-widgets.min.js diff --git a/web/static/js/bokeh.min.js b/backend/web/static/js/bokeh.min.js similarity index 100% rename from web/static/js/bokeh.min.js rename to backend/web/static/js/bokeh.min.js diff --git a/web/static/js/bootbox.js b/backend/web/static/js/bootbox.js similarity index 100% rename from web/static/js/bootbox.js rename to backend/web/static/js/bootbox.js diff --git a/web/static/js/bootstrap-datepicker.min.js b/backend/web/static/js/bootstrap-datepicker.min.js similarity index 100% rename from web/static/js/bootstrap-datepicker.min.js rename to backend/web/static/js/bootstrap-datepicker.min.js diff --git a/web/static/js/bootstrap-datepicker.zh-CN.js b/backend/web/static/js/bootstrap-datepicker.zh-CN.js similarity index 100% rename from web/static/js/bootstrap-datepicker.zh-CN.js rename to backend/web/static/js/bootstrap-datepicker.zh-CN.js diff --git a/web/static/js/bootstrap-datetimepicker.min.js b/backend/web/static/js/bootstrap-datetimepicker.min.js similarity index 100% rename from web/static/js/bootstrap-datetimepicker.min.js rename to backend/web/static/js/bootstrap-datetimepicker.min.js diff --git a/web/static/js/bootstrap-timepicker.min.js b/backend/web/static/js/bootstrap-timepicker.min.js similarity index 100% rename from web/static/js/bootstrap-timepicker.min.js rename to backend/web/static/js/bootstrap-timepicker.min.js diff --git a/web/static/js/bootstrap.min.js b/backend/web/static/js/bootstrap.min.js similarity index 100% rename from web/static/js/bootstrap.min.js rename to backend/web/static/js/bootstrap.min.js diff --git a/web/static/js/buttons.colVis.min.js b/backend/web/static/js/buttons.colVis.min.js similarity index 100% rename from web/static/js/buttons.colVis.min.js rename to backend/web/static/js/buttons.colVis.min.js diff --git a/web/static/js/buttons.html5.min.js b/backend/web/static/js/buttons.html5.min.js similarity index 100% rename from web/static/js/buttons.html5.min.js rename to backend/web/static/js/buttons.html5.min.js diff --git a/web/static/js/buttons.print.min.js b/backend/web/static/js/buttons.print.min.js similarity index 100% rename from web/static/js/buttons.print.min.js rename to backend/web/static/js/buttons.print.min.js diff --git a/web/static/js/chosen.jquery.min.js b/backend/web/static/js/chosen.jquery.min.js similarity index 100% rename from web/static/js/chosen.jquery.min.js rename to backend/web/static/js/chosen.jquery.min.js diff --git a/web/static/js/dataTables.buttons.min.js b/backend/web/static/js/dataTables.buttons.min.js similarity index 100% rename from web/static/js/dataTables.buttons.min.js rename to backend/web/static/js/dataTables.buttons.min.js diff --git a/web/static/js/dataTables.editor.min.js b/backend/web/static/js/dataTables.editor.min.js similarity index 100% rename from web/static/js/dataTables.editor.min.js rename to backend/web/static/js/dataTables.editor.min.js diff --git a/web/static/js/dataTables.select.min.js b/backend/web/static/js/dataTables.select.min.js similarity index 100% rename from web/static/js/dataTables.select.min.js rename to backend/web/static/js/dataTables.select.min.js diff --git a/web/static/js/datatables.Chinese.json b/backend/web/static/js/datatables.Chinese.json similarity index 100% rename from web/static/js/datatables.Chinese.json rename to backend/web/static/js/datatables.Chinese.json diff --git a/web/static/js/daterangepicker.min.js b/backend/web/static/js/daterangepicker.min.js similarity index 100% rename from web/static/js/daterangepicker.min.js rename to backend/web/static/js/daterangepicker.min.js diff --git a/web/static/js/draw.js b/backend/web/static/js/draw.js similarity index 100% rename from web/static/js/draw.js rename to backend/web/static/js/draw.js diff --git a/web/static/js/grid.locale-en.js b/backend/web/static/js/grid.locale-en.js similarity index 100% rename from web/static/js/grid.locale-en.js rename to backend/web/static/js/grid.locale-en.js diff --git a/web/static/js/holder.min.js b/backend/web/static/js/holder.min.js similarity index 100% rename from web/static/js/holder.min.js rename to backend/web/static/js/holder.min.js diff --git a/web/static/js/jquery-2.1.4.min.js b/backend/web/static/js/jquery-2.1.4.min.js similarity index 100% rename from web/static/js/jquery-2.1.4.min.js rename to backend/web/static/js/jquery-2.1.4.min.js diff --git a/web/static/js/jquery-ui.custom.min.js b/backend/web/static/js/jquery-ui.custom.min.js similarity index 100% rename from web/static/js/jquery-ui.custom.min.js rename to backend/web/static/js/jquery-ui.custom.min.js diff --git a/web/static/js/jquery-ui.min.js b/backend/web/static/js/jquery-ui.min.js similarity index 100% rename from web/static/js/jquery-ui.min.js rename to backend/web/static/js/jquery-ui.min.js diff --git a/web/static/js/jquery.colorbox.min.js b/backend/web/static/js/jquery.colorbox.min.js similarity index 100% rename from web/static/js/jquery.colorbox.min.js rename to backend/web/static/js/jquery.colorbox.min.js diff --git a/web/static/js/jquery.dataTables.bootstrap.min.js b/backend/web/static/js/jquery.dataTables.bootstrap.min.js similarity index 100% rename from web/static/js/jquery.dataTables.bootstrap.min.js rename to backend/web/static/js/jquery.dataTables.bootstrap.min.js diff --git a/web/static/js/jquery.dataTables.min.js b/backend/web/static/js/jquery.dataTables.min.js similarity index 100% rename from web/static/js/jquery.dataTables.min.js rename to backend/web/static/js/jquery.dataTables.min.js diff --git a/web/static/js/jquery.validate.min.js b/backend/web/static/js/jquery.validate.min.js similarity index 100% rename from web/static/js/jquery.validate.min.js rename to backend/web/static/js/jquery.validate.min.js diff --git a/web/static/js/moment.min.js b/backend/web/static/js/moment.min.js similarity index 100% rename from web/static/js/moment.min.js rename to backend/web/static/js/moment.min.js diff --git a/web/static/update_bokeh.sh b/backend/web/static/update_bokeh.sh similarity index 100% rename from web/static/update_bokeh.sh rename to backend/web/static/update_bokeh.sh diff --git a/web/templates/bokeh_embed.html b/backend/web/templates/bokeh_embed.html similarity index 100% rename from web/templates/bokeh_embed.html rename to backend/web/templates/bokeh_embed.html diff --git a/web/templates/common/footer.html b/backend/web/templates/common/footer.html similarity index 100% rename from web/templates/common/footer.html rename to backend/web/templates/common/footer.html diff --git a/web/templates/common/header.html b/backend/web/templates/common/header.html similarity index 100% rename from web/templates/common/header.html rename to backend/web/templates/common/header.html diff --git a/web/templates/common/left_menu.html b/backend/web/templates/common/left_menu.html similarity index 100% rename from web/templates/common/left_menu.html rename to backend/web/templates/common/left_menu.html diff --git a/web/templates/common/meta.html b/backend/web/templates/common/meta.html similarity index 100% rename from web/templates/common/meta.html rename to backend/web/templates/common/meta.html diff --git a/web/templates/data_editor.html b/backend/web/templates/data_editor.html similarity index 100% rename from web/templates/data_editor.html rename to backend/web/templates/data_editor.html diff --git a/web/templates/index.html b/backend/web/templates/index.html similarity index 100% rename from web/templates/index.html rename to backend/web/templates/index.html diff --git a/web/templates/layout/default.html b/backend/web/templates/layout/default.html similarity index 100% rename from web/templates/layout/default.html rename to backend/web/templates/layout/default.html diff --git a/web/templates/layout/indicators-main.html b/backend/web/templates/layout/indicators-main.html similarity index 100% rename from web/templates/layout/indicators-main.html rename to backend/web/templates/layout/indicators-main.html diff --git a/web/templates/layout/indicators.html b/backend/web/templates/layout/indicators.html similarity index 100% rename from web/templates/layout/indicators.html rename to backend/web/templates/layout/indicators.html diff --git a/web/templates/layout/main.html b/backend/web/templates/layout/main.html similarity index 100% rename from web/templates/layout/main.html rename to backend/web/templates/layout/main.html diff --git a/web/templates/layout/single_default.html b/backend/web/templates/layout/single_default.html similarity index 100% rename from web/templates/layout/single_default.html rename to backend/web/templates/layout/single_default.html diff --git a/web/templates/layout/single_main.html b/backend/web/templates/layout/single_main.html similarity index 100% rename from web/templates/layout/single_main.html rename to backend/web/templates/layout/single_main.html diff --git a/web/templates/minst_serving.html b/backend/web/templates/minst_serving.html similarity index 100% rename from web/templates/minst_serving.html rename to backend/web/templates/minst_serving.html diff --git a/web/templates/stock_chart.html b/backend/web/templates/stock_chart.html similarity index 100% rename from web/templates/stock_chart.html rename to backend/web/templates/stock_chart.html diff --git a/web/templates/stock_indicators.html b/backend/web/templates/stock_indicators.html similarity index 100% rename from web/templates/stock_indicators.html rename to backend/web/templates/stock_indicators.html diff --git a/web/templates/stock_web.html b/backend/web/templates/stock_web.html similarity index 100% rename from web/templates/stock_web.html rename to backend/web/templates/stock_web.html diff --git a/web/templates/test.html b/backend/web/templates/test.html similarity index 100% rename from web/templates/test.html rename to backend/web/templates/test.html diff --git a/web/templates/test2.html b/backend/web/templates/test2.html similarity index 100% rename from web/templates/test2.html rename to backend/web/templates/test2.html diff --git a/web/test_thread.py b/backend/web/test_thread.py similarity index 100% rename from web/test_thread.py rename to backend/web/test_thread.py diff --git a/web/test_thread_v2.py b/backend/web/test_thread_v2.py similarity index 100% rename from web/test_thread_v2.py rename to backend/web/test_thread_v2.py diff --git a/web/tornado_bokeh_embed.py b/backend/web/tornado_bokeh_embed.py similarity index 100% rename from web/tornado_bokeh_embed.py rename to backend/web/tornado_bokeh_embed.py diff --git a/docker-compose/.gitignore b/docker-compose/.gitignore new file mode 100644 index 0000000..41ed8c8 --- /dev/null +++ b/docker-compose/.gitignore @@ -0,0 +1,14 @@ +# C extensions +*.so + +data +.idea +*.iml +.DS_Store +*.zip +*.log +*.pyc +doc +/bin +pkg +*.tmp \ No newline at end of file diff --git a/docker-compose/LICENSE b/docker-compose/LICENSE new file mode 100644 index 0000000..29f81d8 --- /dev/null +++ b/docker-compose/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/docker-compose/README.md b/docker-compose/README.md new file mode 100644 index 0000000..520cf3a --- /dev/null +++ b/docker-compose/README.md @@ -0,0 +1,60 @@ +## 镜像仓库选择 + +https://github.com/DaoCloud/public-image-mirror + +```bash + +# python使用镜像 +docker.m.daocloud.io/library/python:3.11-slim-bullseye + +# mysql使用： +docker.m.daocloud.io/library/mysql:8 + +``` + + +## 本地部署方法 + + +``` +git clone git@gitee.com:pythonstock/docker-compose.git + +cd docker-compose + +docker-compose up -d + +``` + +## 访问地址 + +http://localhost:9999/ + + + +## 查看日至，进入项目代码 + +``` +# 查看启动日志： +docker logs -f stock + +# 进入stock容器 +docker exec -it stock bash +``` + +## 开发模式，映射stock 代码方法 + +直接使用 dev yml 即可，会映射stock到/data/stock 然后在外部修改代码容器中运行即可。 + +```bash +docker-compose -f dev-docker-compose.yml up -d +``` + +```bash +docker-compose -f docker-compose-v2.0.yml up -d +``` + +## 老镜像还保存一个版本 + +``` +pythonstock/pythonstock:v2021 +``` \ No newline at end of file diff --git a/docker-compose/build_stock.sh b/docker-compose/build_stock.sh new file mode 100755 index 0000000..ee099b1 --- /dev/null +++ b/docker-compose/build_stock.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +cd ../stock + +NOW_MONTH=$(date "+%Y-%m") + +DOCKER_TAG=pythonstock/pythonstock:latest +DOCKER_TAG_MONTH=pythonstock/pythonstock:stock-${NOW_MONTH} + +echo " docker build -f Dockerfile -t ${DOCKER_TAG} ." +docker build -f Dockerfile -t ${DOCKER_TAG} . +echo " docker build tag xxx ${DOCKER_TAG_MONTH} " +echo "#################################################################" +echo " docker push ${DOCKER_TAG} " + + diff --git a/docker-compose/dev-docker-compose.yml b/docker-compose/dev-docker-compose.yml new file mode 100644 index 0000000..8cfdf6e --- /dev/null +++ b/docker-compose/dev-docker-compose.yml @@ -0,0 +1,66 @@ +networks: + stock-dev-network: + driver: bridge + +version: "3" +services: + stock: + image: pythonstock/pythonstock-dev:latest + build: + context: . + dockerfile: docker/DevDockerfile + container_name: stock + ports: + - "8888:8888" + - "9999:9999" + volumes: + # 设置开发目录，方便开发调试 + - "../backend:/data/stock" + - "../backend/supervisor:/data/supervisor" + - "./data/notebooks:/data/notebooks" + - "./data/logs:/data/logs" + environment: + MYSQL_HOST: mysql-stock + MYSQL_USER: root + MYSQL_PWD: mysql-stock + MYSQL_DB: stock_data + MYSQL_PORT: 3306 + LANG: zh_CN.UTF-8 + LC_CTYPE: zh_CN.UTF-8 + PYTHONIOENCODING: utf-8 + restart: always + networks: + stock-dev-network: {} + # 入口写死，手动启动应用。 + #entrypoint: sleep 999999d + depends_on: + - mysql-stock + mysql-stock: + # image: hub.atomgit.com/library/mysql:5.7 + # https://hub.atomgit.com/repos/amd64/mysql + image: docker.m.daocloud.io/library/mysql:8 + container_name: mysql-stock + # 执行命令：https://juejin.cn/s/mysql%20healthcheck%20docker-compose + healthcheck: + test: ["CMD", "mysqladmin" ,"ping", "-uroot", "-pmysql-stock"] + interval: 10s + timeout: 5s + retries: 5 + ports: + - "3306:3306" + networks: + stock-dev-network: {} + volumes: + - "./mysql/my.cnf:/etc/mysql/my.cnf" + - "./data/mysql-stock/data:/var/lib/mysql" + - ./mysql/init.sql:/docker-entrypoint-initdb.d/init.sql + environment: + MYSQL_ROOT_PASSWORD: mysql-stock + MYSQL_DATABASE: stock_data + TZ: Asia/Shanghai + command: [ + '--character-set-server=utf8mb4', + '--collation-server=utf8mb4_general_ci', + '--max_connections=3000' + ] + restart: always diff --git a/docker-compose/docker-compose-v2.0.yml b/docker-compose/docker-compose-v2.0.yml new file mode 100644 index 0000000..8e56d50 --- /dev/null +++ b/docker-compose/docker-compose-v2.0.yml @@ -0,0 +1,57 @@ +networks: + stock-network: + driver: bridge + +version: "3" +services: + stock: + image: pythonstock/pythonstock:latest + container_name: stock + ports: + - "8888:8888" + - "9999:9999" + networks: + stock-network: {} + volumes: + - "./data/notebooks:/data/notebooks" + - "./data/logs:/data/logs" + environment: + MYSQL_HOST: mysqlstock + MYSQL_USER: root + MYSQL_PWD: mysqlstock + MYSQL_DB: stock_data + MYSQL_PORT: 3306 + LANG: zh_CN.UTF-8 + LC_CTYPE: zh_CN.UTF-8 + PYTHONIOENCODING: utf-8 + links: + - mysqlstock:mysqlstock + restart: always + mysqlstock: + image: mysql:5.7 + container_name: mysqlstock + # 执行命令：https://juejin.cn/s/mysql%20healthcheck%20docker-compose + healthcheck: + test: ["CMD", "mysqladmin" ,"ping", "-uroot", "-pmysqlstock"] + interval: 10s + timeout: 5s + retries: 5 + ports: + - "3306:3306" + networks: + stock-network: {} + volumes: + - "./mysql/my.cnf:/etc/mysql/my.cnf" + - "./data/mysqlstock/data:/var/lib/mysql" + - ./mysql/init.sql:/docker-entrypoint-initdb.d/init.sql + environment: + MYSQL_ROOT_PASSWORD: mysqlstock + MYSQL_DATABASE: stock_data + TZ: Asia/Shanghai + command: [ + '--character-set-server=utf8mb4', + '--collation-server=utf8mb4_general_ci', + '--max_connections=3000' + ] + restart: always + diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml new file mode 100644 index 0000000..4b81ba0 --- /dev/null +++ b/docker-compose/docker-compose.yml @@ -0,0 +1,62 @@ +networks: + stock-network: + driver: bridge + +version: "3" +services: + stock: + image: pythonstock/pythonstock-prod:latest + build: + context: . + dockerfile: docker/Dockerfile + container_name: stock + ports: + - "8888:8888" + - "9999:9999" + networks: + stock-network: {} + volumes: + - "./data/notebooks:/data/notebooks" + - "./data/logs:/data/logs" + environment: + MYSQL_HOST: mysqlstock + MYSQL_USER: root + MYSQL_PWD: mysqlstock + MYSQL_DB: stock_data + MYSQL_PORT: 3306 + LANG: zh_CN.UTF-8 + LC_CTYPE: zh_CN.UTF-8 + PYTHONIOENCODING: utf-8 + links: + - mysqlstock:mysqlstock + restart: always + mysqlstock: + # image: hub.atomgit.com/library/mysql:5.7 + # https://hub.atomgit.com/repos/amd64/mysql + image: docker.m.daocloud.io/library/mysql:8 + container_name: mysqlstock + # 执行命令：https://juejin.cn/s/mysql%20healthcheck%20docker-compose + healthcheck: + test: ["CMD", "mysqladmin" ,"ping", "-uroot", "-pmysqlstock"] + interval: 10s + timeout: 5s + retries: 5 + ports: + - "3306:3306" + networks: + stock-network: {} + volumes: + - "./mysql/my.cnf:/etc/mysql/my.cnf" + - "./data/mysqlstock/data:/var/lib/mysql" + - ./mysql/init.sql:/docker-entrypoint-initdb.d/init.sql + environment: + MYSQL_ROOT_PASSWORD: mysqlstock + MYSQL_DATABASE: stock_data + TZ: Asia/Shanghai + command: [ + '--character-set-server=utf8mb4', + '--collation-server=utf8mb4_general_ci', + '--max_connections=3000' + ] + restart: always + diff --git a/docker-compose/docker/DevDockerfile b/docker-compose/docker/DevDockerfile new file mode 100644 index 0000000..c8c8a68 --- /dev/null +++ b/docker-compose/docker/DevDockerfile @@ -0,0 +1,103 @@ +#使用 python:3.8-slim 做基础镜像减少大小。其中tensorflow再用另外的镜像跑数据。 + +# 之前使用的是python:3.6-slim +# 可以更新 3.8-slim-bullseye slim-bullseye + +# https://hub.docker.com/_/python?tab=tags&page=1&name=3.8-slim-bullseye +# 用这个做为基础镜像，防止每次都进行构建。 + +#FROM docker.io/python:3.8-slim-bullseye +#FROM hub.atomgit.com/amd64/python:3.8-slim-bullseye +# https://hub.atomgit.com/repos/amd64/python +#FROM hub.atomgit.com/amd64/python:3.11-slim-bullseye +FROM docker.m.daocloud.io/library/python:3.11-slim-bullseye + +# https://opsx.alibaba.com/mirror +# 使用阿里云镜像地址。修改debian apt 更新地址，pip 地址，设置时区。 +# 设置debian的镜像源 +RUN echo "deb http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \ +echo "deb http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \ +echo "[global]\n\ +trusted-host=mirrors.aliyun.com\n\ +index-url=http://mirrors.aliyun.com/pypi/simple" > /etc/pip.conf && \ +ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo "Asia/Shanghai" > /etc/timezone + +#增加语言utf-8 +ENV LANG=zh_CN.UTF-8 +ENV LC_CTYPE=zh_CN.UTF-8 +ENV LC_ALL=C +ENV PYTHONPATH=/data/stock + +# 增加 TensorFlow 的支持，使用最新的2.0 编写代码。目前还是使用 1.x 吧，还没有学明白。 +# RUN pip3 install tensorflow==2.0.0-rc1 keras +# RUN pip3 install tensorflow keras sklearn + +# 设置 vim 的语言配置 +RUN mkdir -p /etc/vim/ && \ + echo "set fileencodings=utf-8,ucs-bom,gb18030,gbk,gb2312,cp936" >> /etc/vim/vimrc && \ + echo "set termencoding=utf-8" >> /etc/vim/vimrc && \ + echo "set encoding=utf-8" >> /etc/vim/vimrc + +# 安装 mysqlclient akshare (pandas ,numpy) tornado bokeh +# 安装 nodejs 库 +# apt-get autoremove -y 删除没有用的依赖lib。减少镜像大小。1MB 也要节省。 +# apt-get --purge remove 软件包名称 , 删除已安装包（不保留配置文件)。 +RUN apt-get update && apt-get install -y git pkg-config net-tools procps gcc make python3-dev default-libmysqlclient-dev libxml2-dev cron && \ + pip3 install mysqlclient sqlalchemy && \ + pip3 install supervisor && \ + pip3 install numpy pandas && \ + pip3 install akshare --upgrade && \ + apt-get install -y nodejs && \ + pip3 install tornado torndb && \ + pip3 install bokeh stockstats scikit-learn && \ + apt-get --purge remove -y gcc make python3-dev default-libmysqlclient-dev libxml2-dev && \ + rm -rf /root/.cache/* && apt-get clean && apt-get autoremove -y && \ + cd /usr/local/lib/python3.11/site-packages && find ./ -name *.pyc | xargs rm -f + +# /usr/local/lib/python3.11/site-packages/pandas/ +# 1.解决 pandas 数据插入问题。直接修改数据库驱动 sqlalchemy +# 修改：statement.replace("INSERT INTO","INSERT IGNORE INTO") +# /usr/local/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/mysqldb.py +# 增加了一个 IGNORE 参数。 +# 2.解决torndb在python3下面的问题： +# http://blog.csdn.net/littlethunder/article/details/8917378 +# 3. 解决 type 问题，使用sed 进行替换。 +# File "/usr/local/lib/python3.11/site-packages/torndb.py", line 260, in +# CONVERSIONS[field_type] = [(FLAG.BINARY, str)] + CONVERSIONS[field_type] +# TypeError: can only concatenate list (not "type") to list + +RUN echo `date +%Y-%m-%d:%H:%M:%S` >> /etc/docker.build && \ + sed -i -e 's/executemany(statement/executemany(statement.replace\("INSERT INTO","INSERT IGNORE INTO")/g' \ + /usr/local/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/mysqldb.py && \ + rm -f /etc/cron.daily/apt-compat /etc/cron.daily/dpkg /etc/cron.daily/passwd && \ + sed -i -e 's/itertools\.izip/zip/g' \ + /usr/local/lib/python3.11/site-packages/torndb.py && \ + sed -i -e 's/\+ CONVERSIONS\[field_type\]/\+ \[CONVERSIONS\[field_type\],bytes\]/g' \ + /usr/local/lib/python3.11/site-packages/torndb.py + + +#add cron sesrvice. +#每分钟，每小时1分钟，每天1点1分，每月1号执行 +RUN mkdir -p /etc/cron.minutely && mkdir -p /etc/cron.hourly && mkdir -p /etc/cron.monthly && mkdir -p /var/spool/cron/crontabs && \ + echo "SHELL=/bin/sh \n\ +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \n\ +# min hour day month weekday command \n\ +*/1 * * * * /bin/run-parts /etc/cron.minutely \n\ +10 * * * * /bin/run-parts /etc/cron.hourly \n\ +30 16 * * * /bin/run-parts /etc/cron.daily \n\ +30 17 1,10,20 * * /bin/run-parts /etc/cron.monthly \n" > /var/spool/cron/crontabs/root && \ + chmod 600 /var/spool/cron/crontabs/root + + +#增加服务端口就两个 6006 8500 9001 +EXPOSE 8888 9999 + +ENTRYPOINT ["supervisord","-n","-c","/data/supervisor/supervisord.conf"] + diff --git a/Dockerfile b/docker-compose/docker/Dockerfile similarity index 41% rename from Dockerfile rename to docker-compose/docker/Dockerfile index a388c54..c8c8a68 100644 --- a/Dockerfile +++ b/docker-compose/docker/Dockerfile @@ -1,14 +1,16 @@ +#使用 python:3.8-slim 做基础镜像减少大小。其中tensorflow再用另外的镜像跑数据。 -# 拆分基础镜像： docker/dockerfile -# 基础镜像，按照季度，月度更新。不影响应用镜像的构建。 +# 之前使用的是python:3.6-slim +# 可以更新 3.8-slim-bullseye slim-bullseye -FROM pythonstock/pythonstock:base-2023-06 as builder +# https://hub.docker.com/_/python?tab=tags&page=1&name=3.8-slim-bullseye +# 用这个做为基础镜像，防止每次都进行构建。 -# 拷贝本地文件到目录 -COPY . /data - -# service -FROM docker.io/python:3.8-slim-bullseye +#FROM docker.io/python:3.8-slim-bullseye +#FROM hub.atomgit.com/amd64/python:3.8-slim-bullseye +# https://hub.atomgit.com/repos/amd64/python +#FROM hub.atomgit.com/amd64/python:3.11-slim-bullseye +FROM docker.m.daocloud.io/library/python:3.11-slim-bullseye # https://opsx.alibaba.com/mirror # 使用阿里云镜像地址。修改debian apt 更新地址，pip 地址，设置时区。 @@ -33,7 +35,53 @@ ENV LC_CTYPE=zh_CN.UTF-8 ENV LC_ALL=C ENV PYTHONPATH=/data/stock -WORKDIR /data +# 增加 TensorFlow 的支持，使用最新的2.0 编写代码。目前还是使用 1.x 吧，还没有学明白。 +# RUN pip3 install tensorflow==2.0.0-rc1 keras +# RUN pip3 install tensorflow keras sklearn + +# 设置 vim 的语言配置 +RUN mkdir -p /etc/vim/ && \ + echo "set fileencodings=utf-8,ucs-bom,gb18030,gbk,gb2312,cp936" >> /etc/vim/vimrc && \ + echo "set termencoding=utf-8" >> /etc/vim/vimrc && \ + echo "set encoding=utf-8" >> /etc/vim/vimrc + +# 安装 mysqlclient akshare (pandas ,numpy) tornado bokeh +# 安装 nodejs 库 +# apt-get autoremove -y 删除没有用的依赖lib。减少镜像大小。1MB 也要节省。 +# apt-get --purge remove 软件包名称 , 删除已安装包（不保留配置文件)。 +RUN apt-get update && apt-get install -y git pkg-config net-tools procps gcc make python3-dev default-libmysqlclient-dev libxml2-dev cron && \ + pip3 install mysqlclient sqlalchemy && \ + pip3 install supervisor && \ + pip3 install numpy pandas && \ + pip3 install akshare --upgrade && \ + apt-get install -y nodejs && \ + pip3 install tornado torndb && \ + pip3 install bokeh stockstats scikit-learn && \ + apt-get --purge remove -y gcc make python3-dev default-libmysqlclient-dev libxml2-dev && \ + rm -rf /root/.cache/* && apt-get clean && apt-get autoremove -y && \ + cd /usr/local/lib/python3.11/site-packages && find ./ -name *.pyc | xargs rm -f + +# /usr/local/lib/python3.11/site-packages/pandas/ +# 1.解决 pandas 数据插入问题。直接修改数据库驱动 sqlalchemy +# 修改：statement.replace("INSERT INTO","INSERT IGNORE INTO") +# /usr/local/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/mysqldb.py +# 增加了一个 IGNORE 参数。 +# 2.解决torndb在python3下面的问题： +# http://blog.csdn.net/littlethunder/article/details/8917378 +# 3. 解决 type 问题，使用sed 进行替换。 +# File "/usr/local/lib/python3.11/site-packages/torndb.py", line 260, in +# CONVERSIONS[field_type] = [(FLAG.BINARY, str)] + CONVERSIONS[field_type] +# TypeError: can only concatenate list (not "type") to list + +RUN echo `date +%Y-%m-%d:%H:%M:%S` >> /etc/docker.build && \ + sed -i -e 's/executemany(statement/executemany(statement.replace\("INSERT INTO","INSERT IGNORE INTO")/g' \ + /usr/local/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/mysqldb.py && \ + rm -f /etc/cron.daily/apt-compat /etc/cron.daily/dpkg /etc/cron.daily/passwd && \ + sed -i -e 's/itertools\.izip/zip/g' \ + /usr/local/lib/python3.11/site-packages/torndb.py && \ + sed -i -e 's/\+ CONVERSIONS\[field_type\]/\+ \[CONVERSIONS\[field_type\],bytes\]/g' \ + /usr/local/lib/python3.11/site-packages/torndb.py + #add cron sesrvice. #每分钟，每小时1分钟，每天1点1分，每月1号执行 @@ -51,27 +99,5 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \n\ #增加服务端口就两个 6006 8500 9001 EXPOSE 8888 9999 +ENTRYPOINT ["supervisord","-n","-c","/data/supervisor/supervisord.conf"] -# 直接使用基础镜像然后拷贝 site-packages 安装包即可。 -COPY --from=builder /data/jobs /data/stock/jobs -COPY --from=builder /data/libs /data/stock/libs -COPY --from=builder /data/web /data/stock/web -COPY --from=builder /data/supervisor /data/supervisor -# 拷贝二进制文件。 -COPY --from=builder /usr/local/bin/supervisord /usr/local/bin/supervisord -COPY --from=builder /usr/lib/x86_64-linux-gnu/libmariadb.so.3 /usr/lib/x86_64-linux-gnu/libmariadb.so.3 - -# 拷贝 cron 定时任务： -COPY --from=builder /data/jobs/cron.minutely /etc/cron.minutely -COPY --from=builder /data/jobs/cron.hourly /etc/cron.hourly -COPY --from=builder /data/jobs/cron.daily /etc/cron.daily -COPY --from=builder /data/jobs/cron.monthly /etc/cron.monthly - -# 拷贝类库 -COPY --from=builder /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages - -RUN mkdir -p /data/logs && ls /data/stock/ && chmod 755 /data/stock/jobs/run_* && \ - chmod 755 /etc/cron.minutely/* && chmod 755 /etc/cron.hourly/* && \ - chmod 755 /etc/cron.daily/* && chmod 755 /etc/cron.monthly/* - -ENTRYPOINT ["supervisord","-n","-c","/data/supervisor/supervisord.conf"] \ No newline at end of file diff --git a/docker-compose/docker/README.md b/docker-compose/docker/README.md new file mode 100644 index 0000000..c69c9fc --- /dev/null +++ b/docker-compose/docker/README.md @@ -0,0 +1,35 @@ + +# python 基础镜像 + +基础镜像升级到 2020年7月的版本 + +保证运行的最少基础环境，基础环境使用python3.6的版本。安装了超级多的lib库。非常的好用。 + +mysqlclient +sqlalchemy +requests +numpy +tushare +tornado torndb +bokeh +stockstats +ta-lib +jupyter +sklearn + +# 2021年6月版本，使用 akshare 替换掉 tushare 库 + +akshare 地址： + +https://www.akshare.xyz/zh_CN/latest/introduction.html + +AKShare 是基于 Python 的财经数据接口库, 目的是实现对股票、期货、期权、基金、外汇、债券、指数、 +加密货币等金融产品的基本面数据、实时和历史行情数据、衍生数据从数据采集、数据清洗到数据落地的一套工具, +主要用于学术研究目的。 + + +# 2021年 9 月版本，镜像裁剪，supervisor 使用python3 + +supervisor 使用 python3 后好像减少了不少大小。 +同时删除掉一直没有用的 ta-lib 和 jupyter 。升级python基础镜像。 + diff --git a/build.sh b/docker-compose/docker/build.sh similarity index 69% rename from build.sh rename to docker-compose/docker/build.sh index 5a545bd..d0ccd21 100755 --- a/build.sh +++ b/docker-compose/docker/build.sh @@ -1,14 +1,13 @@ #!/bin/sh -DOCKER_TAG=pythonstock/pythonstock:latest -sudo rm -rf data -sudo rm -f jobs/nohup.out +NOW_MONTH=$(date "+%Y-%m") + +DOCKER_TAG=pythonstock/pythonstock:base-${NOW_MONTH} echo " docker build -f Dockerfile -t ${DOCKER_TAG} ." docker build -f Dockerfile -t ${DOCKER_TAG} . echo "#################################################################" echo " docker push ${DOCKER_TAG} " -mkdir data diff --git a/docker-compose/mysql/init.sql b/docker-compose/mysql/init.sql new file mode 100644 index 0000000..6bc963b --- /dev/null +++ b/docker-compose/mysql/init.sql @@ -0,0 +1,45 @@ +SET character_set_client = utf8; +-- 切库： +use stock_data; +-- 建表 + +CREATE TABLE IF NOT EXISTS `stock_zh_a_spot_em` ( + `code` varchar(255) CHARACTER SET utf8 NOT NULL PRIMARY KEY, + `name` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `last_price` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `change_percent` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `change_amount` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `volume` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `turnover` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `amplitude` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `high` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `low` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `open` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `closed` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `volume_ratio` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `turnover_rate` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `pe_ratio` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `pb_ratio` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `market_cap` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `circulating_market_cap` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `rise_speed` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `change_5min` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `change_ercent_60day` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `ytd_change_percent` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `date` varchar(255) CHARACTER SET utf8 DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE IF NOT EXISTS `stock_lhb_ggtj_sina` ( + `code` varchar(255) CHARACTER SET utf8 NOT NULL, + `name` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `ranking_times` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `sum_buy` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `sum_sell` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `net_amount` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `buy_seat` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `sell_seat` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `date` varchar(255) CHARACTER SET utf8 NOT NULL, + PRIMARY KEY (`date`,`code`), + KEY `ix_stock_data_stock_lhb_ggtj_sina_code` (`code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + diff --git a/docker-compose/mysql/my.cnf b/docker-compose/mysql/my.cnf new file mode 100644 index 0000000..4392d8c --- /dev/null +++ b/docker-compose/mysql/my.cnf @@ -0,0 +1,38 @@ +# https://blog.csdn.net/aichogn/article/details/117788275 +# mysql 推荐配置 +[client] +socket=/var/lib/mysql/mysql.sock +port=3306 +[mysqld] + +basedir=/var/lib/mysql/ +datadir=/var/lib/mysql/data +socket=/var/lib/mysql/mysql.sock +default-storage-engine=INNODB +character_set_server=utf8mb4 +collation_server=utf8mb4_general_ci + +port=3306 +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +server_id=1 + + ## 最大连接数,MySQL服务器允许的最大连接数16384,连接数越多消耗内存越多 +max_connections = 1000 +## 日志过期时间,包括二进制日志(过期自动删除) +# expire_logs_days = 15 +## Enable Per Table Data for InnoDB to shrink ibdata1(innoDB表优化) +innodb_file_per_table = 1 +#默认128M,用于存储页面缓存数据外，另外正常情况下还有大约8%的开销，主要用在每个缓存页帧的描述、adaptive hash等数据结构,适当的增加这个参数的大小，可以有效的减少 InnoDB 类型的表的磁盘 I/O +innodb_buffer_pool_size = 2048M +innodb_log_file_size = 512M +#默认是8MB,InnoDB在写事务日志的时候，为了提高性能，也是先将信息写入Innofb Log Buffer中，当满足innodb_flush_log_trx_commit参数所设置的相应条件(或者日志缓冲区写满)之后，才会将日志写到文件 (或者同步到磁盘)中 +innodb_log_buffer_size = 8M +innodb_flush_log_at_trx_commit = 2 +#表大小写不敏感 +lower_case_table_names=1 +#跳过密码 安装完后屏蔽该选项 +#skip-grant-tables +#关闭 binlog +skip-log-bin \ No newline at end of file diff --git a/docker-compose/nginx.conf b/docker-compose/nginx.conf new file mode 100644 index 0000000..af68832 --- /dev/null +++ b/docker-compose/nginx.conf @@ -0,0 +1,47 @@ +# 设置nginx启动 +# systemctl enable nginx +server { + listen 8080; + server_name www.pythonstock.com; + root /usr/share/nginx/html; + + error_page 404 /404.html; + error_page 500 502 503 504 /50x.html; + + # 开启gzip + gzip on; + # 启用gzip压缩的最小文件；小于设置值的文件将不会被压缩 + gzip_min_length 1k; + # gzip 压缩级别 1-10 + gzip_comp_level 2; + # 进行压缩的文件类型。 + gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; + # 是否在http header中添加Vary: Accept-Encoding，建议开启 + gzip_vary on; + + access_log /var/log/nginx/stock.access.log main; + error_log /var/log/nginx/stock.error.log warn; + + # https://medium.com/aviabird/413-414-request-url-entity-too-large-error-nginx-b6dcece6f5dd + # 解决GET 参数过长问题。 + client_max_body_size 10M; + large_client_header_buffers 4 20k; + + + location ^~ /static/ { + access_log off; + # 需要把源代码,再下载一遍。 + root /data/pythonstock/stock/web; + expires 30d; # 设置30天超时 + # 参考 https://www.cnblogs.com/kevingrace/p/10459429.html + # add_header Cache-Control max-age=360000; + } + + location / { + proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://127.0.0.1:9999; + expires 0; + } +} \ No newline at end of file diff --git a/frontend/.eslintignore b/frontend/.eslintignore new file mode 100644 index 0000000..6b04c85 --- /dev/null +++ b/frontend/.eslintignore @@ -0,0 +1,5 @@ +build/*.js +src/assets +public +dist +eslint-disable \ No newline at end of file diff --git a/frontend/.gitignore b/frontend/.gitignore new file mode 100644 index 0000000..b488630 --- /dev/null +++ b/frontend/.gitignore @@ -0,0 +1,16 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +package-lock.json +tests/**/coverage/ + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln \ No newline at end of file diff --git a/frontend/LICENSE b/frontend/LICENSE new file mode 100644 index 0000000..6151575 --- /dev/null +++ b/frontend/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017-present PanJiaChen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/frontend/README.md b/frontend/README.md new file mode 100644 index 0000000..456471c --- /dev/null +++ b/frontend/README.md @@ -0,0 +1,34 @@ +### 说明，项目迁移到了Gitee 啦，最后一次修改，2023-06-02 执行存档 + +项目迁移到这里了：此项目后续更新访问这里： + +https://gitee.com/pythonstock/stock-ui + +github项目后续就Archives存档了，不再更新了！ + +csdn的pythonstock专栏地址，相关资料都在这里有说明： + +https://blog.csdn.net/freewebsys/category_9285317.html + + +## 1，股票系统前端项目 + +使用vue-element-admin的模板进行项目开发： + +https://panjiachen.github.io/vue-element-admin-site/zh/guide/ + +模板源自： +https://gitee.com/panjiachen/vue-admin-template + +【相关python stock资料分类】： +http://blog.csdn.net/freewebsys/article/category/7076584 + + +## 2，动态展示表格 + +http://localhost:9528/#/example/table + + +在.eslintrc.js 文件中配置 eslint-disable 指令来关闭ESlint语法检测。 + + diff --git a/frontend/babel.config.js b/frontend/babel.config.js new file mode 100644 index 0000000..fb82b27 --- /dev/null +++ b/frontend/babel.config.js @@ -0,0 +1,14 @@ +module.exports = { + presets: [ + // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app + '@vue/cli-plugin-babel/preset' + ], + 'env': { + 'development': { + // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). + // This plugin can significantly increase the speed of hot updates, when you have a large number of pages. + // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html + 'plugins': ['dynamic-import-node'] + } + } +} diff --git a/frontend/jest.config.js b/frontend/jest.config.js new file mode 100644 index 0000000..143cdc8 --- /dev/null +++ b/frontend/jest.config.js @@ -0,0 +1,24 @@ +module.exports = { + moduleFileExtensions: ['js', 'jsx', 'json', 'vue'], + transform: { + '^.+\\.vue$': 'vue-jest', + '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': + 'jest-transform-stub', + '^.+\\.jsx?$': 'babel-jest' + }, + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + snapshotSerializers: ['jest-serializer-vue'], + testMatch: [ + '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)' + ], + collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'], + coverageDirectory: '/tests/unit/coverage', + // 'collectCoverage': true, + 'coverageReporters': [ + 'lcov', + 'text-summary' + ], + testURL: 'http://localhost/' +} diff --git a/frontend/jsconfig.json b/frontend/jsconfig.json new file mode 100644 index 0000000..ed079e2 --- /dev/null +++ b/frontend/jsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": "./", + "paths": { + "@/*": ["src/*"] + } + }, + "exclude": ["node_modules", "dist"] +} diff --git a/frontend/mock/index.js b/frontend/mock/index.js new file mode 100644 index 0000000..c514c13 --- /dev/null +++ b/frontend/mock/index.js @@ -0,0 +1,57 @@ +const Mock = require('mockjs') +const { param2Obj } = require('./utils') + +const user = require('./user') +const table = require('./table') + +const mocks = [ + ...user, + ...table +] + +// for front mock +// please use it cautiously, it will redefine XMLHttpRequest, +// which will cause many of your third-party libraries to be invalidated(like progress event). +function mockXHR() { + // mock patch + // https://github.com/nuysoft/Mock/issues/300 + Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send + Mock.XHR.prototype.send = function() { + if (this.custom.xhr) { + this.custom.xhr.withCredentials = this.withCredentials || false + + if (this.responseType) { + this.custom.xhr.responseType = this.responseType + } + } + this.proxy_send(...arguments) + } + + function XHR2ExpressReqWrap(respond) { + return function(options) { + let result = null + if (respond instanceof Function) { + const { body, type, url } = options + // https://expressjs.com/en/4x/api.html#req + result = respond({ + method: type, + body: JSON.parse(body), + query: param2Obj(url) + }) + } else { + result = respond + } + return Mock.mock(result) + } + } + + for (const i of mocks) { + Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response)) + } +} + +module.exports = { + mocks, + mockXHR +} + diff --git a/frontend/mock/mock-server.js b/frontend/mock/mock-server.js new file mode 100644 index 0000000..8941ec0 --- /dev/null +++ b/frontend/mock/mock-server.js @@ -0,0 +1,81 @@ +const chokidar = require('chokidar') +const bodyParser = require('body-parser') +const chalk = require('chalk') +const path = require('path') +const Mock = require('mockjs') + +const mockDir = path.join(process.cwd(), 'mock') + +function registerRoutes(app) { + let mockLastIndex + const { mocks } = require('./index.js') + const mocksForServer = mocks.map(route => { + return responseFake(route.url, route.type, route.response) + }) + for (const mock of mocksForServer) { + app[mock.type](mock.url, mock.response) + mockLastIndex = app._router.stack.length + } + const mockRoutesLength = Object.keys(mocksForServer).length + return { + mockRoutesLength: mockRoutesLength, + mockStartIndex: mockLastIndex - mockRoutesLength + } +} + +function unregisterRoutes() { + Object.keys(require.cache).forEach(i => { + if (i.includes(mockDir)) { + delete require.cache[require.resolve(i)] + } + }) +} + +// for mock server +const responseFake = (url, type, respond) => { + return { + url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`), + type: type || 'get', + response(req, res) { + console.log('request invoke:' + req.path) + res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond)) + } + } +} + +module.exports = app => { + // parse app.body + // https://expressjs.com/en/4x/api.html#req.body + app.use(bodyParser.json()) + app.use(bodyParser.urlencoded({ + extended: true + })) + + const mockRoutes = registerRoutes(app) + var mockRoutesLength = mockRoutes.mockRoutesLength + var mockStartIndex = mockRoutes.mockStartIndex + + // watch files, hot reload mock server + chokidar.watch(mockDir, { + ignored: /mock-server/, + ignoreInitial: true + }).on('all', (event, path) => { + if (event === 'change' || event === 'add') { + try { + // remove mock routes stack + app._router.stack.splice(mockStartIndex, mockRoutesLength) + + // clear routes cache + unregisterRoutes() + + const mockRoutes = registerRoutes(app) + mockRoutesLength = mockRoutes.mockRoutesLength + mockStartIndex = mockRoutes.mockStartIndex + + console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed ${path}`)) + } catch (error) { + console.log(chalk.redBright(error)) + } + } + }) +} diff --git a/frontend/mock/table.js b/frontend/mock/table.js new file mode 100644 index 0000000..bd0e013 --- /dev/null +++ b/frontend/mock/table.js @@ -0,0 +1,29 @@ +const Mock = require('mockjs') + +const data = Mock.mock({ + 'items|30': [{ + id: '@id', + title: '@sentence(10, 20)', + 'status|1': ['published', 'draft', 'deleted'], + author: 'name', + display_time: '@datetime', + pageviews: '@integer(300, 5000)' + }] +}) + +module.exports = [ + { + url: '/vue-admin-template/table/list', + type: 'get', + response: config => { + const items = data.items + return { + code: 20000, + data: { + total: items.length, + items: items + } + } + } + } +] diff --git a/frontend/mock/user.js b/frontend/mock/user.js new file mode 100644 index 0000000..7555338 --- /dev/null +++ b/frontend/mock/user.js @@ -0,0 +1,84 @@ + +const tokens = { + admin: { + token: 'admin-token' + }, + editor: { + token: 'editor-token' + } +} + +const users = { + 'admin-token': { + roles: ['admin'], + introduction: 'I am a super administrator', + avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif', + name: 'Super Admin' + }, + 'editor-token': { + roles: ['editor'], + introduction: 'I am an editor', + avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif', + name: 'Normal Editor' + } +} + +module.exports = [ + // user login + { + url: '/vue-admin-template/user/login', + type: 'post', + response: config => { + const { username } = config.body + const token = tokens[username] + + // mock error + if (!token) { + return { + code: 60204, + message: 'Account and password are incorrect.' + } + } + + return { + code: 20000, + data: token + } + } + }, + + // get user info + { + url: '/vue-admin-template/user/info\.*', + type: 'get', + response: config => { + const { token } = config.query + const info = users[token] + + // mock error + if (!info) { + return { + code: 50008, + message: 'Login failed, unable to get user details.' + } + } + + return { + code: 20000, + data: info + } + } + }, + + // user logout + { + url: '/vue-admin-template/user/logout', + type: 'post', + response: _ => { + return { + code: 20000, + data: 'success' + } + } + } +] diff --git a/frontend/mock/utils.js b/frontend/mock/utils.js new file mode 100644 index 0000000..95cc27d --- /dev/null +++ b/frontend/mock/utils.js @@ -0,0 +1,25 @@ +/** + * @param {string} url + * @returns {Object} + */ +function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} + +module.exports = { + param2Obj +} diff --git a/frontend/package.json b/frontend/package.json new file mode 100644 index 0000000..bc2ab4d --- /dev/null +++ b/frontend/package.json @@ -0,0 +1,64 @@ +{ + "name": "vue-admin-template", + "version": "4.4.0", + "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", + "author": "Pan ", + "scripts": { + "dev": "./node_modules/.bin/vue-cli-service serve", + "build:prod": "./node_modules/.bin/vue-cli-service build", + "build:stage": "./node_modules/.bin/vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "svgo": "./node_modules/.bin/svgo -f src/icons/svg --config=src/icons/svgo.yml", + "lint": "./node_modules/.bin/eslint --ext .js,.vue src", + "test:unit": "./node_modules/.bin/jest --clearCache && vue-cli-service test:unit", + "test:ci": "npm run lint && npm run test:unit" + }, + "dependencies": { + "axios": "0.18.1", + "core-js": "^3.26.1", + "element-ui": "2.13.2", + "file-saver": "^2.0.5", + "js-cookie": "2.2.0", + "normalize.css": "7.0.0", + "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", + "vue": "2.6.10", + "vue-router": "3.0.6", + "vuex": "3.1.0", + "xlsx": "^0.18.5" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "4.4.4", + "@vue/cli-plugin-eslint": "4.4.4", + "@vue/cli-plugin-unit-jest": "4.4.4", + "@vue/cli-service": "4.4.4", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "9.5.1", + "babel-eslint": "10.1.0", + "babel-jest": "23.6.0", + "babel-plugin-dynamic-import-node": "2.3.3", + "chalk": "2.4.2", + "connect": "3.6.6", + "eslint": "6.7.2", + "eslint-plugin-vue": "6.2.2", + "html-webpack-plugin": "3.2.0", + "mockjs": "1.0.1-beta3", + "runjs": "4.3.2", + "sass": "1.26.8", + "sass-loader": "8.0.2", + "script-ext-html-webpack-plugin": "2.1.3", + "serve-static": "1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.2", + "vue-template-compiler": "2.6.10" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ], + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "license": "MIT" +} diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js new file mode 100644 index 0000000..10473ef --- /dev/null +++ b/frontend/postcss.config.js @@ -0,0 +1,8 @@ +// https://github.com/michael-ciniawsky/postcss-load-config + +module.exports = { + 'plugins': { + // to edit target browsers: use "browserslist" field in package.json + 'autoprefixer': {} + } +} diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..34b63ac63a87ee3ea8e7a0f3f5b5406c437e2112 GIT binary patch literal 67646 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 X;@D+E7Ad=S_FbjlW&KY_+xPzm3MBT? literal 0 HcmV?d00001 diff --git a/frontend/public/index.html b/frontend/public/index.html new file mode 100644 index 0000000..fa2be91 --- /dev/null +++ b/frontend/public/index.html @@ -0,0 +1,17 @@ + + + + + + + + <%= webpackConfig.name %> + + + +
+ + + diff --git a/frontend/src/App.vue b/frontend/src/App.vue new file mode 100644 index 0000000..ec9032c --- /dev/null +++ b/frontend/src/App.vue @@ -0,0 +1,11 @@ + + + diff --git a/frontend/src/api/article.js b/frontend/src/api/article.js new file mode 100644 index 0000000..2ed31b0 --- /dev/null +++ b/frontend/src/api/article.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +export function fetchList(query) { + return request({ + url: 'http://localhost:9999/stock/api_data', + method: 'get', + params: query + }) +} + +export function fetchArticle(id) { + return request({ + url: '/vue-element-admin/article/detail', + method: 'get', + params: { id } + }) +} + +export function fetchPv(pv) { + return request({ + url: '/vue-element-admin/article/pv', + method: 'get', + params: { pv } + }) +} + +export function createArticle(data) { + return request({ + url: '/vue-element-admin/article/create', + method: 'post', + data + }) +} + +export function updateArticle(data) { + return request({ + url: '/vue-element-admin/article/update', + method: 'post', + data + }) +} diff --git a/frontend/src/api/menu.js b/frontend/src/api/menu.js new file mode 100644 index 0000000..7987d2a --- /dev/null +++ b/frontend/src/api/menu.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// 同步获得菜单相关数据。 + +export function fetchMenuList(query) { + return request({ + url: 'http://localhost:9999/stock/menu_list', + method: 'get', + params: query + }) +} + diff --git a/frontend/src/api/package.js b/frontend/src/api/package.js new file mode 100644 index 0000000..779e915 --- /dev/null +++ b/frontend/src/api/package.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +export function fetchPackageVersion(query) { + return request({ + url: 'http://localhost:9999/stock/package_verison', + method: 'get', + params: query + }) +} + diff --git a/frontend/src/api/table.js b/frontend/src/api/table.js new file mode 100644 index 0000000..2752f52 --- /dev/null +++ b/frontend/src/api/table.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/vue-admin-template/table/list', + method: 'get', + params + }) +} diff --git a/frontend/src/api/user.js b/frontend/src/api/user.js new file mode 100644 index 0000000..8ff4389 --- /dev/null +++ b/frontend/src/api/user.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function login(data) { + return request({ + url: '/vue-admin-template/user/login', + method: 'post', + data + }) +} + +export function getInfo(token) { + return request({ + url: '/vue-admin-template/user/info', + method: 'get', + params: { token } + }) +} + +export function logout() { + return request({ + url: '/vue-admin-template/user/logout', + method: 'post' + }) +} diff --git a/frontend/src/assets/404_images/404.png b/frontend/src/assets/404_images/404.png new file mode 100644 index 0000000000000000000000000000000000000000..3d8e2305cc973ad2121403aee4bf08728f76c461 GIT binary patch literal 98071 zcmZsD1yoe)_qGfpFmxy&-5?DTB3;rUAxKDvbVzqeiAZ-S3L@QI(jWrT-5rArH4O2c zxq5&1-u3_1I%_Gcbl>@Z)@`}0ni zgTxS1Xz2Sp5LyN$jB+`(TK2go0$*ON+wYG~Qz71pR)(>+cvvo`d01{Xdj)u2?ZXzy zmA;x1Nzp_;m7?it6=)ebdFi9=K=7-zt#9B^kGF`IzK;CC(qMy@r8#>WqG2@cS5uox zXbf0B@c&#i)!^b0Mb!?4K=50dqjrDj)8Y7T(OQwKjh4xB0;y*hgfuAsToL#vtY-x2 zcDPC4UD@TJ&X)ylS~p2s{Vm(V1wS(C*u6kTtf;l}x2;9RDSK|B+2Q|vU# z5g|>`3ves^tw-x#pW$kM%4o{)rRUjP-bFAxh4kKaDr2nlD0Ny3>QcfT2w<51UE`{O zQGN&5UTB2YKA@#pXv;7`0|{yiD)FUE4eA?4@$j%fYDMKsqFQWUi?UOjnyuv<1_{u= zug?(m3a+6reFd6hu*h(3OM4>q*mTc~Pg?D7J-n+TvnsoY9 zWoxbD->+xD=K*Q$(+jLna6%I4kA`x*GDPIgI-Zm%UVn5!@S7kc4LW0oj3yb?d`)8c z7ej523IBV$9&o#~u-m;%@UGl)D|$=WY^|@KLU`Ac)l*@|602_{T4+M7IA6dbP#2AL)Eg1u&)lV@(b^iSAa}Wv>^6+>!0CyZsvtcv1&Qq&svN z+sZThYEIutRzAD;PdEXgWle?>lIf5kVEHlvET1a{;shO{ zn-EQLhR|g}l#-=7bY$DeCw*BaO6=ZCIRr)2d3ye8*IdkaiCqEbd9ba|DSo;7ROxl@(%P?=XHjX#v%4uLDStHz#?vp;8Jp~psBrurXiozhE0`(5iED>LBhfh5__U^oInU|$yP zEjDz&{zwWAxMdUZr8h#Q=vPr46k)9@kV_jypUZrWZ3!8{4Gc-ISvP>EqE52=OPg%cn3_A1Z+SuWO*0}uNWds4s zAhHbNeJ>FWsaCAW5waW9L4FA9Wr=FLpr*j>!WUNfY>TSb`i)Yththth%76Sc@)}q} z#=A@s1{4@Z>WAs!^^cH?WYrfik`9X{fiIcaicws{R=?W(`}oTdF7Taj4mNRDu&>;I z{4zufM6pn&*L_0n^uS2Kp2m8rj=vHajm%)0ZyNTcn@wug^UjqFs9J#iwD=khPyY|B zktqP6M89)9&wx(|%4a*P;&Jc6s(^o8=aRB(4Kgwpm-fAp_?~bxq0|4UPCxmP54Nw` zf8KveXS@t^YI)NG0{})#k;X3S`owvLhXtN)LG8zL?>f|k6Y<^+zeU_~P(n_T3cesZ z8M$)|qkPrp{Yt_1HBT1+ zO$}G`mF#sBF264SZO#=YiEgoZnB0y+E+=?at|BLr{=?)Ir}<1cztP~%gOtGG__6o( zMm~b3uxF~!@$Upjl>b=+yK-RE^|!b6=#XmBAb0Kk0yP63l$@RoTOm8=ocSwp{*zOYGx+e}se(;LO3e6?ei2{2&&Vv#NqBGgg!wJ(!R2P`LBb7c^&8 z?_}TM;6eYN3D70K&z~p#{=4r}rQ6HpW`vHNQ6cYvu$FmNk@Ifi=~0v3F+WPqS*X{> z2_Nn)^R~a;O-srktbEh9S&aNYACRic7*z#8+=w0Mna;iy>`*~9X)GjuDJ%2()!vdB zZ0%@0nm{d0Hybg!I$Csmq{VC#z5?Jn182ITfa?C@E(zU!0=cu06u$Y?}# z)Q!Vd5YFX{PI!wE)k>WaaQkvEERB9y_+J|{$ekI8#RaR>HTob-4E2h#JB02*h^Df6 z+hbAf6XDe)%Bk-yG^;-KiykYn{3G^*W_{J-^WXPidjIz05b`1L?_RQm-0y&O7;DB? znhfbMQX7`Q)xWCPdi9+!bnTwM4~5>a6{jc@y+8h6f(8CFuG-$*J2Knb^#~b_$kXV(?y&%;wLJv#A=pR$wIksq9h{$)&wK4AHHGojB6 z2(7_D+CMG$3c1i4)v3GYWLSQ5Fi4E)uPOqkT_=lR{&dUcQ=+q{7G%ZnFRo#YhBB7T zpTT4KG6XDdObk4tDsUWL!nCY;*QhBHa&fhy=Rzuuu@v+LHImBfsx)g-H;d=!^}p?a zgG^77#$I}a7(~GRLzx^(#GUa*ujinA+$hxZSd|yfo)lV_E1uj==Sh=$LkwNEasOf) zT5`b0yEWGfLaG^o+eYhw|&EXwMkEM>mX1|P;97mZ;zVY)Zsr#NQ z_wXNtrD+7xw4BGGkPG2sC178@xc9VW`wjIKq1&9CoxjJoJ{NDBp#buct7%`48WHE) zC$>LXBJREU2b$<4faQak(xe%J!T?_wMX2wIi)RGlMfr1i&r78EsVhp4-iqCvF&mHG z4kS$mO(x`l|FPc44H*0NiCw@p1ufF6T1qrfZx zWV5;6dMF$~gZGYJq({OgEp7LSuk~T2jza-BbAVZV3a>nup0jCE;N8am$F1!WO{#9F z%ZtF*))3`(x4OT{&;Ibpq5mgm{eg5pR8mNE`+AdK3E!M1R^k^_?eqFd6IT^(Ix_RdbaCSknTxXyUb|;m z&nNLmSwmlEZ7K+W|5x57X?vWEy@v0lp0n|tEjaXJUEYw9gaX7 z^uv?6E_PQbj8#SqOIQ0dtdeinTHL0b>j}|=KjZ()=~AFKB8@fg?{KMr7-*`eVN9v2 z5+(3xlWu4Te*okrAKMW0)Vu@Z-fg&P#851~z%5(K3%P>WkTRft_~S4dR%F~-z-#%4erE*iyIUDsI_aw!@R(+*>ZLLojl=EX;6?#;ZLvr}?BDkWfMk8f46 zly8wLw37nqASMlS?e0US<+1v!ZuJu)o=388_yaKFMZa(&D8r_&%q$fZ3;!1>^11Gy zH&1jY#kjMB{(5BY4VdEIM{#~yf1SA&y(8`ZDF$CA#^sPyKho>0h@rMeW|863S2=5b zZI*LJ9-puF-3MKE)x!UULqU`HK!EVidubDLM*;EsR7K7@Orc9%wX6s~WvK{qfnBqS zdPL)Yb>-qs`Os_K<6M_n3M(u4Uxf>>_qOZ-@3gObHKXsUN)R2Leg&}D3?__yiWf2{ z_V(gf^NLae+P38aZ?Jgbun=?<`Y)FtSr$1)N&!<)Ij|Hl_DA<$3TbL0u@oA_Pu=53 zPo9Vv!!I_vf6b{+B`MUR`4m&}!#^f5CPR^?F3DHuO97sVgG>x75ne&Bz@{VV{7gnk zz8pm<GC_er@IEsh z=7|sF0pe@QiuD95$$$3Lq|hqpBYVqOF`P2;GOKCPD)>t;&-s!xZ6Jz5f8M#F4bB9D zOoaNMO_xXyn1JGe19K1ta!J0G{E&HVTagC;yuR9vu(I*GVb9~LyzHxGW96Qzj^QDC zE5ak9qmHPu7iTq@REe+X$-7)cl>80e4z-=L?xp<4*t2f}Kg7z~cc!4y2C3ucni?(e z75ZH8?}@;V(BeweHxn$bx($aD63nujoxUaXE=Bh5z3nT-JrVJl8`doS#?v+%74Wa9szPtaGOjx8g5fJYN_27HkJicm~v@1-<} z=W)j=oqqC*zV(;aQ(H2V33Wf}k58JCua0sVA6TvIxx@}&yk;iI5dXaG(c#y2Ia9d* z#BG`lPxe*;<8k0(!0r7>CAY`SYLb6L48Ai6O&lTPYx&rh(3%eL+-H*_-hgW~78pr{ zot~+JNFcA#<@circTpjM-F_~Dv}@90IQpwjj_|L$2aqngFHQcV>5gVpD)#EfvCH8X zJ`uyzy7SDjemiuw<618slKkzNKqLfa2n!~@1*bm+(w)%w!*Q)P|2(#-(mL}HRv4Mg zQm8<>^G3{Aw#Z$6Xm2=s|066T!!JM%k?jWis-FoDxz7xDSlmL2rBBR`P|pqRTQo>8 zL?C~^Kw^%_`UjEioZ0#v1)6#A$I|JdN)OaT__=giTkbGnlfr;+LlYC8?ae5GTDFhc zdIc)R2o+ZybDfS7&D}Drw#-E>P%E+8Y4hqD`sI6)1gJ?#q4+3$>{87bS;qMtfBFBJ z>;4i@z9z!ze@nySP$v=-d%_-N(;>EmFErFAzEQPm{Mzwm|lFqUBuc9NI-DcEi1#S=7N~U6xl7j!oQ23A>GoOCz zu0p#A=$Xd8@q5I)xv<){ovZFNrVr)1zbKQgP9@^=CvwF8IWZ zNc?lp$>(V1gmqWooCCW!CtVxP=Ce86&vh}M{{0;zP9QWnasl7{W*~V=bYa*TaUQb? zo31v}b-tP!wp&WVNC_^Rxk&M7s4NtWosm9ztiOQqHqWNR^Z9yT#Kj8fZe6_*wqfro2X#-n{{aPZ-%v-r`uHAzt5cdI zc=SZ1D4J4B_7E{?n+3yKJT|Kl^({bi|l+Q!jcn7xl}x1MqMkULV?ct=_mz zelqcVi2J`-$wF?gN9x({!1C?NARW47f7xM!DYuxa+LGXSku;(Q((ad}-*XG=87a#* z_qLd-MV`|x3T44Il;|yPMop}pTE(n_UmtLWFy}q^h4?@l)1AXwfNl#25WC-`;+|m( znBiDcJEZwd5~TSWx1Ez7uAzS@*kHymO4-ZA(Uz@rRVjc2I3hMEt zfbZ1wmLFA-VzxpnW7{5f=A%wtsm^!hv@faA{FKODZwoqK>gEtF_xvmZ?~ZxiC^YVQ z|9?JtO31xW@F`AuqX9_s9~GDLIm(Nrc*<(;$M4O6D2;k@?+ZC}ShUd-z&I`^vbp+h znB`!{hwppFhV32vHTJvcPVZUS5}=Ue|B`&%XgifJL=I$2^<$s+pbq@-*kGp%@vem^ z@pBXV)z*$R-k|9#Xs7IF>IM+?NB&!Orq(|SWY7o_up1xdwF99sfv>K!6DwU&)>7Er zx?Gv_CR-FYp_MpWvuz-8kSV~(7BC?fm2HOV$WliWir*Z+#L}PnAGc5jbd$xzv|I|nA8yRK z5ZJiJ?7XFdoubkp&CJ55^plmn;;2l3yP4a5PG{XFQwp%L(|gmbA)GwDDJ1mERH(v^ zXsDeLyvf8MB?A&m{5e*NB^`~dRE-jj(vkxmZ5rKIpqwn10gsato-wTWfN!fW*Rn;b zp{(nR|4 zt+nh1hx~ijq4^wm)4oM5mVI1RPWVUFBE=B!>t|LN4Ldb$A$x8%ATgGU^w8lhurIzd zfy@ndCcapnr4I{ycx^b4^)lrpt(xC-rJ|Kjm#Q7``M<9iq>#j8;Po7+Q-}#ij@`-h z9rf7i_ve83GwHfM>rq`RUn2jp;%NWVJK~oIO#V|!pga~qfbeZxn^tswR-;JJfj+5si4i|3iE<2-3D8F^f<b zL{D5BKg+S}W6N8Ls2gGFnsRB5KZE&f_k@`KT+q4zUc7?#}&R{u6s_{6ZX_c3;&Z_Q?#CkO)G$u%5{DcU%B zvqJE}u-y7%w0^p;8u0Pm8s5)s8qHPErTcZ_&Qwp!C}+5=s5}RJMyi04LzC)eL6rCq z^M9&WkRmcqCEhy+csh5sgzdoGgNVC&2^mV!S$1~zJ`>+dJEWpqj3zX*cE1o`ldqJP ziDC`HxME3);a|7$ep<9`X4nuW5i`a44y(0?Cy|JAQWN{t>@sImEox4X8aMP-#$J(4 zGW*-R5KdkdH0QjC7&^z#2v~aQg@z@~pPy2!NOAbL;_-oAeIY@2`;A->U@cZ!r}Mz` zgSEUx9oCttaX(H&#$%t9a44HSVg9aJUzCxGuxMOL4u$fdYwy<7$i8`sZiP92L8<3b z(IoM`%bJ!`i&9Pmy0J5-9&G6iLQG#2qU#S4tywRc^Y<`wi1o%SK13^UN)g2k+J;4 zZ|&+AVX!!f5RmK+t|DPl~W-1C^UN3iax* z=qP`5R^~UkS*aSw=<_cDB|K{~4ZlyB;7?TM9s+7gnXpFod!U1o1|Cm(Jg{*Wm=?STJhVV&FP z&R^e|g2d|gZ9!rx@z%!rD6ZFK^yjN(`t++b0s(C_0^;wcugdn5j7HKOm)|~P_=_Y2 zy}{>(SvAs1Zz%k=K{2YjZ(vRQ^gf<#17!9UQ$ls`!@jG2to6Ik37<>ukirY|pNeuS zr&RRuf8$rPX-n6NUA3Qr*rKxb!9IWYS0f@CN2OiR$~c*#b3r(8k?Wz?NvjeE@rz8< zNb=taXf_Ne#}9ZDD9|A?@7ry*zfw2T1f!O@^kr{-1ZPjyhCi>B7`t$<88ND4rNH!a ze(Xn?Y|!@Xs`PZhFU7BG(>D29lc>ApLXZW81m%$IQXM;BTNRLdGZfpc))!X$S#@D; zUltUjVE`S7r7ZyTTB!CUS4icu^B=r7MwUZNKQJwTwEQLF&fuJOX#Y~bw7n1BgX5Cv ztF#mGT3Mp07rc=&*UtNxDVA$CxmNN^jdx+Oc`4jIMx>J)#Bb4>= z@&6(|0)PU%U+d3a6Grd`EwIVDXIp*B8tHo#)S*3p#b9vkL!78~E_+|Bt>|3r9<@=w zngkXv-w*Fa9>YNF8FXG9gCqtM#l?j;0d z#97D}K;WRP$zis!I+_8|-*9*qLKR{z%j+WlvGahZjJ%>+y zSf>u!zMdsH?>94Q>?13Q!Hh);he++PhbY%{$+M>!1aP-32oMbB+IZDIwO=8gKL7)* z`AfBY#p^-gym$51z4^IqE9-gdN4&c0@}Y>v_fW|P;s;4rr3^&u!3ZQ$Q4|ix^L{LSE;(JsBjeBRuvZmC7!jovh5X{^DSijU z2D6=qm2LhNjC&-}zL#`0k2@`lIN;mEoo)f~oCy9!4&8g-a9jmYs0WB_K&__ve%BuM ztKaZtCXIt*m!Wb_O}CT-JCw(!$X-H9!FmPPenpQhS|`yT`Coz(xfWEJ>|g*$yue~L zDxcU)K4OlDpw+zW4-sxHs5v;eyem-@FAlu71YX`pyl`fl)G*U~p3e>+K}*z-(Mh>Z zQ6uKvFXF!iYd171%kiKrHOcE2EE09s`*IXm*`%U7z)n{OpsP@5c4i_w@4+oT_ocl) z+F{GQcL}GlC*hx(0|TjD-?0`61y;fjeohOW3+J>Rs+l|Z%4u+HuO9#+tC9y9>Qwa4+X3JV~6|6 zPokd>F=p$TQM*L|Xw9rBDUdl&el_~{;LB*PgRZRG1-jB3`WD@PqE|# zzWFoi-V$+R#?QAm=Pw+|9zF{D9WvJBz+&bsS%vTktsOy4&m#<)=|c5#JH}QUA5_eT z+0IS*VBp3>UySh@UY4??vP5P>k^*$F4 z+OG!t>ZuOL4u;20=a->CB(#OB{0h;AXKN5P|>PLUl5&cbh z)dfMDHw=^Z5h4V@mYRlqIqp4n$4Qm7rb=gAs%*r%ImW5)k}A*=JYxq|q+|8AYSLHN z!fmm0+zz7{OMNzgk`o~(CpwynUI>w~OlkS9!U+0!2=O~F+Q%45^xl#UhX(APlMV}`a{w|Ah zSpoMHee2Ew5@EWE1d&xmv!Pj`4{mcXzjUj`^COp03-LT#ybpkNS3BY71MTpIqd+Kh;X5VWdJMqPE!u@-gG1X z{{HjAXQwQR-Pxjm`ofy-A47qxaIb^(Ks=SIPl(B@hf~+zCXcReee3s^D&^OcvG|Mp zJCG2wTPgmOzm$`x5OVP@FEQJ_r1-zT5_Hu8-pq1!|Uvrpmz z)slQ`wlgvV@oZm+I>}tzyYW{vgT(%baHT+=vur;7dhH?;}=^>aPu4U_w3*Z3rZNq&=M z31MVj{!ukp5ho!JF^Jw@vDIC4$ezh#?i6tv@c*Q+Q>pH#h5p83%wvWtc?^sES;>+= z|NLo9ku99OuhQuCj5zk-BmDy~z|=P%kNBGdf{Kx%<3M`Z2C0gDJ>&8kZ4;&3&BaWC zg>DJlbIB1MT7o4{l=+1<{yjG1EF9f*x9x+ zEwZs*GBGcAUUr$zAJzr!*i#+4b#01=>-*kO^uJASsl0U`lv>98V})rXfkR+x_!C+` z0;NCjea32@uAMO?c`tm82A=I6B)jARGzJ5{X1<*EEZ(kNUjt$x`zgEBsKxCImP`6{ zllLW-Ae$ke#p`JOm!wp_$))%pr}~!$%VmnU7d)X8VR1x`XbI;R5Z~+%Ie%$ES@r<; z4^1Yk=)IEw_}AuO`XB3e#2efb(WPUH~2*g$9{9=RnkFxE4y2m7!e&VgbiHy_V7 z6$QZN?a(8-ugkVVEz(Y0Rz-M0RgeqyhTPP^GV387HT;k{!s2K1LHcXBQ-pYmH&yRz zsL$c;EjoQ;$rd{40A6b4KjB-`O7R=VKX1YW0+5GO{4FPf zgp+9Wrh$^~_Si=CW<^#6ZA3D^^n49y$z$py9KL!e%28V6DF=}JsY}q zL5sSP_FT%5ACN|HR^d-~{6;BbR)D(a|G?g$3yL5ZxmZ@xdDa;*T^;UFFPn0WZE!Y` zZuE9g$3mRl1L`@M;Gt^qnfwD@7qyR+&P%FQgyh2;x72!Z?CqRe2Ta4y06|fF5 z=+{@snF46c5yaZ7$*skt!o%gKyfG)rL_%D_p&gp{I3AZStia%Wi)wV9Lw=hxTy@Lb zlaP&|Dm^17QMVa=K=c;pht$|eU3#G7V-9~3hGivM>TeqLdw`z9wEW1;xi5UR-(_AS zrx#x=r{fYo@hWHaaOXUCd&wj0isGD5%<^|j(V7YHz|f~54y*T-n zfNBSF_vgj{!RMIQzpgG%^A_yzRH5``a$S+p$@_8a2lnQ(ic*Et!_va$Sd2kCoQR`uXZI1N0L-86P2}qKuXJQ$OI4IrH>i>w zcj3DZ%Y`VW@mq;AEDzEmD*-A=HDik}c%_%=p=v}&6R_68b5AGouVo$l7d|+X?`|+F z;JwSW;<=oNiccagOP`5@@&DlBu4G`_;%RQ5D>82BoX80`yUFb2^q6)tY- zhuqf%Vr7LDK4I2dPUjp}LYoezkYc=2UE^YbYsB3zA9p^6WT-{s-0p0mV{6e`cX!;AP7Kb9Sr(ZA8g_c^S+_P8og#oCu@WWAWkfxA)dh&0uZbpHG`dD>WY@ zs{-y!U{tV^Ibt^ zBkVbQLBSy+sk#F)RX5($Xo{cfmA%JyUh$YuR$vWc?G{2%jQL6&;}tL-*0WypaS5xa z)jxoAeii>#ug`Tb6sLe1?zi^KR z3~x+EucSj1m5|!#5VP^klrJppC<^!ihskN^NgNh&hP|Q`>Tu!|{@D ze;-ypIawvtpin^+Q71T`)0A!Iu;m(K6&H%fCJp`8A&P>Br_x*iG&$UiI>p{PWEXcX zTnnq81Tc%TzR-mQfV~jEIE3y1HE2w7);A>PNhDyT-e@l}U^im}KU84=nAeJ%U@tpF z$8-MVtGL^1hQje-*-nlz42B8jHkrYx{ZMh(Co)GUji#7Bf}pSC?)rErvt#zzdRiVG zR}Q`qW>~<-@|Wgkfuagh9c@(CP}R3WTz>F?{5FT$_C%mt2#|j1K&B6yPMg}m|0Rqc z>~b%ar?Ds!M9{w1+8eV?wiO^ujg`2va|=x)_O552YVnGwJ6FH?5tWwh&~hjp`yEoi zyeu5*;te#lZHA`6zUfOHUG5jJpJ$6cW+ETn)3y2Nn;7}mi&OwESrrNMX23TA)!B2^ z2R0r&x^eu-b{u^u)M%5}O0Ws85NX2GVM^Frr92Do1~O;k z$aDcGLel|3rZ};iKlp-+I_>?`I~7Je>l%q>F=WCbl>#aXS|Ujv`P>DF-5V7PsExFW zI7et1-VePW?_$7TX>+3`tM2=Vhxqd|7djc$i{yb9!K(*8tRlfpHCQM$n>m1x$MQ2N z@T2(sl%+h#Mfz1zsqG7KVQy9^&MPv7-(q&q4!}dz3Oc5cVNCC|_2W&}lXzxMU8{^M zElP!-mbgz$=6L5`&agzc5FRaWLFpF7EIVHh62AZu2@S_~PI>y0i(T6EPp$i0)+z6X zH&&1h*B_6Q=kW$>#Qv#PT>*T}84T42{IaXOY?D|wHzLPa&8cf5Ik;IB?`GMfGqo`< zqF{}|aQztZYW1sjOGjO3G~!1k-(qVE6{W*0gUcGR8ZK_+)tXW=1$9nO64xN1lT&9F zvW@bqS+;zc1Q^=#G#qw!;p0Lqk%grwq7o{MYpQ2QBi*GZpWEV}rH>Jx0;FFS6$vGi z+kx7jInK6j;BgLtgdsXjuMqzF-LBO|4jTNB8Z9EuM$HGX<6W+$(B~0#P+Y&}7N#&n z)}Y8t)xdE=ccE#cLq#9|UJXMgGZfqFcwx%yc)x;4!aiEblNS@}c@PeOnjtVsrqr4| zQN#!o@yxu(-&UO24fwaH9HV!ZX@E8TQ;q~}5?ovm*W0-N)H7mp?sa2`p55@RElDy* zP~=Gb`t?20bSdKP#b^1Q)p*u(cZ0pTl-bUGd#Dkc3qn=x`RP64rS%_7;hpJ3lh!}DnAHJ4=u zCC=L6td2M!;`rhLI{x%0&}^nz1)oSBJ_QmooU?BW7C*#OT5b8>-aQx`oc>7jT$X-q z&&mu|-nZU6*J~1mBdIBStd!#I0w;?*G{+{?X{8&Di|D@#X!{f-8zSP`fR0B?YQIf{EiyAvE)ZP@hT=07jChp+NS0 z&9Ye-A))c@R$PP%-xw1(SWvpgq@4$cS#60=>_kdiFsv=FOl{p?zuBW%Tr6{RJT&Vn zg~_y*_a@Xtb41eHeV8Qf^_cN0KMA<^Qhv(u&7Rk6LLHhY{Ptx`e^G(0sL$(nIWnMD zh3!2nVBRRbEZO%!S1xWvK`z_dRf~!D(V)=NaC|vMB_kMOfbj%;5V^@l zBcVeXQ;kS<4iN^(a5C$CqL?JveAKU#&+HYAT0dXaU!mpMlaG#@8dZy>G^&w_s-ttl ze}y)#XTTg4%o=V}7P1YRs3wi;$MtdIRTc(G=)1OgS@Kd!h||6|9v^-IW=M?TEu;H$ z8(027qt@eb%)6Q3yGsdzOO(mJd5VfHv7-;l^6_rM1Yy3TI9}j=x{7z<7_OLtMzT!Oc zRdY*nd$dOl#qwQw-*f$x#>!W(zFYmY3wpA$+Gde=oA#-q8vZ$cGrC|( zdArb@5U*|go=uC~+=i!H?-XP9bKU)<4|~fmt9idT;sxvyR}a5j@0SydWIxc@yJ{E- zC5~`8iwDSE&XVmQvyZGp>xlG%+px#P?N$nh(A!Js-|E;122wVZOxj`y!XQ$|`!(z! zh}WLxJeITqU)xzL|ITDmC^&@mtvT&ovdr$goDh;IOMFLdSJ(rV3B9FOp{P?YC;W@7 zL4%pvc|sKjE0?MY(mHT7u8#C((WEzTkcM~o8&R(#6{T$Nsp4+61R;$-P#OjRolz>m zIbeY=!R;#g#-fjkn+?f+m64&^+KhR6b69L87QRT9pN@|prw}$~oyO?NNLB7{xAT6`3nK1g&`t&bh4kA_TM7D zPNX|U4Rmj11Ca?_Z-B(_cmaMU0t{UTb+Z_q@UWca*F1_S5v(cvz@OEhSY7`$D)DG- zC&LWFpG2_1swTnlt)zOAgb`NG^11(HUuJFfV2%4nfSr=$hhf@=*^5xlNiTm$lU8#D z7G}5eB&=+pxpep`3H&>5VyN`PmK46PE4z^A&lPzzJFQsbWcDj(N_$S%(|lSW$zFH1+xuPR&DKxs113IT z_-|7z+K0HipL|5Dic*0~yXicGvHzjP%cLvdbO!Maty}m=d|79tS&*ey9V7KD%W(%z zHnyoqz@@ITs_lWt|CSR7EC-XunFLr)7{uUC(HLTiquI#yydAajSH-Dor1d7^oeYR) zP?pj1Q0$ zFqxb=UQt!^I6C>Nl;MUl%MgP*Y~-7Zb=LX$8`t~cF#wZZ^{hTb8d?H^6ov(koOY3FmJ;F~M!Hl&;$yeZe^%_*T z&nzrf>$B!Vrxm*9rbeNwllFA|QO!X=UL4oh&89u{xGrab7xW&xm~%sYN+U8t&_k!V z@i2&>lz&E+@c{~tSl;(!fV^+N7t~TDTg&-KiNNi{b=Z*J@b~l2w+a?6oZlYuWk2C^ zX7Ok#U-yt2RkL~eIwX%>F*g6Y&O5tjuAuv!$D~EMl2iJgAexZ&14imantY3~DJYxv z_V8QbM`*jWjzQtP{zG3MbFZ!XN+Uy(0Us&KO7k1uO9p?Z&&@8)Sun{qpeMqu{GP$A zBNUkmZ>2~}n}d}bXQxT*e1rTlJmJrO68Zh8rBC2+VpK{5_SIL117)~B5}nb}Z4C9W5)ZD+M)ihZ8mNid{+_H*+AWae3IGv3sZ!m9FATHZFb@SLgZf z&0&x1Ymh6`g-d`+7@SZQ)i?x;o3pS;=2sNP_9k;O_)FBN>(byi6mbJDg;KZT6yz3# z8IP9$H6kWMw1Lcv>N#9{%0?T^mJsBV#GL!EW#4gw+9>dr349L84kZb)l(~-qxq;nd4RFS_9e!~UaqLJnDNN;S82Nt zy~9%Bo82DHpA34r>ueco^zSIh3++&Tj(H+{(b#`|9{m3Z!>sg2Y))|psRK_9X9!}J z*uuSM^U8xOWHZ_|=Xx`_E?Y|F-;d=p&rw_ow2P#HHXdSSdjNPglxo)LH%J+Tyfv6 zXW>XqV`oeTX8-wfUiiz;7;KAb_cgQ+?OD#T_*DXL*+@95b@s%jGD)31JB#RBm=?#( zvtSS5dIN`siIu{lMTv$Z1fEpQ@yp4MGZW#0;1;IX-|`N34$z$694267K*_`S0(zYh zv~loLNbaY9iEEzIv()$afmPur^nj`fP{^(RaKQ-cK83ga=l2wbRMrj*yXJcL;Y96* zbtp+V-rp-GhXtLM;>DHvp@EETJ_GS(pZ9@T%cMv<9Lq~W&;>;a7@(uZe;lq2I6UtO zj6x8Q+Kxt5=(gO_&PHNpH>)SnGoMjCk7`%LjkcbuT@z7rm^A>#fF|a)E6cEh`G@u$ zUg#|?q6=*?Pyt_ZnuwTEe+8wigkM;apMXyYEi%|^L5sV^Z`>hruvrM z`8;qd42MJlb4!t)h>Y5ZlYC|U$Hgvz)1nUgEDf)Q^mAG-tA2=llTKF`6kOTjOoc<1 zeyeygaR7+2{CLu<3_^kUk~x>9-=8f;vlZoCsfv?$gwZTacbroY59OE)E5(ZQbxe}a zp+2;mZHuwQhdAM+X4JG^?|UL%9%&6@)DA%EIa?9Oug2@Fn*BD$>zV)h8fFxk!Aj)2 z+P{G(ziD_KT!x+7o>9?%c~R!}VMac82K?p`-R)6uAGHYG@%G$Mt9N~w&fB^iF-*4( zD7V9kQ)8%Q>!hcT+I`o1k^h_TgwW$E+9S4S>9szO3MtY%w<&jjjBFTg?0)M znPVAdYb|U!?e+uCjnWO*9Tb3}20mDpr}};3cmz2KTQ{ieLcuU10ZM6~@a%Pg&A$z2 zhOzKZvozG(2Rc@-a~MpfbnrSm}fBhK>yi8FSy*>#*j zohK;Pj_}2deRhpMJ_JUpXY`BDMUId=xt+3!FSg8UiKhpYA;&${|BYT;aG2`q_erMQ zwXw9re8Cot*Dacp=e#Bkp9$ms{_~q(~E~W9fsu3F@6~HIhAG1fO1t z3}*EX<+ZkeZ-20Ryma_|%8WbqPJs4M29cr+h=UP7M67Jm8A~RgisfIhPY$}Wu+J!5mp~py zvQcQdpLV2To4(=Y^s!cV6iRKbz%jO&bSx9w9g)t*&rFh2qv%) zeaWmT1{7(?7Y#>KuckPN+;PX?b&yIp93a z&!MWZ;3E%$tm7-RJApjf^&CwhDxDP*+9G(wK9hB2Y#P~bkq>x_91~70%%x!%c>?m8 z>T8VFN!_B#@DO>BhJ6@PW&#%%8koMETzJvU3%Q43P(Pon^n6Uu@!Pd}MBSE60mN1E z!C%YB248gPtEG#OKtkUKZh4)>5j0H7jD{PRgfsgupLNC6n}?KPfm=E8fK#NY3d=u4 zDIWw>F@w5L(BM>$#USr20W0%lrfAkYm{`?TSIGWdYBT0vX;vZ(Ft!dx zR8yRUFk!p2A@woKby%dC@FQXolk9g}71GYm@b5OO;~M!GfDHI;tJbi3GUM?^m?vN* zL1zb+zmCm<0V|1N@KZ^H?4|BZUIt(-cr?7~RM;{|>q8q(^>AWfa>PB}8>;sDEHX;( zw2=QPb4h9Vfu_}>tLy5M2b$e^2EQ4mHvV#gNl!c91vCKBuC|o&Dy%5VLYB6z9RzMRFNgI-pRaB&N z0HHNCC?NbuaqXv8tQCdARxo0u&54((w|8jpXi2ONM@|Zq1jt9S4|n#~&7N9RZyrt* zJMvuDy1|Ma#XZpK!;oR{O*XKtekGj?(5>BQxdnFoz>3!;ZbB~%)mHnLJ&&d@MY7cc zJg4hxq8bTT`;k2mZ%v@f95Z=IGg=?2p$>%mqCmI%tLa1Fq+$&DRD@^M9pD6Iuz_b6v|Q zmv~^7t6lHb(JB4D+hc7*wUv*{z8sU6nncMW0l~!ijjEVxPeCXccDkm6NqebVA2nX@ zdY3)F)Gao)a(bSc|NiNdmDn;Bn@n&(cd)J3(pWeT_ z(Yq#}`x5M47B%=T$+uWHqJYzfVcEM3a$H>)CXz4|<;|HkZoo{>qqKG)RKPTZWkHKf zGcMo@K7)7IbqNyW1f)Y=)KZ-J!>NxybwKK~(C#V6`s~wCKS5nxGhtBI0o5TUFB`Kf z4^#z2_gZj&I8$_uS-sWV)fT`(XGv_wy2L55GWpZOM4m|>q8r)+{&odMJK4R?sx?9V z*KjYcjG-ppWZZ0;-LQmO3OQe(zx!Uo7GmHkDK&Y{Gu-W4m0NmV_-$~RR3e0u-l!*b7ibQWDH-!|7BoPF<^duGj=nRQyjtLL{v$6VXpMCO!Z8e&Dl#r9~4Is3d)DS01NQu6)*>1lFCgd7&2Bc%$C+zcl(b z$xi@G+DDUXM2BmD%H-h2`x5$@Au5~52JWt8id5A(R7}?#ddY^WUu1hTcwB6W-SXp4 zl5=|&>@N+>X|G7y)ZyAZ(VT!8^VT-x)HNR_hwy@oH?OEFG zS6%BUOqBd@Sy~*`>|s*rac~;&PDo`sgF+Ys|(46;9gb6C2S*Ja&o( zqF?ly2HM|6roPQgMw7?anzR~>bnLcZQKpU_DG>O4u&doa-8;0u4H?QRzshQ2*HFKR zXmo&oR6%_(!lsK5>_S*RR4q0f=+tZ%Sn) z#isMc53y8KcpmH0A9p7!25sUIeuv%Eu$vzwa7KfFho6UqtMlI3jLBrsDjY! zl)7Auq_MKRfa0ZKSFMEzTj$#9LviGKRsRorZc zXaGAzgbJF5|HIZ1)Ifp{waUh&!^K9WC5U=w#=38Pt2>E(DBPm6X=6nZ_S4qjm;To5 zab`rmzQEh<2Bd=4#S^E>2cX-9x$Nr{QdFN(?ujbT#tQuV_k}r6C^wGT`j(QVdX69B z&i_++@wddENFD8tcNwPtR%ny~iBd4Mz&a_q(tJ6+QJI9K*QZG?f1`ELUu)e_iLB2R zs3re4{U4;zoYJ8(UG3iUG_+5TXylL${&y9C;ZmTi2o|c8M~$U@`z}`O@C8-KA3e5< z;R&^>3jW$+Uc(tr^BD(*Zw93q7|YFtc^Sb|b=83jR~_W}l5Opg?q2Md2`2x0OjZCW zrOBkuy$1N+ft=;3fqdFZ)*ANr@A^AXVLx@986i1oM zgSMlCh33E`>NW}LZXpA8`A4r)``QSTkoB8Vv+uRN}>4#tEW|0qi; z@A-%OwxNVw$cJ_*0+vL<*aJ@~L*$;k<5~N{P z|0nY+urvWc2AzkA&hXBQ8amu>s7_=d*hURqGC@(EWcXz);W4b$wuM;dhyKg-;0fZnD@Z9GysG$06DTq zDMdxAJBI#VHOkk=!jIu~bErD;6u;M&3M zvyXoPD4U&#HvPo#!uaRHbc0=qZ6clvUR=WHc2BRdxeyOd4w{nvrz2@iA*>LSeXe&K*h(Wx2WmCsE3$ZaX;ld3u~|nME;o?I-b_fn(GSS=888Q1W zu`7|J%{!Y;zA=rGLVQ1Y}D3XjBI;Y02fcg!|19sOvBrC1dM+0UcB7JwajRAZc-)Bs(w2!ow8$L`g`H5 z?-bdCWEE4(xt$h%eCh1#KSBPZLB`&mtYWfU=mLTt9a67E<5gMUAGzCo^$YMngzd|l zrSUL^yF;gQ`AD!s{w=keKeQ*VVJd=v$$ns_vlJGNUk5M|Cd%5GVPl{8#~HHLYo6@` zhnG$V3i^76=9F*~DFTm#VXQT@?JotI3L>*q7ChhDm0#-?5q|F-AotpS8~)Zh;MGypLSqsU4$5oHlFgVpeU|gQ)P~-Yhg)$ zh^3MHyYbm+p?Pvd77hKw&eQ(x?Ozp{(y7$rgX8*XjM6_>^o|5kAQqq*_a@Y&hThlFXD_Mes?+N<~#8LLVdkMgo% zzwnz(+(L?T2aEqS5AH+|5`DLtg??oak}aOQ>WwnRKf7%4n_M-Vp*&c6E?o4#ISx|U z&XMigzQ|+?27fs`zs6nGka0O|P-a)~&1;?TN4CHg_aW4CYbZ9oO(;Qj$5u8f>PH(l zU0f!at1u3_uQaL)W*hQ5+DWD4$&co&23G|lB8SleyriAh)jU!7(QHMMunccqwg z(ET;31Jx>IZNvS)&@@>Ehd!*7CQpGp!>yxR z0+~*xTx66s@S_hCp#I~eE8pu^#Ga7;rCmG+DvLI_WZA92zl-<4QPuY}{ado+i4~VG zzYHyy11Iu~mbBLmUqi<}Q^d*UR>zw-&QOgFEfu<)?^yLW?qt2H+_K#{$&>%Y6^pwR zJnSB(^LIzyzQPnhS#F1}YJ?S&+s6P*QL8CxUL7ZgkGKJ4i5J|>=JRa<--Tnxe`uCT z%5Sa2tkaSE9|suc$6TTCtL)O9q^Wnk(AU>t83F+Y2*O7E``5?3E#ER$W)2McOK85p z(vHJcHDJ+io0v2zVXdBt?qnk_$Y-=-m|Dj~H{1A~!bMjCHe>YGpDse11y5mZ!OvlDO!^}qtKvO8AWbHifx^S#9iv0~ z&>#!rxp9$!n`?tD*$j5wDnH@(+K&fkxs_9KWE?zGIuIH@=!pBfO*x)JAFLbJrH`nY znq>}aA{USUcSekl*(lMG{$}g`fJc2}h*4B#|M1J`+Uz;Dzv#y~5BFKSB#P3?DWc=0 z^#&wnIZo8Aw^~}?lxz-<7RxP&2=n6E2NGSUtGh}8jDl6pn}&2vcjl|@vnG23)~0RU zhUP)iVTEyJz?0+vMF#bw|F|e#0{8ubOg>h*nT3M4Q=h$-b=f*ng&-v)NVZxkH9|lPR%8g1l4)l3X2hdDr~@^JpwyBcg9J?5hR2CvFAI^`WC z7x;)ZpgVWZS%vu{3Jrg%mU{u{3;m?s{4P|T@wm7;{ZzM1(EQ8N(x6gkhOrN{YLsjn zs9FJPjnM02ClEhYoEo*V?R+RGY7-`M-~Twn54}Fn&%9h&D>K64N!T#1z^ddE8`k3? zE4nv_HU&$ab=pS4aGqD#o*wJYy6n0pzv@K;q@z8RYwGz?a1{9M?aAp+|JIo9+<)>? zek2R%@=fqPAhL%7S(W~@kIdoHymp~-`{K^4vvY*;vPenk$)<*a)kuRh_BJhvvNHxl z)aH5vfxNH0Ay1B#bIncgg|qW?tU=FG+Qcj6wRG(!lj!EN(ZcuG;h0uq3DW1x72%H0 zdzO|sT_F8(N?7QC>;3<_gJXDpX+T{HU6U)E0!5ayjQjl7T&FksfGXe7z!T>eZI*LP z>-F{7Qj1z-^^UTszCh^xHHnmb7-wdOha05kr`Cl| zoRaK{QJAPZj`bvUQ26)A0z{lqaL&?1? zF{qTscxo>bNKk7R++`F}kSGVWq%^cG`IL~&t#Y_jK>#gz0rRk?Hz zN#kvXUkdnWihj!mKlB|+(=v!Te$e}|{KAg4>bxt=gS@tIakB~3gmH^``wRa#vin(< zEUGB)F0dh9A>Eal5%fg8{L;jFALpCY_pWrEuK_He97$tbKG9?9}8$Kb@`hh<~mU2jdee{?N>=J}NJ|70xzkKL*Ca`*V;j9-+}>Hir0 zo`Hb@LH-P`|4zFe`My7A0@PkwdU#02Z~qaepqY1+!QfFHYCwsR%3g$;ve+?3QwT?vS&IU%A?En2jV= ze;KgvAE3GsCA}C?B~^O#4356;iDYBCOh&`KN^uwNaDZMPE02ouWyHp6jbzC6m9w9P zV~nl_Kt6PuqHb^QUp0%R$c5TTsmc_gEd54Hdi^ESZ11MC_|N2X{^!vpRsAL*8{c8E zw#Sm$ffh=wSdp9m@c4UR!fB1EMwkOrUHs7y%(H13$tFL)V$gL`>n8Am1rAfu zrKp5w^~go~*yq_Gp_kyurR^&zM{m+*>hBFwc}Z=)eIwORDAcB-FR=9ee%!Y?!hkpM ze`vOakKXb2bbTx*Cr9l2CuGPgV+-Eyz)$f(W=PQS-rlX7ZlgU#@z%VeLR=~ZGQ0&+ zZDQc|ixx!u5-y~MX~QU=N6#XFe)HPj9Pjkk#{LSvh7j4pTAa#(V!bebxN7~Jc8473 zWK?&2Dlqh+#REl1%nDZqWrg*px)r9%g>gO9R)A8D`jN#sAZTg%4n=Fz+gXixU83()q%hmgX<7SvF2Tpe3RA2CoY9DKD$;)MxxZ4#--G{}7uPf@ z2Wud&$e6r;oZtT|O%v!I1tIXY_P{}it~j9)@Y!dr1IS9f&79N)L<3%!c3&oYLV4QZ z<~WFcH@SGD?B7ea5u@40u&+nl%f}vr8mrms6%^e}83l(R4~D-R$$Q zx)`uulwY~CeCFzS;JXAur_w^t`)F<1xwiAOy#k93Gt1%*rGamf0Tpe?q<+>YZw>Ix77%zKgt*;E>ewVK(@21ncMBoZ?nFuzAyc zd#S4X{w$++HW=+IZ#1%L$WH+jR;<={b%<*7-)lQ}1(NK$lZi||E%XPzd!penLs0Ew* zyXHd{6wpc7Hxm0dTZLE(1uMEwC58E{30r=;mZPv)EGk(WQ1FB*E5>uh!7VihzP zO`$*X%MN%OBQ$J^&kiIo6Cw)xyF2>Ub~9X3&b9kHgx7nEv>mM9DVAei_`1IXD8fV3 z?VK|LT8xB>3*$h`m%wf_(2}ADDvSBz9HTFEex8@QKr(z(cGalPB9?F`_3i|RqvLi1 zRCYaY4uSLuZf#5G8VGZ;XC}uIt|T4l6C{Ug(wlD9**tZ>FiH45$wF^G<;~ z%tix5Yu|9AQ-J13=q#=5Xu+u813xW5P%=@@Bt-+946>oM73#oezx?wBvs7(#tubbG zeEY^$-xeB|?hQEe!fP@!Mx@lXc?%Y(hhc+omP!mazu34UV#vn1C^mIg^6~7K5f-st zBwo5~^7?$4LI{@ISvLH9U`K26QdodjN4F(L7N>8&$j829>74MQxo*48Sp|49?1%0B zEih(zm*C!c|*@!PRCPQcPwXoZAQak}H%5u&t zdGo&&@uG)?#>LySJq)~ej(^4bZ*OlQQpHFUEHZ|J5}g-6V942pg*)Ojeh12mg8|&* zqyCjbB8g_I0DCcHOVHyL$@0YJVo&zm=vh%~MRuQXU=rSpz)XVO_o@XE9!a(_^CH*sH-|4dGeeAM6Br&VJ`4 zR!qsY)0)`2lIc&3q;=SVXND>cjS+G-zudlL4;=1Dn&MW~#@vMcWUa+!OtQUBKj#<8 z^mWznj_?1&ydX%B^tEtA4_AmgiFohYe@R)T);IUOGQM+e-QOJ7h~i&F21?PuaNw0W zjuIExaiN&Du4Rnxf`e>t=AJZN+Ej6^qBlbQAN2=AakaGVdRAKRc;XH|XYGlhn;pjw*!un56VA;9tKDQak*;frJ_Sh@ka7Th)? zs#;PCH#}afKh&+7m7VKD+ZIjo1NpGBr}BdJmf?~&0i<_PQMusMcu2MzJ%j1ZkfcC6 z8?XdwBG4X$8+_oRSR3;(J0Z6mdGt!zaDVISYfnBcr;kzbFoy0iTzX{waaF+Q4OwmK_=5Ikrcc;ZYE zTCUuusO~FLJfnjg5Hb%Y4m@GNOz8x^8Nl{86FX*%A0A*UGEVH5xrt~7zIWT@p*bL+ zpQc-q_;?8Rh5X_{aU%qHie&_;Th@`kE`o03gd3X#fvW_)6^dGmchzZNuLTqdmj2d& zQ@1Zkf48kNW&oeQy6ez?@$J_~^#hsrxSCm`=$d~FLSaMZYd9 za((3{C$j2sqc42qWb^L2;{<-S{8{rU{ir~P>%5YzIkW-4SjWBm|Ir=?tWDL z=&-APb@%Pmi5^6C7UEqpMpiTheLS6dB^ON9B;qoX)K%y4oX8)&=kWvA`arjKJzSbs zZ`3s(aU63SUM= zxEo`{c`$yKOz+0Rj2(qbV3+&rXNFmUl1PV~38Y1O z-cvI5AkFXz`@fiTFqsX3(AIH&h7(cAcLLK)cz$ChCB`66R>lqkB1h3opuYO($bs)D$-9fw6j{-hc`Pek+9!G^5OPXN zUu;bz_hm_fCsP^@L;T=MXdXCO-p6H!!@TfsDj4ILC^#uqDqRzk8$~T6!3I#od4<1Y zMWWDPN${5q_xNsi4>0<7yzE}lSB*)OytfmPRMH>MK_R7^-s7%w3ae0X_ATg{ymh`W zt)a(u;*CJm1zQ9>)td2H*=i@Jq0C(iMBR(^rZU5i$_;1En_tXe&hw^Tp^rPpPXO&> z{VXuyk}~qNah6Kbs&!6v16Xl;@URCb^F)O`DbLhah(4uksa|qfM)K(vH*OXSBq<$T z40fSA+`^NdE%$_j;nzz5kBKzQo<`Q`6i_~cW872aNEH@-TI;b&b9uu;L_jvwZa((V zH2?WQTq+u%Z=C2rx=}(aCw1_j;}!r{X&8 z*YNC2<9qyK13DIGGuViP)A@cal~flzJSW5+w%d_LDeCBIlGZN%3rZKavBJ&CdB%%n zhu5cfhLJOnw_I}rqKQHnIxN=hyZ53y_xIsFMB#pa-INW}Rih*)2-Dr?XyS zBtzo;P&2Q~xK>+tbZfsJ??p`;5hkDkJ`H-JMUlw8*)=u4d)j?{`$gw4vTa|7?j_bM zwiYgqf7I4GfaXP|U3RyOL8!If4yvY+vL{D^mAA9VLkHbD=RQ8BHvZQOtCeH(ug>{Z z_S}F-^o3OirX1m*kk~Eo-S#FcWEjr7)aZcpNbGmMVIY|B5=`o}!#M;dH>6Yiif8YU zS?&D(@pJ;it+a=GE}kb|(W?tC*Kr!g^j$Q8M91tpuT8Mt^M#;^b_S1Uccap21MY(Q zL5~md4t96*#ROR;hP5+YQ)U_yV~Qd<5a)XRv)#OKHxu~jXk}&rBQM^Ye^XR;Q`U6* z>_&md{U?#cO&BkQM7hmDIzr-Lv!0{e4fKr}!tncb`O0#AWs#6Yf!;b1IVviOzn{3c zkr^6lwINAX(iw%%WzHdU#d$#elLHwYh*osl{7Yy2Ld`xRXW^5hl~*gtBOiU6W^*zsVuy&S zuaH01^5#J@3x}kbk_RB1PoP(l$khOJoZ#-srQ)-x8hHw_HSWFq%(V~i5917*-a-&3 zw+YZR6Sb2tHMNtY+qNl>ziD4K-Zoc}R5jXV?lLOaXr!)Arn&GRF}FaPxSgaj_$}rd z>=vIr0oz_qK6~=a3_*%XP$^@MiWbZXs(kT@48wQDKcF=5^P9|w z<$|iGpf~e^vx+uHLKce+CTVZfS*dYxEjfW};!yomTQB`ATI6)bEZJM3+-nW@$mTQI zuyh6J5Jd=;BOIq0>~eJEA~pm^=W5h|ig;e`&EDPJQH4w+-+sFHB;={*y{LT1rdy|{ zr&^^m%wa2g+fHL zmm{nsV62SV)0dSq4%x_<;niUF>!X(2xW`SRJJD!@HeoGGL{e9D&6kD#Of~L4dor{G zn~KQgVI1j`;EW)`4+(UaSrlg_V=f<8(FkyhsQd#FjhAPxGGB*3&QR`qJ4nD?;O5ml zhVgoNau>*xIv3gIr{omv{n2Z95IAAnlyoV#u<8P@nF}T81%1yme+Ax z^D$4a9|YZ(mCYWhFDtyhtrULMtb4Py+#vds=)K+L0)fB{e<8l+v%n6h;D^UH-cEw9 z^aJ0_^N(sNioJhXk3-*GSPxYu6_`%KLL5FU2hQ$9GoDmiBs#cU*vkh==Kj0A|BU+R z!KjaV%;`|>e)Lg#oCefe5ij7i`IXPfnQ3qN-s9)aKDnT_SOVRQg-}5`o-2`op5#!y z-$u}u@LzYp_ z0LJ~*iW{muUf^nw6>ibMe`)3_J`q z?&D?8oFm|bo#r&Sp>XqDu;i*qwCF8Gn8Hah_N0x?p^d%1qpPV{pL$zYLJ_Y9D%e_Uox3It;I+E+lqtC z`iPman259v9u30jpV&luL;ho zu{kHD#pRLuyJHzpZLT(R>=fUqcVZ)F-$1p&P5OjS%3{AXyBVzo>BIZ54yE_+?P6Oq zu`3Z>$7AZIwffiKuTQNO-}n1g^+5O;vqX9s>)ZrleXS z;9uO)MrEV?dgwsP`=4V~aRF{s88QCrHYx*zfRb>msE?*!{jky2HH^$Mko&B?4+yyO zXQVQHKn%|3;lK+i)^07bhL%&WhDq-=zko=7-<5b?hzo-7p(bw2PW>Q7`s*u(KfLR_ z9+GBYvQo2WbN1%FA@kG6hYpVB1vSVX0gl0BY2-(>}1T>7*CXiYOiv?!1J>!>wd zvg|^TP+9Q=@{v~9$n!};qSl$e2PxNHKmm~b6QZ6OJ zqxi@qOVZ3xsGWaN`p$svhukY|H{})Ubmb5>_qa*|B8HvI2>Obw(c^nB z9c4vuDH)5pC=i+-4j@SBFMgz37RI5$>`*9IrlEvw-Rl$3THAVsi!!#-*wADAiz4^O(^qa}0P8NLGEDyldQ_VdyKvbb3e7ikAA;=q+wgLTs~v*(mumVG%{e}gH-u1MCk+o) z#?Bqi##51Pwx?&DfJmSRo>LOX2CWxJv_QmM(~I00!bj>}>+tS*P(b;03Sn+tWb(8Z zWPWp`C3P zMZF^`16hL8D8*FM7WpGY&RZZ0XQzw^wen5tir5KA$Oz~Wv^{3blUTD4>qvS>=71lz z*FG~{nfTieB9<#G`1xi?)=azd|nJS?6YNe_|J- z_#rCfw%s#-Sjt=Yb1MkuyzAKb3Z<$Yhu<#ZW+oiovhDjw(sAwESeg2D*01D6C(p7` zG2dcc6^tt^jIS?HMS_AnjEawz*rAS42|3>ebFhmwnRN{*8mx=G6q5u9-T#F;HXzK+ zNq4zsu(^Dd{AodK#DoT#;U?r}|18mm z?rzZviNOpt3wsPeSTwZ7r~bl|_ueH1eEof11Zsq)jbUU}`qxX!W@1P5RSgx5C{kJV zgseT!{?#IEQ4cOKA^w2VF}{7?7465<@9l`x=4+o`xMpobW>(8m-i}h>fM6U+-**QY zv%E3;=ir~n`)@e5!Es~<*YUVBI9FF!a2Q+Ta?MkjgTzk|Rx!s#rO2o{Km5VxOG z-Nuc!3_!KqLb^)J$@BV#bcW1OVv9>g!eDKR|#0#{Zr+BlsZ}FXwJXi(ZyElYISes!KO{6OlUJXs;31y!T+%A6>yn+;6Hg;`}VRrPOd)Cd)V217YwdgU|783 zO?MX!JO@=OC?R6aG?@%M8hq5lRKlf)ab6V!RR1 zaFg9k`2J$qw_n~JjsoCt*VV&Ze;eZOVS#f$mrvcuij~dBTehbAvqPYIC!O8wq{3VI z_F3srQ$@?3E+K=HTtonSiuL6eD+N2Yc1TZS>E@q z9*KM3|BX_FY|{r;^Rau>3^)-?|6j11_4k|A1!`26n;hu5nUdtsCTCF> zisFzW6#pGsYWjc-xR&S{%RZUqcaV+Y>WYs_!<^3=3xS(??oo$#%MoI0FiuEd;mss0 zQN_~NEAW40SL;K8z)(k?pQ*o1(Q;9|ZnDDP^mB7t5AB2UkQzI)`;|9bgK^i(RebVB z7nQI)9(*g)sw92TNa^|~bB>kfx=dR5^l5SegWmRKR*}s{$ z5|R~M#|@Fl4zi`Y740w^P(Ssh7-kOg^HU0g5b!L&o+h5(G}u2a+6Yo47##kSbAokX;PtNz(G8wdzJz5%+N9+x>?&z)eK^$XXR z4sOkoktYO|uIYPkCV_Dcjj6({u#N9>#0^(*EVcS$tWR zyDWNv(qQKeoLBn>Bj2HKpS!sx4s)weE+3mSj%)bb7m7lDY1@d+CClGy|G~*YVjo4X z`9hELX8hJSo}p2barB<$&7)VGV!Z&Kt1}gMelg3fyY+|bmUfaKT`Iq=n>qN7FClh9 z&G(rz(#*ij@cW)ve|3n&HvuUYm^}lkV2%S$puyoj*_Y{?#wEDLM+NPfh4|AYBOj{$^y_^1?5qJLv(Nv=P9G0`Z28{bEJ zQI&H4{!kwkMR^RgNRPg@H}_|*XhSxzI90ybGi4;B)Sy+gCS~%|&69nQ^NHFr4UOEW zna-mWS}?*E>O`DO+;g|ohY)kKN4AC$zQF!4(DVqs1sv%PaJw8w3IIKDb5QAY?Nen$W7}Ft-R_5$X zW>!v6M4u^6zvIa5bzX_eUEp6`-R+Cr5#!e}*GIGo$l&AspB4c0D7?J958u+q$A>xa z#lP%Cf~rYHV)nWl(t_9YKZqU8x;GUr4hdW`T*dlR0o9wXC9r}cPg|Gz}oNt1TLZ>gJcn(jG|SnSb{u%8QL+Md5(z7(vQ6 z*}CvK6AG&NJG16pJ$`iwalGK(tNiuL?WEZu^LD=54Xb@UmNrHA_6mqwy?h<$Q11DF zRbCkO1BUPyH*Cr5ApT&QH&Wq0(0={YLc@xZ>PFho8Y-*en_8ao*iJq3b;b#R<&(b< z4|pf`{sH)0Fs6O#P9EO+x&_*K|w^3ELP<2Ebmpoj;o>?cn4 z5X7GHF7D;w=xY}DAm_{`@4NKn4sFyA-YC@V&d41$HV+LTrFF7O<`s-N#0Gr0-1A(x zX(Qed&(6rU3&oCz*?ciNMQDPiMj?6?rQyTr~TPGlPx6LxECGG3)7xcCE-eXD8*8 zQas1M{F{M>wNK3Ri$p3YAwzoOw9keak@2%>b^;>f0F(@bk@yg#9cfDI$J=rLHH|~2Nvu2p4;#)XwZNIN5yV zMnZ6m@cBvXYFjIzu>FDSM@jf&)I*u<%&W`8Q5z@kVmQ_6@rW-pBW{(Ep*NYwumsxA z!4`#g@)$K7PtMk*Ex-5kaKD8yKbM9x{m!-SdS}~chKAO1@cMtHd>sx@R5*z1DhgkB z9v8$xGZ&*1T{C1Oe9cbIBAR6uXDAhQt~HH{sbPl|Ru$#^~xQp8gb4amCmY8rNb+Cn`71NVh1;Q zW2TobSTq`1)Ft1bT)c~0e^x3+`j=Ii(}K2JIS1g3 zcH+ryZd}=|zgqub*5hE5MTm3HPF1Fxz&nErePyI;AfVI&y3)|)>`AEEr^WWk02!X>@KKpZz8X;|1r4`}|gC0VoZWBr;6;MxzI@~6)Sn@)F&{gQrr~X1@{Jn09uj_J_ zq$=}Izs?!F&@xc+9YexCH(@AWJh(x(gXeRqmAL|;8%#2+L#I?~euR83&XpzEj_nH5 z>0dqE*+&f&8}Uw2EQwj=qcny`ZoM5r-%jg&hxHk!`t`SA$m>tun|={bxwsMZns?`3 z6Objdo>fH(sZY`Dw=*Nct&%fVo=@jrgOX~G6`l*7*HZu0j34)f>i_WpZ_eRPr#kTk z+VRVJ#rF!&X@YHh zoRwaCntEr9?LX{b`QZWP8`nl4_74rR)Z^x6&DRUA>e)-1GTn#h=glH#r^YjNW?P*o z@yPa%-GHW(+~jys9+%tZ{O!E*-_w)6?J1EroWU+GSUWpKH4S5i)kq+ z)>kiQc$s;SlGNF7Hx|CWRnBxfIhxk_WE=D@HkOP>=eM*b3y&;QcQ9=XcbL!CjxnCk zadrI9mX1(_&gd5FC(qf*@mPcZ!|)T$7-+_8`3>79@1}bX8Cf2QcD&yqENh30{*7i6yQnQ7&DG|3n@!rKp%AvfC z{(t@&puUeKCBfuU%%c~6Oc`_9Sc;1qJ7<5-rB=|B=>B%dsaNsL|L2Yr=kPsy@sfr4 zQWA~O>F&zUpFU|Rz41hL8Zeb*0JH6=hr&xr|2exHrb6_e4=UcVYo;H%#; zef@2Py)XZ6pF2B@eJShvZgy)X3Ld}m$zs8Zq(GX#ALHGkC1i5C>`K<_6k5IXDrb_Y*!J$iexkJb4ox z5=6gUWA^u#cH9P(VV(Z#JEuMUl&jpA!LnoDRCsk8m@%wX>hs+tQrBwirhhz%r#nh5 zPj3u`2TK{WYcfNXb83*R%+QptZG^)Hx(wK``nK$Al7Z{OiAp&TW2(uKxhRGc*}-u2 ziJ)VOlI^DFLH^b4QsZUo^JMdP%KT1nnca$&mEHG+a5wG#gKq)N=5Kwk3Zv5zPYyhV zlegZ>CvHiDKgiSdoLdDq@>X9#uf@v`zp-F&ZnZ2xG_FL+C2Q@ zG_BcL1+OM*jf4to(vHQ!kaeUI{W~%=yMBv2iam(P-bj+s(742j+jXO1{S}s_!!vCX ztGa1?AIKsCH1pnqVMyzRqy&LU(Of(XWdPBa6}*aYca_BU^g6f4eJ{qlIX6F&`^$mA z@RG2+(Lq_wu$e$m>~rF!sY9IliA?d^l&pa9n=D1qtJ~r!4`Pbw_@OYSp~$W0L9wyA zZW+F6FAE&Pucet11pnm+)*yfeQOK!LYNV65FBeh%H9y>}o?-lov*)ZWElsi~S^jXU zL=nq=4V0r+(!A(t887|Y_wehWkI8#x4YEeG~G9Yc3_4$?7nH%NEakl%Pe-+LVU5A1#Ib*(sKEj?;n zbek)hNB-u*Y2@1i?)D1O(r(ULFXP&qX0PPEBengGx6`ag(QUU#kebYn`mR_qTB zBd~4dnV!G>wY9cVF3`H`r@e?7IN2bm{<+|%R(KUj;Dt5v-t;UWekH7NLAYf-{Pa1p zQo;3Ia@B{RX#F$ok78vjQo40Bwr-i_l^$%zY=&PBZ{kVL$%NV&K6E3G>(dmdFj> z)TpeA+yOzTuHc~~v2_Jzp#5>*=#{R{oXwcmGnW z;u05^0>o>NS}gJ_9&&YP2I=0Tyi|sAkVdWNdwjgVyPYdg2iw0@Z2F0bd%I~Y9iDv< zc9fNsO;!$P1mvdpo^jpIh89jXc1OoV4M!u44Cyq0-?WVAJ23|3LELE5j~THZ+RFyB zem>U|@*f&;q*2@6htK1ROi_;Eh#gMiE$LzLNgP)h7iXOWRIW~d_>NX^XKtK@E@4m8 zUHG^bFKiDf#*-$RFPu58X6%YwZdjG}=N+PsDEh71-2L0I%sfDSpG5 z4IV+w!dp)iwvudlW|e+&HFzc+tVh=}&mm3jL~JW@o|p?y-YgMv_E+NhIJ494iE?u~ zW@Rw{Ookm_V3;@2&!7j4-~YaRHChzCJt6_pf}wgq)beV?{X>^E<$vks;$NJ=k2I~l zitPb-E;sJ3a$hT`DLYFf4!4Hp&nZc2tImBN0o)IjP?E{#&XS!KB8%d4QWz=oc6H&? z(s#X_A=as(d??Ge;^In)pzZK$r}$rvni6SM7<*X^u1%;nhq`IuK3V>UHE{>_q*h5I z>>PJxMPQxLG}n}&p^G?m+XrwKF-JP~D(|Dc^`6gmYF9lsECx=j4=dreF!_lX2+pW3 z$v5nhPW@I8vkM*z!)%mvIGPE6nW$}XfXZ3C;y(VKS{qHIY~dWx@&;#r+sz&4@p6m9 z7E`O_7c^U_2JmC%ExjK0xG(MdOgf#3{F}I*3X`HgQa3#QM@2A*=E)W^@d~u*_oX(9 zr>1YHBL{sghp|W6gC1jmt~Au3ZUkHZyj>e0U^vF?jq?QMGkYpZ`6Xe3dGzfoeLn^MDlbf}mAB^S)s_4NJt z0=PNC5WlS|0e-JY8fzPFQ~D4YB1fS4S#wpiwrOWDM~Ngse8;lJ%^&RSby7RoaP$XZpm9xGzJ^c_BC;KZP zD_Xb#7x9kxHEo{nJg!uzSq%#=<{>!bK74^&C0>AiLsd<2YZs!^UF#^gOo$rIYzC$? znDS_?KKzmo9o0h#VZ(eT*QY2>#Ne!cDBJZw3SY$4bGjfiN;4mTTl64OROmt3q=*eK2`L`@qCyZifShS6Wv zE?TheR-K99(*7IK`TRMA0XkkcYO_R_^g!rvQ>J(vTHWuv{#J@dM3A8Q%N+Mv`&D?u z1^?@T91zGj8a4^kyJsb8>t^~V%8C;pVyM#RB3CTmUXZ?^_%4`~SR%Y`*NTI^6V31yq_C#saqfn*F_qDAk1;cPl-;T^EwLAhT0vV-mYkE8s4}?D* zlD^GQbCy=jx3L3D@8YJ=uD@@8EVM$Ou+N^xX73hv8*^KY92~x!$a)9-q0R(hEod{N zp?fSolCpYDtH=Ras|f`}s0jPqRS^qy1VLxH+yMo6CBdv>I1D9t{sZ}O?yD)~K;cfd ztv#ol+RpIWRYltt%1!kZ0yL`Q3Gb-9V9q$eK)>e&B9_;{qw%MV*1NTk%%A@ymR5XN z&=4*>$nin9yX;z?eu_V9TCO#{)HhT$#8dP#y+p8m>C(!f z*{uNj90Pq8H*3Wxi?mL68k39Xzs%+wbe^=ezasRFbZLIOeJkESsX5?!?o`eTs;T?1&%T z5k_zDcUwged|jtc9FER*@_s6fjdyWr`92~^qB#a=29UnVnRjh?g?r>HSK44-3AwM0 zSSn{87YEPn+hhw=n%$@n?S7UuEFE6V5AyP7UAM3*9(7;%Y%?yuW<`QnwN>cY|4Gt? zL2Qk!>|w76^KOBqX3?wlY_*Y*fA4fH*;&&KZpa4rG&8I6*CiLdgw1q4CdeuOrurdb zzYNbfUz>aVNW+cVBkP+>lFWzRqNT~VbNeKQDqA>dt%G7Z|6^@jAGg!5~Rt3-XYq?Iw z9*5>(M?zc3=Uc=a^bCUNueJ5VUypGb@WRhrZTe7wn2q4oJlcr_!@$K1gK!|qGy_@>;btPXDjsGB9uTbhQh7{jZCtnB7hbGP02+JNy& zcE3hGJ%c#y8n06+io^s=0`j88E+ss2W0u{Xl$&gbP@h@;y|*Xqy{qaX7e1dM%rU@r zd0faiijMjv-w!@XdV9Y<+O!@NUX0XKu74%aQ3xOusjG6E<;bX@uV6%!)+8!SBl#n# zu^}e7xR+;Ng5W-olrZ3+vIFKl-|*dP*Kn zH(d6wHINX4VujOpC9#v2`6ylr#kO5@0rQMeRWeYtU$2CVmC>si$fof! z+=DM4Egl!k0R(R)o{6gx_GCR)rGf?+E!uwn>;5h2{*m%9z1aH+{U$ntBQMru6WFY3 z`@_#;1#`}CVZt8%hGEO(kNv_|jxYB0gXsn#Lk1F6B4llwxPqP0VPL$+cWS2kCMlK` zt>$_Crwd!x@+XP9fcWjQHD9=I*LrgIL;YP zs@{(dx$f~@>07FdU+b~2PBT8C8fYnO)nB^mn% z2l&uKO(*Tz{BF=cKvf8q%3tVyU)2uRMZJJv6frrhgiP@xj+m38#V=<>|Ja3~8Is4# z&tlQUt1MoBpLAWF=9KBeo%+!T_wd!~Q`x^i=^eXQYmU?iy_(L{s-=Ofx@r98PesXb ziJGYB4dMyT)ncDvn-h*vT0^}9!;{YeV)qSR-am(drvXv5p)NKKb0@OL78g^7)2d@i zBQJA!>WJ-;+P9pda>B0@pE_0z{SVmT?}HR~+?I%q0VSc*)WwuF)@DWN9FJHm~cJEUQH2!Y2=?P;zjO0Ha8rQ%34~}N$)JEv!B`;>5gYmDYGL4S0B{RWuXGcfJ zSqpSGov?M6Xw>(p4i4MREz^=JO54?1Mfg>1ciyTKR_hkmQR|%^H?{&)ffy|XQPWt9 zutlv^TqAjv(Z*G=PlroSq@%z}sc#3BUd$8mJ#IE;Vk4}E1a?Emeg^N*C%7JEDQ_Dl zB3Rt-@Wuy>3lb^q0A??|<>TvfVnwKh1{g8&9XfT@;58BxF^}ah(KWsmpuM$_mmQP2 z@Tp}4XkjHFcifZx1b=h-lSLOAVyZY(a|Ibze=m|E-PiLg!n16KMzNL^B0-?ors%Re zJ;-%)usFTOrvV4EeHyQ1#Rk(9#`S(Feikw6^yulUuK}HzVLme#CT*sdBJnan z9%UwoCd3m$^!|>a39uwnt4P>}a%5y#J?0kfQz&%>C0HP^om5yU#q@}u2_KYlv+-@G z<4d+fydVq&&40k^ZajRe-T|{u`YSzM2#)b?x5c{Ds6KNNJQR62o9dOt-ibdc$l0%x z%Ydy4Zo!Cs&VYc#clTs>c4afccWdr#`>2R?unI^e^iSI05#6+Px^BBlSngDSg+&Cw$q1`R*HEHUymT#Gdm_7wXwYEl`h>Bt`3q%++&UYx0whM+BZyQ zd~)86D268p9^?-v)=D2F;8O6*9BRgna zmRr^aApo{^T^u}f2cz)R6T+SRPV#KiBN$#5M06nrKfvMtx{hTI<$03Vij}#Hm?9hs zW=DGcaop|J_e8c3p zT?=`6T{|J69#~sh5hXx#60v@$7JO-i0Otq}B?}Y};U!_ULv&?TNwpJRVU_@gaIdqy zf`F$tYjPY@SVIZGkWS*K`wTb3zJV5D93Z3V*4~WtTyxw~dM|NoyVKO3XmeQ?>vFfv z@OG;0&ro2b@rkk4dXcJ?@MnI`nkJl@1^4YYoJ6_{m&}fS#n>(5{PsE5^KzN|QV2Au zzkeu)Nfo)*By`runhaXZd?w*o#mH~K9E{3$8*@DH*S^{w8Cl{mh>NE9 z*dn((iEMvJuTRJE9iO;YlXW)(n@vN@QVZ5nv#Z>|ZowDI+w@@1!It+JF%AnKzfDvv zGNciN4L>YpI~7XxdoV@tuSS%%eZw=_VaENWum!hJA4~<+g5L%BOD z#WrIC!p!P#d5UQO@nh}+Dk0t^!9S*2+BPc@Vqt3x;(HQ=etYvP;n-n=^!$Oph?|v- zI$h5Bdw~Eig3rr)%*qiH@L`m<)h<5)c?_4+j<+7V!izVm!4m3uF3eT^@*2#8(Agj4 z7l@a$5$61J>-IK>Psjm(LwMQ9qSysg4eD^;C3-D!GvIwv`2?40>>UfT2z9GqeTxpI zvA-(VMiCny|Ft_E@m993^z~zKe+FIKQ>weo5~nqOApcumT+wX$kmuyiryXxrHny9( z_F5Y?1I>g~&ZoO~@7|qpJM2&Nu@%;wn&#!@L6Sgs3pI`=6XZw}vRrr9Ce?8>AEt8= zL+oM9jz0 zF5c}{CdB<4jkBY`AEF1?%I!??Q|YH1?ZA8nDHTH?=LRXWnJ|B^%@;2plv+WxG<5Pg zuPYvHid5iCJ%L0%Fy2z8BmeeABYn@6vC<|gZ8&YT&>~`AEHR>(9wKe9PK}4X7E%9h zyJYCiZSK_e8`nZC#3V_!Vzje39b@94p-VRz+v$DO@S4(pcT2qkqf(^i$t+QeD@IVVRBI;HZT;k% z8#nq}-USB8EK_q68eE*|ouG%25i{IZ<^?25dB>E!bUwLNR=e`b(Rors8JjQuB^57* z5N6i*G+yeWbw5wODBW@t;$Jz`3mkJG9K}HT$w}S%Ut2#`X;WMfTuBV4VR&{#Q8f&F z|6HyN!86f}xevIH?2$9QqGg>}ESJT58t98iPVndHnH$N(&9xOi^+b<9f3&b4WX#zk zzmW__sACVBF|oKXa|gZmPR+UCKsJ2#MR7zRfmC9TFnWj+y^Fz@jJqX0@X}K8;&;{E zQFT?W_==x>&w+U!1NO#XetEJ4UIvNW4e@)QT6p^FVLyx_?fb7L^AmS%Zy!0hBza6WifAcgr$AOU@fjgm>Dt*P@t!$(67pSSJpev?R>p1Z3NttGml89 zfXoZawl&$5v1d@;)>+jPITmj{iH(sl2{iv`7!jlP8v8g~b?r)9v>s$F080G)&SAgv*bEX5Z7K z%2T};KRv)FQtAZh&JqiKt$;M;e*-G6ox9q}nYV=HzfuZO=3P;a^QW7V*0MidEuR}1 z)iTqOh!puq22EwpofTasHkIRp_%UC!tWgf(5zFj2c2Z(P_A+2Tt*rn)4z5ppCL#~o zjC}LSggjVsA2T|y#)=Dmh^c_imvs;wKGt|Y92D6I-@G{czGgMB`mPbCtQ!(Nx7oB` z^s`t<7`)s3SQRr+gY%>@hEh(FE8pqUQMZGPhdiSM&x~0teNA=Didii8@@2{c{Ffd6 z9}ff^$*OemiM`a|WDSML)m`(7yx(8=D? z5G*iTsq^V;E@h?YOz)!0vYUcU{REcyV8WU}p>;GzmyF*yZxoqV&pFm$8tDdJYld~W zN$Ih9vZYm9rATRojDyI>D;h+kYEV@O^e;i`O5tIfD&^Hd#i1Rf7SV%{BPTFL*L9-(S$(P zr3~}D5%I%H`Gbzzg}UehPjXLt-cBf>IfCdTjA=bSKGWGm(4D=ri26y^-u9G& zC-0{&uSLf_Y-_|#c)hBiXW%OtCkMWMGTniU1DpR)4sd=M+p$ly-%&VtQsg)x^i&Kc zwq>yNQ|E@Wk~@wj=5;$+Sy=&{@0SP8fOM_KqG4KX;QXh*{eAgSJ&<1~vEB21`AmE_PI3I;4E~htCAGyFEpY766JLK>*$?&_elER+03h`CnBx*ijXK2T{$Xk;MIAuqV?%&ipVyO8f`P#61I0l z^O3q;GLgK!J+zakt?ylWekk_9gUHl(>)ZG`*)cYTc&Vlm68Y)mYQEW!3`xd_^oL(w z%}ec+?d;hzRF08=qTwwhKNz^G^A3i)(-m^jBe|-B>iLSXv3 z4{HBvo+V3o7PdLeD2v=&(Vd~hxE}w-%k~>|ss;tm=f<)iE`uiZs&DhSrDtA?MKrb4 zj4o8S6~(ua<`$+D>lBSADlb~xzg}wI%xiN#ds%#bypx;7a<1#XY^BRi{ryKrGaT7> zxkf~m!Cq>yQStMM`}wExq>X=^I2^bKQbrj41%|XHP*;?mmm%h3h{IqB@vAbz^Pda# zS~=5^rC;sRFlJ!ac&FYwa9NXA4k6djte)usx*JeCEp)Ur`-6~wZ}{}=M~ORa-Y7mK{V5lRgxL-VUXoYl5zil7z)`A}Jm-CXB|TgzF%?ix{zCqc zWq==zd_m{~f^9Kx);SOQTG8Eb5@Pe+y*1iDt$gVwyDUH!uU}{lM+%-K>`a|?>g2kZ ztHyTH(|dx5cIG(D1~$~IEIbB~LL|RK(09`vt&cv@Wy_qaf%7Y*%Ux*2RG@4~0!z1! zI(|GRX3N{}TEgn%3w?bEG2JQdFMnC{d6$|WFq!;(ICt66Wt$@^+yu#qcZ7h4|M0y1 z>VBpTznZ#rL8^l}pczLo08k?KwzXtUhJbp`JmfaV_L`K&)~h`qT}CMb(Q$%Ed@v|&Tw!rpsua@C_W|jN%q$PZYrA~#7A@bDU}j<(+KdUVckS_EN%qo z{TDZ~X6rbmVCt&selMA7EA#wRXjnYa&WwfG!AE9$S_v>BzrqkI{j%y<|LNBFfOV_V z4!P>CjIDyqF8wq6gospe!>-rb%w;lUVcwsd<;$fZ5gwD^)kMQ2)mr}G?>b-XmBB&Y z(4c$4MvQy>6v|$(gE}i+&eZJ|mPV?`zY@*&Ea~-+eA;A~ zb!(txUEYNg&SoH1H&+mIjQyMIRx!L7r30v1BX`$;XIWo6zy~ zcKf}6EPN@JrvpUzrL+YWsk^E}(?Gza>v}&-1g|5Ok%TmC=YOR7bp)2H*;m4wHk)D( zU@fe*%Pv_@r9ieyfhNuvtcBI(GBvgM!pfRzlB=Uafr?}z0xx{4d?(9MYEaQATGU`e zu~apIN|b{k&|pfS5yTwD3RH=908v6?JS48&Ss}CV_Pzygqj?lz_DHH6Q5<7^Dc*JK zC9eCjOhq@Z5Hxj>c;T5ydbeXznYd)Z8=h2_Tu_iAB86@MUfEx+UK?z$-|~|x**EPt zU>Q7SWe?As*;QN2mK#(U&mYkn=}<)2h_p}i_q3>VrtoQ~3^THb$7&ko`a*-uk`gxu zo}rNVOK3t}B#G>;W$HE1tknA+36ZMzxjRqn8$G?A5+j{3bdaBczg>qDL&qMYxZB-1 zuy2x@s=S(x&XBjPTtt2>#axHdhYV{oY>6UK^)vw(kE^BNa6UA1%YYWH?>$Iek^FtS zVVD95tS8j+hbkG++}sWr+qoUe`NQ%nZMcP|2#^@n{=+MaG_Usy)zzdSG93sYdBa2_iOrU9p+{~4N6RYr^NsJ+Iwy#Dv@8E!GreXu4D-u*qk238HxG=t{lSel`s?1ysQvZ_>s&@88h8 z>YWXnKuP83o>fXD;Zg^TK+bOg44kB&%!k%j3__Tz1{32fEch$x01a;r%q`G0tIy4+ zFAf%-ckxVCe;B^9^@!YE`inT9+_oQ8*t4HOYr@>G7i-(Tw>2h%^h-dAY;9^rJn8Q= zm}qu$8eYSLyl5r1ao&UuiFeS*&-P0v5cD#tAJ)W1O^o*Lvk9B%Jd zqsAFkqKDA6zA0fLfj$b4VvX+V$aKRTni4sZrj;Rjxvh+vSm{j@L$iykvo~j9P6MIN z?A2oqR!D*8flQ}qwjF5Znfy&fuMU0ZeI_Mq?qLNr`3UA3%C3rVY*sov>ujYX&y-+m zTqHk@oY73KBRb=uhBr{;zu^-3j`~LXfh!%$>dzS59Ft=e+bt)>E__|z8x?Ai+&BsL zQ4#n=ZKK>~L&WMBH^2M(c6WmQLev0Ifk_?gti!83Jhc~c0KUh2D`1|X96pZmxVQa>~;1ESu8XqERMM%WdBvK!1OR?{JDU|KpC;F7@L3H_f*tqgQGA2xqZ* zRCRQHMDACo7FB@Oeql^+$7!}BA{Ari>#w7@O&#IWimP9nJ? z$MVOg4e&|C*%oDkW5Xu~0r>H61?yQ7Ab9yUCw?6S+|-qkWrqyMKSp=&f(*x=v<)P z$C!1^nzQ~-R)%Y2RX%^*(2J?s-P{f7Rx`;@a8fgc(tz$6S%=?hL0*~j?|_hjibepi zafu4wYh(Jdud2+JBnR=7x9cT6iKo(H*8zKseg^|5V7^D z5APUe6ybBCgH{luWd+@4MUsDSn7$&Z1;+&6-vp-JLXcUk33u)*n1)Q>Rs!W?mDFNYAZq}st( z3a#g{2NfJ6>O2V?WeD{*;WbyDnNP#XB+(6hs+jdYagwM3Ylm;~s)1BJuU<;i#2zOF*xKxe8hT&nj-!a^-t);&2qmh z9|!GTtPc6wm0C)UzNR4&)(*W-If^_tKK@YSNW|2vwCJxXpv!_Wp=w=IKTioJXkXeh zXOU`pX}=j7jharEh@OVP5SvBr)#9iIDP}G!OtF*sLDcJ8G!bk5>3X2IzkS?o*hct1 zzk8R>=EA{q0nrhM@3-S<5M8P=^h_{~KlJbg1uy*yZcE&1;Y~yi=g|Btds5x*d^?1(jf1XSVC}4yls_|q~-j5;Qdiwl_aCD#%tfRaJd;uk2Y#H zRJ;}A-)tW#Sz0LyKsnvL`74n*e6grkxgASLiDE-tO@l4;l6<-Upo|hv;e=|vmkg<) z?KQBXH1B-YNb zZ4Mt9kQ0y=R(6$=l-PY^W(C@T@$e;K{5y)~aZ8Vhm@U2HyzWTy%I+Z^t?Ij8i#~<3 zS4w%cR9VZ)mvs9*_`%(lCORqXpc``&daDP8OS|ro)c?~4l+0+w4d4$vWqdUqb&4RCC zh?9>1^~uRr#aDe$iNg_A!~XOva$iN;$2bj$WG?J}jrHK$TndR^j$$tb(#USI9u2m2 zWes*5`>>SNjYMk)Y=iEEU-jh|Z5B;L1{TnpjRdX0&b0 zvfu>IpBqBZ3K~^2yNeN;C3MaC{yz-SjivQ-!QR@IU*cG=F^JW>o`W}EUR%6l@QxBg zUw`6jmVPOd$8roYo;gV%D-!2l;U9^)l;ck+OlBQ?bB2=GY>nb25{=V#wC@6`Vh-Ld zBz_UTR5m{=qK|}Yk2NK9%2s&~W5RQlQsI34sDX0x*1 zNOj92z3loP5Q=?DlYDKeI6#x-qR;Pms9AVFkYsBU!U6?H1n~KJY71e0424;~ym>2u z?FO9~95$o`Vm=3scidSFbhHd8w>BfqF59%o}4>{>X4=E^@>y zF4E>hX@~e36Q2wCdqx>m#J#aFCfpvI-|GbElXtwITWKS%LC$md(_Ph^nEXGmgjoTK z#GWUwWoJGIs}D&-w#2QO8byR8F^8*rE`zH5c5S<;$(EnV+RuSNE#S>n3scDmM93U4@EmPGf$Cc#8_DDe)c~FD z*i7sb6*M|>VlPjch+nQY&6g|;(9~^jzm>6AB1oIXF4Z10EGAoWulFap~bR7Zdr`04na7yU$7UY`c=n4fO`-Nt+B zXWBU!G_Ycc8*u3MY!_Il*jb&i?zS?`vo1%l?!S}s2}T0wK>WsMJ<49bWiUrOk-iO+Ms(0SW?Q}6Q;7)7f=G?%mSvKMi&vwH2hGQv|opqFiR~i zoT5US&dH~#c{ox#36ig+HI54wQm->~*`SXWlX}ZU>sZ=}J+;YUAKp{Y|1ctui%o3& zGTI~PM%xVN1VnSXkCjR#_C*|SR?T$ndwt`S=Q6eoBcoVWA>mA~&lJZUcj{}RKcr%F zs{wX@#!bt}J{CPI@!J&td@9ilbb2F;yNuYNt&W>-1T9?p7?jD=F6alSo9)`#TNXT^ zj}dQ*U?1sGQk2=bMTqZX`FOeckb*4rK4!taoGm!^9`)_H2$g`Ii>}NGNpyg@Wc>Qf z69ZSp21pL+i=Aew)n`G)jR$;D9cWk9_C0iH7^SEmkZ3>YQiHCY0UC-P=uq5hI$7gQ zy?GCkb$+(e)L+*g-404F1K4yMK%f-8FexL5L*vpRpRrIvrF;iXQH}K2d z;X~Yhbfrn#i|nZ(kphRrNj$Fn(D;?#rN+!{t3INCJuyuzLIeg~eBhE}g$B5Js(Xfr zL-a}L>1K;&&V*97Gkci#HS%IeWKEFxG_hq`aC07?>~>_Po3>n}3AkS_-Z7QiRUR2D zZK7bdG$yDX5%HTo=H>(Av9?*wF*1o3E;Z zRAinm8uKl3> zO}QS9XFLqZYH^_*zKa+i8Ax`*w#VCY*_Z-*TDKA+dKY23A2}QnWa`Qj5$IGBk7N;P zj#Uvm>%fqQSFhv8>bC0tsL*8s*-40DE3mn#gX=P#g6S$L0nNd^xx`gNy+$t|1(ZB7 z)0#Qab5^lO;%|0nhRW28={ADfk(nF=%8&Y`7pzmQ?2$g2GptHP<2ZJw(u+tAai>w?G+y_ws%Q;M`D?{5aF ze}u#k&{rW-;1!sP8r8-@WHxrxW-1?OQ?jr@0u{YFDNTG5KC zlXd24MLA;&xTmG{4H?>5vI6;>+%UU=#6{~`bSidRwjO4i8(sd>DA2}Nk5A} zw)UZrDld@-?!{uSMFbCXO-=A00YNNINP89se3S~=Z8&|K1*zSg?e{~^c_!N4;|Z4H z!|-h>BVZ9L{PYWA2!{wFol<53gA1eSdp{ zTFFMUk|z=*+j)zpLp#AXjv9K@E=0A1!V`&+;2hvoc0I5O8FW@W3l@MNUn2`EP;TL8p93vMKk`2E5hZI&>{}D4{9Zb3v6un*U@S;xy zTBV<~O^i2ee^{g(6SXi$yi(!t43RlqD%)Dve{{&$5tT7!Xk{=4X5w%0cx9-z?5-^p^NBHO z=d7ciCO<5A2lScTte?(smUHjh&=sic{rcc*SVlkDnJ){}^a#)YoCFTs9g8;>Y4j>G zv=SVe)(IE-z^44f`n7K&!2i2ng(MM3kT&E}1?mB1IP4}Fw$w`UDKWUUXc8T>y5PEx zZ>D}De4X0$JwrluJoGy=VlyR}k@qv5k8JaNiU`hy)bVt5)S#n=3lxIhJLpU-$Vd}w zQDf=UCl_0fE+f0U2-Kp!BmiEoK=1Kfw=y9 zt!Y(_ZaZ#Ja+u^^+V)5HZIT=OskX?^B!9d#J(+~||53jy5Df!V303#s(fR?(-r7Fw z04=5%Fy!nnmw2qArc8yCXH|Rchu%s^CA2aH4&G|Zn|G6?_fFc>Ejv{Z?wbiLmo0{( zvMW>*?N)2ReADc#EfN0NFv?v~x%(R2u=|r*e}^YZ&NQT@wk|lcNx=9yV))}JOzDC@ ze!Nhwtk3SrgM4dxNA%cyr0XNobgqTW<0ay$NH8XRw8`u`n0zh={&~;Or7d#gWV9o zr~%9G7Qz-aWB2yY3bWbH;Oc}&JL>>3oz1mynCiEv@!4(`?ewj0(oX?UOy878tjEb< zrJh(DAu2UYqc~GZH3@NA!b3VWr0A}RwMuUy1A2yhQuwo~d0F{E;=wqb=sEWB@F-)k zMac*_<*|5>^qJaswEKEax zaa!H42~~B}*zJYBPQ7xjWv&_qG5GQCwu_|ksIk8ZaOFvII#?KCoy=BzgipT|I_%Kf zYQ^6A_6GlVD1X4>ru$TRyP>qbz)c*rUjcHK8A9%Y@CdA+KmRiTFC_g43HNcmWVefs zmVG0Q)PW2ii5IjD!s(}0@!(QtdNK@1jD8Q#b3aw5`Q0Tirz#Vg`fYGt7We*p0>-Q- zW;o{|Ao-|(=cCyr_o5JKYO!>iMZXraowae}lw#^P;XtH0s9X}`s0{db&+X7-9%Af3 zf2zPK`==weo$IHoaT`!Z#*FNZRH}g#C!`*S0xusf@^6Fol9@)|Hy8=aaCBODtf7G;~C4nIMZ0M#KJ9G^(*dx*r-}k(Xg6E zu(QDV##SZOLCEihdGa^S^mr}IwAI$^r_t+(p-?SiC@aR>*hjnml-EeGtR(ZFDg#kst#3G??FL{6DJRfxD8f z3m1)@j%^zq+qP|VY-`81JGRxaZQJVDHafZc{m#APj`I_$YRy%1KAN#Mc>C)iU{=(A z_10U9$E^U9{)FF?87Vc)?$b3?aaMVSjCzq%l|d)|kc{tO%0q+Qd7&a>eI}DvRpy*?ylVaF4GadkqLz z1Pi#aH`qbsAz~9BorMG%j?@M0Amh~08&0CZ3Zfw(J0>Z~()u&c-+9ZhUCF8mB|{=` z($~qs)NxhMyoiGeHs_ruUUkGLOLgB9<6HeP&Qn=#mJ6gK{dix84Wao0EC~Ip%99Qk zNKbKx9o(rIJ}iY-y?$+v)W&=v+n!aNni*9MZeJhI;q_3s^QC?Z%Tl0tUUyk@?Bn3+ zZ*OnENS{nraI)nVY=4-laOlSQ5WW<){hu*5nk@g$+P$_TDl^fy!fh4sOScPm5>s)o z@RExkl4XA~U9~rdae7wm*{7ma0t={lc`Cn@Wp-gNs(*M6%--Z4QyHj&v`6tzed8%@ zGB@-na>24d^FXKhN-n?h@D{X6q%7~nc4Z_G#QLar`FE#@V_Jbo_J0`ScUNNhn19VT znN%(kkBg3Q#^B@wK49qkoCtyj_JuV<7hZI}S&Hcu`xkVjn#c;Itvv;DI!I^1>QUVn z%TmnJCtmF(vA=n6tk~CEL{JRt1W{b)l@h(L{d~9DiSYohC;y%x)e%&X!B@oHz=H6y zt5tu;n`mpp4mJZRVrmr~0E?;ud0Fw_KRf!yPEFFVsYIgN(i}C_;>;&a)Ex?wNvOWM zJo#HRy<=SI$VUI;hvV500sk*Qyw#Q23DaY3m9;CZ+C8)bQxV#z#^No#WxFrbxenjB zRKCNv+G0RJ#ni5uQGJ*qOX5}|BAWWoEd0psHyBDLR0~&-;c~FcW%r#Kw`#j4YDM@F zqX($bA+AcDq3J~m&c2KFmKj3G@?^l#WZz|}jaZhY;%jY?74smo@)gqv=4 z0~5X2^F>Bq`v&d@!xXBtjDNFZ&5uW5#%}jMu7!L4+Ih*<&V7Yp7Upe7Sn1?J*<*Ur ziciolGLM}YiTgJj6;r&?3%80@YE##?+-@G}2`+F0XC%R+Vz7E_;nbP)&XI$4xRQ9*0*fjD6IBfZcAE&JNwz z99kKe%k!+T$l@s82M&Qul;ROK|b z{S|G16Su0~avvvhQSE`4rVJAnvolBa4xK!KuSmXD0cUFE3ZZi$S+Lc;`DlWftr-|g zNd*X7;j-1!$=*A>I44gTjzU_L@);8LHTEh=xj(UDmphitzs5 zy~r!b=Va`(I_$C`$;sHY=(t_@XnvRvmMtLGyKU0z zNCb3bHF1JXC%m?xl9Dz7r9#2B%bc55{;<=V8no{nlO|}mG2ZX5wD93_s-nr)w_xR9yicPDyZIAfGD1_=E|Mrd#L zr=lx}>D0|hg_7WfkDxaFdv9`V5`52s(~&yPC(U{gDW(LH8o8fD(kF60zEXCyy~wQo zNzeZcdS`RYU|1DRTO{{X1PfQuX|do!w(e=7_CuKFGqsnAlU$GXxjJ$6rD~${sA2&a zVIuSEjvZx8yk*4TYMg-`Sp#!t>F9`&8hOs=JQwa?cjs_D5Yw>RFJtS@N!oF)GdMTuAa3lyLjwOft3X=3lVy`d5KP`xm0l4Tp!lZHx2$){>l}gRyguUdE2f zX%;S#^WthDh|*$wWZ_w`kq$xN9tNBz{X>zY-sqE}aW8aL-2dXR=K5hyNepH7=_(wG zRva8Cecyu`(lf7^>zplLQxbg>|0-})+O*(i*CGuE)KRN2nZdF|1&mPSjCE%K* zH^HYFzjAkB8A%xx6w4ADc}21ukox#O+?xu!jSg-sl-)Wa*ST2 zsxnGqZRXj5P-1Mz=HFoHHa{*%VlTe(dN8PZv>m@2dEUP4dRK|-<4_~{1z9NinP2aW z(Z{Q!6@SyPGf3iDYK9+zhIR@pP<^6jql$^n;7>=#fYosLT>hM;ydyg@=EfvZH+&8O zvf#PS+w671^cm&Fnomr61=9_~5xtdxKv>bfpp3%c$9uQ#QajNp#o;s=R}VsVFcFEH zY0YVyYTt2GBvp2IXu zeC!a97UMd_V^=2G9!=kOWI7T61x+cZFI0E~q4ECc19ELhO?9FmyFKf1tQYZ$hl0%y zru0k7b=z~%Xd!$N*`ZTeP)ckxk%u3%>x-|797#esX6``JKkhJ#bCpUnB_y0!NYLb! zY~P}eXzhnDz8pcj1e+p;79xv4F#CX0QLohKPm_UT(0zG3Y}iJbM(-j-?7ic|bD5r@ zIV&(0`VN|73G^XTC(`E8X+RtELJX(kII(;IXuIRPTSj9<*RKE;Yp;@2YFI=B>Qc-K zk9ivi5$*cl&D(@la1eO>x8MpgJIr7au(&|5(76;yDL*YM!$1bUJ7kGgQjw&~2imistlOBhMsEyPZ-j+>bNVcQyV&Lh(O0_4L8)j@IZ_H3dfNTp4-y+&H5Vgmzwo|>jX zbN4;*93;B=6Mpb&NMd4ejNSsz#vb%_fUVqE0LE-^x9N#gw`Xm4r`Tf!A(tC+DqXQu z>07F3@)~ZViyPccig5;HgwJi2&a{e^3v(8cN0tAlFk@nX>1cQMRdpQ{qWJd;A#r5? zUrn5W0T><}W$cR9EUKtNsT4x#_V$N1-bM1KYYpL)xCPBH{h9jkEo%@Vjx_(#67xE8 zlGVbkC`F5O2gYRpfpKc*;QXc5(RQMb^9AA{cHALtz7)Hd#$BRA^zw|%VgejEOaX+i zEP-M3T8f|vxFCw1QoZ^eWWetdp9sA!0XqsKHf^hvql%dT$n@fh!PL#q4T0xC9!^o0 zewDlXNiJloiVzczN^`!FT{j%#E{U~)XVhv}8R>(Luj#KOKGNl6K*52qGt8A~ zS%uyQO9V~|o^hN0)Xs2a@;Ku+XU*(3G}v9Yx1}$BdMb8z{#Wn-TXo*Lp$1dyGA27i zYY>M9=IzBdPa_BvzOzMqHze!+?<|mlc|m~T9L6f9lO%iwA3K~JV4v9VAo1c)kauHD z;I%9rh-<5fLT7+xV=?}j5eO#8SfL&(UY~Q^K;&_W_XA!!2SNb=#?PyA@Td`y(-Zff z&hvt<@G2(|f9^NBN;~U%n#2Q$))Ft}Xd`411hGGja0k?3cxP(fE#i3D7?$v552MjV zEIpapJ2Q6Cj2Wl#?;m;2ZM9~Qzf`G~L80Yr172y!G*hYwIv4H%gI11|XZ7+cP&HJ|0 zA38W|Qu63+uq71IbaaI)D8rpH43%hMJgE@|uNiZaL`jUpSg`u+DW{F-M#GUhJ)V2%;bhKYk|)GBls; z7j9DYvaj$ZBwBZuFumZ=iL!nlR;8%ZRi?O&AFV2+ovf~`)H>+3IT|M?bZ1Ik`iP%n zfBGHZ?fzbM_dr@y*qF|i>(uXx2VM%KV9+EWI0z4|cX(0)Nx)S=$N5?#t2wLYs+oq% zWt#sYh3;Kc=SN#XB*$>*c3rZqb(!P65kqk#$@&{7K$Fp(LrQgKHRjPl#VRISMX^Z-WPC&tZf@`7RYu zeX4wFhhH}`K}9)wk}ssn1jLe3e848ad~@efp$8#(l!GbPHHUc$Wir)@mRoA;5n;~= zEQ)jbK@{6kONoT?L7Tdq?Ic=O*yLFIsOuB0Ra!tus%oVKXfPCGHceFDC2ZyC`k8Vq zjK_PMB~s%nnUysD+*wslacq$wwd8i+AI2`DBz>=#xW;LbP5y$A5Z3E~&BxQNFc4=etchoi z8)8_hK}ay043DCMuR$}ieq-cb*A^I~`x;J=#$u_#qx#wU_Tal4%m2}YC(+>tg>Mxu zM^@qSmMkb~Nt&)Emhuchg7%u7o!pBz*dcpZ;_h)5-RjKA z3PQqLH*0O~5mv=n=xf{$3{8gB2+i~jhR?en^>&=kI&Dt>)WqGefsKVzC}Qd2xa|3H zfuV7x9UBScpl==JJs-v%RBt6 zHTnqT5REkr?O5p_YK83F3wr6O9y6b{ZX<(^!Q{Vs`A+bNwHtV|Vw8I1XqXxGcCNL^)jZRAm{tD7z@ zTbap~URg5GCwp{4JXe!45u|pEArQ$3DINmtrbjp)i=#y~>!H?*P$CQ(dT zPnrk1Gc8Kkl53~ZCaUmwN$*Y+YYn6p5l?K`dc`T8HLQvP9d9d62Zz2w^9*!!-ruAy zq2nE5ev%@iaAAWQ6uvF5kpO+Hb&b+}NO30Besgw~y9!82@nS>;17iMSPyxOv_edZ^ z*u#tvMmtSagN{D%qWR!4gchb?wvAAUDlm|C`UeW=YZn+{GcDtB+ue|{d!e($w`iqH zfzpb4S=x(s7dj3|F+@njcI zSy7O~yJx2L1*7Cymr`k@7cs`#x(iqH5ZS0v$LogM82rF!h|(mn_*aS*?Zt{~#FJwP zj)zO)n+Qy5V@`?K!ClCiWYFayMt<-yNi5Ww`Qb?vGI^AekEI8QVGy}tHKKzpylCv$5Qtyv8#NIlEoy4wzU@$Nw+8Tqx(MI`9v}6E8tqcR&dfiPCTcXv- za461f6QahALJw^1Kq6z+2-;5ZvDr!lH-{Ok)Oj~;Pf~Kt0y-uS0-9Gd%X?RNm)5;R zn>u>(=Z6#AumiwWX#mybC5>tr2TEovpw`dV5=>}s9_+8#!)(TTf;F$~o6}oZz=3sn zM1ts42CfnlP6em0Z6;_gxfgU~0+Ezw+XxOg1OoC}0H|2j;}a_#O-K4ZYn$;7dg@jx zRzn5;UOa-MY%T@_8u_KyG`OJz)=p3|<{@FKI75`?^aT5va`ke!LQi3ohLh0lY~iLO=}Hp06IY ze32Si0C zBPzz(78}IMJU&}XLh=~9KB;uzKa4`8w9n{NJxT2DPwo}RvXxyWB#!1c!y317xm(9C z1`HEfK|tnLVZ!#RJ-rnA#)#)i23*b_q`Op@l(>$_k{7Vb$!XoFytJ*I=W%&D*}&?`cbS}CNXF(TQnk7g5nD5f{{9%p?TnxvOb z`i@rc6Qd_r-VokabB-1uNgCw`EUdJ-Q_@6eBO=E!AQi$YnuSe>A?u&?-!z>kdY#P% zl{u6^$}90*501OogNgo0{XWL`t_eE(+0r&0jfjh#+;ST- z(&qg8801IPtb@0R?^ zKyQ}x+9ld%9~aiMZfE}Pm(wDuH1%+jWC6XO3W;m+ZG=x}Tt(#mI-`nbT5C+e*5yT% zszV$iDjWp9nHcAI5s!Qz*s9S!snlo+^03lPS4TI z4||obKaKtMzZfY2W)S3&7~{emZJe|_f#K{!ltrsi^`O`V!_`Dobm%#W2%J(j!&5O^ zbU5jO*k7kWk2RRe#ey=HH*1s#R0#j}%aa|dx8LRA<}w=T$+1*?EkUAtGZ+%beHC_M zk7{z^ItM05V2h(nl5ozPz3Y5en80R`Cr5rhR|Js;!^dCQT>W3*_xM83P8k@pS5eX|aZrA1L4XxVqTlmr1KEw1VA zbiuabZx5gpUcyK&5|hY8=e(%pX0Z_4{UD1#!G80ApbjI#22_Gs(xqDG(cjrE|Ebu2 zC>>SMNYJem-eoU-BK0##{o}EEhat+YVhyp<94DkB-xA9d8r~u@S5T1P9YN=0;#y$l zx{&8`LT4(rTKs)n#tl-?iCN{=zs={fK^Z#%)8yGO+lxv@A%1dyG#P5By^$Y6wM^T& z@Dkb#BF1E@y(a=YNsSU3x)B{hN4SoQvs&^OMZkC?u*6vSQgZy&IS^+xN{6ek`}#G( zF_2wW?3(jzA;RP3T+E+W9^y{y~c%@LbotcnVF2i(nRsLk^$jbfa z)PVEVR%EAx?4q4lhP5hiq_bzQEc=E|Ei+uXbFK5b;ONc0RmSMmL@(-%=<_6-i<~=g zksBpJ95y=|N!fb73MnlB&R&qkSsxmW6Ayy`1A4r$ zy5_SWh>ox&HQ-*pMslkF0bBnwsm|~+2Fr*B07_$2%dZ!^G$o&|HFO(1Fx$N#ytcGu z7uTs7jCH)D-efSN7M*|;WOE|n7ctaO%wx844jr^(jdD*VgX7saFVl$n-E2((Ww=Y4 zIdvt0VJM*t#Da#>K|!^(Ka25QKeEoWWa}N_s2M=f{vM!J%43fAF7(5R?$e`EnL^;0 z*Z`IY*-Pi}tM9*3DLBgyZ{|gmjNlb3IsO!|Lg++NOH(y9wV#ultSf0$&oQVdo+o%q zaal+=-N`}0l=zVC+0O-Q9gcQM4d;NuI#Ac$7u{2XRK5bLc!$q4hN(c8bNMx2$LU^l z*>L5Q?kM!JGN=fp_!Bp?J?Kc*%-~db z6`3kPrF(y7x%efG$&R7OBX3oQJ)v8K*582Sj_h@39fKYFg`O=+RvJne24Mq*=`)K|i zjHt{Y+l}>0b6Gl=@mFE|MEj!w^1meVxIt2s!pp!Vu;jA{_-#JvF71`V=d;+pE(w9h zrbVa#qrUF$Cs@k7lr@QHSBGK)0rrjj0{Hg8$S!I7D}gn!!*&jHN0f`8R7i9z2|dDJ z*N00>aV4U)j%wL~Kj=W*52e@DgTOS34Gh43a!R*9EDp`?H_l@zTey&c%8K?j{9%E$ zJes|tniUO}=_*m&9s{9xO%@2etMaWPv9jW^6{Xal0^IRWW`s&M%42bi_V6XE%UZqF zCh1wLRmr+&H$1)`SX>{SM?n;>LkEhWe)vuBqEaW7SRHF%SRl6 zn6`Mnp~x=H>SJJZ#|=++_A}(Gt$mL-GJ?HaM*(k0KoUyZ}p5S=EQgeEgMRp4!$j;F!U<= zl*|8?@zO1<>XbB$2puqx*^gsX!s5bi!Q=pXeHn8zIZ-_1XkNwHzDIvdK)zB*+4Pjd zxwItS1#6yK#vIs{1boXXFG=26=Ox0R4HAc>|2M<>y38$B4w6=?r=O(^(8s?w!PjD( znb%3`4CbQ4-7epLYr@!?I3Z0^W%a`+eg`U(Z-w6;y^6X%v!K~E`iR{JIvomu_G#9% znX&CIWcrkx%XS+$Qh&3#qv@^>5XPS@!9*D=`(DB(H*<{}O}7(-MItf_P-I*AAyWL# zK58G+)Hf8WgPO21;~j)goh2Jn+Y%LBt{qLjCj(?y966(}n@nJdYcJ7y;f|z_xQ2?r ziYar&hutiX+6DbnrfI><; zBWqSTe5Av?Xksj3f##lgI)ON=)>7PSCRggxQ-ki&R=x2sP3j9V@ssx)Dod>zBqG0Z ztC%R9I{w{&lqYWKPDV*-mX@HdpHZrC*cgA@LrPvZ|W;VzP3WMNG!4F}4-Fvm&ifY3z2l90KaCNqkW$VR}_ zHX_6;9v_a?NS1nUNkQ>Id4OylTS|lYAv<`A@+2KX77A#!OYzP^5|U2Qa5c`6nGo^X zsc>|0=Or2rE#gprp+`qE_XQ@>28=ulV?}o@BHl#hJzK*2g_AJ~x9+64MJQ*{t(e>b zIk|4}R|+Z&f>2bcF+BHX0OX;5O13vM0}LmeFaSmpN_=6PqBn>9xuM0Ejy<02989N^ z5Sr$r%<3(d@g_xPxn#oq>G~M$7G5R&yJ=thCedQC>JT%prp}SNRKXT(1ZZp<>D~S!j}ESBI7ht^zB=%F{c*g zKrX-vkN~xJRP8PK)*l;5J%-E*iwS?;oqq>X0oiE9LiKC$FcKP-SIIDZOY}bR*a6Av z*3sa(%|6iVgjrt`GAUod*ISl|&X%QxcGB$}}@NvOq?|>CwZEzfAsw znaW4&*Ls_S=gDjXR2zmBz)T97vur(@s(9iZ&dDdFi4MeS!%K(t^vz!;spUbDy`Gq?Jg@oLGNj|-!sH%!VZ)%Ot|5U}@jIQ14>Ufmy5+ln zuMr|i{yCMnwD|Swa@sYd+;r|gjA;x8LPYS#!{FN`rkA}(^6j||)OFw?R_LuVC6wj! zWm0}!{Kepp_Mh=qkJH|oU*$GXjh;JwHkkoYNjWb=}K{yH(g!xNDt z&q<?eQt^qb0)7m^t;d}O@yUnnr)uQ zVx}Q^IjeDpgdHZ^G!%+z)^NfW+SQwCn^q(Kj5B&Tpvh~bicZl9(KjG4*3g5yAb+mC z%3#(5ND*1JAI+13xGDZkMMIQitN*hdG( z0UE<69T~O%Q({OILA zeYL{5Q~bswnnJlv3~NHyZMCN0Ae*|J?Of1t;H?wO&{gg&nH+3^Tu3A(Uj1r=3aCsGhpXFDq0cGN?q}Tnu7|=T1E!%f#sA7 zCtp^XTn$S;HVkIqx{?Rf8nHklCa&uWn2cMe z(atlHI(EUt@D|*J{n&jY_~G@p2DTl^`a{$w(tUCY`H}`6dSom&1VQStf@wF^H4g24 z6Zj!MvFg9xD=?uvxXL}$T~w0jq`*=KAnp3G9AA0mDU(|*Lun&*M18mm1kulAA@ z_LhK-k>bQ_BybEa46C2c6G)_B|#}Y=&7FxWE zS_);oN9+H^e2sBhKPG$xgzk-lfE#HAOx4gTdTljzeqrwl_^f z-o|I4&AmPUdYa?h?xf2PMlgO=M#Sx>xyI86gEFl}2K)ko2t(qhOtd@y!)9JbJ+Nsi z4z#a&a>Y{Ckf0y1ZN&14Ac!N%rA0BRa;TI1F<%ahJl6gY;FAlzd5JUi<%KRkCesuM)y^+5WT?Y@tct^2%BdBWB_+w0tJsZ{jIf zbU@|yM`~wIp8Q!foQo1j6QP2MlRoAIEL3Wag86^Y-Lh>r3kOoMrs+BMfD*$Eo_x7-vg{*8DuXm9LWvmJlE zv9%i(>CI-FI;vD%M*rPS5d&U8Z+!5{ztmzSF4le_-q&)}{@U#r$zd_B+b?JYrUAJ- z2%CEDvBG?Y{B#Qd>zp?=;0E>Agsf%kVy`1ptuG5|b29M?gE&NLiK8Ywg41e1*;pA% zPt+qFtM|^VW7}t-m0isYmQ{WEk6dDKfnedOJGD#W*G@p91X*M8U7OCEMJ*AFB8n31uP3R!Dg?xDn_#KOBSw7mR#!MVj6BX% zZ8*@@PLN=%AqMDQjKp3@cZvTIO9|Z`Ix3X*{02;zJ6OkP3vBxQdE2wBXV_tNJAv6XV}v&J5>WBi>z zYGKx}9v|UbgFP5X?J9isLSZdq*?y<2&D1yE)^4D0>34Nb)%2jFq59aUu1&g=lk8*A zhODEPBx~hwS^mxViAJZbdhFVR_m$5Dyjg6-4u>)TUzY5#xaeqj)?6!9knOC_5(mUt zwSRV5yj#S_f4uI68Ee#pRc_SpQnOjekp@Jb|qQ&FE>0|!T&3z7>8%)DUDn^eL}$HJ|hchkEpCGj1>0 zgx`uKcbZ>jbXSDgVu~DEAW1~G#I*o~h3RSS=M1YIG7%$6S2=QN)J^w9DkyX+IMghd z&jh-G96!-F#6%Xo{wiNPo^+A7Y%M4IA>ct@k?&9T3u;{%QlQkOi(Bo>=wyd^$p_ML zwIrZDZ%AOKp2*8>2!agE2YHQRZ&{N!;nNs3kUs+(ExK!>HBszIH)!MQx7nT4I?M(v z!l}?D_&8Cs*^5-@8kJ)whlGoL&w1i|wuGr$ZBSz;*pnPy*$y=OpWx@AtfU18g@Bn4 ztBOlOhSYy$L}E6Qv>yq+1i&>0(gF3%FgD9-PekM`arv|^O-5v&30}oD`|^kFR-^2o zZgG3iVMNIA|A#?o@g$r@jv?x>7jbt9>=zlggAuYIo3AZQNGJQpnM4O=TeU&w8=?9z zmsO*b$l`f`sy0+Uc#(Vcj2`|UfuefZGC}r37jg%(0Y9WK&D>Wy-_ifYSqOPVe9L(X5n zWI1J;FOL_dHe%D643?C1fw;{!@Q!BUd!+T0DD%%hKNUOJ`RE9WGh2NKyu5EJqq#>5$Xoiw!7OwH4u{o&#I-$0%*J1aMKW z40{wP&g?7Ke_>v4OT67q=R8ZCo&+mfiyZE&Yu=ItLN)r~{>h)ne46~aNze(p+apJZFm!gV;w#<+RPoRvb=+`tu-+(i zFiP0n;k>m}t;CP9poBqCtRN}ovqMkDi_jt6kKnsgn5;j*fgI)ug8&7xW2zsk{6jUD zS!l)E#h-^kG>i*jP5`MS=&?(E-}4PRK(`BC#mHoXZl;F6Xx8xVZzgtoJ^zEx8chRZ z=}k+ZR*g(a&EzKc8hoN|^;Pu#-h~Gs0_}1>I^at7tgIu5xs1k&g0hAcC=}F`+T=z+ z42mpN40yyX9adW5lMXoyMm(R zBe>GvyAetOn4a`igWFmv?Jh^er?y=xczse}*tq>wXg_#z{kfz$XaT8y()a02FnNT* ziFnKLuW4i#)*Z|uIWc)89>X%u2SV=|jdq7SZ*vX^{;r=0a-hI;vv#sxz(xnY8aSUw z?gA|Xb*C=b?76fYHdKt_Pd&;M(PI4?3&2)>R9!ec7XRyjcPFJk0h7aFAocFENN8;X**lt%v%w!rblS ze=~ozw;)H@&jX#Bhdw>>XH!-ApJXV3xyY93w@^t)psoi`{Nk!Gio)iCim1VCT&~%a z?fE_}i>lwTUT-O#FmCc5E$uBqw3XaSWYW(~_GMU5cb2Uje~LP;)pjpPyERL^4H-m4 zPwx|QGi8%oW%culXqlCkC6oMh$^A!d0$gEvkZoXy#kSiDqm|8M>Eqm1@qtOMH~;nq zVSaxO7AEYB-hvMxfidwx)+9h%O1F}9llFEY#(ri#ZuP#(>(p@{#WY1Y@n$lp*y2|9 zphiN^AiZ#|bM&C+>LwrJb+!oOVG%kYyS=u2*%JD%(Z*wcf`DBOA_^fV;z!Kkgf?_l zVjs#vs(hvN%=UWn(~S2{rZZsy%&me^)3ooE9a5A_W|J30xna({gj0*7OY(J*!;_3F0pboHQ|0AC*Q9--C&JLi}uMNln zqp2sx#j@el31VX8$b-yGdHo5}oaiJ>>m>jhCU9QlUee#kLa`$S6@$d%WrXlbq2aZK z`3*!Z3-E4$y+G~3lY)=Q@rIVh&Q@(%jgmM+|c;0kdbm+MuL->uv1;Wn16N6 zZDL8VCFh8hKk=kj>k>JR`qt9iK-|n1d>#%%YJmt{)Gkn$**EKCip;_80lO)_k%QZX z{9H@=?M%td`6xo+NjgPg{c5rccN`%A(fwqgj6Zhar&gNcpwaRHECHvdX`=wJq9`UZ zEVX;-3Cx|riSxYjAbWpS0vnp^&>CUbrtc&8JZo_T17=Gh9!4U}W&tx^+S?kH3SWll z^VP}N$M>AF8AE@H*viKN+DsH;X7(Y2y0~~4Ma&T&Cy2J^95EoUP8x&y(PJD7N(N>c z4g!%j+|I=ucqsY>N5AG0I{i=NepAy5Dam)t1SKX>;Jdkm3R_CRP5zB)TPciLDcQ2t z4ZAPsQ1#i0m2VTj@ts@RG|lU@$$yR?`@-begH!CW^?bbBj)3%^4R4&7CsQa_{|;eF zhrp;y=4V^vL=V-QhuAChUF}2h&a|?9lDDa?bta`PMp|49N%u>9w#VRbqMYRBK)w(H zlivFP(jST~%v6hck3A$hhvr|gEp58Aa!bJRV8P*BywHK4qw6PmSaQi&>-g{!L4x7s zU5(N;H>}HgeL6$KOF|6M5XzYbBevFDk)?f#bdPkD4AK|7oDn$m_0ExAt#!^jE7UH& zS^nEvd59kF1#Vxbfr3SCMZ#*!Le2$K@730oUY8j|W<;M93N?BC>YzOnNWzlO5kJqr zsJNRGz}7TiNI>RtwENlQixli1*&O3u=wm^HpxuHm&pW}1TQnBC;pM+U-%Ao2Q2?kw zmBlhUIIjWkA%s*;B9L%k$Eue6sewdazU7~o><-MWb{TNOh$hRFwJG6w~4 z!}wGu*3prK{ROZ+2WI||J`QyqteG88Jp`tJ_faHQI|?5zW|f=L0uGR^b)4OkZfNCj zI=pM=L2V{c)nO`#nC%*U=#N&6Yam=srCG7g>Rm+VK?)PL)Lpy-mC&^kpobnVeJS2w z0eGk+Ds1v}4GaS%L)w~@j@(iHTs=I{(NL^oSi*Jaxg8j^Zl4!}7=aI5!7}fFF3 zWsnZas=9_#-rzmJw4e~w^&vbV(A`=J+Z;%k4$)nv&L~2o9hI_Jx?f`nf_V;%0%$g9gFzc&&0`?cot9Ce^+1|llBw@@_lSQ?_zsC}=W4L>5 z)Bch?aj>*6$PU&DWQJiIX72Tb$nW@zNGOz`_Ry4TtZu%_N|HrUH(WjoUru(Fe zyTYY6LT63K*-#B=PE4zt(V$yBpA~R^Dq-V4_9Ghe0Cqyb{~b9&kL#`8n!@kOADH7= z)Q!MC6ZIpqa^m-TM4u3Het3gqCR1TZNGtV2vkxTg)P=oFkoavsl(QZL@I3*Q9i^7& z#zNr&9v@B7Lif=s;e(dpWkAq4<@j9iONj27c-v5-gNf!l3g$a%290hT3yZgk5N{OR zg>}5-$ou|1$*EbRpi_^;-K|NUer|e=Lxe^ae+Xmy>&ZaJL2oD0dLAzPCS%D!!1T3f z|HN?EzG*0cUEP<^PcSUVy9-e%`c#!4p$!5EB@5xU9&7%PTCSP+ADC=VHLiAnA%9z? z97NAhMG&!%HuQOJd;Vz`C4We4J_GG3J>E;pj*&g$G}Q_mXydb<0on z2y49c?SqFk&mVOMQC7#rNH*3Nlhh-^Bf}!b`@Fz|;jHTqR=-PI!Ep~@0=3ny2(go{PdJj9sb*RrbM zYZK(fp(0^yR~Aoi{Ce>d8$QLvNdgx(tkP<`^5jD25xI|Q)j}^#YZcG`!_-^GHTl2q z!<2%85(=n*q#!v21nH1YrF*0_6A(rZM5P-fCFFCdKzQyTv{r||Q&QaxIsYoaQavq7gYD;484HQ1VG;a{ARY#wv%tB|7uB=E&)(`7o5YR&9g}=4l58{%!B$p+ z#J-Ty8|LA_l>_SP1e19tGh{1#9<6aMdou=J9@3fwTzn{5Jn1bk zAvym2j>12zlLP-Iw(Q`|Pidu>nxpG8Uaq5yVJTw{!~^X z`eZ14a>6h-p{>~7kH7R2Xe4P!uYD_h$N61g+p8B4COoa+4p|Bxam;8dYQOY*Dc97= z^E9|sPIo&tL+iXizAL+X{_Eu3J$AE?)WD%6AxOFUcm{U1`KCsy0CYFJfzr=gzHsLq z$qc16dCyIaXo-Vvk!0~T93(!u|B#Qj8_!RLChi37bme#?0a(OMZeBNBt~hm8uk-DY zB4POu-28#dY(;xRo&v^#F~+cU!XvYupYFgaM!>WRuWLyoNGqkLZq zCbv{xqqt`Jmi+3s`1kx*CUIxEeA}61fU&H@43BCxqU+mw=ROTj9Y^jqRJgFI5s6ib z#VW?rwfGRf=pxRPUS(4)#{V>p?J=}j6}&N_{N_;e6I^H!O*lVQ?Ttxc?FFhIL=NSD zpV%s&*iO{T@YVETm3=}ULWB*LWyyTVy>%PzYNIlzUGAj6r)VRc&kxu&SP=1srEg$C zvj3IMNn?yee#x2omTNUt<({v!qeKYE4)1?XrkYe*7A-oQT;%#XK)Tyu-1&k;?)g}@ zYPta5YjDCgX~n(FgbJ~~mwOU!NXDDEBjzpOw0mLV^{hYxc94DG_#+<6uuvPFZ)1X{ zdJpAaSH1ZPiZfSWa35V9o;uu$hCu$^ z=$jo)@xqI|nDV(WS+a4Rqjy=k(scKQS(oSB{?@>UI&ps19eypZC;M9>8aOn-*&Y0H?pmp^6|T(?(1G4GmcaCSG2G-k)>fQ;&GCn3SsD`g z6)hs%u!rYVLe zLwrjoARZ)}(PMy;>|MtgyLx^;G(Wo%!Cg@( zQ8ElmiX_M61kdiun=Ez%^^mS_h6a-^%#2qQCsiPO;?a)p^w&ZEUf&22Elt(zP+X$! zZ9!D#?CIFMAc2zBba5X+15;B$icF0f)#w^K$56c%OYK(8@`W{2PH~>ytN88Q=IC#b zPkM8oSWcOkc&Ug8il4KXXG*N;Z(e4pZVpIe0dtWwNa+=%$Z}Lc1`3=$a;?FoGr#Zr zEX0K28k^%1n4SAzuK$_Lb(DcBbMoEMhW)dL5F@MG8GE%9(WOJsQPPXQ*YW%V>BF~m zwa-6$^)+dpUE$N!a`b<#OcP+AE{!Z>lI}|@Q{P>N4~XJxIe!%QN{Uz7;XWtx+&2{3 z?l#6I6o!;eQt@#I?^mJ+NHY@!CpA3``nf;Fb=uVISzyvhfnKk+h^f^6ZA2&$EpgQ> z@dY8l4B)`?6NNO5ZU(@(F-GjHpLt+^->|x=sra$h`}8o)>fZrrvRJWNcZPFcaO2}% z)`)AG&M7d*fO?PMscU+i)S38rG{+5Ylcxj^L742WsCmETi+>fb*!!Ahn^J9^IW#Nk z*KJdMu{UxulD~9`=GQw;+-1(3v;-dV>f2arW~WTtlyEvQTu+uP2R4h_BPmT?gLxGX z(Ts>z4W6*Sk{Gjr`)eYsb|yIjleMu<>?5OjcJIHfY-z{>A+J}$2PPw3$#>y-=gkdA zlpC7TOqIKiydBq!t|n@qJt=*Z=BYzLTqSAYZjlq~ge#bn;V6Cip?_A*g8UhK)vO94 zNM_$n#56;{`$w9KA`+i8ttu$*idU!fE!}jUVW~1D^c96mW=agBgidwU6B`K~-w;jW z=ofcUNKM@ruN2$aP>P6i{CkYOo>4?3__$b&fj1&4yS2~m^Km2?-Fr+S6_2MLO7JeQ6m8q zf~2Eo1^Xd92>1dM9tLB3C%^W_gWp^^J7|lyE^;+Zh{~_}-*^>_IPCR`S7)$08 zJ6U*d39xr1JB~x^;l;4z=2qhoqx+u1i}^anFZMD*sr}QgrswvGl`2YmKm_bSN1BIv z!9Wwj#w)Z$NfTr=^=4H3a_NTW5lj9?=r_JE3vYt>sFhMi zm65YY({Xi&xuda=Gq|Hhw?DSm40=x`jZBz&j1?KwNOEjdUKqtaJZd0%4spF|Q8mGSf ztKv=Sgr{GD0KuU|T(bwg3Qe7Q?OiDy6`?jTD$iOLxGtE7UQ&2M{)_;xg{9FxJaBXJ z6uew4oyYgwW%E@)K{e^~GkbLW$FI3td@+(14>my`N|stTBJ|~DAhpUbq-+;F&;e26 z$n~%(bRNx$kzA_3R;(%7ogC$}5S`K9%|N1w4%QfDX_#qII;;y$nIg^<%Y7Tv>@M7| zY-k@cc3f1szB7KXG2W9E25|XNJikcY+bqXgyhE8i2TxIK;`=DBlo~X`bV>0&s~!OJ z=aSlcNIv|B{-dWI-BNtTR!*L9_~6cZYXuCs^j-)%!kqG-1tBBnCHNr&zr@x50MDE` ztq~c~S3b3QO(fMSO!e&@y=jQVChasjM*B?PgtSo#Nw`* zVSS$lWc#sI^uYaqnB)bTp$=4OvnzBKMEH1)Ug@{J0|NrbemEBfh<-iAY3MCD(<9wy zIy>i;@5feGxV1)=cTVtNmYD=l7j)4a(psOWLOsMkV8P67f*P@bRo4Tb=NkRDA2@-5 z6h3VfUPw$))SXP99Nl;X8Lpz3&yt(jhea?2CZ#-$)PVFp^v~z5B2htZADaO}4WP(z z*L@P#_L%h~hHLCp|QjdY%o6l8yuQ` z+}TO96esD*TGIur(-l9@;iz!WuK4f4s*%+Tnp!_{)qTGSHFV8ivnLMX-w@(FTg;ga zvfBoG8G#t{WG%P+P42h_*qESKox#MybWzd^s6>5<7 zk@58=G2l0?3O42R&&?PkB8iv_7x0%Yz6*;&z7(N;)A4~U;LGS9{va(T-cX}}#~od; z-_C+UBu`L(ucQR>+jP=pzLRiAjoNv?d57cDNB!du{`P^2B!d#?oK4i`dqf+`UwaL# z-vjGn9#i^i#B#aZ#XzBr06z^;n8cc6!txy??;G`>Fw6qpaqjEv%rX@Gr_lnR`#|6u zyY_$0NXL$BXzG#HT#e7S29H@XJ^X36kL1OhvcI2};7H&FP2J9j9NZ|n`b#BG?-c3P zwp8{Xx32i1AK`xa+vGt_;WFzPaB2Hx%ZFEfMF}X*0HS8O`0R(0ma5 zmi#o4m9K>KI0u%8o9~NmN~H_Ze`@ec-`shzGf=zW2ce8Q3H-GO{oKaS!j2_j_KN@=d4N7YFe8ZPiDz<3+l7DZ{yAeUX_;|Q zcLp!RU}0j{*d?{P4tk*^ zZIOvyNf2Z&<%e90!0A*TaHDA3=d%(D84EeMpjROgJ|g-snm)6!n%q#e=K_!-y*?;P z&V5OR4-RtNNu>w`w&xz<=;D%`CauKVtLQw1Rp(X0sa{~6$C!g#@~2&MoedlHs@gr#i% z?jGnLvV0)(p`pGZQmk1RrWkQ4GQ*ixL#|EqNkEOD!^*>B<}ugu4c1jGWplqw!E@Oe zy6?J191Lq?y*lIZeTlJt_IZui(1wh$n9bahs$cx_N&QNVbU<6ILTZSV0s*4vxCGgI zb72?14c0pU4iDb>%^Wb!$HZ$+Bv2=q09x>i*>pRKCyt`TOJH=2OeV2)P|aJP&3A=p zP@H{C{_&7cG@g~s=GBMa?Q<&$dvWQLFOf*@zg)`=AKF???OLx;%gUkN;$^WOW*E4P zE9O+IPV%*N-3tN}?i{7nk8MdhF{_K~9|m*Ee;jYmPWGJUt!$E!a0|?^3_U8ut4`cKdsBL1d*@81tkXEDu|>Mv%$7K}vCfWdb7 zc2;Xb#;PW?c>B@P*5;ZUfmWl#!>`=haiXyEzW6nO!PyULh4qatuqw&<_aR7-|DOh> zBQT*5ci<1yi{f>gt!IZ=5_403`=UK5l-d_fsR_cz;yM;x~L@p=1N zVZQG7-ar2G!X-<_<$hkJajow`708S+DI8+B$t<2v@Ear`L6;|E(Em=h*jq!%Az!?i zp}-%MUqFrPRcOR?=^t(g^$!>QAlt{=l3yz4F3w~3zNN>}27Lx@yXrnOKO@J;W8>lf z1cVyq0_Eug>0=5ZMehMir@Yu|fzrE}k)7ea$-;QIoza%^xxd-LObac>8Samh6jABk zSI+E^XJq|_!jZED^`Hsg!g?6frIYQ6PSS%$5s0sRs$RwW^{PHVrXh8hC`3*S#l?R; z%z|dZ1n%~U;1=3?%VmXxyIdL~S|vk1{7NEy6T-^$L7RX9fu%)%3<@5#Y;YHRjpmNs zSaf*ti++tLSYrHztx~*~(jF-vQqTctveG|-?Mawl1C zwoW#OjO3KL!%f_E6KS_JR;jP4iPz?EwjoOeROo>VqLWUgGVS#GAItUF3xx~3*em$R$d}NdZlI;NQ``-7`wiC)w*3Z@;>F#_$Rm=KIX; zUJWVQ%?al9X*2ZVAN>#4o-6`Cu#@-r?1>J*4Y@!jN8#RW+=7F9>&9N6PB9vio@$uy zK?;vjgrlhcgK)D}^4+Ty$~QjB^S7_)Bn4LHkJCg$to4)A9U9hsY@mp(wbZ2dUsY@p zYaB^ezC3KFTO;Y77~V^wvx?u{6V?cIIX_QdkO<#4H{KK1jRDO+@5QBZwnB7niW3k{ z7n;vU3^wK3+f?mSr6P(cC%-{)pF>bGI6AXZXH6Np_yfVK`~Z3-Gwk8yFvZNS25tsd z?J^}GSLC@3X1;#O|=AX-~K-3i2Vii4JYsNG-1_rm_a4mY@MORcHs9fhwFX=^xS!g4lgDkS|$-a)p;j| zOW2WkwSL!INdRX$)}!5jd2?(4cn^0&iphv80txwpiJ&5Pu+01LVJFz=Zw8rgxH0dJFf|jI+6W2GTqY^al4~F^3@~XsdU#K&wb-+ScO+Ua?`juC66>x@>lSCt+jVC zv1r%#3c8M{RX+FfXdd25M@DY`KgR8dn_NA~Ircb)iAaxNg}__M&w3I~DQ<>vCA=Tk>pStnjxBsS-Z4_BBF zEpOb`(rhxng*e8*MWNS?=WnPkU({(6iO21?;_7MF1bHKzS9X(51$$lBMq)ukPALK<7TeX%P`;yv8+|NcB=QlDejFzvU8<-M;a@q-jTww==T|$pb1*7Q*A1P}1pAISr zl8qs1(%5=8T|B~1#=UaB@#)TaP{0Zd*4E%SjO4qYJMJ%~G35xv_sCBE{ay@FMJQg8*|I|+cnEsM?V?7f0Qf9FRFE$ zKA(5-1R&XVGJIT>`m`cycoIa zgdDW*xjO{nm*w}lrJ{sZ}t0LG3bZ;=d>o#~d?QM^wElapV3*Lfu*a~hd#gIN4(D_V8udf|#NA1>xIW|)@ypJE z+~*@rfP5&+OB=eSuXkq0BWj>#Cn4u7X-%ha5R(N?QUHqHdjvl`!(0pgrc787THBW# ztH%mt+T`_SAK&kOsYy2A_tCJCQ(eyU+64wVFXe>~}}>A$8M zw}Sj>LFt(}aq?G1XX$Y(%1uU1hv~8minohWM5-u5>S+g_S8HxMp&>;952>k0k?5Gmvb7H1r_n3qQ zHdS*erpj6MK0Yu=a3~!umNN9*OrSRs+NnSRr$hEb&d!pHeL z)AQYf8ao6e%`pwN2oO(SnTLVD{Nv*O+eLMv-Rbh!IeFKDN_GnaS4dli?`%Q)j@_^} z;x19bHr3Snu1fuZdMX`3wD|O!>q--b{Gyci_;hb-Ra#R5?PUs+l~xAGz&1&%Gv}qO z|Eu$7cEt)$y6_3E8acZ+0+?%UF3r+E1#*)^{eT~8Sc4X#lP}y_KRN|U?OnY;Oc^S{ z%^%}CGWC(1$N1 z5{6|4HR5pyN8gLpgfNsnz@i<23YDmA+|#qCgGc9;yt=G>sug}2>@UX;1@(V{N|`H6 zuG8pl!QaoRvhRcY-lnuj?J`Df9=?0Dr?S}hI4ir0_XbHuUd+nzJM!`P zgOcOy-}372@m?P@m~X2)Dv`1c9L7GSM{LK}W_MR}%jS#k4Z-wcHPsShLx*Y{I*Z#SeDV4FixIie}YxU}_vCOA_UJ5?JZH+MI+`X_09_J!$MdDS!zFjcyp zF%+XS&a9WvE4txaJ?gb?jM8QE)KL-^N^yreY_RMXh1&HQQCCHSv|U@Zlw)u6AG!?J zxwIi$MqV-&NpXCWLpTTO+$~;C`Q9qe{lU;xhr=}NfSL=ak1wJd*5>(Ud0!~w8P9*d zqAY<2^Qr_pe$3o)RQ(~3$`Mv*-3AqPjB5Sz4`QR5JLg#72~le%WT+R%A8#C4 z!^A@F{vA&x$)7ZtjUJaYP$unLbxkE<#qjEk^N#Tkl;{z*(|K*}LA_L=7*6)^ke-{u zLpb>%Rc#C+;d$rZKQ_QK??ggm{;(?%v7Y9qQGfrC>|_(VH8`67k4%!A0roSyAr;l=q=SqWxK`gs)$D zM1PCPIRfhhoDI-JMi(c99xL-V{~x$^tdV{0_J2l!=D8-DHD^3Ue%C=vt4LYjrDBKX zuq9%4o^qAI!GC!4Tc+*6lXQw!?@o5!<+GJam=Oh*lWT&Y$b@tDXx|8M-&2`Y4IZ91 z%#DBY8)}G;gOKFy4ca2te06@5Tx6JlbWu*(fGly|lBV-Bls(>PV zl$yP#x5tG_jFhZTHR7z!ooDqdgq{}o;kG$9Uf7SKqwu@XbaA8DkG?&5aeEwc-mQ8Kg5C{$hwU;B@4ouKOM{Z?2x;4%y8}G*F$5ff zyA)6%g?9`sI*8dGb%r-AZ!tZF`&LF+mS6p0vsY$7HoMkLLL0sU=3PCs>gj73J{Pw{{o^$X?OW=h!#3$yePr%8=j z;>;gRKg1$(AG{NW_nZ3|m^}B`G5PLt*HTXC*;nsgW*$oqer9%INw33@N~X^8!E(V@ zKFl%(evfh`w>~n!h2?^|ymy?Hs=hK+)K0W9TL z?#u;pehg68%uIg3xT90Sn&DpYjgBW4sSDd!XMUUY$c znSu44bY*p=%Z_bSm=r^K_eKck6kSb=-Pj+P%Kqtw-K7EK+ zYsfr#A=Q1xx{rx=v^%DRB=UapI?F8AOxP-NH7v@D;i~9}UcS1|jpXOw?BiJCS~j|4 zHk`l(y*pT*wtSiMU?-Magrb1Qj4U}`1DEwi{MXw+qL)4F6;b*Z|A8{E zD}lGytWm*?NA*sv=U}v=)7{3yiyR^~U~VHmyLpOZ(eW+Y{+FM5Khcl3cCrJzX_)Pp zRu$Ww@9~tLf!W{!*=^nR&p*x*cQys$^t&LhTI6|kAOE1?UCyhMm*DZ(Rm%M_n81eEx+w`-3 zgl=3l{Yvs9o4D4)wAatRiuKQdf9mMZu}QlL&9T7pJC7EB)=z^2$AYR`25-Eaf`Ef6Ikl-7=lCMfL>}R#ofpuZn zbISNol=BMH#Rdnhee!WY_a#^>{^_50m{OsIIh2W~G zqe_Ul9T&h}z~;9-(nss3hpMquvP!o1Le~i!L`0%i) zR)(v;^O@X9x>OSv^uA~Kp8-WIm%aQz#M^`r=ywm2*afV{R}@ zCYE*GA_MTI z!n*bL=OrafOs}Fh5biCjkwX8=a5<9g9^aD;fLA)&jD`$jLVns{evQC5sw;Ue-Xsgm zTP6BAV`0MG()dKXSwy6J(F?2XN&YxY1js(wg z_SGf!ZdJ-;Ro}fy2fQqh3PNxORH#_rIbfYMW~`G&dDodW8FDH|z)FrAzpWBSkC4mk z<|APmErMfHb04iCWFfupyyX~-py^Z4TO;}1>t8|~G)k9Yx-Bq~m)P5N{on1f_Vies zhC5U)7guOIL?V&t$|=tIc8Dgo`A$I3;Q>ni&Hae~B3@<%GkA!fC?2xDrZBJMZgxWc z%q1PFW(6r&9_>Gxv{J!qhG74zyA%$!wzBK{#)M}X5ukJ~KA@0Nx$}i1lDnhu`U?Jl zbRe4eM9rH2nSXZb;;fxt+*#S7*gE!+zCK*5^nm=rYrc2kf5|JI1Ct;d^M0+8bfn#$ zl^$w3PUBf0{hBLe>gaBC{_IAh{WD|R5{UMV@qf`JmTydoXQ=@{|E-t;fnp=@k1g_!0`OLBD z0CeLYw_=HIo}_X)T$#@E-*A|K!k#vl~rG$d4x8eN-4W1FnYTVu3>- z`u2OfmSTL1UEHnBvDd*3{-v5kR#67(4dq&Pq)*43%DI91(sMtk$n8#E~ ztjJM4>aYm@FGjDG^1mo@={?zq#5o@Z+pAx`nCK-}vmwCyvm;hM;j1-28_xK5IGO{U zzNlPFiKpWPMD9zf3}XG4T5a`e`L1#gKyjNhD_%}xz=~OEv8DzO)TIzLT&|4qK}8uX z&MKXsLNnEN?j{@kOkl5j1O8_%%E(@mRE_3x*xmX$Om7lS-(CNbFs7&45y`|JX`RR^ zgySo;Y$HeHL?c=R^K0b_r!>yW{UemvyIvXjQJ||J<#1RKk~n9Uh;G+M);_tUXm7Px|Oty zVocT%?&ystCjT93M;_A$&-UzSU~_f6Z{@>5U2pnHU2l-&$e^Z#v$FMF={fec32$v} zx@@x*EYssH6ZtjFts`ugW9FUc^R7t}q)>(9-=wp%>Va2D7XrGjq}D69>7%TXqLpmt zARkEFNTyPG7AH*yI*fPmyboE1qYgbQsHPZzgiM(Oqu`qrk>>r!W8Ok zGI0Yg=3Ckv*ckkvio|vusO*Z$g)F##_!BiTuTCT^8X|7AH!XYi$M40?_WLt~FVP4Y zqfp`#cMw3%%>bQwYdE3bR(vhKWpz6a-gV3W!TW>N@5E`~Z@6Sk!b{gd+xfw|yfaZ~ zPH=rQXM+oFo5|-3-x`DA_8ZjUzHa%7XYr2I;Y%z$9ENoNlU8P6`k+Wq>$3PI`H5X~ z5yc%}aNczxmdSx-sY-FRBf}cs-*FBiaC1WjzY+}%{pDZLrB_V90@N47qir-QqN~-t zW2DJY0l44la;~o^4W79S6`S`p&EURjFbxziqIet;>#K25D3>y7CLj5J>&G0xb}L5l z$i(OMMWv!ky~hw`)klr$bf@@*Xq{vms<`Bxc1d>0bLBW4!FW`@r1Bs&RIL;SeWj$4 zu2MZs(^8$v4d_ig1v6IPMYan!z#2_3lb6aHJ_03su&?Ogy-kifG^FJ4z@NhzIQt;o zmij+v4*T9QMUM8p+zV=`K;I?eCt@xSH!15UCdD}qMNi*Lbi`C9Za4hKp$UG5;l{#_ zbwxtjPuWZzMDE~i%<1t{aROJP%W;X|_IQ{-JfgA6qBS#@zCqz2im7CeHgv_1r1sas z?Ni0`$g$GD*z!yPe&7$P-btZigSm)ucwUsGI;*$~MAIJuu>0o9TKh4?bZ7G71Sv`BGk3%`4+#U~pGnpB>IC~jvMDo9a4eK*pcj{bR z+*n`lk9V1p{;vE(JSBk3E+!B9B<)KKs$*mWq%EK9rEe9@tmH5db#_7+x1C#k*Q$8e z^l{75aPqkzR%VHFfreJFF*oe-c^M=4qhId#7n%-_e3Jz-35BqUO1aqWTr69inF6KT zrZJ?0Pm#tSx!{pg@cBmGZLdrDW`5f>t{kR55l^bz)(d`Bt1KCZa&&5_&4>{C35ZsB z9!1|%A*?@Na(B>^zkrF9NBEhD(`~NSSE3`ZA85Mr^nEYky|APIi~l|l5HM98YlgE; zCS*+Sykij--qS%y7NC#GV?9-p%-&ah`XJpmw8+GbP3=0wtpk(7&h8aEL*IwWj|eer z;%5glJUq92n^)-+3Fl4pn|A$`O0R=3(s{oDQa*RbcE_&$*q6BUTDqJYv;*nM?_Pe2 z;y|{o>Bs^v1uZglux*d>@jUPLeD~JCERhGm353sG!*I5Zgr7Gmn?>ABn&8e+(|gEG zY2%1SY42uIX=7#xwUq05=f>0Sdgb&q88qXI&^nO}tAc#XyuQRb(!$P31 z@2v`^m%K~ve$-KvpIverq38J{#piaKBx&5+|2C3ysLfre(9xC=7Lqb_pciDx}fCYQOO@3WDhVB zlyA4x4=H?B`%6R()0}G^iV6zp1us!3y<4w1Zj*@)eQ|auMl^n+iS4qQ{nh-Sdtn^F z&KCoas60@PQ%cFK7P;*jWf^#B0kPhv9$PH3g507GmD^VOC6>VaqaYwszj+!g_Qvf0 z{IjPIu?jMT`ss1o=Ybd)wp&oQ=2%;DcO&ja_28`=zG_KfQNp%pe#L0u;H?vM@b&@u zL*04FWi6I_=h`eXuwr|LYiVnG@b)^^xmCQ(wPR$krQnvgBdiZxb$j_!K+;x^Yj>Dt zR>^i+uGO9~#;KAuvOMwUcc^{HT+$C!xWTkU>g2G zv63LSeJ9+uNKqy4JLb4C6*=H0)MckGkHrGmex<2-*L%GG$Kou8f3h_oV})G^2-Wg) zubJ?alL=^t_3qo;OuE|LvcWLF%JH9OMeh9HLkl7L?V>HvC9`@ve*xrhj>=r=uO`-< zzhgY*sh{*Qh=(XNgJUQB6x|}Bi#!c; z)kri$fVhnfcxQKG3w@9=pKb!j;}=&LJ@u11{(Et8fLtlG@kT8|VQ9?C^`E~=GA4&X z5*scek6 zy|+X1ZjVb+csHs7sbA1>#^F4Okt!t1`VAV3HMKWL8k>U5-UA=_XnN_Ni32w!@gBKo z1vRe;;m1xyZYhQi-TM4q2flWhCv{S@-F(O4q#~C%@*Y$#Jd+s33`cONhx4GH8-q$! zyj@Hsn17Gvm&{yzFS{Ppkb^YI-D~5U$?~inOHwJXX-JiXwky8pM$`d*>SI!0xvV~+ zSi~vhTk_L=OAqr62Ef&vCqNU1f~iEksvQ{rE(!hfpt4f??|Q^-b>4;j13P}%pgRId z_up5efOIM;(!B#yG5+;3>|_(l>s@OCh0wi&ZOE^y6avKn0>#xAcux_t48?a38z+iE z>)?ms&2V~3!XwmAdTR&-g-+2x&6nvgDWKM>LkR=+EZz+NMm-p?!sx!|?pFCijL4we(>u>3!lN zm#mrpWAwV9duRk~Iou2k4QxUW_4w~C{!)M#Hov@OInk}O)n017##-v+hR@7d%gh@)#^-+qI0ZjV_#i3!Oir06XLTYXDF3Z5 zYx2Q|IiWvnI6P=T7ESX_i;|^ak)-g*nX>qWU1Wx`OzTl!fNJw81}zk~^sN_dHr*6*sB9y9vcjn-uLtGtl}gwot7Kg@ zjfcGAfV%*{eJ7B4qW{;TQdAp!<4M`MvVVx2oZed&-6@CuxVIuN)yhbOytKG1Bm0wc zzOzi~|Kb7&Vr7WQpr-|4OkLJ~fXbH-!*4A(M1eO4YJq$zsrSduD+-n~ecw4BcL@jV z9Sq)ZedhnS9EQLJimcz2+@mQ+kHClSog2u9;dy7Uu4Um7DAUpfcjI28Sm@@eQW z0a81867Zn=)~aDz*wfT8M<*N@SnFJXHL<675d5+Hy1ifFMBLADm+<$!tat@t+C0|d z975u&oSufC!HTwD0nWZ?@=$uu`_4#dKhQ;)CpGX%d^<-qxzM49WP}$&@fY5KpD#>H zA0pRUdK?Pgq6_`g`4Wb1ylZ#fXh(yk+vG%>uV@abq(FQ&rsCph8Vr8RUE$HF`^UB@ zkvCANp?7=p_q_vWoN!P)){@{n;F1sM^nb&r*4SRTh`QIDKa@1lTXv3@gu&hYYspJ# zp=q`8aKX4OV95XRM+Er&(kfq7n{u&^?svcO%Y`1dy3b(c@hU3(lWQI{#|7irbc#k2 zM*aHf=d??vEDMyk+n)Glc;9S!j>YAL()tnPbyXzV7wl!(gOT#0nwSiIh*l!$ ze`<`Fr8Guxwoy4*Avv8@?r{|`Uxn-Pg!w+|oK>3frM!;fdDb8wq|Nj0sQncX^zAox zqqODCs;)14+I}fBZLpES)uDOfLk#=KuCv>EN$M5DCY|QDcz>uRLg$Mjgt2?@9_A>>_H&{zS=!N}>oQ zmh0UM>_EQVK1Z8_O`b$zI1KR+8tXhmJTEY|2!_|m&e^WW3Sdrr+|x=X#&A=Q_NMVJRg}b-0gx>go{(T;MLg7{ zcYU)se`$M!s(ER(@nBa3Ug_7NUgC@kX@1a~i@S^M(+N1Fur#nLCfBjX^N}~R3SDHglG%A()6y!t65f* z<<)~J9z9jM2KdL)xQ~MuBK;5Vviu}{lWI~~H3c~-ZOcsj3d!6JG z*w0C#;&=Ht64tuQvVmuJ8{1W#8)6pxIqLdpFjckU28GHK{@BdZ70}nMzP!z!!@B!* z^`NG`am+r~sD#w0gi7gyyCHX?SK{I7D5@ag!mF-uj^p{c|xV8C#TRO zTiRf}H@{1@r07PAjkNCxNrDAUGLiIkE7$GgZeKva^aTB~dHbb|bO?l3Ua>ycHVUBQ zB_=OX{E=Vm&Vlb+O?$dDs4{NUH=o6Gu`|c7+aeE!I+BWxUnMF*Smrw*S(|8_Gv@N~ z9l}mCoZuqtHeaII>VlWpP3`RLGRD{|EtMS0ofKpXRMBOm?)H!}P=GYJ(~B&(Xq1)C z6v3KF9jj>x2o68qBAwssQlo+ah?hEXN6EQD`Ef=)%5#tT#Mh$BWs(HuDVvAEVlDfI zL8TT~x?qRNrJe@Bwd8-6%z_UEH{YDh%HHfMf3H<@eq-A=|72ZGj=X|r4_i1&suP=! z4Xl5L09PT*y~;wlH#VFRsrhxew4Fe+IbYsX!4rlJOh)A+B<%Rj+Wqv)}DK^}`9;tQxyVYI%wndKHvhP2H8jHU4wc zaoek^VnNxLDa7vM7=NTc=|fZH=n?+IT>7Tk*WY`U(3;?~t+-SZgXp=pJDnKOH9E*+ z)bOn`n(n9b164+vRlO+&huO>`GrUi}!lih0NqxckeS0rztmOW#go;S;@>(u;}+8BYI77GtSh^C;8*ZQcnb!B5+MIN8$9 zn$Unv#TLuxa?kR^N9R;eX3Vcy1dJlMo9|~oWXKNZ`d~D#oskuHvqrnY+JQo-35vDZ zuVxuA3;oSjv%Nv&acDt0?NBEZE2U9~?{(W#j6W3x+%{UA3|Zh$NhX|8bQL5DOA;ih z$FZez1`RL-r{{Q57(P!u_CxtSP6l+7ROi^IM_GaY(X4m#xe*aw)b?Miy4x8?w#}Ie=2?uc` zu^*VR#@Kh4G$~YOauLU`Ec!h8dPg=cb8$I$kN%VKA7bN6j+m5_*yR%oW#Sn{dl=7P zY@m(6JRQfGrt&$8KDj$)Z#oo`8o|Wv_%_J1X1b5x$$>cS?3w6pYxD)^OXTNbjE;t= zMj=L|t;*+?W0}wTkLSiEiwkwTQy&Cu!tnP#;x|Lv)5hr~7~SP4uv8wS17j?Ac@RmUdLE6Kh9-e!ffpxtXu7XCwcCf9XJr-#jx{ z(t+a*8)911k|k9oq5LI^*x#hGgGAvD%~m+k3=M~*gB$T^XHN$?*35g0L-7JgH!pOh}(yP=p>t0@K}ZM3uIQJl?<<2?CE8vCkD|U zzEs;}`*m@?ZY1{tjzbiURk^=@!spPI`fKBTf9hUY9I+d*RlKxVRdwUYk%htJ+nomC z-#arDw3W}KQuX$SUTcZ^Gr4UMKrRqpxd*Al&rF}%ES`o86KUeV29!*Xn-NNt;hzcw6q4glC>>>(*hmhgUecuy;B~)Eswh2pDC*!Gj3t%ao}VI8qRn-kF{g$r?84;>73?tR|McWt2P~`I|Lr_lUqFjUkB`; zP&w1|`8hQ!==g@8c+G2-`}VHBubs^FROYU(TUYIj`I7FKb9MgqvFv1zjzuHWO-}dc zS4@7^ODxw!nr%R3;TFax@4o)y{*=_NRUlyXum;Itq@1v_^kJ8+PWzrpE{JDvptkNk zPbm4)uEOAh=YE2gP?U*v7_6L|?u)KoD{M8b>%P&37-R*QVrL z-vOEi-Z{Op;09FW>wdr&NemV?WI|sMwOjWHf?|^T#&f9@S)asdh6DhLZ+{4a3$8fdCP0oZOY`2 z3+e0f{cu`;$IYbFS3zyn0hNwV&exisjaH_@xi^t)G^Pk*V;$Pc9&s6*W^?tcDAuSZ(Mu*`)9HFYq@D_-pP=2OjEfV^v?oqL(AhO zT>JaAq!fBxPZ41tk}*rF_lqmO;6P~7R7&2vv|#z6yQB}C1h4DtI9|l+T(}t9_Kmj= z!zu#0CXtB?>dy`w8~I>*z#bR{xRn^p0Mv5|6_x;u)I!2lqE7Vz(KfSo2C2wFiDleIDE2eyXM85YyoKYK~m$q&nFp}`1RT5{>oe8pR8ZU z8Qg!REWXdPUsO=LV9)FLwr@B4+PdNV&iis`a~)c)jE8;Wd6nzqFUMv_2DtN<8JUs} z>w$-qO(p&D5D6_10P~J>D)|dip(b=~(;z?dCXk0g4*ZEcxhvB)Zac9{{TuMl;bM2H z-kgH*_LqZvjue6=joddbcT}E&vwz%EQD{8*aqrAyp!99$!UJ=%vkabKQW{fh-ylEG0dr_5K!G7s0m@YWXLX>C`D(|K5u(6JGzMi}(t$P#kgtSiKwqVG`} z&{hK#Rm?Vx8M`&0g54wfx@^C`cAEacHTBgztT2s+*G2#QDYi~LB48e;Ba?hWDy_Lg zQKdY0qAAbYk9~f>#B8g4te&xt+T_Wh3iN=^d@lrj%Q|O%AXNS`%<^dp-G(uox#_l)sZa9F-h_87G&2i|-wW%0ISv%YMX z1MzCJx8pGD^|JxA9=1sg&R1{93<`>wZe1U%5Iz!|)n?axa(-x60P1h}V)s3+rjPTa z?}sP-A8*Y6q$}TYDOI&i+mST5mubfq{uy31CDCGw*abl3=;w# zM-vY#B~kUCzds+rRRL|r0>2YB<`xmP6nZpNX&EWy&d;j-iii>qr$;l@IGQID>vMl& zg<2ZR`>O*jCQj@ZST{|e@MmzxS(ED{>!&}N;LKjQ`6qsyK%S8ZM+O^^|6q5 z{kY>mbB>UkZ7P3Y^&I}|WB)d3%B3)04KdW&9e%=HX5M==IyuLHc|fYSfA9WY_#f|0 zpnpc1ToKYa>tM&4a`_?9t*14N=I6$lC%H39D;^w8LiSG}aX@|ITE5$TH$3x=aPU{Q z`q8Gy!*zwCv0vj=mXX3ugYxG&Na??}-0E=QC>*Z(dVB2D>$Q8ccRzLPE8bDx zS1jElk~#nfw7whLb;w!JTXgkrdR{K9W_mERF*7z4Lm{d5^CX_z;wTXEE}&MJ>tA9p z@r~OScr9n`Gb;Ld`JC;^Q*OQ`6UY+y;^PO10YD|yyr_%kf#ho@^?{fbKgsUj9dXpp z;?Aiqc&2`F(T#zY3Fj=-CU3+~3=N^!B2us&E;To^oV&T`fo}DAaa!=#&DPZX5@$HT%u%>7PTF0E$oLto3a6k~)O|wB$YXyf_B%WqsGdLm|sTxx-V% z7F?o5J+ITw_CvS)5Ted)T{TlvUs5puT9$i6IDp1{?%YHy6jkA~F8OH(t|95HKwC+$ zIf}~7?(c~1I+Bxxy9-}cZ8x*s77rgL%CZdyzK!`fDN@^L;v zbw%!Alp3gQYuTlj{~Yu%IB1s|&2~z;sCqVRbwmZ}7N^-;KM^2})*68PX*<%sd|)C* z+$%QV>Sj}8YMf`+hT>I{4iI>fnhV@i!2WqskNAFA`_|__vr%lI^R9+D}K zNB!X9s+?`-Oc&GG6Win}+qNX)urFa^dGcxNAD2YY%lFf<7v`(5kLO>c?0)KYl7?G6 z^8Bm1bdLeo9wzL%dol?GMNb_|-M6%kXBZw4d4B8($1`;N5vHZE@tEorO}4YCIOI5Y z0*r+KpmeyE1U^=hFF2IpiEVJRPtfZ`buN2YKnrE!rAyLJcSvcGs>3yLM!o%aH#&BaGZ@H#OKj*E z^Y1DfS;|WTvXD#f5v;YAu9a5uwt!zYHu+u5-~tf&kD!DQ6dH)@g8t!`?JV%zudj92 zaayIr7jZWG5xYgjy(xEElEB>MFb5@e%;HboPudMJ^+}ctSHI?6;dmF{+ zgb91R-dKZgNmNK6?c#EUP@L%}E)(J3$|_%Q#kpIx8jqIM-Cc#c#i=Kd;|ZPEmPu&{ zUuM8D;!$3P>UQ-xVMg;$IbjDGW1 zXIR2Zalr$o@g*ULej2=%nnv^2GB{gg)(o$9GUE83ZF$)=qo1_Qy`{Yf1Ay{Z5k5{y zBt9hLON5%J%NnaGZB8lOFPQRM=Pgz*EiMvE{~GQK3~>R-K$?&*&==Zr^cA{P5;xQ& z=8Rr1z7|gFU|-qE%eAD-&!@MLH@_UP8&Y(}*Ven4DHFC|f&HnH^(B*P-SXsmwH@>u zXA``K8-vQYY%yXouB$QQWPM@Zgm^oL_uyH{S-AOS%YC=OSLvCF?&}kfolv-8ZSuY4oUtRz zby5e6HkMh_Z?p5xuNnVxFpLiDygYx+L*)YVCpuzO@vp*x zu7{fnDo?&E!L_{8_aQLZ^{MMsuKg~weZD_#yWtQyjB7jSP#);kgf0(is;hRRpAPpv z+s8sy`eiI;SqEpKAn_~?mA|;GcTh%G>8)alS3~jt&F5a!AEUHP@5%!m%WJ#n_t_kj`yOAoH^03XV+^h2bo*L17aLRNncp-;+z)(z8yuGK9@FQ%U|Mnk z;Ll3~)XJGDV~utAZcsh8?W?-tOA8%SSD00$P8dbD?w>%dV2&pfm4RVh%W{q?l5$L; zR!mVNm0$!O+CMO)^4>XmdU*fE1Cy~S!tk!iUT(G&you+|w`t}kCDP=gV~~mkcS4NQ znC`59jZj~?Z4a%>7Hx0;Xavi+$X}0)qMr~+14?1GF+)8J!zD>rDu7I!_N9s&&OOVh z>=6e}CPI>6$U{>x8cCg=1-BSsF6p4PD?-J%D2soH-OUWAXy+ECw>W#(1wk(wR>7E1(QtU{Vzc<`B7< zDDR{A)gVtk!eLu!63H9b>5wSy>Rtt^eLhwlrpZL&fQ4rRMd4Y-LSRWJT*nVQ+(7q2 zy7SHL)mJ?d%uyLDS%M?m;n2{4QfiZ3EAF`=&f=p~IZy?7Q_LoY5H{%EZ?EAt?% zPa0Wk{dRACy?Uh`7-x;Hfrjxdl);sbYSal)@C0t#Su96S1v;M$D4%e!QjYMK z&4{a$UX&cQYMxrwWCrDEjW@Rc$>Zmf!6sC_MR7BHzDNm_as8PY!(-MgCI{-u&d=Qy zx{rxWAQ3cx`20FB*$SP{JfJqpih`W|ge4gRJ7jVQ1R5)(+A3((7j>oJIG@#h^RSZigbN9; z^dtp&LY&|Kw7|Xo5Co#clRJZ!-z-X&cdiF%jCt|*CA)vhuIu;XR>d@tp8$(ixITN&te-Y8G6^ki-d-1VUN-rpRv zo%q!J<#-eNHM)4{NZbD3H@|fbC^|CgZnA6()Ks7f6fSMz1(Y1yw}$u}`LPgoz~ITX zSV2bG0fv?=TSq9>uCwOIyl~pnR@0m~?Uu~|!z|f#pLZkZF*9)<5}|X;Yn3oL+4{%1 z?}dPa)jfO8`z3WQ|HXJ&|4GnEG~1Bs(x%c4F3|DIm28rE=4jy}Z2M9iwW7^&?4l^G zV=}eCwF{!2A6wo~#CVc){A=%@qWw~zw2 z`j@yG@PsG~^7=)FLcCLCffN|)UM$7C@wlwhpFq*<33EhBaW~O!zq)(DEdDP5+3SOJ zvF~aXgl&O>%5_=)t^0;yy4qj;Ey8_(W#2_}2D)~mb?BM!ndUSy5&(QIqOJv`sY>jE z9i-N!FKkWde`>Zux1>Oe#kK&J_)?9IHKjFmlpbyBIf&uR;398WwUF40W$kESnzL=OeZ^*zCLvvV%->p`vP{*wsfu} z#{Nm^%>1WXS_jf4s$Z*3n;#9gLxFXiq~0jLuPpaU>2*2N$XelfP$i^M{zpOfL8e&( zv8_;};s(MkMD=wd9pi^BTB|n9l^ds6@Hn*@1bs454p>8L2<5f5V5dq5rCxknIg83Qh8@?(3#>q4{l^s5sA7fGtjBeR9HXff)75|k{Pp_$U25E!pjI@q1|(pjSoCf# zFR*7w@OeNHOV--p#%nKsUeCTjA9J$?g1NZlh>u~wO`pufwWv5nqdV&xCh7<=V zro1t%UXg#M%*CKtFDK*YHxLMy3E%QcA+bH=4dnixVy+IKJvehiUdjpsDj`><;Ps-x z$N;adCpvlI2|s!wEb!WsNJK5bF)_tqgnoEc2=IuBfE4#kOsea3f-NiX<>x z9pt<=SVCvFw)vI%_Gw&V*&Dn}m#n{Y?Y37%X%SAyrmc&2;6Vna(&Qf2=sW!OI}j^Z!3Zyo&%Ql zO*SW&MegZ3M4&g8>OX203d&|+)5^X7TobI z<_&P62+7=BSo8+6vo`!U*4k~qWPEf2XBDmOKyoYj|aLxKV?J!P@=T?O6ZgsHO5Dxp9KJe@^3fwoOYUzZ#aUXBpF&>_<-EQyGw%?)6XP4FsT8Xf}{WT>8V<0az-ZlGE z&jAc219(FruR1;pur^7uJG|_~PG`RRzBxlyTFsKf+6OL(?>Pe*`K$nf>ptEm$uKtU zk~C#kYtw61g6U$64`gJmG5_&{{pxe7?JH;gV#1~8VBBf5GGVZf9KzX>gcB8K!)kdh zfr3`f`S9CQ$Z=={5;RbqXV!r^r4>Hj*<)^5RYBeTj7Am+n*&5-IHvlSQBi`-bl&ba z$rTm42>YhLgp50}K+!a)EiI3!{9^IL*+cg>fUG^_+vg92$q>xhq*WzruV4=Clu(A<1cUl{Qqr=2|m& zy(~|qc{6KvOO^b8M%JRg>fKPKgFyXm9UTg*e=E(Eo~|5wVwLaeSYzpeRHUOT*kCu* z3YXdDPOgE2z_KpgC1u4`($qmpS;Lcu{&J1YZu@0VYUdg0F5jIm9AsYpGf6Pd&+>r2 z;8oFQxdAXHumm+%&`A>Fl0eU5WP!uxeS9TZ8hgM0-Ffw)6KM9d_W$Nx+h`mc`@c=| zF)&S~)d-JTV4C{sRv^Lkj5!t&UbUAr!k&j!9fHuA5{=qY#C4ly`6zl|m@ftl-}_^; zcq*X!^R>1%$23ldiKn7Fk>~(dqYZQVm-AsGjD^5${**vGPk}ieSDH8rLXX-eNB~KG zQe1Dpi=kGeqKlG~^qM5DjInc8P9QOtk?7CY8pmc|Z63^iF5@+l_+sEtbP5vL;$#>P3h?2)k@EZ-+I$V25xj)Dr&pv_-)IOn zP#!c=;+eB~+gkV8tQ&nzB{R=-X0*+9^b}M#YW#YRr*0_$%^LwF*gYaaKI= z-D7lm(EgS1RN`Nd3r-RQrtcme!+nm7dcnn)MuB*D-t3WRoe2Mi&(&s7u0Wg(-U&-^ z8>DW)h!miI6pl__-wBPL#$SG-=UDuX>0klq)^Zeg|E=3f9ZZ$cX7UDk?vEs>60UgE z2e(#&Y|CHJYml>wBL0x_K0X<+0RMZ@bB->uzME?wto?_)>y#e$hduea<;9=<>FD2c zd7)MXj0h{-yh48D7ls3ifkV_Y6K?A9huf-=|65e|m$UFRIE)ePqTHT)|IKx!H8bgvayg9lxinH7nDqPv2unEV(QF z9k6j(887D_B$)kBO;-d1P9kW_E6EJgUs*+PP!bm#zRY{{__O~^I~xXKSmn1I8|~j) z=tg}GdCjO#g=t+WsA`=zxZB`T@phHOWcbo;Wl3CPD!D5dmr`&g)( zQxVGhI?Wb9j2lmWUHEr2m%!1ynd~(AJuZwsMld2hF*%NLZWc73HPR&(djCk$1HXFw zCQDqRgR^(WYQ5~w<4~DBSBR60AX~6&N&QO@$ng-IjK|xN-@43aDN3)wtZ(ha%-Q_! zTtUtLK6l=PiUfmpY{1CHKzyTUK#1)lCvd6LZN@Wi5b_B-&uxx<>V`l3UwMsAb|5uJ zEkyy;V?_4%wAGYYbzmJ5yZooON+;GyfRaL)SA{h75@iPwjwymH39r|ZgfIoeZu(OopF)z_jntdSv0!H;=EAv`-=0$-*fn_sL zIow|?tlG|$Rw`Vi``%A%mFb&5?xfFC@(@y_`&X(1Yu^?CtCm8JNRfvE$#2BL?pr}^ zi?`p6qE*HB{JCO}6z}gDnU;;_4FBBnVj~>nNVMTX$LRi(f5{5)5i-Z5kV*S((>Fyf zX3EtB1oNU+c%OFT3gi>IzkrUaCHNy0;vYbrA!k3*x7MEjHj;^bGJP;4v*{$zS3^o& z?x){zK4l%ps|CC#JguDU&c9y*AjRS354fyPUO>i8HNhYG+*Ms3#0mc;B&NhfPm~Q0 zY+7t(g!!M5Py-_o4C*}hhY)j+DKPh*hNz0;I^VOvg)18{27l03w5#SS@$X-B$;E&V zjm@3EA0(M)36ewXJ+M@r^OcD(gfJu%%M)Wr)#OEqs<%1)8J7&S>43N-@bY=b{hlnv z>4hTz#hT;QyIxXC=lU*{m~)%}v-7cV3`qFr8#Lsq$b`CW@^2gNWq1%XnAD{{A=s{( z6h48>O7D7rF0E`*JYslA^R6V#Agbiw+x<`e6$COqG7JCi>-!CWT_z5Rv5fyl4;Hrk z%YZ%{BtyR=%PR11G%-$E`*%ktw9bRs_-DKfpDDa8Zw65J{Jv*-Wq dMholi;b+%;xa{z=N(%6GUF+u6VhyX1{{!?kDDwaS literal 0 HcmV?d00001 diff --git a/frontend/src/assets/404_images/404_cloud.png b/frontend/src/assets/404_images/404_cloud.png new file mode 100644 index 0000000000000000000000000000000000000000..c6281d09013e0a2c5f8e699a0a6038d9480291e5 GIT binary patch literal 4766 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 literal 0 HcmV?d00001 diff --git a/frontend/src/components/Breadcrumb/index.vue b/frontend/src/components/Breadcrumb/index.vue new file mode 100644 index 0000000..29f9a04 --- /dev/null +++ b/frontend/src/components/Breadcrumb/index.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/frontend/src/components/Hamburger/index.vue b/frontend/src/components/Hamburger/index.vue new file mode 100644 index 0000000..368b002 --- /dev/null +++ b/frontend/src/components/Hamburger/index.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/frontend/src/components/Pagination/index.vue b/frontend/src/components/Pagination/index.vue new file mode 100644 index 0000000..c815e13 --- /dev/null +++ b/frontend/src/components/Pagination/index.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/frontend/src/components/SvgIcon/index.vue b/frontend/src/components/SvgIcon/index.vue new file mode 100644 index 0000000..b07ded2 --- /dev/null +++ b/frontend/src/components/SvgIcon/index.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/frontend/src/directive/el-table/adaptive.js b/frontend/src/directive/el-table/adaptive.js new file mode 100644 index 0000000..d229e9f --- /dev/null +++ b/frontend/src/directive/el-table/adaptive.js @@ -0,0 +1,41 @@ +import { addResizeListener, removeResizeListener } from 'element-ui/src/utils/resize-event' + +/** + * How to use + * ... + * el-table height is must be set + * bottomOffset: 30(default) // The height of the table from the bottom of the page. + */ + +const doResize = (el, binding, vnode) => { + const { componentInstance: $table } = vnode + + const { value } = binding + + if (!$table.height) { + throw new Error(`el-$table must set the height. Such as height='100px'`) + } + const bottomOffset = (value && value.bottomOffset) || 30 + + if (!$table) return + + const height = window.innerHeight - el.getBoundingClientRect().top - bottomOffset + $table.layout.setHeight(height) + $table.doLayout() +} + +export default { + bind(el, binding, vnode) { + el.resizeListener = () => { + doResize(el, binding, vnode) + } + // parameter 1 is must be "Element" type + addResizeListener(window.document.body, el.resizeListener) + }, + inserted(el, binding, vnode) { + doResize(el, binding, vnode) + }, + unbind(el) { + removeResizeListener(window.document.body, el.resizeListener) + } +} diff --git a/frontend/src/directive/el-table/index.js b/frontend/src/directive/el-table/index.js new file mode 100644 index 0000000..d3d4515 --- /dev/null +++ b/frontend/src/directive/el-table/index.js @@ -0,0 +1,13 @@ +import adaptive from './adaptive' + +const install = function(Vue) { + Vue.directive('el-height-adaptive-table', adaptive) +} + +if (window.Vue) { + window['el-height-adaptive-table'] = adaptive + Vue.use(install); // eslint-disable-line +} + +adaptive.install = install +export default adaptive diff --git a/frontend/src/directive/waves/index.js b/frontend/src/directive/waves/index.js new file mode 100644 index 0000000..65f9b30 --- /dev/null +++ b/frontend/src/directive/waves/index.js @@ -0,0 +1,13 @@ +import waves from './waves' + +const install = function(Vue) { + Vue.directive('waves', waves) +} + +if (window.Vue) { + window.waves = waves + Vue.use(install); // eslint-disable-line +} + +waves.install = install +export default waves diff --git a/frontend/src/directive/waves/waves.css b/frontend/src/directive/waves/waves.css new file mode 100644 index 0000000..af7a7ef --- /dev/null +++ b/frontend/src/directive/waves/waves.css @@ -0,0 +1,26 @@ +.waves-ripple { + position: absolute; + border-radius: 100%; + background-color: rgba(0, 0, 0, 0.15); + background-clip: padding-box; + pointer-events: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -webkit-transform: scale(0); + -ms-transform: scale(0); + transform: scale(0); + opacity: 1; +} + +.waves-ripple.z-active { + opacity: 0; + -webkit-transform: scale(2); + -ms-transform: scale(2); + transform: scale(2); + -webkit-transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out; + transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out; + transition: opacity 1.2s ease-out, transform 0.6s ease-out; + transition: opacity 1.2s ease-out, transform 0.6s ease-out, -webkit-transform 0.6s ease-out; +} \ No newline at end of file diff --git a/frontend/src/directive/waves/waves.js b/frontend/src/directive/waves/waves.js new file mode 100644 index 0000000..ec2ff43 --- /dev/null +++ b/frontend/src/directive/waves/waves.js @@ -0,0 +1,72 @@ +import './waves.css' + +const context = '@@wavesContext' + +function handleClick(el, binding) { + function handle(e) { + const customOpts = Object.assign({}, binding.value) + const opts = Object.assign({ + ele: el, // 波纹作用元素 + type: 'hit', // hit 点击位置扩散 center中心点扩展 + color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色 + }, + customOpts + ) + const target = opts.ele + if (target) { + target.style.position = 'relative' + target.style.overflow = 'hidden' + const rect = target.getBoundingClientRect() + let ripple = target.querySelector('.waves-ripple') + if (!ripple) { + ripple = document.createElement('span') + ripple.className = 'waves-ripple' + ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px' + target.appendChild(ripple) + } else { + ripple.className = 'waves-ripple' + } + switch (opts.type) { + case 'center': + ripple.style.top = rect.height / 2 - ripple.offsetHeight / 2 + 'px' + ripple.style.left = rect.width / 2 - ripple.offsetWidth / 2 + 'px' + break + default: + ripple.style.top = + (e.pageY - rect.top - ripple.offsetHeight / 2 - document.documentElement.scrollTop || + document.body.scrollTop) + 'px' + ripple.style.left = + (e.pageX - rect.left - ripple.offsetWidth / 2 - document.documentElement.scrollLeft || + document.body.scrollLeft) + 'px' + } + ripple.style.backgroundColor = opts.color + ripple.className = 'waves-ripple z-active' + return false + } + } + + if (!el[context]) { + el[context] = { + removeHandle: handle + } + } else { + el[context].removeHandle = handle + } + + return handle +} + +export default { + bind(el, binding) { + el.addEventListener('click', handleClick(el, binding), false) + }, + update(el, binding) { + el.removeEventListener('click', el[context].removeHandle, false) + el.addEventListener('click', handleClick(el, binding), false) + }, + unbind(el) { + el.removeEventListener('click', el[context].removeHandle, false) + el[context] = null + delete el[context] + } +} diff --git a/frontend/src/icons/index.js b/frontend/src/icons/index.js new file mode 100644 index 0000000..2c6b309 --- /dev/null +++ b/frontend/src/icons/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/frontend/src/icons/svg/dashboard.svg b/frontend/src/icons/svg/dashboard.svg new file mode 100644 index 0000000..5317d37 --- /dev/null +++ b/frontend/src/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/example.svg b/frontend/src/icons/svg/example.svg new file mode 100644 index 0000000..46f42b5 --- /dev/null +++ b/frontend/src/icons/svg/example.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/eye-open.svg b/frontend/src/icons/svg/eye-open.svg new file mode 100644 index 0000000..88dcc98 --- /dev/null +++ b/frontend/src/icons/svg/eye-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/eye.svg b/frontend/src/icons/svg/eye.svg new file mode 100644 index 0000000..16ed2d8 --- /dev/null +++ b/frontend/src/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/form.svg b/frontend/src/icons/svg/form.svg new file mode 100644 index 0000000..dcbaa18 --- /dev/null +++ b/frontend/src/icons/svg/form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/link.svg b/frontend/src/icons/svg/link.svg new file mode 100644 index 0000000..48197ba --- /dev/null +++ b/frontend/src/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/nested.svg b/frontend/src/icons/svg/nested.svg new file mode 100644 index 0000000..06713a8 --- /dev/null +++ b/frontend/src/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/password.svg b/frontend/src/icons/svg/password.svg new file mode 100644 index 0000000..e291d85 --- /dev/null +++ b/frontend/src/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/table.svg b/frontend/src/icons/svg/table.svg new file mode 100644 index 0000000..0e3dc9d --- /dev/null +++ b/frontend/src/icons/svg/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/tree.svg b/frontend/src/icons/svg/tree.svg new file mode 100644 index 0000000..dd4b7dd --- /dev/null +++ b/frontend/src/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/user.svg b/frontend/src/icons/svg/user.svg new file mode 100644 index 0000000..0ba0716 --- /dev/null +++ b/frontend/src/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svgo.yml b/frontend/src/icons/svgo.yml new file mode 100644 index 0000000..d11906a --- /dev/null +++ b/frontend/src/icons/svgo.yml @@ -0,0 +1,22 @@ +# replace default config + +# multipass: true +# full: true + +plugins: + + # - name + # + # or: + # - name: false + # - name: true + # + # or: + # - name: + # param1: 1 + # param2: 2 + +- removeAttrs: + attrs: + - 'fill' + - 'fill-rule' diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue new file mode 100644 index 0000000..f6a3286 --- /dev/null +++ b/frontend/src/layout/components/AppMain.vue @@ -0,0 +1,40 @@ + + + + + + + diff --git a/frontend/src/layout/components/Navbar.vue b/frontend/src/layout/components/Navbar.vue new file mode 100644 index 0000000..0ca5cf6 --- /dev/null +++ b/frontend/src/layout/components/Navbar.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/frontend/src/layout/components/Sidebar/FixiOSBug.js b/frontend/src/layout/components/Sidebar/FixiOSBug.js new file mode 100644 index 0000000..bc14856 --- /dev/null +++ b/frontend/src/layout/components/Sidebar/FixiOSBug.js @@ -0,0 +1,26 @@ +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + // https://github.com/PanJiaChen/vue-element-admin/issues/1135 + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/frontend/src/layout/components/Sidebar/Item.vue b/frontend/src/layout/components/Sidebar/Item.vue new file mode 100644 index 0000000..aa1f5da --- /dev/null +++ b/frontend/src/layout/components/Sidebar/Item.vue @@ -0,0 +1,41 @@ + + + diff --git a/frontend/src/layout/components/Sidebar/Link.vue b/frontend/src/layout/components/Sidebar/Link.vue new file mode 100644 index 0000000..530b3d5 --- /dev/null +++ b/frontend/src/layout/components/Sidebar/Link.vue @@ -0,0 +1,43 @@ + + + diff --git a/frontend/src/layout/components/Sidebar/Logo.vue b/frontend/src/layout/components/Sidebar/Logo.vue new file mode 100644 index 0000000..040fab6 --- /dev/null +++ b/frontend/src/layout/components/Sidebar/Logo.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/frontend/src/layout/components/Sidebar/SidebarItem.vue b/frontend/src/layout/components/Sidebar/SidebarItem.vue new file mode 100644 index 0000000..a418c3d --- /dev/null +++ b/frontend/src/layout/components/Sidebar/SidebarItem.vue @@ -0,0 +1,95 @@ + + + diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue new file mode 100644 index 0000000..da39034 --- /dev/null +++ b/frontend/src/layout/components/Sidebar/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/frontend/src/layout/components/index.js b/frontend/src/layout/components/index.js new file mode 100644 index 0000000..97ee3cd --- /dev/null +++ b/frontend/src/layout/components/index.js @@ -0,0 +1,3 @@ +export { default as Navbar } from './Navbar' +export { default as Sidebar } from './Sidebar' +export { default as AppMain } from './AppMain' diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue new file mode 100644 index 0000000..db22a7b --- /dev/null +++ b/frontend/src/layout/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/frontend/src/layout/mixin/ResizeHandler.js b/frontend/src/layout/mixin/ResizeHandler.js new file mode 100644 index 0000000..e8d0df8 --- /dev/null +++ b/frontend/src/layout/mixin/ResizeHandler.js @@ -0,0 +1,45 @@ +import store from '@/store' + +const { body } = document +const WIDTH = 992 // refer to Bootstrap's responsive design + +export default { + watch: { + $route(route) { + if (this.device === 'mobile' && this.sidebar.opened) { + store.dispatch('app/closeSideBar', { withoutAnimation: false }) + } + } + }, + beforeMount() { + window.addEventListener('resize', this.$_resizeHandler) + }, + beforeDestroy() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + mounted() { + const isMobile = this.$_isMobile() + if (isMobile) { + store.dispatch('app/toggleDevice', 'mobile') + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_isMobile() { + const rect = body.getBoundingClientRect() + return rect.width - 1 < WIDTH + }, + $_resizeHandler() { + if (!document.hidden) { + const isMobile = this.$_isMobile() + store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') + + if (isMobile) { + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + } + } + } +} diff --git a/frontend/src/main.js b/frontend/src/main.js new file mode 100644 index 0000000..c57df4f --- /dev/null +++ b/frontend/src/main.js @@ -0,0 +1,44 @@ +import Vue from 'vue' + +import 'normalize.css/normalize.css' // A modern alternative to CSS resets + +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' +import locale from 'element-ui/lib/locale/lang/en' // lang i18n + +import '@/styles/index.scss' // global css + +import App from './App' +import store from './store' +import router from './router' + +import '@/icons' // icon +// import '@/permission' // permission control +// 不进行登录校验。 + +/** + * If you don't want to use mock-server + * you want to use MockJs for mock api + * you can execute: mockXHR() + * + * Currently MockJs will be used in the production environment, + * please remove it before going online ! ! ! + */ +if (process.env.NODE_ENV === 'production') { + const { mockXHR } = require('../mock') + mockXHR() +} + +// set ElementUI lang to EN +Vue.use(ElementUI, { locale }) +// 如果想要中文版 element-ui，按如下方式声明 +// Vue.use(ElementUI) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/frontend/src/permission.js b/frontend/src/permission.js new file mode 100644 index 0000000..fa1ea19 --- /dev/null +++ b/frontend/src/permission.js @@ -0,0 +1,64 @@ +import router from './router' +import store from './store' +import { Message } from 'element-ui' +import NProgress from 'nprogress' // progress bar +import 'nprogress/nprogress.css' // progress bar style +import { getToken } from '@/utils/auth' // get token from cookie +import getPageTitle from '@/utils/get-page-title' + +NProgress.configure({ showSpinner: false }) // NProgress Configuration + +const whiteList = ['/login'] // no redirect whitelist + +router.beforeEach(async(to, from, next) => { + // start progress bar + NProgress.start() + + // set page title + document.title = getPageTitle(to.meta.title) + + // determine whether the user has logged in + const hasToken = getToken() + + if (hasToken) { + if (to.path === '/login') { + // if is logged in, redirect to the home page + next({ path: '/' }) + NProgress.done() + } else { + const hasGetUserInfo = store.getters.name + if (hasGetUserInfo) { + next() + } else { + try { + // get user info + await store.dispatch('user/getInfo') + + next() + } catch (error) { + // remove token and go to login page to re-login + await store.dispatch('user/resetToken') + Message.error(error || 'Has Error') + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } + } + } else { + /* has no token*/ + + if (whiteList.indexOf(to.path) !== -1) { + // in the free login whitelist, go directly + next() + } else { + // other pages that do not have permission to access are redirected to the login page. + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } +}) + +router.afterEach(() => { + // finish progress bar + NProgress.done() +}) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js new file mode 100644 index 0000000..be7f23b --- /dev/null +++ b/frontend/src/router/index.js @@ -0,0 +1,128 @@ +import Vue from 'vue' +import Router from 'vue-router' + +//Vue全局使用Router +Vue.use(Router) + +/* Layout */ +import Layout from '@/layout' +import { fetchMenuList } from '@/api/menu' + + +/** + * Note: sub-menu only appear when route children.length >= 1 + * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html + * + * hidden: true if set true, item will not show in the sidebar(default is false) + * alwaysShow: true if set true, will always show the root menu + * if not set alwaysShow, when item has more than one children route, + * it will becomes nested mode, otherwise not show the root menu + * redirect: noRedirect if set noRedirect will no redirect in the breadcrumb + * name:'router-name' the name is used by (must set!!!) + * meta : { + roles: ['admin','editor'] control the page roles (you can set multiple roles) + title: 'title' the name show in sidebar and breadcrumb (recommend set) + icon: 'svg-name'/'el-icon-x' the icon show in the sidebar + breadcrumb: false if set false, the item will hidden in breadcrumb(default is true) + activeMenu: '/example/list' if set path, the sidebar will highlight the path you set + } + */ + +/** + * constantRoutes + * a base page that does not have permission requirements + * all roles can be accessed + */ +let constantRoutes = [ + { + path: '/login', + component: () => import('@/views/login/index'), + hidden: true + }, + + { + path: '/404', + component: () => import('@/views/404'), + hidden: true + }, + + { + path: '/', + component: Layout, + redirect: '/dashboard', + children: [{ + path: 'dashboard', + name: 'Dashboard', + component: () => import('@/views/dashboard/index'), + meta: { title: 'Dashboard', icon: 'dashboard' } + }] + }, + + { + path: '/stock', + component: Layout, + redirect: '#', + name: 'stock-data-table', + meta: { title: 'Example', icon: 'el-icon-s-help' }, + children: [ + { + path: 'table/:tableName', + name: 'Table', + component: () => import('@/views/table/index'), + meta: { title: 'Table', icon: 'table' } + } + ] + }, + + +] + +fetchMenuList().then(response => { + + let menu_data = response.data + for (const menu of menu_data) { + console.info(menu) + var childrenList = [] + for (const childrenMenu of menu.children) { + var tmpChildren = { + path: childrenMenu.path, + name: childrenMenu.name, + component: () => import('@/views/table/index'), + meta: { title: childrenMenu.name , icon: 'table' } + } + childrenList.push(tmpChildren) + } + var tmp_menu = { + path: '/stock'+menu.name, + alwaysShow: true, + component: Layout, + name: menu.name, + redirect: '/#'+menu.name , + meta: { title: menu.name , icon: 'el-icon-s-help' }, + children: childrenList + } + + constantRoutes.push(tmp_menu) + constantRoutes.push( { path: '*', redirect: '/404', hidden: true }) + + } +}) + +// // 404 page must be placed at the end !!! +// constantRoutes.push( { path: '*', redirect: '/404', hidden: true }) + +const createRouter = () => new Router({ + // mode: 'history', // require service support + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes +}) + +const router = createRouter() + +// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 +export function resetRouter() { + const newRouter = createRouter() + router.matcher = newRouter.matcher // reset router +} + +export default router diff --git a/frontend/src/settings.js b/frontend/src/settings.js new file mode 100644 index 0000000..ae3c494 --- /dev/null +++ b/frontend/src/settings.js @@ -0,0 +1,16 @@ +module.exports = { + + title: 'Vue Admin Template', + + /** + * @type {boolean} true | false + * @description Whether fix the header + */ + fixedHeader: false, + + /** + * @type {boolean} true | false + * @description Whether show the logo in sidebar + */ + sidebarLogo: false +} diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js new file mode 100644 index 0000000..5ab7b4c --- /dev/null +++ b/frontend/src/store/getters.js @@ -0,0 +1,8 @@ +const getters = { + sidebar: state => state.app.sidebar, + device: state => state.app.device, + token: state => state.user.token, + avatar: state => state.user.avatar, + name: state => state.user.name +} +export default getters diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js new file mode 100644 index 0000000..6be466a --- /dev/null +++ b/frontend/src/store/index.js @@ -0,0 +1,19 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import getters from './getters' +import app from './modules/app' +import settings from './modules/settings' +import user from './modules/user' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + modules: { + app, + settings, + user + }, + getters +}) + +export default store diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js new file mode 100644 index 0000000..7ea7e33 --- /dev/null +++ b/frontend/src/store/modules/app.js @@ -0,0 +1,48 @@ +import Cookies from 'js-cookie' + +const state = { + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false + }, + device: 'desktop' +} + +const mutations = { + TOGGLE_SIDEBAR: state => { + state.sidebar.opened = !state.sidebar.opened + state.sidebar.withoutAnimation = false + if (state.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + CLOSE_SIDEBAR: (state, withoutAnimation) => { + Cookies.set('sidebarStatus', 0) + state.sidebar.opened = false + state.sidebar.withoutAnimation = withoutAnimation + }, + TOGGLE_DEVICE: (state, device) => { + state.device = device + } +} + +const actions = { + toggleSideBar({ commit }) { + commit('TOGGLE_SIDEBAR') + }, + closeSideBar({ commit }, { withoutAnimation }) { + commit('CLOSE_SIDEBAR', withoutAnimation) + }, + toggleDevice({ commit }, device) { + commit('TOGGLE_DEVICE', device) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/frontend/src/store/modules/settings.js b/frontend/src/store/modules/settings.js new file mode 100644 index 0000000..b3f33f8 --- /dev/null +++ b/frontend/src/store/modules/settings.js @@ -0,0 +1,32 @@ +import defaultSettings from '@/settings' + +const { showSettings, fixedHeader, sidebarLogo } = defaultSettings + +const state = { + showSettings: showSettings, + fixedHeader: fixedHeader, + sidebarLogo: sidebarLogo +} + +const mutations = { + CHANGE_SETTING: (state, { key, value }) => { + // eslint-disable-next-line no-prototype-builtins + if (state.hasOwnProperty(key)) { + state[key] = value + } + } +} + +const actions = { + changeSetting({ commit }, data) { + commit('CHANGE_SETTING', data) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js new file mode 100644 index 0000000..2f6423f --- /dev/null +++ b/frontend/src/store/modules/user.js @@ -0,0 +1,97 @@ +import { login, logout, getInfo } from '@/api/user' +import { getToken, setToken, removeToken } from '@/utils/auth' +import { resetRouter } from '@/router' + +const getDefaultState = () => { + return { + token: getToken(), + name: '', + avatar: '' + } +} + +const state = getDefaultState() + +const mutations = { + RESET_STATE: (state) => { + Object.assign(state, getDefaultState()) + }, + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + } +} + +const actions = { + // user login + login({ commit }, userInfo) { + const { username, password } = userInfo + return new Promise((resolve, reject) => { + login({ username: username.trim(), password: password }).then(response => { + const { data } = response + commit('SET_TOKEN', data.token) + setToken(data.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + getInfo({ commit, state }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + const { data } = response + + if (!data) { + return reject('Verification failed, please Login again.') + } + + const { name, avatar } = data + + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + resolve(data) + }).catch(error => { + reject(error) + }) + }) + }, + + // user logout + logout({ commit, state }) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + removeToken() // must remove token first + resetRouter() + commit('RESET_STATE') + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // remove token + resetToken({ commit }) { + return new Promise(resolve => { + removeToken() // must remove token first + commit('RESET_STATE') + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/frontend/src/styles/element-ui.scss b/frontend/src/styles/element-ui.scss new file mode 100644 index 0000000..0062411 --- /dev/null +++ b/frontend/src/styles/element-ui.scss @@ -0,0 +1,49 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss new file mode 100644 index 0000000..3b4da51 --- /dev/null +++ b/frontend/src/styles/index.scss @@ -0,0 +1,65 @@ +@import './variables.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +// main-container global css +.app-container { + padding: 20px; +} diff --git a/frontend/src/styles/mixin.scss b/frontend/src/styles/mixin.scss new file mode 100644 index 0000000..36b74bb --- /dev/null +++ b/frontend/src/styles/mixin.scss @@ -0,0 +1,28 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} diff --git a/frontend/src/styles/sidebar.scss b/frontend/src/styles/sidebar.scss new file mode 100644 index 0000000..94760cc --- /dev/null +++ b/frontend/src/styles/sidebar.scss @@ -0,0 +1,226 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $sideBarWidth; + position: relative; + } + + .sidebar-container { + transition: width 0.28s; + width: $sideBarWidth !important; + background-color: $menuBg; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: $menuHover !important; + } + } + + .is-active>.el-submenu__title { + color: $subMenuActiveText !important; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $sideBarWidth !important; + background-color: $subMenuBg !important; + + &:hover { + background-color: $subMenuHover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + + .el-submenu__icon-arrow { + display: none; + } + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $sideBarWidth !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $sideBarWidth !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$sideBarWidth, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: $menuHover !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/frontend/src/styles/transition.scss b/frontend/src/styles/transition.scss new file mode 100644 index 0000000..4cb27cc --- /dev/null +++ b/frontend/src/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss new file mode 100644 index 0000000..be55772 --- /dev/null +++ b/frontend/src/styles/variables.scss @@ -0,0 +1,25 @@ +// sidebar +$menuText:#bfcbd9; +$menuActiveText:#409EFF; +$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 + +$menuBg:#304156; +$menuHover:#263445; + +$subMenuBg:#1f2d3d; +$subMenuHover:#001528; + +$sideBarWidth: 210px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuText: $menuText; + menuActiveText: $menuActiveText; + subMenuActiveText: $subMenuActiveText; + menuBg: $menuBg; + menuHover: $menuHover; + subMenuBg: $subMenuBg; + subMenuHover: $subMenuHover; + sideBarWidth: $sideBarWidth; +} diff --git a/frontend/src/utils/auth.js b/frontend/src/utils/auth.js new file mode 100644 index 0000000..059af18 --- /dev/null +++ b/frontend/src/utils/auth.js @@ -0,0 +1,15 @@ +import Cookies from 'js-cookie' + +const TokenKey = 'vue_admin_template_token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/frontend/src/utils/get-page-title.js b/frontend/src/utils/get-page-title.js new file mode 100644 index 0000000..a6de99d --- /dev/null +++ b/frontend/src/utils/get-page-title.js @@ -0,0 +1,10 @@ +import defaultSettings from '@/settings' + +const title = defaultSettings.title || 'Vue Admin Template' + +export default function getPageTitle(pageTitle) { + if (pageTitle) { + return `${pageTitle} - ${title}` + } + return `${title}` +} diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js new file mode 100644 index 0000000..4830c04 --- /dev/null +++ b/frontend/src/utils/index.js @@ -0,0 +1,117 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * Parse the time to string + * @param {(Object|string|number)} time + * @param {string} cFormat + * @returns {string | null} + */ +export function parseTime(time, cFormat) { + if (arguments.length === 0 || !time) { + return null + } + const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string')) { + if ((/^[0-9]+$/.test(time))) { + // support "1548221490638" + time = parseInt(time) + } else { + // support safari + // https://stackoverflow.com/questions/4310953/invalid-date-in-safari + time = time.replace(new RegExp(/-/gm), '/') + } + } + + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { + const value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } + return value.toString().padStart(2, '0') + }) + return time_str +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js new file mode 100644 index 0000000..bf3ef07 --- /dev/null +++ b/frontend/src/utils/request.js @@ -0,0 +1,86 @@ +import axios from 'axios' +import { MessageBox, Message } from 'element-ui' +import store from '@/store' +import { getToken } from '@/utils/auth' + +// create an axios instance +const service = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + withCredentials: true, // send cookies when cross-domain requests + timeout: 5000 // request timeout +}) + +// request interceptor +service.interceptors.request.use( + config => { + // do something before request is sent + + if (store.getters.token) { + // let each request carry token + // ['X-Token'] is a custom headers key + // please modify it according to the actual situation + config.headers['X-Token'] = getToken() + } + return config + }, + error => { + // do something with request error + console.log(error) // for debug + return Promise.reject(error) + } +) + +// response interceptor +service.interceptors.response.use( + /** + * If you want to get http information such as headers or status + * Please return response => response + */ + + /** + * Determine the request status by custom code + * Here is just an example + * You can also judge the status by HTTP Status Code + */ + response => { + const res = response.data + console.log('res.code: ' + res.code) // for debug + + // if the custom code is not 20000, it is judged as an error. + if (res.code !== 20000) { + Message({ + message: res.message || 'Error', + type: 'error', + duration: 5 * 1000 + }) + + // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; + if (res.code === 50008 || res.code === 50012 || res.code === 50014) { + // to re-login + MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { + confirmButtonText: 'Re-Login', + cancelButtonText: 'Cancel', + type: 'warning' + }).then(() => { + store.dispatch('user/resetToken').then(() => { + location.reload() + }) + }) + } + return Promise.reject(new Error(res.message || 'Error')) + } else { + return res + } + }, + error => { + console.log('err' + error) // for debug + Message({ + message: error.message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) + +export default service diff --git a/frontend/src/utils/scroll-to.js b/frontend/src/utils/scroll-to.js new file mode 100644 index 0000000..c5d8e04 --- /dev/null +++ b/frontend/src/utils/scroll-to.js @@ -0,0 +1,58 @@ +Math.easeInOutQuad = function(t, b, c, d) { + t /= d / 2 + if (t < 1) { + return c / 2 * t * t + b + } + t-- + return -c / 2 * (t * (t - 2) - 1) + b +} + +// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts +var requestAnimFrame = (function() { + return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) } +})() + +/** + * Because it's so fucking difficult to detect the scrolling element, just move them all + * @param {number} amount + */ +function move(amount) { + document.documentElement.scrollTop = amount + document.body.parentNode.scrollTop = amount + document.body.scrollTop = amount +} + +function position() { + return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop +} + +/** + * @param {number} to + * @param {number} duration + * @param {Function} callback + */ +export function scrollTo(to, duration, callback) { + const start = position() + const change = to - start + const increment = 20 + let currentTime = 0 + duration = (typeof (duration) === 'undefined') ? 500 : duration + var animateScroll = function() { + // increment the time + currentTime += increment + // find the value with the quadratic in-out easing function + var val = Math.easeInOutQuad(currentTime, start, change, duration) + // move the document.body + move(val) + // do the animation unless its over + if (currentTime < duration) { + requestAnimFrame(animateScroll) + } else { + if (callback && typeof (callback) === 'function') { + // the animation is done so lets callback + callback() + } + } + } + animateScroll() +} diff --git a/frontend/src/utils/validate.js b/frontend/src/utils/validate.js new file mode 100644 index 0000000..8d962ad --- /dev/null +++ b/frontend/src/utils/validate.js @@ -0,0 +1,20 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} diff --git a/frontend/src/vendor/Export2Excel.js b/frontend/src/vendor/Export2Excel.js new file mode 100644 index 0000000..d8a2af3 --- /dev/null +++ b/frontend/src/vendor/Export2Excel.js @@ -0,0 +1,220 @@ +/* eslint-disable */ +import { saveAs } from 'file-saver' +import XLSX from 'xlsx' + +function generateArray(table) { + var out = []; + var rows = table.querySelectorAll('tr'); + var ranges = []; + for (var R = 0; R < rows.length; ++R) { + var outRow = []; + var row = rows[R]; + var columns = row.querySelectorAll('td'); + for (var C = 0; C < columns.length; ++C) { + var cell = columns[C]; + var colspan = cell.getAttribute('colspan'); + var rowspan = cell.getAttribute('rowspan'); + var cellValue = cell.innerText; + if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; + + //Skip ranges + ranges.forEach(function (range) { + if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { + for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); + } + }); + + //Handle Row Span + if (rowspan || colspan) { + rowspan = rowspan || 1; + colspan = colspan || 1; + ranges.push({ + s: { + r: R, + c: outRow.length + }, + e: { + r: R + rowspan - 1, + c: outRow.length + colspan - 1 + } + }); + }; + + //Handle Value + outRow.push(cellValue !== "" ? cellValue : null); + + //Handle Colspan + if (colspan) + for (var k = 0; k < colspan - 1; ++k) outRow.push(null); + } + out.push(outRow); + } + return [out, ranges]; +}; + +function datenum(v, date1904) { + if (date1904) v += 1462; + var epoch = Date.parse(v); + return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); +} + +function sheet_from_array_of_arrays(data, opts) { + var ws = {}; + var range = { + s: { + c: 10000000, + r: 10000000 + }, + e: { + c: 0, + r: 0 + } + }; + for (var R = 0; R != data.length; ++R) { + for (var C = 0; C != data[R].length; ++C) { + if (range.s.r > R) range.s.r = R; + if (range.s.c > C) range.s.c = C; + if (range.e.r < R) range.e.r = R; + if (range.e.c < C) range.e.c = C; + var cell = { + v: data[R][C] + }; + if (cell.v == null) continue; + var cell_ref = XLSX.utils.encode_cell({ + c: C, + r: R + }); + + if (typeof cell.v === 'number') cell.t = 'n'; + else if (typeof cell.v === 'boolean') cell.t = 'b'; + else if (cell.v instanceof Date) { + cell.t = 'n'; + cell.z = XLSX.SSF._table[14]; + cell.v = datenum(cell.v); + } else cell.t = 's'; + + ws[cell_ref] = cell; + } + } + if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); + return ws; +} + +function Workbook() { + if (!(this instanceof Workbook)) return new Workbook(); + this.SheetNames = []; + this.Sheets = {}; +} + +function s2ab(s) { + var buf = new ArrayBuffer(s.length); + var view = new Uint8Array(buf); + for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; + return buf; +} + +export function export_table_to_excel(id) { + var theTable = document.getElementById(id); + var oo = generateArray(theTable); + var ranges = oo[1]; + + /* original data */ + var data = oo[0]; + var ws_name = "SheetJS"; + + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + /* add ranges to worksheet */ + // ws['!cols'] = ['apple', 'banan']; + ws['!merges'] = ranges; + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: 'xlsx', + bookSST: false, + type: 'binary' + }); + + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), "test.xlsx") +} + +export function export_json_to_excel({ + multiHeader = [], + header, + data, + filename, + merges = [], + autoWidth = true, + bookType = 'xlsx' +} = {}) { + /* original data */ + filename = filename || 'excel-list' + data = [...data] + data.unshift(header); + + for (let i = multiHeader.length - 1; i > -1; i--) { + data.unshift(multiHeader[i]) + } + + var ws_name = "SheetJS"; + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + if (merges.length > 0) { + if (!ws['!merges']) ws['!merges'] = []; + merges.forEach(item => { + ws['!merges'].push(XLSX.utils.decode_range(item)) + }) + } + + if (autoWidth) { + /*设置worksheet每列的最大宽度*/ + const colWidth = data.map(row => row.map(val => { + /*先判断是否为null/undefined*/ + if (val == null) { + return { + 'wch': 10 + }; + } + /*再判断是否为中文*/ + else if (val.toString().charCodeAt(0) > 255) { + return { + 'wch': val.toString().length * 2 + }; + } else { + return { + 'wch': val.toString().length + }; + } + })) + /*以第一行为初始值*/ + let result = colWidth[0]; + for (let i = 1; i < colWidth.length; i++) { + for (let j = 0; j < colWidth[i].length; j++) { + if (result[j]['wch'] < colWidth[i][j]['wch']) { + result[j]['wch'] = colWidth[i][j]['wch']; + } + } + } + ws['!cols'] = result; + } + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: bookType, + bookSST: false, + type: 'binary' + }); + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), `${filename}.${bookType}`); +} diff --git a/frontend/src/views/404.vue b/frontend/src/views/404.vue new file mode 100644 index 0000000..1791f55 --- /dev/null +++ b/frontend/src/views/404.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/frontend/src/views/dashboard/index.vue b/frontend/src/views/dashboard/index.vue new file mode 100644 index 0000000..c1d291e --- /dev/null +++ b/frontend/src/views/dashboard/index.vue @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/form/index.vue b/frontend/src/views/form/index.vue new file mode 100644 index 0000000..f4d66d3 --- /dev/null +++ b/frontend/src/views/form/index.vue @@ -0,0 +1,85 @@ + + + + + + diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue new file mode 100644 index 0000000..1db2464 --- /dev/null +++ b/frontend/src/views/login/index.vue @@ -0,0 +1,237 @@ + + + + + + + diff --git a/frontend/src/views/nested/menu1/index.vue b/frontend/src/views/nested/menu1/index.vue new file mode 100644 index 0000000..30cb670 --- /dev/null +++ b/frontend/src/views/nested/menu1/index.vue @@ -0,0 +1,7 @@ + diff --git a/frontend/src/views/nested/menu1/menu1-1/index.vue b/frontend/src/views/nested/menu1/menu1-1/index.vue new file mode 100644 index 0000000..27e173a --- /dev/null +++ b/frontend/src/views/nested/menu1/menu1-1/index.vue @@ -0,0 +1,7 @@ + diff --git a/frontend/src/views/nested/menu1/menu1-2/index.vue b/frontend/src/views/nested/menu1/menu1-2/index.vue new file mode 100644 index 0000000..0c86276 --- /dev/null +++ b/frontend/src/views/nested/menu1/menu1-2/index.vue @@ -0,0 +1,7 @@ + diff --git a/frontend/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/frontend/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue new file mode 100644 index 0000000..f87d88f --- /dev/null +++ b/frontend/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue @@ -0,0 +1,5 @@ + diff --git a/frontend/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/frontend/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue new file mode 100644 index 0000000..d88789f --- /dev/null +++ b/frontend/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue @@ -0,0 +1,5 @@ + diff --git a/frontend/src/views/nested/menu1/menu1-3/index.vue b/frontend/src/views/nested/menu1/menu1-3/index.vue new file mode 100644 index 0000000..f7cd073 --- /dev/null +++ b/frontend/src/views/nested/menu1/menu1-3/index.vue @@ -0,0 +1,5 @@ + diff --git a/frontend/src/views/nested/menu2/index.vue b/frontend/src/views/nested/menu2/index.vue new file mode 100644 index 0000000..19dd48f --- /dev/null +++ b/frontend/src/views/nested/menu2/index.vue @@ -0,0 +1,5 @@ + diff --git a/frontend/src/views/table/complex-table.vue b/frontend/src/views/table/complex-table.vue new file mode 100644 index 0000000..295c5fc --- /dev/null +++ b/frontend/src/views/table/complex-table.vue @@ -0,0 +1,379 @@ + + + diff --git a/frontend/src/views/table/index.vue b/frontend/src/views/table/index.vue new file mode 100644 index 0000000..336b6a1 --- /dev/null +++ b/frontend/src/views/table/index.vue @@ -0,0 +1,274 @@ + + + diff --git a/frontend/src/views/tree/index.vue b/frontend/src/views/tree/index.vue new file mode 100644 index 0000000..89c6b01 --- /dev/null +++ b/frontend/src/views/tree/index.vue @@ -0,0 +1,78 @@ + + + + diff --git a/frontend/tests/unit/.eslintrc.js b/frontend/tests/unit/.eslintrc.js new file mode 100644 index 0000000..958d51b --- /dev/null +++ b/frontend/tests/unit/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + jest: true + } +} diff --git a/frontend/tests/unit/components/Breadcrumb.spec.js b/frontend/tests/unit/components/Breadcrumb.spec.js new file mode 100644 index 0000000..1d94c8f --- /dev/null +++ b/frontend/tests/unit/components/Breadcrumb.spec.js @@ -0,0 +1,98 @@ +import { mount, createLocalVue } from '@vue/test-utils' +import VueRouter from 'vue-router' +import ElementUI from 'element-ui' +import Breadcrumb from '@/components/Breadcrumb/index.vue' + +const localVue = createLocalVue() +localVue.use(VueRouter) +localVue.use(ElementUI) + +const routes = [ + { + path: '/', + name: 'home', + children: [{ + path: 'dashboard', + name: 'dashboard' + }] + }, + { + path: '/menu', + name: 'menu', + children: [{ + path: 'menu1', + name: 'menu1', + meta: { title: 'menu1' }, + children: [{ + path: 'menu1-1', + name: 'menu1-1', + meta: { title: 'menu1-1' } + }, + { + path: 'menu1-2', + name: 'menu1-2', + redirect: 'noredirect', + meta: { title: 'menu1-2' }, + children: [{ + path: 'menu1-2-1', + name: 'menu1-2-1', + meta: { title: 'menu1-2-1' } + }, + { + path: 'menu1-2-2', + name: 'menu1-2-2' + }] + }] + }] + }] + +const router = new VueRouter({ + routes +}) + +describe('Breadcrumb.vue', () => { + const wrapper = mount(Breadcrumb, { + localVue, + router + }) + it('dashboard', () => { + router.push('/dashboard') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(1) + }) + it('normal route', () => { + router.push('/menu/menu1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(2) + }) + it('nested route', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(4) + }) + it('no meta.title', () => { + router.push('/menu/menu1/menu1-2/menu1-2-2') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(3) + }) + // it('click link', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-2') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const second = breadcrumbArray.at(1) + // console.log(breadcrumbArray) + // const href = second.find('a').attributes().href + // expect(href).toBe('#/menu/menu1') + // }) + // it('noRedirect', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-1') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const redirectBreadcrumb = breadcrumbArray.at(2) + // expect(redirectBreadcrumb.contains('a')).toBe(false) + // }) + it('last breadcrumb', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + const redirectBreadcrumb = breadcrumbArray.at(3) + expect(redirectBreadcrumb.contains('a')).toBe(false) + }) +}) diff --git a/frontend/tests/unit/components/Hamburger.spec.js b/frontend/tests/unit/components/Hamburger.spec.js new file mode 100644 index 0000000..01ea303 --- /dev/null +++ b/frontend/tests/unit/components/Hamburger.spec.js @@ -0,0 +1,18 @@ +import { shallowMount } from '@vue/test-utils' +import Hamburger from '@/components/Hamburger/index.vue' +describe('Hamburger.vue', () => { + it('toggle click', () => { + const wrapper = shallowMount(Hamburger) + const mockFn = jest.fn() + wrapper.vm.$on('toggleClick', mockFn) + wrapper.find('.hamburger').trigger('click') + expect(mockFn).toBeCalled() + }) + it('prop isActive', () => { + const wrapper = shallowMount(Hamburger) + wrapper.setProps({ isActive: true }) + expect(wrapper.contains('.is-active')).toBe(true) + wrapper.setProps({ isActive: false }) + expect(wrapper.contains('.is-active')).toBe(false) + }) +}) diff --git a/frontend/tests/unit/components/SvgIcon.spec.js b/frontend/tests/unit/components/SvgIcon.spec.js new file mode 100644 index 0000000..31467a9 --- /dev/null +++ b/frontend/tests/unit/components/SvgIcon.spec.js @@ -0,0 +1,22 @@ +import { shallowMount } from '@vue/test-utils' +import SvgIcon from '@/components/SvgIcon/index.vue' +describe('SvgIcon.vue', () => { + it('iconClass', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.find('use').attributes().href).toBe('#icon-test') + }) + it('className', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.classes().length).toBe(1) + wrapper.setProps({ className: 'test' }) + expect(wrapper.classes().includes('test')).toBe(true) + }) +}) diff --git a/frontend/tests/unit/utils/formatTime.spec.js b/frontend/tests/unit/utils/formatTime.spec.js new file mode 100644 index 0000000..24e165b --- /dev/null +++ b/frontend/tests/unit/utils/formatTime.spec.js @@ -0,0 +1,30 @@ +import { formatTime } from '@/utils/index.js' + +describe('Utils:formatTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + const retrofit = 5 * 1000 + + it('ten digits timestamp', () => { + expect(formatTime((d / 1000).toFixed(0))).toBe('7月13日17时54分') + }) + it('test now', () => { + expect(formatTime(+new Date() - 1)).toBe('刚刚') + }) + it('less two minute', () => { + expect(formatTime(+new Date() - 60 * 2 * 1000 + retrofit)).toBe('2分钟前') + }) + it('less two hour', () => { + expect(formatTime(+new Date() - 60 * 60 * 2 * 1000 + retrofit)).toBe('2小时前') + }) + it('less one day', () => { + expect(formatTime(+new Date() - 60 * 60 * 24 * 1 * 1000)).toBe('1天前') + }) + it('more than one day', () => { + expect(formatTime(d)).toBe('7月13日17时54分') + }) + it('format', () => { + expect(formatTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(formatTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(formatTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) +}) diff --git a/frontend/tests/unit/utils/param2Obj.spec.js b/frontend/tests/unit/utils/param2Obj.spec.js new file mode 100644 index 0000000..e106ed8 --- /dev/null +++ b/frontend/tests/unit/utils/param2Obj.spec.js @@ -0,0 +1,14 @@ +import { param2Obj } from '@/utils/index.js' +describe('Utils:param2Obj', () => { + const url = 'https://github.com/PanJiaChen/vue-element-admin?name=bill&age=29&sex=1&field=dGVzdA==&key=%E6%B5%8B%E8%AF%95' + + it('param2Obj test', () => { + expect(param2Obj(url)).toEqual({ + name: 'bill', + age: '29', + sex: '1', + field: window.btoa('test'), + key: '测试' + }) + }) +}) diff --git a/frontend/tests/unit/utils/parseTime.spec.js b/frontend/tests/unit/utils/parseTime.spec.js new file mode 100644 index 0000000..56045af --- /dev/null +++ b/frontend/tests/unit/utils/parseTime.spec.js @@ -0,0 +1,35 @@ +import { parseTime } from '@/utils/index.js' + +describe('Utils:parseTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + it('timestamp', () => { + expect(parseTime(d)).toBe('2018-07-13 17:54:01') + }) + it('timestamp string', () => { + expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01') + }) + it('ten digits timestamp', () => { + expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01') + }) + it('new Date', () => { + expect(parseTime(new Date(d))).toBe('2018-07-13 17:54:01') + }) + it('format', () => { + expect(parseTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(parseTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(parseTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) + it('get the day of the week', () => { + expect(parseTime(d, '{a}')).toBe('五') // 星期五 + }) + it('get the day of the week', () => { + expect(parseTime(+d + 1000 * 60 * 60 * 24 * 2, '{a}')).toBe('日') // 星期日 + }) + it('empty argument', () => { + expect(parseTime()).toBeNull() + }) + + it('null', () => { + expect(parseTime(null)).toBeNull() + }) +}) diff --git a/frontend/tests/unit/utils/validate.spec.js b/frontend/tests/unit/utils/validate.spec.js new file mode 100644 index 0000000..f774905 --- /dev/null +++ b/frontend/tests/unit/utils/validate.spec.js @@ -0,0 +1,17 @@ +import { validUsername, isExternal } from '@/utils/validate.js' + +describe('Utils:validate', () => { + it('validUsername', () => { + expect(validUsername('admin')).toBe(true) + expect(validUsername('editor')).toBe(true) + expect(validUsername('xxxx')).toBe(false) + }) + it('isExternal', () => { + expect(isExternal('https://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('http://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('github.com/PanJiaChen/vue-element-admin')).toBe(false) + expect(isExternal('/dashboard')).toBe(false) + expect(isExternal('./dashboard')).toBe(false) + expect(isExternal('dashboard')).toBe(false) + }) +}) diff --git a/frontend/vue.config.js b/frontend/vue.config.js new file mode 100644 index 0000000..4856ed0 --- /dev/null +++ b/frontend/vue.config.js @@ -0,0 +1,123 @@ +'use strict' +const path = require('path') +const defaultSettings = require('./src/settings.js') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const name = defaultSettings.title || 'vue Admin Template' // page title + +// If your port is set to 80, +// use administrator privileges to execute the command line. +// For example, Mac: sudo npm run +// You can change the port by the following methods: +// port = 9528 npm run dev OR npm run dev --port = 9528 +const port = process.env.port || process.env.npm_config_port || 9528 // dev port + +// All configuration item explanations can be find in https://cli.vuejs.org/config/ +module.exports = { + /** + * You will need to set publicPath if you plan to deploy your site under a sub path, + * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/, + * then publicPath should be set to "/bar/". + * In most cases please use '/' !!! + * Detail: https://cli.vuejs.org/config/#publicpath + */ + publicPath: '/', + outputDir: 'dist', + assetsDir: 'static', + lintOnSave: process.env.NODE_ENV === 'development', + productionSourceMap: false, + devServer: { + port: port, + open: true, + overlay: { + warnings: false, + errors: true + }, + before: require('./mock/mock-server.js') + }, + configureWebpack: { + // provide the app's title in webpack's name field, so that + // it can be accessed in index.html to inject the correct title. + name: name, + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + // it can improve the speed of the first screen, it is recommended to turn on preload + config.plugin('preload').tap(() => [ + { + rel: 'preload', + // to ignore runtime.js + // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171 + fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/], + include: 'initial' + } + ]) + + // when there are many pages, it will cause too many meaningless requests + config.plugins.delete('prefetch') + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk + config.optimization.runtimeChunk('single') + } + ) + } +} diff --git a/startStock.sh b/startStock.sh deleted file mode 100755 index 9775849..0000000 --- a/startStock.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash - -PWD=`pwd` - -DB_IS_RUN=`docker ps --filter "name=mariadb" --filter "status=running" | wc -l ` -if [ $DB_IS_RUN -lt 2 ]; then - - #判断文件夹存在不。 - if [ ! -d "${PWD}/data/mysqldb/data" ]; then - mkdir -p ${PWD}/data/mysqldb/data - fi - - HAS_DB=`docker images mysql:5.7 | wc -l ` - if [ $HAS_DB -ne 2 ];then - docker pull mysql:5.7 - fi - - ####################### 启动数据库 ####################### - #检查mysqldb是否启动 - DB_IS_RUN=`docker ps --filter "name=mysqldb" --filter "status=running" | wc -l ` - - if [ $DB_IS_RUN -ne 2 ]; then - - ####################### 创建数据库 ####################### - docker run --name mysqldb -v ${PWD}/data/mysqldb/data:/var/lib/mysql --restart=always \ - -e MYSQL_ROOT_PASSWORD=mysqldb -e MYSQL_DATABASE=stock_data -e TZ=Asia/Shanghai \ - -p 3306:3306 -d mysql:5.7 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci - echo "starting mysqldb ..." - echo "wait 60 second , mysqldb is starting ." - sleep 60 - else - echo "mysqldb is running !!!" - fi - - - #检查mysqldb是否启动，等待5秒钟，再次检查mysqldb启动 - DB_IS_RUN=`docker ps --filter "name=mysqldb" --filter "status=running" | wc -l ` - if [ $DB_IS_RUN -ne 2 ]; then - echo "mysqldb is not running !!!" - exit 1; - fi -fi - -#检查stock启动 -STOCK_IS_RUN=`docker ps --filter "name=stock" --filter "status=running" | wc -l ` -if [ $STOCK_IS_RUN -ge 2 ]; then - echo "stop & rm stock ..." - docker stop stock && docker rm stock -fi - -sleep 1 - -echo "starting stock ..." -# 1 是开发环境。映射本地代码。 -if [ $# == 1 ] ; then - echo "############# run dev ############# " - # /data/stock 是代码目录 -v /data/stock:/data/stock 是开发模式。 - mkdir -p notebooks - - # 测试使用，自己需注册，申请：https://tushare.pro/user/token - - docker run -itd --link=mysqldb --name stock \ - -e LANG=zh_CN.UTF-8 -e LC_CTYPE=zh_CN.UTF-8 -e PYTHONIOENCODING=utf-8 \ - -p 8888:8888 -p 9999:9999 --restart=always \ - -v ${PWD}/jobs:/data/stock/jobs \ - -v ${PWD}/libs:/data/stock/libs \ - -v ${PWD}/web:/data/stock/web \ - -v ${PWD}/supervisor:/data/supervisor \ - -v ${PWD}/notebooks:/data/notebooks \ - -v ${PWD}/data/logs:/data/logs \ - pythonstock/pythonstock:latest - exit 1; -else - echo "############# run online ############# " - # /data/stock 是代码目录 -v /data/stock:/data/stock 是开发模式。 - docker run -itd --link=mysqldb --name stock \ - -p 8888:8888 -p 9999:9999 --restart=always \ - pythonstock/pythonstock:latest - exit 1; -fi - -- Gitee From 25c19c87de2f140c6c63b2926574d9edd382a6a2 Mon Sep 17 00:00:00 2001 From: freegolang Date: Wed, 1 Jan 2025 09:46:15 +0800 Subject: [PATCH 04/29] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B1=95=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/README.md | 4 ++++ frontend/public/freewebsys-logo.jpg | Bin 0 -> 11315 bytes frontend/src/layout/components/Navbar.vue | 12 ++++++------ 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 frontend/public/freewebsys-logo.jpg diff --git a/frontend/README.md b/frontend/README.md index 456471c..5de6ed5 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -17,6 +17,10 @@ https://blog.csdn.net/freewebsys/category_9285317.html https://panjiachen.github.io/vue-element-admin-site/zh/guide/ +在线预览地址： + +https://panjiachen.github.io/vue-element-admin/#/dashboard + 模板源自： https://gitee.com/panjiachen/vue-admin-template diff --git a/frontend/public/freewebsys-logo.jpg b/frontend/public/freewebsys-logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..53440088cd6e343b941ed316ad4856d2aff602eb GIT binary patch literal 11315 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
F!IUe8 z(4vM0nqjt@l2(IrI;|>Z-^EHUQUlW7-d^vb18f0R1bF(2ZL@t_{`tK%RY5=f6t0Y@ zDL`4gGw5_%k-SfBhy_)M+y*VKytdCxM28ADWa zE|Z~*@l(tf#~q1qd-K@I?B>mz-89RDzAkiEv-KtFzI=P358guEck34K@nk{Eyk^>z z7C;yDl;@uVCEw64T0g-g+uw}6cIQ)=0@O~Lgq5=jfou{PTj z`g)(=`wWFbgXMLh_MXyI6YioXkM z=tBd&ItDD;0T{~%&p|`LzWBJ!TJT4ZfYD28bUv3j!_OE_R1FG2GxnwQ69DS4L~<0V zl`4KiyoZ5?tN($>_7ujw_bR{*RPe8Wsu<*_pe+|?-e3vAsswTZ-=0WcS&$z=Q`%7A z_X5I_>Vj`Z)ot)9tyxIONKHPQFE0X7@X8W2cG!sd{{B^GE*zR7z){|TZnoQ`DJ`P|5LDrbG=dwnL5U7l9YSCZ6lF8LR%3U-ZE>p3g5yD)Z7aubajI zyg%pnjmO?3n?JEhl4mN_*aZ5Vk%CZYO86ArWbVw zuDw*9_mdF?mi>AU`2YIiu4MK0n`K6tr%ZIvTAV%-l)tf2f z%7z>1qWD_ONd||D950(gDYG!Xaw%|&#ycJEEo`ZPCU60e>5uOpvw=fCy41tweJ7Zu zxr7rsDJ@lA?(d}C@jIdBzsO%@D-tS#e@e+Tt_uT(b#R~>H3T6R?nbRj6{^eH#R}x? znLLp%+{*zycG9hz3vE#Y_szshJ26K}ojA$Z1x1jePx>%yvgm1D&WZ<|1?2%+u` zH${{PbUp$4A;~MsPeScBTVE~^-2%oOdQwD5R)hN#VcbCBJ?G!X8|5fhjs^cIno-kH+&-Px>`Ur+#-PHOQxb5zn3(3XfEH#gHks4 z`Mimk;fdJevqSgyUH{}O4n35+B_(tyyX(}WOjsSDVNL^u)Gy7ue3vzq?y+!L;+xk` z7GES{hhB`rgdfyO>>+dJ5#8GEe)4{1Q}v`;xw1vF}w|ph;G8A(JK270n4wT zBXbd(iSX*MQ`Bq4*MVTC1d3jXLGyT}>^7$mfA-rj<6-ucRn6bMwQ(x870nRAWQrI+ zc7{-de*_g<`#$$qn#8u~d^q7l>^8!7scf_i6f#p7l?$9tycZ`}ua|WY9NTsg+mBnV8iFaeBQZ2Sgj`GKYf>fS9 zeG2zQSQ#RTn8Z_(+5p!e2ZNpf{0u504`1wso_(yuk=7C(Hmh6aEry9LMZw{u1_%8< zvHr$Df4Icrf71yy7eWHVz&Y#yrEYKZ1!KVuBEo6-@KVc0qn&CfSJ8$OY# zV)B7EjNktj6@pebA#ybDktW=GSpD`Me&chjjD(Dg zgH&I>?oqA)S>8d;C|*XFvmxZzAq0JHEwe45xh;R)7A}s1E8?q zjEy~vBHib4&?}4r+}VEdFx&ux3@VmmH0jIFY3(Dl(6pmcvCUv~EKV9f;zA+$S$6e0 zv3)-XRN{lh#>G&SP=HB)=t!nc!W>rkzAX7FpSwvTEiOc7^t}PAr zD~C8Sux@6J*lkk){tmZ|`fDzminH6Hw5C>NMsuK3#UR zP(x`+t?nWh;}^;aRvR`OIoV%|i>d~KPaPC{5tY`eoH;Joy}o}?+t4z za4C(X+Ll~(G+%G&aUW9ef66qaGupbIg0RvH&{nfQV&E^}>UXd^x@6!wLI*Lj}AuBf(xS{G>-R})VqNwmtP;EZ05y^W%;bbW#hhp(UeL|p20kmF*+ z6Ffe;nrp2~WgS4BK5Z}0JvutG8W(
- +
- Home + 首页 - - Github + + Gitee项目地址 - - Docs + + 博客地址 Log Out -- Gitee From 0108b5588feee0da5b85b75ceb25ddc8788282b5 Mon Sep 17 00:00:00 2001 From: freegolang Date: Wed, 1 Jan 2025 11:02:16 +0800 Subject: [PATCH 05/29] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=B7=91=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/libs/common.py | 60 ++++++++++++++++++++------ backend/libs/stock_web_dic.py | 4 +- backend/web/main.py | 3 ++ frontend/src/views/dashboard/index.vue | 11 +++-- 4 files changed, 59 insertions(+), 19 deletions(-) diff --git a/backend/libs/common.py b/backend/libs/common.py index 55cd8dd..3f27689 100644 --- a/backend/libs/common.py +++ b/backend/libs/common.py @@ -21,25 +21,26 @@ MYSQL_HOST = os.environ.get('MYSQL_HOST') if (os.environ.get('MYSQL_HOST') != No MYSQL_USER = os.environ.get('MYSQL_USER') if (os.environ.get('MYSQL_USER') != None) else "root" MYSQL_PWD = os.environ.get('MYSQL_PWD') if (os.environ.get('MYSQL_PWD') != None) else "mysqldb" MYSQL_DB = os.environ.get('MYSQL_DB') if (os.environ.get('MYSQL_DB') != None) else "stock_data" +MYSQL_PORT = os.environ.get('MYSQL_PORT') if (os.environ.get('MYSQL_PORT') != None) else "3306" print("MYSQL_HOST :", MYSQL_HOST, ",MYSQL_USER :", MYSQL_USER, ",MYSQL_DB :", MYSQL_DB) -MYSQL_CONN_URL = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":3306/" + MYSQL_DB + "?charset=utf8mb4" +MYSQL_CONN_URL = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":" + MYSQL_PORT + "/" + MYSQL_DB + "?charset=utf8mb4" print("MYSQL_CONN_URL :", MYSQL_CONN_URL) __version__ = "2.0.0" # 每次发布时候更新。 +# https://docs.sqlalchemy.org/en/20/errors.html#error-e3q8 +# def engine(): - engine = create_engine( - MYSQL_CONN_URL, - encoding='utf8', convert_unicode=True) + engine = create_engine(MYSQL_CONN_URL, pool_size=10, max_overflow=20) + #encoding='utf8', convert_unicode=True) return engine def engine_to_db(to_db): - MYSQL_CONN_URL_NEW = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":3306/" + to_db + "?charset=utf8mb4" - engine = create_engine( - MYSQL_CONN_URL_NEW, - encoding='utf8', convert_unicode=True) + MYSQL_CONN_URL_NEW = "mysql+mysqldb://" + MYSQL_USER + ":" + MYSQL_PWD + "@" + MYSQL_HOST + ":" + MYSQL_PORT + "/" + to_db + "?charset=utf8mb4" + engine = create_engine(MYSQL_CONN_URL_NEW, pool_size=10, max_overflow=20) + #encoding='utf8', convert_unicode=True) return engine # 通过数据库链接 engine。 @@ -196,13 +197,46 @@ def get_hist_data_cache(code, date_start, date_end): print("######### read from cache #########", cache_file) return pd.read_pickle(cache_file, compression="gzip") else: + # https://akshare.akfamily.xyz/data/index/index.html#id4 + # 获取历史行情，em + #stock = ak.stock_zh_a_hist(symbol= code, start_date=date_start, + # end_date=date_end, adjust="") + code = gp_type_szsh(code)+ code print("######### get data, write cache #########", code, date_start, date_end) - stock = ak.stock_zh_a_hist(symbol= code, start_date=date_start, end_date=date_end, adjust="") - stock.columns = ['date', 'open', 'close', 'high', 'low', 'volume', 'amount', 'amplitude', 'quote_change', - 'ups_downs', 'turnover'] - if stock is None: + + stock = ak.stock_zh_index_daily_em(symbol= code, + start_date=date_start.replace("-", ""), end_date=date_end.replace("-", "")) + print(stock) + if stock is None or stock.empty: return None - stock = stock.sort_index(0) # 将数据按照日期排序下。 + + stock.columns = ['date', 'open', 'close', 'high', 'low', 'volume', 'amount'] + # 数据返回的是带 0 列是索引，第一列是 date 日期 + # date open close high low volume amount + # 0 2024-09-20 9.81 9.90 9.90 9.78 797297 7.851212e+08 + + stock.set_index('date', inplace=True) + #stock = stock.sort_index(0) # 将数据按照日期排序下。 print(stock) stock.to_pickle(cache_file, compression="gzip") return stock + + +# 沪市股票包含上证主板和科创板和B股：沪市主板股票代码是60开头、科创板股票代码是688开头、B股代码900开头。 +# 深市股票包含主板、中小板、创业板和B股：深市主板股票代码是000开头、中小板股票代码002开头、创业板300开头、B股代码200开头 +# print(gp_type_szsh('002340')) +# +def gp_type_szsh(gp): + if gp.find('60',0,3)==0: + gp_type='sh' + elif gp.find('688',0,4)==0: + gp_type='sh' + elif gp.find('900',0,4)==0: + gp_type='sh' + elif gp.find('00',0,3)==0: + gp_type='sz' + elif gp.find('300',0,4)==0: + gp_type='sz' + elif gp.find('200',0,4)==0: + gp_type='sz' + return gp_type diff --git a/backend/libs/stock_web_dic.py b/backend/libs/stock_web_dic.py index 9609abf..fe9aecd 100644 --- a/backend/libs/stock_web_dic.py +++ b/backend/libs/stock_web_dic.py @@ -80,7 +80,7 @@ STOCK_WEB_DATA_LIST.append( name="股票指标lite猜想买入", table_name="guess_indicators_lite_buy_daily", columns=['date', 'code', 'name', 'latest_price', 'quote_change', 'ups_downs', 'volume', 'turnover', - 'amplitude', 'high', 'low', 'open', 'closed', 'quantity_ratio', 'turnover_rate', 'pe_dynamic', 'pb', + 'amplitude', 'high', 'low', 'open', 'closed', 'volume_ratio', 'turnover_rate', 'pe_dynamic', 'pb', 'kdjj', 'rsi_6', 'cci'], column_names=['日期', '代码', '名称', '最新价', '涨跌幅', '涨跌额', '成交量', '成交额', '振幅', '最高', '最低', '今开', '昨收', '量比', '换手率', '动态市盈率', '市净率', @@ -98,7 +98,7 @@ STOCK_WEB_DATA_LIST.append( name="股票指标lite猜想卖出", table_name="guess_indicators_lite_sell_daily", columns=['date', 'code', 'name', 'latest_price', 'quote_change', 'ups_downs', 'volume', 'turnover', - 'amplitude', 'high', 'low', 'open', 'closed', 'quantity_ratio', 'turnover_rate', 'pe_dynamic', 'pb', + 'amplitude', 'high', 'low', 'open', 'closed', 'volume_ratio', 'turnover_rate', 'pe_dynamic', 'pb', 'kdjj', 'rsi_6', 'cci'], column_names=['日期', '代码', '名称', '最新价', '涨跌幅', '涨跌额', '成交量', '成交额', '振幅', '最高', '最低', '今开', '昨收', '量比', '换手率', '动态市盈率', '市净率', diff --git a/backend/web/main.py b/backend/web/main.py index 44526d9..41011f2 100755 --- a/backend/web/main.py +++ b/backend/web/main.py @@ -18,6 +18,7 @@ import pandas as pd import numpy as np import akshare as ak import bokeh as bh +import sqlalchemy import json class Application(tornado.web.Application): @@ -61,6 +62,7 @@ class PackageVersionHandler(webBase.BaseHandler): def get(self): pandasVersion = pd.__version__ numpyVersion = np.__version__ + sqlalchemyVersion = sqlalchemy.__version__ akshareVersion = ak.__version__ bokehVersion = bh.__version__ # 返回包的版本信息。 @@ -69,6 +71,7 @@ class PackageVersionHandler(webBase.BaseHandler): "message": "success", "pandasVersion" : pandasVersion, "numpyVersion" : numpyVersion, + "sqlalchemyVersion" : sqlalchemyVersion, "akshareVersion" : akshareVersion, "bokehVersion" : bokehVersion, "stockstatsVersion": "0.3.2" diff --git a/frontend/src/views/dashboard/index.vue b/frontend/src/views/dashboard/index.vue index c1d291e..20bc7ed 100644 --- a/frontend/src/views/dashboard/index.vue +++ b/frontend/src/views/dashboard/index.vue @@ -6,9 +6,10 @@

基础库版本

1，pandas使用【 {{ pandasVersion }} 】版本， 中文文档

2，numpy使用【 {{ numpyVersion }} 】版本， 中文文档

-

3，akshare使用【 {{ akshareVersion }} 】版本， 中文文档

-

4，bokeh使用【 {{ bokehVersion }} 】版本， 官方文档

-

5，stockstats使用【 {{ stockstatsVersion }} 】版本， 官方文档

+

3，sqlalchemy使用【 {{ sqlalchemyVersion }} 】版本， 英文文档

+

4，akshare使用【 {{ akshareVersion }} 】版本， 中文文档

+

5，bokeh使用【 {{ bokehVersion }} 】版本， 官方文档

+

6，stockstats使用【 {{ stockstatsVersion }} 】版本， 官方文档

@@ -58,11 +59,12 @@ import { mapGetters } from 'vuex' import { fetchPackageVersion } from '@/api/package' export default { - name: 'Dashboard', + name: '首页', data() { return { pandasVersion: '', numpyVersion: '', + sqlalchemyVersion: '', akshareVersion: '', bokehVersion: '', stockstatsVersion: '', @@ -78,6 +80,7 @@ export default { this.pandasVersion = response.pandasVersion this.numpyVersion = response.numpyVersion + this.sqlalchemyVersion = response.sqlalchemyVersion this.akshareVersion = response.akshareVersion this.bokehVersion = response.bokehVersion this.stockstatsVersion = response.stockstatsVersion -- Gitee From 927ad2597506a41bce79dff26ba89523e1b3e3fa Mon Sep 17 00:00:00 2001 From: freegolang Date: Wed, 1 Jan 2025 18:39:44 +0800 Subject: [PATCH 06/29] add: --- backend/web/main.py | 1 + frontend/src/views/dashboard/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/web/main.py b/backend/web/main.py index 41011f2..23ec804 100755 --- a/backend/web/main.py +++ b/backend/web/main.py @@ -47,6 +47,7 @@ class Application(tornado.web.Application): # cookie加密 cookie_secret="027bb1b670eddf0392cdda8709268a17b58b7", debug=True, + default_encoding="utf-8", ) super(Application, self).__init__(handlers, **settings) # Have one global connection to the blog DB across all handlers diff --git a/frontend/src/views/dashboard/index.vue b/frontend/src/views/dashboard/index.vue index 20bc7ed..a41c99c 100644 --- a/frontend/src/views/dashboard/index.vue +++ b/frontend/src/views/dashboard/index.vue @@ -4,8 +4,8 @@

基础库版本

-

1，pandas使用【 {{ pandasVersion }} 】版本， 中文文档

-

2，numpy使用【 {{ numpyVersion }} 】版本， 中文文档

+

1，pandas使用【 {{ pandasVersion }} 】版本， 中文文档

+

2，numpy使用【 {{ numpyVersion }} 】版本， 中文文档

3，sqlalchemy使用【 {{ sqlalchemyVersion }} 】版本， 英文文档

4，akshare使用【 {{ akshareVersion }} 】版本， 中文文档

5，bokeh使用【 {{ bokehVersion }} 】版本， 官方文档

-- Gitee From 9d5d5232a3dfd491660c8d1a9938cdfabc549f6e Mon Sep 17 00:00:00 2001 From: freegolang Date: Wed, 1 Jan 2025 18:48:19 +0800 Subject: [PATCH 07/29] add guess job --- backend/jobs/guess_indicators_daily_job.py | 45 ++++++++++++++-------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/backend/jobs/guess_indicators_daily_job.py b/backend/jobs/guess_indicators_daily_job.py index 47a8731..e636c30 100644 --- a/backend/jobs/guess_indicators_daily_job.py +++ b/backend/jobs/guess_indicators_daily_job.py @@ -23,8 +23,8 @@ def stat_all_lite_buy(tmp_datetime): # 当六日指标上升到达80时，表示股市已有超买现象 # 当CCI＞﹢100 时，表明股价已经进入非常态区间——超买区间，股价的异动现象应多加关注。 sql_1 = """ - SELECT `date`,`code`,`name`,`latest_price`,`quote_change`,`ups_downs`,`volume`,`turnover`, - `amplitude`,`high`,`low`,`open`,`closed`,`quantity_ratio`,`turnover_rate`,`pe_dynamic`,`pb`, + SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, + `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`,`pe_dynamic`,`pb`, `kdjj`,`rsi_6`,`cci` FROM stock_data.guess_indicators_daily WHERE `date` = %s and kdjk >= 80 and kdjd >= 70 and kdjj >= 90 @@ -58,8 +58,8 @@ def stat_all_lite_sell(tmp_datetime): # 当六日强弱指标下降至20时，表示股市有超卖现象 # 当CCI＜﹣100时，表明股价已经进入另一个非常态区间——超卖区间，投资者可以逢低吸纳股票。 sql_1 = """ - SELECT `date`,`code`,`name`,`latest_price`,`quote_change`,`ups_downs`,`volume`,`turnover`, - `amplitude`,`high`,`low`,`open`,`closed`,`quantity_ratio`,`turnover_rate`,`pe_dynamic`,`pb`, + SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, + `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`,`pe_dynamic`,`pb`, `kdjj`,`rsi_6`,`cci` FROM stock_data.guess_indicators_daily WHERE `date` = %s and kdjk <= 20 and kdjd <= 30 and kdjj <= 10 @@ -96,7 +96,7 @@ def stat_all_batch(tmp_datetime): print("error :", e) sql_count = """ - SELECT count(1) FROM stock_zh_ah_name WHERE `date` = %s and `open` > 0 + SELECT count(1) FROM stock_zh_a_spot_em WHERE `date` = %s and `open` > 0 """ # 修改逻辑，增加中小板块计算。 中小板：002，创业板：300 。已经是经过筛选的数据了。 count = common.select_count(sql_count, params=[datetime_int]) @@ -109,21 +109,24 @@ def stat_all_batch(tmp_datetime): # 查询今日满足股票数据。剔除数据：创业板股票数据，中小板股票数据，所有st股票 # #`code` not like '002%' and `code` not like '300%' and `name` not like '%st%' sql_1 = """ - SELECT `date`,`code`,`name`,`latest_price`,`quote_change`,`ups_downs`,`volume`,`turnover`, - `amplitude`,`high`,`low`,`open`,`closed`,`quantity_ratio`,`turnover_rate`,`pe_dynamic`,`pb` - FROM stock_zh_ah_name WHERE `date` = %s and `open` > 0 limit %s , %s + SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, + `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`, + `pe_ratio`,`pb_ratio`,`market_cap`,`circulating_market_cap`,`rise_speed`, + `change_5min`,`change_ercent_60day`,`ytd_change_percent` + FROM stock_zh_a_spot_em WHERE `date` = %s and `open` > 0 limit %s , %s """ - print(sql_1) + sql_2 = sql_1 % (datetime_int, i, batch_size) + print(sql_2) # data = pd.read_sql(sql=sql_1, con=common.engine(), params=[datetime_int, '002%', '300%', '%st%', i, batch_size]) - data = pd.read_sql(sql=sql_1, con=common.engine(), params=[datetime_int, i, batch_size]) + data = pd.read_sql(sql=sql_2, con=common.engine()) data = data.drop_duplicates(subset="code", keep="last") - print("########data[latest_price]########:", len(data)) + print("########data[last_price]########:", len(data)) stat_index_all(data, i) # 分批执行。 def stat_index_all(data, idx): - # print(data["latest_price"]) + # print(data["last_price"]) # 1), n天涨跌百分百计算 # open price change (in percent) between today and the day before yesterday ‘r’ stands for rate. # stock[‘close_-2_r’] @@ -208,7 +211,7 @@ def stat_index_all(data, idx): stock_column = ['adx', 'adxr', 'boll', 'boll_lb', 'boll_ub', 'cci', 'cci_20', 'close_-1_r', 'close_-2_r', 'code', 'cr', 'cr-ma1', 'cr-ma2', 'cr-ma3', 'date', 'dma', 'dx', - 'kdjd', 'kdjj', 'kdjk', 'macd', 'macdh', 'macds', 'mdi', 'pdi', + 'kdjd', 'kdjj', 'kdjk', 'macd', 'macdh', 'macds', 'pdi', 'rsi_12', 'rsi_6', 'trix', 'trix_9_sma', 'vr', 'vr_6_sma', 'wr_10', 'wr_6'] # code cr cr-ma1 cr-ma2 cr-ma3 date @@ -236,7 +239,7 @@ def concat_guess_data(stock_column, data): elif col == 'code': tmp_dic[col] = data["code"] else: - tmp_dic[col] = data["latest_price"] + tmp_dic[col] = data["last_price"] # print("##########tmp_dic: ", tmp_dic) print("########################## BEGIN ##########################") stock_guess = pd.DataFrame(tmp_dic, index=data.index.values) @@ -268,6 +271,7 @@ def apply_guess(tmp, stock_column): # 设置返回数组。 stock_data_list = [] stock_name_list = [] + print(f"stock_column : {stock_column}") # 增加空判断，如果是空返回 0 数据。 if stock is None: for col in stock_column: @@ -285,14 +289,16 @@ def apply_guess(tmp, stock_column): # print(stock.head()) # open high close low volume # stock = pd.DataFrame({"close": stock["close"]}, index=stock.index.values) - stock = stock.sort_index(0) # 将数据按照日期排序下。 + # stock = stock.sort_index(0) # 将数据按照日期排序下。 stock["date"] = stock.index.values # 增加日期列。 - stock = stock.sort_index(0) # 将数据按照日期排序下。 + print(f"stock: {stock}") + # stock = stock.sort_index(0) # 将数据按照日期排序下。 # print(stock) [186 rows x 14 columns] # 初始化统计类 # stockStat = stockstats.StockDataFrame.retype(pd.read_csv('002032.csv')) stockStat = stockstats.StockDataFrame.retype(stock) + print(f"stockStat : {stockStat}") print("########################## print result ##########################") for col in stock_column: @@ -304,7 +310,12 @@ def apply_guess(tmp, stock_column): stock_name_list.append('code') else: # 将数据的最后一个返回。 - tmp_val = stockStat[col].tail(1).values[0] + print(col) + print(stockStat[col]) + print(stockStat[col].values[1]) + #print(stockStat[col].head(1)) + + tmp_val = stockStat[col].values[1] if np.isinf(tmp_val): # 解决值中存在INF问题。 tmp_val = 0 if np.isnan(tmp_val): # 解决值中存在NaN问题。 -- Gitee From bb22a823396bc1ca148c20aa2b8c7aa28401be39 Mon Sep 17 00:00:00 2001 From: freegolang Date: Thu, 2 Jan 2025 07:27:38 +0800 Subject: [PATCH 08/29] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E6=AF=8F?= =?UTF-8?q?=E5=A4=A9=E6=95=B0=E6=8D=AE=E8=B7=91=E6=89=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobs/guess_indicators_daily_buy_job.py | 60 +++++++++++++++ backend/jobs/guess_indicators_daily_job.py | 74 ------------------- .../jobs/guess_indicators_daily_sell_job.py | 55 ++++++++++++++ 3 files changed, 115 insertions(+), 74 deletions(-) create mode 100644 backend/jobs/guess_indicators_daily_buy_job.py create mode 100644 backend/jobs/guess_indicators_daily_sell_job.py diff --git a/backend/jobs/guess_indicators_daily_buy_job.py b/backend/jobs/guess_indicators_daily_buy_job.py new file mode 100644 index 0000000..699c5fb --- /dev/null +++ b/backend/jobs/guess_indicators_daily_buy_job.py @@ -0,0 +1,60 @@ +#!/usr/local/bin/python3 +# -*- coding: utf-8 -*- + + +import libs.common as common +import pandas as pd +import numpy as np +import math +import datetime +import stockstats +from sqlalchemy import text + + +### 对每日指标数据，进行筛选。将符合条件的。二次筛选出来。 +### 只是做简单筛选 +def stat_all_lite_buy(tmp_datetime): + datetime_str = (tmp_datetime).strftime("%Y-%m-%d") + datetime_int = (tmp_datetime).strftime("%Y%m%d") + print("datetime_str:", datetime_str) + print("datetime_int:", datetime_int) + + # K值在80以上，D值在70以上，J值大于90时为超买。 + # J大于100时为超买，小于10时为超卖。 + # 当六日指标上升到达80时，表示股市已有超买现象 + # 当CCI＞﹢100 时，表明股价已经进入非常态区间——超买区间，股价的异动现象应多加关注。 + sql_1 = text(""" + SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, + `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`, + `pe_ratio`,`pb_ratio`,`market_cap`,`circulating_market_cap`,`rise_speed`, + `change_5min`,`change_ercent_60day`,`ytd_change_percent`, + `kdjj`,`rsi_6`,`cci` + FROM stock_data.guess_indicators_daily WHERE `date` = :datetime + and kdjk >= 80 and kdjd >= 70 and kdjj >= 90 + """) # and kdjj > 100 and rsi_6 > 80 and cci > 100 # 调整参数，提前获得股票增长。 + + try: + # 删除老数据。 + del_sql = " DELETE FROM `stock_data`.`guess_indicators_lite_buy_daily` WHERE `date`= '%s' " % datetime_int + common.insert(del_sql) + except Exception as e: + print("error :", e) + params = {"datetime": datetime_int} + print(f"sql_1 : {sql_1}") + data = pd.read_sql(sql=sql_1, con=common.engine(), params=params) + data = data.drop_duplicates(subset="code", keep="last") + print("######## stat_all_lite_buy len data ########:", len(data)) + + try: + common.insert_db(data, "guess_indicators_lite_buy_daily", False, "`date`,`code`") + except Exception as e: + print("error :", e) + + + +# main函数入口 +if __name__ == '__main__': + # 使用方法传递。 + # 二次筛选数据。直接计算买卖股票数据。 + tmp_datetime = common.run_with_args(stat_all_lite_buy) + diff --git a/backend/jobs/guess_indicators_daily_job.py b/backend/jobs/guess_indicators_daily_job.py index e636c30..32dff63 100644 --- a/backend/jobs/guess_indicators_daily_job.py +++ b/backend/jobs/guess_indicators_daily_job.py @@ -9,78 +9,6 @@ import math import datetime import stockstats - -### 对每日指标数据，进行筛选。将符合条件的。二次筛选出来。 -### 只是做简单筛选 -def stat_all_lite_buy(tmp_datetime): - datetime_str = (tmp_datetime).strftime("%Y-%m-%d") - datetime_int = (tmp_datetime).strftime("%Y%m%d") - print("datetime_str:", datetime_str) - print("datetime_int:", datetime_int) - - # K值在80以上，D值在70以上，J值大于90时为超买。 - # J大于100时为超买，小于10时为超卖。 - # 当六日指标上升到达80时，表示股市已有超买现象 - # 当CCI＞﹢100 时，表明股价已经进入非常态区间——超买区间，股价的异动现象应多加关注。 - sql_1 = """ - SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, - `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`,`pe_dynamic`,`pb`, - `kdjj`,`rsi_6`,`cci` - FROM stock_data.guess_indicators_daily WHERE `date` = %s - and kdjk >= 80 and kdjd >= 70 and kdjj >= 90 - """ # and kdjj > 100 and rsi_6 > 80 and cci > 100 # 调整参数，提前获得股票增长。 - - try: - # 删除老数据。 - del_sql = " DELETE FROM `stock_data`.`guess_indicators_lite_buy_daily` WHERE `date`= '%s' " % datetime_int - common.insert(del_sql) - except Exception as e: - print("error :", e) - - data = pd.read_sql(sql=sql_1, con=common.engine(), params=[datetime_int]) - data = data.drop_duplicates(subset="code", keep="last") - print("######## stat_all_lite_buy len data ########:", len(data)) - - try: - common.insert_db(data, "guess_indicators_lite_buy_daily", False, "`date`,`code`") - except Exception as e: - print("error :", e) - -# 设置卖出数据。 -def stat_all_lite_sell(tmp_datetime): - datetime_str = (tmp_datetime).strftime("%Y-%m-%d") - datetime_int = (tmp_datetime).strftime("%Y%m%d") - print("datetime_str:", datetime_str) - print("datetime_int:", datetime_int) - - # 超卖区：K值在20以下，D值在30以下为超卖区。一般情况下，股价有可能上涨，反弹的可能性增大。局内人不应轻易抛出股票，局外人可寻机入场。 - # J大于100时为超买，小于10时为超卖。 - # 当六日强弱指标下降至20时，表示股市有超卖现象 - # 当CCI＜﹣100时，表明股价已经进入另一个非常态区间——超卖区间，投资者可以逢低吸纳股票。 - sql_1 = """ - SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, - `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`,`pe_dynamic`,`pb`, - `kdjj`,`rsi_6`,`cci` - FROM stock_data.guess_indicators_daily WHERE `date` = %s - and kdjk <= 20 and kdjd <= 30 and kdjj <= 10 - """ - - try: - # 删除老数据。 - del_sql = " DELETE FROM `stock_data`.`guess_indicators_lite_sell_daily` WHERE `date`= '%s' " % datetime_int - common.insert(del_sql) - except Exception as e: - print("error :", e) - - data = pd.read_sql(sql=sql_1, con=common.engine(), params=[datetime_int]) - data = data.drop_duplicates(subset="code", keep="last") - print("######## stat_all_lite_sell len data ########:", len(data)) - - try: - common.insert_db(data, "guess_indicators_lite_sell_daily", False, "`date`,`code`") - except Exception as e: - print("error :", e) - # 批处理数据。 def stat_all_batch(tmp_datetime): datetime_str = (tmp_datetime).strftime("%Y-%m-%d") @@ -343,6 +271,4 @@ if __name__ == '__main__': # 使用方法传递。 tmp_datetime = common.run_with_args(stat_all_batch) # 二次筛选数据。直接计算买卖股票数据。 - tmp_datetime = common.run_with_args(stat_all_lite_buy) - tmp_datetime = common.run_with_args(stat_all_lite_sell) diff --git a/backend/jobs/guess_indicators_daily_sell_job.py b/backend/jobs/guess_indicators_daily_sell_job.py new file mode 100644 index 0000000..a98fe9e --- /dev/null +++ b/backend/jobs/guess_indicators_daily_sell_job.py @@ -0,0 +1,55 @@ +#!/usr/local/bin/python3 +# -*- coding: utf-8 -*- + + +import libs.common as common +import pandas as pd +import numpy as np +import math +import datetime +import stockstats + + +# 设置卖出数据。 +def stat_all_lite_sell(tmp_datetime): + datetime_str = (tmp_datetime).strftime("%Y-%m-%d") + datetime_int = (tmp_datetime).strftime("%Y%m%d") + print("datetime_str:", datetime_str) + print("datetime_int:", datetime_int) + + # 超卖区：K值在20以下，D值在30以下为超卖区。一般情况下，股价有可能上涨，反弹的可能性增大。局内人不应轻易抛出股票，局外人可寻机入场。 + # J大于100时为超买，小于10时为超卖。 + # 当六日强弱指标下降至20时，表示股市有超卖现象 + # 当CCI＜﹣100时，表明股价已经进入另一个非常态区间——超卖区间，投资者可以逢低吸纳股票。 + sql_1 = """ + SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, + `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`,`pe_dynamic`,`pb`, + `kdjj`,`rsi_6`,`cci` + FROM stock_data.guess_indicators_daily WHERE `date` = %s + and kdjk <= 20 and kdjd <= 30 and kdjj <= 10 + """ + + try: + # 删除老数据。 + del_sql = " DELETE FROM `stock_data`.`guess_indicators_lite_sell_daily` WHERE `date`= '%s' " % datetime_int + common.insert(del_sql) + except Exception as e: + print("error :", e) + + data = pd.read_sql(sql=sql_1, con=common.engine(), params=[datetime_int]) + data = data.drop_duplicates(subset="code", keep="last") + print("######## stat_all_lite_sell len data ########:", len(data)) + + try: + common.insert_db(data, "guess_indicators_lite_sell_daily", False, "`date`,`code`") + except Exception as e: + print("error :", e) + + + +# main函数入口 +if __name__ == '__main__': + # 使用方法传递。 + # 二次筛选数据。直接计算买卖股票数据。 + tmp_datetime = common.run_with_args(stat_all_lite_sell) + -- Gitee From 9eab0f22bbdf3e4432068589148c95543355aeae Mon Sep 17 00:00:00 2001 From: freegolang Date: Thu, 2 Jan 2025 08:08:02 +0800 Subject: [PATCH 09/29] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=BC=80=E5=8F=91=E8=80=85=20=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/dev-docker-compose.yml | 18 ++++++++++++++++++ frontend/docker-entrypoint.sh | 6 ++++++ 2 files changed, 24 insertions(+) create mode 100755 frontend/docker-entrypoint.sh diff --git a/docker-compose/dev-docker-compose.yml b/docker-compose/dev-docker-compose.yml index 8cfdf6e..f86b3c6 100644 --- a/docker-compose/dev-docker-compose.yml +++ b/docker-compose/dev-docker-compose.yml @@ -4,6 +4,24 @@ networks: version: "3" services: + frontend: + image: docker.m.daocloud.io/library/node:bullseye-slim + container_name: frontend + ports: + - "9528:9528" + volumes: + # 设置开发目录，方便开发调试 + - "../frontend:/usr/src/app" + environment: + LANG: zh_CN.UTF-8 + LC_CTYPE: zh_CN.UTF-8 + restart: always + networks: + stock-dev-network: {} + # 入口写死，手动启动应用。 + entrypoint: /usr/src/app/docker-entrypoint.sh + depends_on: + - stock stock: image: pythonstock/pythonstock-dev:latest build: diff --git a/frontend/docker-entrypoint.sh b/frontend/docker-entrypoint.sh new file mode 100755 index 0000000..92ff16c --- /dev/null +++ b/frontend/docker-entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +cd /usr/src/app +npm install --registry=https://registry.npmmirror.com +npm run dev +sleep 999999d -- Gitee From cd610be3c533db0f31e94de21cf9e042a2043833 Mon Sep 17 00:00:00 2001 From: freegolang Date: Thu, 2 Jan 2025 08:51:09 +0800 Subject: [PATCH 10/29] add : --- backend/jobs/cron.daily/run_daily | 1 + .../jobs/guess_indicators_daily_buy_job.py | 22 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/backend/jobs/cron.daily/run_daily b/backend/jobs/cron.daily/run_daily index 429ba15..ac06a12 100644 --- a/backend/jobs/cron.daily/run_daily +++ b/backend/jobs/cron.daily/run_daily @@ -19,6 +19,7 @@ echo "###################"$DATETIME"###################" >> /data/logs/daily.${D echo "###################"$DATETIME"###################" >> /data/logs/daily.${DATE}.log #使用股票指标预测。 /usr/local/bin/python3 /data/stock/jobs/guess_indicators_daily_job.py >> /data/logs/daily.${DATE}.log +/usr/local/bin/python3 /data/stock/jobs/guess_indicators_daily_buy_job.py >> /data/logs/daily.${DATE}.log #清除前3天数据。 DATE_20=`date -d '-20 days' +%Y-%m-%d` diff --git a/backend/jobs/guess_indicators_daily_buy_job.py b/backend/jobs/guess_indicators_daily_buy_job.py index 699c5fb..1b78020 100644 --- a/backend/jobs/guess_indicators_daily_buy_job.py +++ b/backend/jobs/guess_indicators_daily_buy_job.py @@ -19,10 +19,26 @@ def stat_all_lite_buy(tmp_datetime): print("datetime_str:", datetime_str) print("datetime_int:", datetime_int) + # 查询参数 + params = {"datetime": datetime_int} + + sql_kdjk = text(" SELECT avg(`kdjk`) as avg_kdjk FROM guess_indicators_daily ") + data_kdjk = pd.read_sql(sql=sql_kdjk, con=common.engine(), params=params) + kdjk = data_kdjk["avg_kdjk"][0] + + sql_kdjd = text(" SELECT avg(`kdjd`) as avg_kdjd FROM guess_indicators_daily ") + data_kdjd = pd.read_sql(sql=sql_kdjd, con=common.engine(), params=params) + kdjd = data_kdjd["avg_kdjd"][0] + + sql_kdjj = text(" SELECT avg(`kdjj`) as avg_kdjj FROM guess_indicators_daily ") + data_kdjj = pd.read_sql(sql=sql_kdjj, con=common.engine(), params=params) + kdjj = data_kdjj["avg_kdjj"][0] + # K值在80以上，D值在70以上，J值大于90时为超买。 # J大于100时为超买，小于10时为超卖。 # 当六日指标上升到达80时，表示股市已有超买现象 # 当CCI＞﹢100 时，表明股价已经进入非常态区间——超买区间，股价的异动现象应多加关注。 + params_1 = {"datetime": datetime_int, "kdjk": kdjk, "kdjd": kdjd, "kdjj": kdjj} sql_1 = text(""" SELECT `date`,`code`,`name`,`last_price`,`change_percent`,`change_amount`,`volume`,`turnover`, `amplitude`,`high`,`low`,`open`,`closed`,`volume_ratio`,`turnover_rate`, @@ -30,7 +46,7 @@ def stat_all_lite_buy(tmp_datetime): `change_5min`,`change_ercent_60day`,`ytd_change_percent`, `kdjj`,`rsi_6`,`cci` FROM stock_data.guess_indicators_daily WHERE `date` = :datetime - and kdjk >= 80 and kdjd >= 70 and kdjj >= 90 + and kdjk >= :kdjk and kdjd >= :kdjd and kdjj >= :kdjj """) # and kdjj > 100 and rsi_6 > 80 and cci > 100 # 调整参数，提前获得股票增长。 try: @@ -39,9 +55,9 @@ def stat_all_lite_buy(tmp_datetime): common.insert(del_sql) except Exception as e: print("error :", e) - params = {"datetime": datetime_int} + print(f"sql_1 : {sql_1}") - data = pd.read_sql(sql=sql_1, con=common.engine(), params=params) + data = pd.read_sql(sql=sql_1, con=common.engine(), params=params_1) data = data.drop_duplicates(subset="code", keep="last") print("######## stat_all_lite_buy len data ########:", len(data)) -- Gitee From c4e3649e3d0d0943854402a4010d324764e33f9c Mon Sep 17 00:00:00 2001 From: freegolang Date: Fri, 3 Jan 2025 08:46:03 +0800 Subject: [PATCH 11/29] =?UTF-8?q?fix:=20=20=E5=A2=9E=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- backend/web/demo-chart.py | 2 +- backend/web/main.py | 2 +- backend/web/test_thread.py | 2 +- backend/web/tornado_bokeh_embed.py | 2 +- docker-compose/README.md | 2 +- docker-compose/dev-docker-compose.yml | 4 ++-- docker-compose/nginx.conf | 2 +- frontend/package.json | 2 +- frontend/src/api/article.js | 2 +- frontend/src/api/menu.js | 2 +- frontend/src/api/package.js | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 7b8de3b..fc23ff0 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,8 @@ sh /data/stock/jobs/cron.daily/run_daily ### 本地访问端口 -> http://localhost:9999 股票系统 +> http://localhost:8080 股票系统前端地址 +> http://localhost:9090 股票系统后端地址 ### 股票系统设计 diff --git a/backend/web/demo-chart.py b/backend/web/demo-chart.py index 165ed6a..12bef64 100644 --- a/backend/web/demo-chart.py +++ b/backend/web/demo-chart.py @@ -238,7 +238,7 @@ if __name__ == "__main__": http_server = tornado.httpserver.HTTPServer(application) http_server.listen(9999) - print("http://127.0.0.1:9999/") + print("http://127.0.0.1:9090/") print("Press Ctrl+C to quit") tornado.ioloop.IOLoop.instance().start() diff --git a/backend/web/main.py b/backend/web/main.py index 23ec804..3f32d42 100755 --- a/backend/web/main.py +++ b/backend/web/main.py @@ -163,7 +163,7 @@ class Test2Handler(webBase.BaseHandler): def main(): tornado.options.parse_command_line() http_server = tornado.httpserver.HTTPServer(Application()) - port = 9999 + port = 9090 http_server.listen(port) # tornado.options.options.logging = "debug" tornado.options.parse_command_line() diff --git a/backend/web/test_thread.py b/backend/web/test_thread.py index fd79744..e874855 100644 --- a/backend/web/test_thread.py +++ b/backend/web/test_thread.py @@ -99,6 +99,6 @@ if __name__ == "__main__": ("/", MainPage), ("/add_job", AddJobHandler), ("/job_check", JobCheckHandler) - ], debug=True)).listen(9999) + ], debug=True)).listen(9090) print("start web .") IOLoop.instance().start() diff --git a/backend/web/tornado_bokeh_embed.py b/backend/web/tornado_bokeh_embed.py index 916f483..17992c9 100644 --- a/backend/web/tornado_bokeh_embed.py +++ b/backend/web/tornado_bokeh_embed.py @@ -14,7 +14,7 @@ from bokeh.themes import Theme from bokeh.sampledata.sea_surface_temperature import sea_surface_temperature env = Environment(loader=FileSystemLoader('templates')) -server_url = "http://localhost:9999/" +server_url = "http://localhost:9090/" class IndexHandler(RequestHandler): diff --git a/docker-compose/README.md b/docker-compose/README.md index 520cf3a..be99374 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -27,7 +27,7 @@ docker-compose up -d ## 访问地址 -http://localhost:9999/ +http://localhost:9090/ diff --git a/docker-compose/dev-docker-compose.yml b/docker-compose/dev-docker-compose.yml index f86b3c6..e2cfeaa 100644 --- a/docker-compose/dev-docker-compose.yml +++ b/docker-compose/dev-docker-compose.yml @@ -8,7 +8,7 @@ services: image: docker.m.daocloud.io/library/node:bullseye-slim container_name: frontend ports: - - "9528:9528" + - "8080:8080" volumes: # 设置开发目录，方便开发调试 - "../frontend:/usr/src/app" @@ -30,7 +30,7 @@ services: container_name: stock ports: - "8888:8888" - - "9999:9999" + - "9090:9090" volumes: # 设置开发目录，方便开发调试 - "../backend:/data/stock" diff --git a/docker-compose/nginx.conf b/docker-compose/nginx.conf index af68832..dddef81 100644 --- a/docker-compose/nginx.conf +++ b/docker-compose/nginx.conf @@ -41,7 +41,7 @@ server { proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://127.0.0.1:9999; + proxy_pass http://127.0.0.1:9090; expires 0; } } \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index bc2ab4d..beddbcf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", "author": "Pan ", "scripts": { - "dev": "./node_modules/.bin/vue-cli-service serve", + "dev": "./node_modules/.bin/vue-cli-service serve --port 8080", "build:prod": "./node_modules/.bin/vue-cli-service build", "build:stage": "./node_modules/.bin/vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/frontend/src/api/article.js b/frontend/src/api/article.js index 2ed31b0..7614925 100644 --- a/frontend/src/api/article.js +++ b/frontend/src/api/article.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function fetchList(query) { return request({ - url: 'http://localhost:9999/stock/api_data', + url: 'http://localhost:9090/stock/api_data', method: 'get', params: query }) diff --git a/frontend/src/api/menu.js b/frontend/src/api/menu.js index 7987d2a..4da5dbf 100644 --- a/frontend/src/api/menu.js +++ b/frontend/src/api/menu.js @@ -4,7 +4,7 @@ import request from '@/utils/request' export function fetchMenuList(query) { return request({ - url: 'http://localhost:9999/stock/menu_list', + url: 'http://localhost:9090/stock/menu_list', method: 'get', params: query }) diff --git a/frontend/src/api/package.js b/frontend/src/api/package.js index 779e915..b734d49 100644 --- a/frontend/src/api/package.js +++ b/frontend/src/api/package.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function fetchPackageVersion(query) { return request({ - url: 'http://localhost:9999/stock/package_verison', + url: 'http://localhost:9090/stock/package_verison', method: 'get', params: query }) -- Gitee From 9e94529b6163c3b4eb45c9790160416ee0469e47 Mon Sep 17 00:00:00 2001 From: freegolang Date: Fri, 3 Jan 2025 09:22:52 +0800 Subject: [PATCH 12/29] =?UTF-8?q?fix:=20=20=E4=BF=AE=E6=94=B9=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E8=80=85=E6=A8=A1=E5=BC=8F=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=BC=80=E5=8F=91=E6=A8=A1=E5=BC=8F=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 2 +- frontend/src/api/article.js | 2 +- frontend/src/api/menu.js | 2 +- frontend/src/api/package.js | 2 +- frontend/vue.config.js | 17 ++++++++++------- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index beddbcf..3b41893 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", "author": "Pan ", "scripts": { - "dev": "./node_modules/.bin/vue-cli-service serve --port 8080", + "dev": "./node_modules/.bin/vue-cli-service serve ", "build:prod": "./node_modules/.bin/vue-cli-service build", "build:stage": "./node_modules/.bin/vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/frontend/src/api/article.js b/frontend/src/api/article.js index 7614925..7e3ba1e 100644 --- a/frontend/src/api/article.js +++ b/frontend/src/api/article.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function fetchList(query) { return request({ - url: 'http://localhost:9090/stock/api_data', + url: '/stock/api_data', method: 'get', params: query }) diff --git a/frontend/src/api/menu.js b/frontend/src/api/menu.js index 4da5dbf..e233ff4 100644 --- a/frontend/src/api/menu.js +++ b/frontend/src/api/menu.js @@ -4,7 +4,7 @@ import request from '@/utils/request' export function fetchMenuList(query) { return request({ - url: 'http://localhost:9090/stock/menu_list', + url: '/stock/menu_list', method: 'get', params: query }) diff --git a/frontend/src/api/package.js b/frontend/src/api/package.js index b734d49..b26c7e9 100644 --- a/frontend/src/api/package.js +++ b/frontend/src/api/package.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function fetchPackageVersion(query) { return request({ - url: 'http://localhost:9090/stock/package_verison', + url: '/stock/package_verison', method: 'get', params: query }) diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 4856ed0..7b6db0b 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -30,13 +30,16 @@ module.exports = { lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false, devServer: { - port: port, - open: true, - overlay: { - warnings: false, - errors: true - }, - before: require('./mock/mock-server.js') + port: 8080, + proxy: { + '/stock': { + target: 'http://stock:9090/stock', + changeOrigin: true, + pathRewrite: { + '^/stock': '' + } + } + } }, configureWebpack: { // provide the app's title in webpack's name field, so that -- Gitee From 68cde9f305be31c7cc00ce0fbba3fbb46c8c428d Mon Sep 17 00:00:00 2001 From: freegolang Date: Fri, 3 Jan 2025 22:42:56 +0800 Subject: [PATCH 13/29] =?UTF-8?q?fix:=20=E6=8B=86=E5=88=86=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=EF=BC=8C=E4=BD=BF=E7=94=A8dockerfile=20?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=9E=84=E5=BB=BA=E9=95=9C=E5=83=8F=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=89=8D=E7=AB=AF=E7=BC=96=E8=AF=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/dev-docker-compose.yml | 15 ++++--- .../{DevDockerfile => DevBackendDockerfile} | 0 docker-compose/docker/DevFrontendDockerfile | 41 +++++++++++++++++++ frontend/docker-entrypoint.sh | 1 + 4 files changed, 51 insertions(+), 6 deletions(-) rename docker-compose/docker/{DevDockerfile => DevBackendDockerfile} (100%) create mode 100644 docker-compose/docker/DevFrontendDockerfile diff --git a/docker-compose/dev-docker-compose.yml b/docker-compose/dev-docker-compose.yml index e2cfeaa..7c415e3 100644 --- a/docker-compose/dev-docker-compose.yml +++ b/docker-compose/dev-docker-compose.yml @@ -5,7 +5,10 @@ networks: version: "3" services: frontend: - image: docker.m.daocloud.io/library/node:bullseye-slim + image: pythonstock/frontend-dev:latest + build: + context: . + dockerfile: docker/DevFrontendDockerfile container_name: frontend ports: - "8080:8080" @@ -21,13 +24,13 @@ services: # 入口写死，手动启动应用。 entrypoint: /usr/src/app/docker-entrypoint.sh depends_on: - - stock - stock: - image: pythonstock/pythonstock-dev:latest + - backend + backend: + image: pythonstock/backend-dev:latest build: context: . - dockerfile: docker/DevDockerfile - container_name: stock + dockerfile: docker/DevBackendDockerfile + container_name: backend ports: - "8888:8888" - "9090:9090" diff --git a/docker-compose/docker/DevDockerfile b/docker-compose/docker/DevBackendDockerfile similarity index 100% rename from docker-compose/docker/DevDockerfile rename to docker-compose/docker/DevBackendDockerfile diff --git a/docker-compose/docker/DevFrontendDockerfile b/docker-compose/docker/DevFrontendDockerfile new file mode 100644 index 0000000..fa1335a --- /dev/null +++ b/docker-compose/docker/DevFrontendDockerfile @@ -0,0 +1,41 @@ +#使用 node:bullseye-slim 做基础镜像减少大小。 + +FROM docker.m.daocloud.io/library/node:bullseye-slim + +# https://opsx.alibaba.com/mirror +# 使用阿里云镜像地址。修改debian apt 更新地址，pip 地址，设置时区。 +# 设置debian的镜像源 +RUN echo "deb http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \ +echo "deb http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \ +echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \ +echo "[global]\n\ +trusted-host=mirrors.aliyun.com\n\ +index-url=http://mirrors.aliyun.com/pypi/simple" > /etc/pip.conf && \ +ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo "Asia/Shanghai" > /etc/timezone + +#增加语言utf-8 +ENV LANG=zh_CN.UTF-8 +ENV LC_CTYPE=zh_CN.UTF-8 +ENV LC_ALL=C + +# 增加 TensorFlow 的支持，使用最新的2.0 编写代码。目前还是使用 1.x 吧，还没有学明白。 +# RUN pip3 install tensorflow==2.0.0-rc1 keras +# RUN pip3 install tensorflow keras sklearn + +# 设置 vim 的语言配置 +RUN mkdir -p /etc/vim/ && \ + echo "set fileencodings=utf-8,ucs-bom,gb18030,gbk,gb2312,cp936" >> /etc/vim/vimrc && \ + echo "set termencoding=utf-8" >> /etc/vim/vimrc && \ + echo "set encoding=utf-8" >> /etc/vim/vimrc + +# 安装 mysqlclient akshare (pandas ,numpy) tornado bokeh +# 安装 nodejs 库 +# apt-get autoremove -y 删除没有用的依赖lib。减少镜像大小。1MB 也要节省。 +# apt-get --purge remove 软件包名称 , 删除已安装包（不保留配置文件)。 +RUN apt-get update && apt-get install -y python3 make g++ && apt-get clean diff --git a/frontend/docker-entrypoint.sh b/frontend/docker-entrypoint.sh index 92ff16c..dc3787b 100755 --- a/frontend/docker-entrypoint.sh +++ b/frontend/docker-entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/sh +# 只依赖启动。 cd /usr/src/app npm install --registry=https://registry.npmmirror.com npm run dev -- Gitee From 7f28d1c2f96c5d8767622c433e4599cdcd929fab Mon Sep 17 00:00:00 2001 From: freegolang Date: Fri, 3 Jan 2025 22:43:38 +0800 Subject: [PATCH 14/29] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E5=9C=B0=E5=9D=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 7b6db0b..0ef58c2 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -33,7 +33,7 @@ module.exports = { port: 8080, proxy: { '/stock': { - target: 'http://stock:9090/stock', + target: 'http://backend:9090/stock', changeOrigin: true, pathRewrite: { '^/stock': '' -- Gitee From 28683b08a60628212fac015fbb51c31f51f49fe3 Mon Sep 17 00:00:00 2001 From: freegolang Date: Sat, 4 Jan 2025 08:23:34 +0800 Subject: [PATCH 15/29] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/dev-docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/dev-docker-compose.yml b/docker-compose/dev-docker-compose.yml index 7c415e3..221a81a 100644 --- a/docker-compose/dev-docker-compose.yml +++ b/docker-compose/dev-docker-compose.yml @@ -11,7 +11,7 @@ services: dockerfile: docker/DevFrontendDockerfile container_name: frontend ports: - - "8080:8080" + - "9999:8080" volumes: # 设置开发目录，方便开发调试 - "../frontend:/usr/src/app" -- Gitee From a3d384d7d75665188703c6fd7228611d24082f6b Mon Sep 17 00:00:00 2001 From: freegolang Date: Sat, 4 Jan 2025 22:37:33 +0800 Subject: [PATCH 16/29] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E6=98=A0=E5=B0=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/dev-docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/dev-docker-compose.yml b/docker-compose/dev-docker-compose.yml index 221a81a..7c415e3 100644 --- a/docker-compose/dev-docker-compose.yml +++ b/docker-compose/dev-docker-compose.yml @@ -11,7 +11,7 @@ services: dockerfile: docker/DevFrontendDockerfile container_name: frontend ports: - - "9999:8080" + - "8080:8080" volumes: # 设置开发目录，方便开发调试 - "../frontend:/usr/src/app" -- Gitee From 3dc86a8ab41af5299224b29bff9474125b34b875 Mon Sep 17 00:00:00 2001 From: freegolang Date: Sat, 4 Jan 2025 22:46:06 +0800 Subject: [PATCH 17/29] fix: add config --- frontend/docker-entrypoint.sh | 1 + frontend/vue.config.js | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/docker-entrypoint.sh b/frontend/docker-entrypoint.sh index dc3787b..bdd5f03 100755 --- a/frontend/docker-entrypoint.sh +++ b/frontend/docker-entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/sh +sleep 10 # 只依赖启动。 cd /usr/src/app npm install --registry=https://registry.npmmirror.com diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 0ef58c2..7d41a81 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -30,6 +30,7 @@ module.exports = { lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false, devServer: { + host: '0.0.0.0', port: 8080, proxy: { '/stock': { -- Gitee From cb1407f0abfc992502e806aaa15e16b60c222751 Mon Sep 17 00:00:00 2001 From: freegolang Date: Sun, 5 Jan 2025 07:20:20 +0800 Subject: [PATCH 18/29] add data search --- frontend/README.md | 4 +++ frontend/package.json | 2 +- frontend/src/views/table/index.vue | 39 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/frontend/README.md b/frontend/README.md index 5de6ed5..879bf8b 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -13,6 +13,10 @@ https://blog.csdn.net/freewebsys/category_9285317.html ## 1，股票系统前端项目 +elementUI + +https://element.eleme.cn/#/zh-CN + 使用vue-element-admin的模板进行项目开发： https://panjiachen.github.io/vue-element-admin-site/zh/guide/ diff --git a/frontend/package.json b/frontend/package.json index 3b41893..42990ba 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,7 +16,7 @@ "dependencies": { "axios": "0.18.1", "core-js": "^3.26.1", - "element-ui": "2.13.2", + "element-ui": "2.15.14", "file-saver": "^2.0.5", "js-cookie": "2.2.0", "normalize.css": "7.0.0", diff --git a/frontend/src/views/table/index.vue b/frontend/src/views/table/index.vue index 336b6a1..b0c6d3a 100644 --- a/frontend/src/views/table/index.vue +++ b/frontend/src/views/table/index.vue @@ -2,25 +2,18 @@
- - - - - - - - - - + + + + - Search - - - Export + 搜索 - - reviewer - +
{ this.list = response.data -- Gitee From dedd42b3d048a490e154aeb8eeccc99af95830c3 Mon Sep 17 00:00:00 2001 From: freegolang Date: Sun, 5 Jan 2025 09:34:31 +0800 Subject: [PATCH 19/29] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/libs/stock_web_dic.py | 12 +++---- backend/web/dataTableHandler.py | 56 +++++++++++++++++++++--------- frontend/src/views/table/index.vue | 21 ++++++++--- 3 files changed, 63 insertions(+), 26 deletions(-) diff --git a/backend/libs/stock_web_dic.py b/backend/libs/stock_web_dic.py index fe9aecd..26baf50 100644 --- a/backend/libs/stock_web_dic.py +++ b/backend/libs/stock_web_dic.py @@ -138,12 +138,12 @@ STOCK_WEB_DATA_MAP = {} WEB_EASTMONEY_URL = "http://quote.eastmoney.com/%s.html" # 再拼接成Map使用。 for tmp in STOCK_WEB_DATA_LIST: - try: - # 增加columns 字段中的【查看股票】 - tmp_idx = tmp.columns.index("code") - tmp.column_names.insert(tmp_idx + 1, "查看股票") - except Exception as e: - print("error :", e) + # try: + # # 增加columns 字段中的【查看股票】 + # tmp_idx = tmp.columns.index("code") + # tmp.column_names.insert(tmp_idx + 1, "查看股票") + # except Exception as e: + # print("error :", e) STOCK_WEB_DATA_MAP[tmp.table_name] = tmp diff --git a/backend/web/dataTableHandler.py b/backend/web/dataTableHandler.py index e58fd1f..71a89f4 100755 --- a/backend/web/dataTableHandler.py +++ b/backend/web/dataTableHandler.py @@ -43,20 +43,20 @@ class GetStockHtmlHandler(webBase.BaseHandler): if date_now.hour < 16: date_now_str = (date_now + datetime.timedelta(days=-1)).strftime("%Y%m%d") - try: - # 增加columns 字段中的【查看股票 东方财富】 - logging.info(eastmoney_name in tableInfo.column_names) - if eastmoney_name in tableInfo.column_names: - tmp_idx = tableInfo.column_names.index(eastmoney_name) - logging.info(tmp_idx) - try: - # 防止重复插入数据。可能会报错。 - tableInfo.columns.remove("eastmoney_url") - except Exception as e: - print("error :", e) - tableInfo.columns.insert(tmp_idx, "eastmoney_url") - except Exception as e: - print("error :", e) + # try: + # # 增加columns 字段中的【查看股票 东方财富】 + # logging.info(eastmoney_name in tableInfo.column_names) + # if eastmoney_name in tableInfo.column_names: + # tmp_idx = tableInfo.column_names.index(eastmoney_name) + # logging.info(tmp_idx) + # try: + # # 防止重复插入数据。可能会报错。 + # tableInfo.columns.remove("eastmoney_url") + # except Exception as e: + # print("error :", e) + # tableInfo.columns.insert(tmp_idx, "eastmoney_url") + # except Exception as e: + # print("error :", e) logging.info("####################GetStockHtmlHandlerEnd") self.render("tableInfo.html", tableInfo=tableInfo, date_now=date_now_str, pythonStockVersion=common.__version__, @@ -66,18 +66,37 @@ class GetStockHtmlHandler(webBase.BaseHandler): # 获得股票数据内容。 class GetStockDataHandler(webBase.BaseHandler): def get(self): + + self.set_header('Content-Type', 'application/json;charset=UTF-8') + logging.info("######################## GetStockDataHandler ########################") # 获得分页参数。 start_param = self.get_argument("start", default=0, strip=False) length_param = self.get_argument("length", default=10, strip=False) - print("page param:", length_param, start_param) name_param = self.get_argument("name", default="stock_zh_ah_name", strip=False) type_param = self.get_argument("type", default=None, strip=False) + date_param = self.get_argument("date", default=None, strip=False) + + logging.info(f"page param: , {length_param}, {start_param}, {type_param}, {date_param}") + + + if name_param == ":tableName": + obj = { + "code": 20000, + "message": "success", + "draw": 0, + "data": [] + } + # logging.info("####################") + # logging.info(obj) + self.write(json.dumps(obj)) + return + tableInfo = stock_web_dic.STOCK_WEB_DATA_MAP[name_param] - self.set_header('Content-Type', 'application/json;charset=UTF-8') + order_by_column = [] order_by_dir = [] # 支持多排序。使用shift+鼠标左键。 @@ -124,6 +143,11 @@ class GetStockDataHandler(webBase.BaseHandler): search_sql = search_sql + " AND `%s` = '%s' " % (item, val) search_idx = search_idx + 1 + if date_param: + if "WHERE" not in search_sql: + search_sql += f" WHERE `date` = '{date_param}' " + else: + search_sql += f" AND `date` = '{date_param}' " # print("tableInfo :", stock_web) order_by_sql = "" # 增加排序。 diff --git a/frontend/src/views/table/index.vue b/frontend/src/views/table/index.vue index b0c6d3a..0cbc6c9 100644 --- a/frontend/src/views/table/index.vue +++ b/frontend/src/views/table/index.vue @@ -40,10 +40,10 @@ :label="column.columnName" :prop="column.column" align="center" width="120"/> - +