From abce4c74552f5aa75b7009cb607cc12c3183eaca Mon Sep 17 00:00:00 2001 From: HibiKier <45528451+HibiKier@users.noreply.github.com> Date: Thu, 20 May 2021 18:46:54 +0800 Subject: [PATCH] Delete services directory --- .../__pycache__/db_context.cpython-38.pyc | Bin 767 -> 0 bytes .../__pycache__/db_context.cpython-39.pyc | Bin 958 -> 0 bytes .../__pycache__/init_config.cpython-39.pyc | Bin 4157 -> 0 bytes services/__pycache__/log.cpython-38.pyc | Bin 720 -> 0 bytes services/__pycache__/log.cpython-39.pyc | Bin 704 -> 0 bytes services/db_context.py | 27 --- services/init_config.py | 159 ------------------ services/log.py | 30 ---- 8 files changed, 216 deletions(-) delete mode 100644 services/__pycache__/db_context.cpython-38.pyc delete mode 100644 services/__pycache__/db_context.cpython-39.pyc delete mode 100644 services/__pycache__/init_config.cpython-39.pyc delete mode 100644 services/__pycache__/log.cpython-38.pyc delete mode 100644 services/__pycache__/log.cpython-39.pyc delete mode 100644 services/db_context.py delete mode 100644 services/init_config.py delete mode 100644 services/log.py diff --git a/services/__pycache__/db_context.cpython-38.pyc b/services/__pycache__/db_context.cpython-38.pyc deleted file mode 100644 index 97605bd17cd896386786f32ee48c457a271ee5df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 767 zcmZuv!EO^V5VgIV%{HV`#eo}WIp&h430$HI^^gJ;Qd9{6(rTr!yLL9FUOU)M+vE!0 zfs!NN!IdxAE2sVfC&rr+MFLA6``P1}=Xvw)@UVqo1mB)~{D~3z<-q?Q4VqekJ4K!!jnfA#)Ca?4Y} z4U6XHvxsPF(<}v)D=ArSxsu)JQmaCzWmGPVjo2->QO2f9v&hc&9V2d{sb-9JSEqAj zY@r#193CIfc*d{z@Xh&$R2CGuMY*|G z=OJL@QXs6`U^`(&l+liqcE^CYoN?a?NgKEQzzdsy E0CnZM9{>OV diff --git a/services/__pycache__/db_context.cpython-39.pyc b/services/__pycache__/db_context.cpython-39.pyc deleted file mode 100644 index a943fde57e56b8deb0a19af7dbed687c84ce63c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 958 zcma)4&ubGw6n?Y2+1+e@w1|odg$N?#k`|9arH6`&Pz1r^5Qv-1G+nzt;><*w*m$sB z?ZtYKQb`Uyc(I_2_kI8I3j^SX zc1{mGgGF5OAp!$NLWl?@1en3h(1=WG;vSe4T2YSXBAeQgL!HQ_Zj`6_$fI6VpalY) zYymB@9J5~oEis3=Xv-}B0IJ?G=7uUst=mDI9FwVIhe@ZyMb$~IRuHq)l~2QF>_j{@tr+mi@YK$@Cb7Z$x9M@Q@a2Qc!I5PmIr2iettsg6S6oV^Mkpi6Ec-B z@fl|o*=x6v>uN6y`>8-xvjB-SSgYAiV#PO9t=rdc z1geOM6U&00&U`< diff --git a/services/__pycache__/init_config.cpython-39.pyc b/services/__pycache__/init_config.cpython-39.pyc deleted file mode 100644 index fd1e46bc433555b9b921bfc7ee3af1ac6424791e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4157 zcmb6cYjYFVb$7LT+JG?-NNCd*k`N^+uQY9%rXjK=n@wa%u_XvQ%xu@XYiY5xEA|1H zNoFul12NzxgpevBq%af6fFY37K!BNk>R;&2^h;~4q?vwgXPTLoo_p`g$V~eoTHUkf zoO{l>=W$;vFIW&^;1~M)#ow%2!7zWrMEfrU#Ou(^5dermY>6qeBFi#+JAvX#oao!i zXixBr!jEla8T=5wPxNhLG;Tekum>3ATgixig7GUEyu!FjX~1w2j=WJ4&d zvM2&i2kJx%pe?Kh(4uPKUB==q26dsusC&|Pa@D)6<=+u_hk1uZOVCoZY?5c0t&lq& zo&!FX(YiJ;=BMjPMp0@Ylfdy|@e2(GcpR?!*w6egVAD|xs ze6qlzACdkalm4GT|0=W^dY*!wr_nQjtpV&=Xi;d-5!vTK>IH)RlxVF5dL8txhqeLQ zM$-2paDPUymx$EQf&K-0xxj%RzXbdhko*;T6-M|qdW~>50rzzj15QtMwaSvb1iwdK zx;Nk)%*@M7h-8K{k6EGlnE@|)VZ1m>Ky7ek`{3OV&t`Z>pgID21K^t|i3XsGDX2v! zN>_a-gWiBT3Lqn(x2kw1bfQ7f86q{M_00k=R}F&PmTH*95&E8SaOS@DI1mG~e`_im z<(yzeHWbY=oshCeH7!XWb(kn8b|lkDp*Nk9-b`#01KA{gM}rPOtZK*!nLA68CYKe5 zw@t-xLKWFGck2dnf-*veVww(L(GAN9A=#3LWm5swh%gZAPe_?qcC!=Nk`{VBJd}Mq zOSz$Bx}RdY;I$eJh+XkSGLcP4!a%>2Ol(Oc z#f1auE$wt?E|W~h;$CmKCzkTiP`cN{A_F-vLDa!yK(45x%9!JWoIzG#pK<)u=K%G` z@t2fcO37h&LpH6Emti{!DOz4fs#a+7;8!11DFA7QDmk5sX4-}#$!1z?c`K*-+1kJ_v%NF`~&wkPJPliag?C-dncfSptawR*Kf~6c`9=B zE8yE$+WqEI3$0I`!)O?D&s}U#8B8_rOx4fc#eH}{N;M{r0>km=bv!kE@FM0K(^qPD zPZP8`bKbpvA?l;V<^Ar&6tUgByuSesUpdvHYR7IgzCH-yV1H`g?yFzDP6h&n`o{-7 z#vZl@-2;b+I7Ml1o4zMO zCdl;R`svFge)m+hh1U1qa<9DS@JdC^M}07R)jjGi8=vNt`j=~3w6R;PC2T>avwATxXWw2ezh8SW<+JszG=?uWM;6X)85 zC}U12$~&B_id+mgLF8n??#5~pQ*QMrR-3u(R*%`|Krzzn&Te7P9r>Xv5o7Vxk$LpbC=q&klL~qXi6KB>XRMeobWyKJMWs{`mutGF4C|IeFJZ9RDI4veWg!7nkgyC_?dtf^%M4iKtDsSddE6~NZ0 zVr(>?gAk490pMe7R1w3-kat561~OhC(SuLYh@nENoUmocnppx@#3vr{70l5wz=NP% zD$AOj7Z;U5)KKM;WGH3W)x{+{Ra?TXWeAcgF577<#u$j0x^3hkN?nCBI?5Ysuxt2M zX*`9&GXU(z0k}seXJ;m7zx}v==j`m=&tUJTo7q}8Di_j|H!ciHNnt1}M)0XMm>9|> z;Q}BoisiCtDHe}QeS<Uv4+fVDX+5342B8gs&Bc@L~bTeHLkWx1s0RoylvJWzOU!5c4uM~G?KEf_!7yAASEx>#3 diff --git a/services/__pycache__/log.cpython-38.pyc b/services/__pycache__/log.cpython-38.pyc deleted file mode 100644 index e06a2209959d65b510ed5ba1d88c7dda418b102a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmYjO&2G~`5Z?7)9OthkAUJU7fk??AJ#a!1qJTnLP}No{J+L(jZg%3hwbzx`ZIxU( z_Z=K@;vIMZo?)+?cm+<(I#FP)otgdSn@=<2vqr-scz%BBfB9w-@=HJdKQ=yIjQvBfMPh0U!cWezx(6(E-`x9^dQc$GVddx+J*ggVfo zu_Q%vNxss@gjevoyvn_MleM5#)^4q9Tg5hb%azK5C1Gu77g~F(#M+yzQ#^!LiRq}V zBTi3Aul5@!AV)o_Tpr|*M+xZo@OXcG^5)|Kb7s*+bQK|H$8Zbr;=_5T8^}pXl%IF{ zJDu({ia`WeD9__az@XFBPNY4)%9n*J!T{+BNEw94URb+v8Y&tr?3;Yrf6+6Pm82Y$ z3u2P;NQAvds)Cdd!_2@wS?xN=XX8mKrcs#TpCQVWbE&E!U0yRQpKaXuF3qldkqWp-^XL9* x{l0|kHkyF+ak|~>xpH6PqHbb%MNv~eMdQ*ses0~PO~W&u(I)i_jd_Mg{{r!P(B1$5 diff --git a/services/__pycache__/log.cpython-39.pyc b/services/__pycache__/log.cpython-39.pyc deleted file mode 100644 index 83c2d096584c590772cf6b2d14d49f80ddfabe99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 704 zcmYjOO>fgc5Z(1hVmpZoX(bS+9*C42nj=CHLV!wIP}No{T->0r%}yM*{;0g$R?U@j z|AT$xiug5q<-}j$#H?)vEbYvjH*cP1*R0p`2!1=f{QAQr31qGcYLuQdrz7X<&nW*#dIe=Jo?>kau_sc^5ekOy~eDx+N)kCHY35 z5Z=b)aF=@zX5fQg&2BZbe(?z0vUYh~lAsU$LVIsjTz}KGi*4{LPNTj?oSu|1v8aUN%kJLpV7QE8NEr@_ z^EgUjG8pQVW+PtrtHD|@L3si~un^U2YaC~xqHJy7$mQP4k)f<4}Oz5o8*=L6+Vvpiu^ zV$WS}U}uW^AF`Ck$eTi9NV7X->Gue_`f~GC)3rVvPft`Aeg8T2&SVZOX$%4%4Y1sd zc#QL=_nqWVan&mPd9gp4o!-k;mNsdAm*rQp`nfMM*`S$#{5D#EnBk?y*Z0bKg->)7 d!)uCG;u!{qc4@cgQQz>4=hUa3p&8Hc=wIS>%-{e3 diff --git a/services/db_context.py b/services/db_context.py deleted file mode 100644 index 3cf46b2e..00000000 --- a/services/db_context.py +++ /dev/null @@ -1,27 +0,0 @@ - - -from gino import Gino -from .log import logger -from configs.config import bind, sql_name, user, password, address, port, database - - -# 全局数据库连接对象 -db = Gino() - - -async def init(): - i_bind = bind - if not bind: - i_bind = f"{sql_name}://{user}:{password}@{address}:{port}/{database}" - # print(i_bind) - try: - await db.set_bind(i_bind) - await db.gino.create_all() - logger.info(f'Database loaded successfully!') - except Exception as e: - raise Exception(f'数据库连接错误.... e: {e}') - - -async def disconnect(): - await db.pop_bind().close() - diff --git a/services/init_config.py b/services/init_config.py deleted file mode 100644 index 55c6b1f9..00000000 --- a/services/init_config.py +++ /dev/null @@ -1,159 +0,0 @@ -# import nonebot -from pathlib import Path -try: - import ujson as json -except ModuleNotFoundError: - import json - -# driver: nonebot.Driver = nonebot.get_driver() - -base_config = Path() / 'config.json' -plugins_cmd_config = Path() / 'configs' / 'plugins2cmd_config.json' -other_config = Path() / 'configs' / 'other_config.json' - - -def init_config(): - if not base_config.exists(): - base_config.parent.mkdir(parents=True, exist_ok=True) - config_dict = { - 'apikey': { - 'LOLICON_KEY': '', - 'TL_KEY': [], - }, - 'sql': { - 'bind': '', - 'sql_name': '', - 'user': '', - 'password': '', - 'address': '', - 'port': '', - 'database': '', - }, - 'path': { - 'IMAGE_PATH': '', - 'VOICE_PATH': '', - 'TXT_PATH': '', - 'LOG_PATH': '', - 'DATA_PATH': '', - 'DRAW_PATH': '', - 'TEMP_PATH': '', - }, - 'proxy': { - 'system_proxy': '', - 'buff_proxy': '' - }, - 'rsshub': { - 'RSSHUBAPP': 'https://docs.rsshub.app/', - }, - 'level': { - 'DELETE_IMG_LEVEL': 7, - 'MOVE_IMG_LEVEL': 7, - 'UPLOAD_LEVEL': 6, - 'BAN_LEVEL': 5, - 'OC_LEVEL': 2, - 'MUTE_LEVEL': 5, - }, - } - with open(base_config, 'w', encoding='utf8') as f: - json.dump(config_dict, f, indent=4, ensure_ascii=False) - if not plugins_cmd_config.exists(): - plugins_cmd_config.parent.mkdir(parents=True, exist_ok=True) - config_dict = { - 'base_config': { - 'sign_in': ['签到'], - 'send_img': ['发送图片', '萝莉', '美图', '壁纸'], - 'send_setu': ['色图', '涩图', '瑟图', '查色图'], - 'white2black': ['黑白图', '黑白草图'], - 'coser': ['coser', 'cos'], - 'quotations': ['语录'], - 'jitang': ['鸡汤'], - 'send_dinggong_voice': ['骂我', '骂老子', '骂劳资'], - 'open_cases': ['开箱', '我的开箱', '群开箱统计', '我的金色'], - 'luxun': ['鲁迅说过', '鲁迅说'], - 'fake_msg': ['假消息'], - 'buy': ['购买', '购买道具'], - 'my_gold': ['我的金币'], - 'my_props': ['我的道具'], - 'shop_help': ['商店'], - 'nonebot_plugin_cocdicer': ['骰子娘'], - 'update_pic': ['图片', '操作图片', '修改图片'], - 'search_buff_skin_price': ['查询皮肤'], - 'weather': ['天气', '查询天气', '天气查询'], - 'yiqing': ['疫情', '疫情查询', '查询疫情'], - 'what_anime': ['识番'], - 'search_anime': ['搜番'], - 'songpicker2': ['点歌'], - 'epic': ['epic'], - 'pixiv': ['pixiv', 'p站排行', '搜图'], - 'poke': ['戳一戳'], - 'draw_card': ['游戏抽卡', '原神一井', '原神来一井', '方舟一井', '方舟来一井'], - 'ai': ['ai', 'Ai', 'AI', 'aI'], - 'one_friend': ['我有一个朋友', '我有一个朋友想问问'], - 'translate': ['翻译', '英翻', '翻英', '日翻', '翻日', '韩翻', '翻韩'], - 'nonebot_plugin_picsearcher': ['识图'], - 'almanac': ['原神黄历', '黄历'], - 'material_remind': ['今日素材', '天赋材料'], - 'qiu_qiu_translation': ['丘丘翻译', '丘丘一下', '丘丘语翻译'], - 'query_resource_points': ['原神资源查询', '原神资源列表'], - } - } - with open(plugins_cmd_config, 'w', encoding='utf8') as f: - json.dump(config_dict, f, indent=4, ensure_ascii=False) - if not other_config.exists(): - other_config.parent.mkdir(parents=True, exist_ok=True) - config_dict = { - 'base': { - 'IMAGE_DIR_LIST': ["色图", "美图", "萝莉", "壁纸"], - 'BAN_RESULT': "才不会给你发消息.", - }, - 'bool': { - 'AUTO_ADD_FRIEND': True, - 'DOWNLOAD_SETU': True, - }, - 'probability': { - 'INITIAL_SETU_PROBABILITY': 0.7, - 'FUDU_PROBABILITY': 0.7, - }, - 'max_count': { - 'MAXINFO_REIMU': 7, - 'COUNT_PER_DAY_REIMU': 5, - 'MAXINFO_BT': 10, - 'MAXINFO_PRIVATE_ANIME': 20, - 'MAXINFO_GROUP_ANIME': 5, - 'MAX_FIND_IMG_COUNT': 3, - 'MAX_SIGN_GOLD': 200, - }, - 'malicious_ban': { - 'MALICIOUS_BAN_TIME': 30, - 'MALICIOUS_BAN_COUNT': 4, - 'MALICIOUS_CHECK_TIME': 5, - }, - 'open_case': { - 'INITIAL_OPEN_CASE_COUNT': 20, - }, - 'mute': { - 'MUTE_DEFAULT_COUNT': 10, - 'MUTE_DEFAULT_TIME': 7, - 'MUTE_DEFAULT_DURATION': 10, - }, - 'other': { - 'UPDATE_GOCQ_GROUP': [], - 'ADMIN_DEFAULT_AUTH': 5, - }, - 'auth': { - 'admin_plugins_auth': { - "admin_bot_manage": 2, - "ban": 5, - "delete_img": 7, - "move_img": 7, - "upload_img": 6, - "admin_help": 1, - "mute": 5 - } - }, - } - with open(other_config, 'w', encoding='utf8') as f: - json.dump(config_dict, f, indent=4, ensure_ascii=False) - - - diff --git a/services/log.py b/services/log.py deleted file mode 100644 index 9de3fc6d..00000000 --- a/services/log.py +++ /dev/null @@ -1,30 +0,0 @@ -import logging -from datetime import datetime -from configs.path_config import LOG_PATH - -# CRITICAL 50 -# ERROR 40 -# WARNING 30 -# INFO 20 -# DEBUG 10 -# NOTSET 0 - -# _handler = logging.StreamHandler(sys.stdout) -# _handler.setFormatter( -# logging.Formatter('[%(asctime)s %(name)s] %(levelname)s: %(message)s') -# ) -logger = logging.getLogger('hibiki') -logger.setLevel(level=logging.DEBUG) - -formatter = logging.Formatter('[%(asctime)s] - %(filename)s[line:%(lineno)d] - %(levelname)s: %(message)s') -# print(LOG_PATH) -file_handler = logging.FileHandler(LOG_PATH + str((datetime.now()).date()) + '.log', mode='a', encoding='utf-8') -file_handler.setLevel(level=logging.INFO) -file_handler.setFormatter(formatter) - -stream_handler = logging.StreamHandler() -stream_handler.setLevel(logging.INFO) -stream_handler.setFormatter(formatter) - -logger.addHandler(file_handler) -logger.addHandler(stream_handler)