pytbox 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

pytbox/base.py

@@ -10,9 +10,14 @@ from pytbox.alert.alert_handler import AlertHandler
 from pytbox.log.logger import AppLogger
 from pytbox.win.ad import ADClient
 from pytbox.network.meraki import Meraki
+from pytbox.utils.env import get_env_by_os_environment
+from pytbox.vmware import VMwareClient
+from pytbox.pyjira import PyJira
+from pytbox.mail.client import MailClient
 
 config = load_config_by_file(path='/workspaces/pytbox/tests/alert/config_dev.toml', oc_vault_id=os.environ.get('oc_vault_id'))
 
+
 def get_mongo(collection):
     return Mongo(
         host=config['mongo']['host'],
@@ -61,4 +66,21 @@ def get_logger(app):
 #     password=config['ad']['prod']['AD_PASSWORD']
 # )
 
-meraki = Meraki(api_key=config['meraki']['api_key'], organization_id=config['meraki']['organization_id'])
+env = get_env_by_os_environment(check_key='ENV')
+meraki = Meraki(api_key=config['meraki']['api_key'], organization_id=config['meraki']['organization_id'])
+
+vmware_test = VMwareClient(
+    host=config['vmware']['test']['host'],
+    username=config['vmware']['test']['username'],
+    password=config['vmware']['test']['password'],
+    version=config['vmware']['test']['version'],
+    proxies=config['vmware']['test']['proxies']
+)
+
+pyjira = PyJira(
+    base_url=config['jira']['base_url'],
+    token=config['jira']['token']
+)
+
+mail_163 = MailClient(mail_address=config['mail']['163']['mail_address'], password=config['mail']['163']['password'])
+mail_qq = MailClient(mail_address=config['mail']['qq']['mail_address'], password=config['mail']['qq']['password'])

pytbox/categraf/build_config.py

@@ -114,16 +114,11 @@ class BuildConfig:
                 device_templates = glob(str(jinja2_dir / f'{device_type}_*.toml.j2'))
                 if not device_templates:
                     continue
-                
                 for tmpl_path in device_templates:
                     tmpl_name = os.path.basename(tmpl_path)
-                    # 例如 h3c_system.toml.j2 -> h3c_system
                     base_name = tmpl_name.replace('.toml.j2', '')
-
                     template = self._get_template(f'input.snmp/{tmpl_name}')
-                    # 修复数据结构：模板期望的是数组，每个元素是字典
-                    # instances 是 [{"udp://10.1.1.1:161": {...}, "udp://10.1.1.2:161": {...}}, ...]
-                    render_data = template.render(instances=instances)
+                    render_data = template.render(instances=instances, config=self.instances['snmp']['config'])
 
                     target_dir = Path(self.output_dir) / 'input.snmp'
                     if not target_dir.exists():

pytbox/categraf/instances.toml

@@ -25,6 +25,9 @@
 "119.29.29.29_baidu.com" = { dns_server = "119.29.29.29", domains = "www.baidu.com", labels = { name = "x", env = "prod" } }
 
 [snmp]
+[snmp.config]
+timeout = '120s'
+path = "/usr/share/snmp/mibs"
 # 支持 h3c,huawei,cisco,ruijie
 [[snmp.instances.h3c]]
 "10.1.1.1:161" = { version = 2, community = "public" }

pytbox/categraf/jinja2/input.snmp/cisco_interface.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/categraf/jinja2/input.snmp/cisco_system.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/categraf/jinja2/input.snmp/h3c_interface.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/categraf/jinja2/input.snmp/h3c_system.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/categraf/jinja2/input.snmp/huawei_interface.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/categraf/jinja2/input.snmp/huawei_system.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/categraf/jinja2/input.snmp/ruijie_interface.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/categraf/jinja2/input.snmp/ruijie_system.toml.j2

@@ -17,9 +17,9 @@ priv_protocol = "{{detail.priv_protocol}}"
 priv_password = "{{detail.priv_password}}"
 sec_level = "{{detail.sec_level}}"
 {% endif %}
-timeout = "5s"
+timeout = "{{config.timeout}}"
 retries = 3
-path = ["/usr/share/snmp/mibs"]
+path = ["{{config.path}}"]
 translator = "gosmi"
 max_repetitions = 50
 

pytbox/cli/commands/vm.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+import click
+from pytbox.database.victoriametrics import VictoriaMetrics
+from pytbox.utils.richutils import RichUtils
+
+rich_utils = RichUtils()
+
+@click.group()
+def vm_group():
+    """VictoriaMetrics 查询工具"""
+    pass
+
+
+@vm_group.command('query')
+@click.option('--url', '-u', type=str, required=True)
+@click.option('--query', '-q', type=str, required=True)
+def query(url, query):
+    """查询 VM 数据"""
+    vm_client = VictoriaMetrics(url=url)
+    r = vm_client.query(query, output_format='json')
+    rich_utils.print(msg=r)

pytbox/cli/main.py

@@ -5,6 +5,7 @@ Pytbox 主命令行入口
 
 import click
 from .categraf import categraf_group
+from .commands.vm import vm_group
 
 
 @click.group()
@@ -16,6 +17,7 @@ def main():
 
 # 注册子命令组
 main.add_command(categraf_group, name='categraf')
+main.add_command(vm_group, name='vm')
 
 
 if __name__ == "__main__":

pytbox/database/victoriametrics.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 
+import json
 from typing import Literal, Optional
 import requests
 from ..utils.response import ReturnResponse
+from ..utils.load_vm_devfile import load_dev_file
 
 
 class VictoriaMetrics:
@@ -16,13 +18,13 @@ class VictoriaMetrics:
             'Accept': 'application/json'
         })
         
-    def query(self, query: str) -> ReturnResponse:
+    def query(self, query: str, output_format: Literal['json']=None) -> ReturnResponse:
         '''
         查询指标数据
-        
+
         Args:
             query (str): 查询语句
-            
+
         Returns:
             dict: 查询结果
         '''
@@ -32,13 +34,32 @@ class VictoriaMetrics:
             timeout=self.timeout,
             params={"query": query}
         )
-        if r.json().get("status") == "success":
-            if r.json()['data']['result']:
-                return ReturnResponse(code=0, msg=f"[{query}] 查询成功!", data=r.json()['data']['result'])
+        res_json = r.json()
+        status = res_json.get("status")
+        result = res_json.get("data", {}).get("result", [])
+        is_json = output_format == 'json'
+
+        if status == "success":
+            if result:
+                code = 0
+                msg = f"[{query}] 查询成功!"
+                data = result
             else:
-                return ReturnResponse(code=2, msg=f"[{query}] 没有查询到结果", data=r.json())
+                code = 2
+                msg = f"[{query}] 没有查询到结果"
+                data = res_json
         else:
-            return ReturnResponse(code=1, msg=f"[{query}] 查询失败: {r.json().get('error')}", data=r.json())
+            code = 1
+            msg = f"[{query}] 查询失败: {res_json.get('error')}"
+            data = res_json
+
+        resp = ReturnResponse(code=code, msg=msg, data=data)
+
+        if is_json:
+            json_result = json.dumps(resp.__dict__, ensure_ascii=False)
+            return json_result
+        else:
+            return resp
 
     def get_labels(self, metric_name: str) -> ReturnResponse:
         url = f"{self.url}/api/v1/series?match[]={metric_name}"
@@ -49,9 +70,19 @@ class VictoriaMetrics:
         else:
             return ReturnResponse(code=1, msg=f"metric name: {metric_name} 查询失败")
 
-    def check_ping_result(self, target: str, last_minute: int=10) -> ReturnResponse:
+    def check_ping_result(self, target: str, last_minute: int=10, env: str='prod', dev_file: str='') -> ReturnResponse:
         '''
         检查ping结果
+
+        Args:
+            target (str): 目标地址
+            last_minute (int, optional): 最近多少分钟. Defaults to 10.
+            env (str, optional): 环境. Defaults to 'prod'.
+            dev_file (str, optional): 开发文件. Defaults to ''.
+
+        Returns:
+            ReturnResponse: 
+                code = 0 正常, code = 1 异常, code = 2 没有查询到数据, 建议将其判断为正常
         '''
         if target:
             # 这里需要在字符串中保留 {}，同时插入 target，可以用双大括号转义
@@ -62,13 +93,18 @@ class VictoriaMetrics:
         if last_minute:
             query = query + f"[{last_minute}m]"
         
-        r = self.query(query=query)
+        if env == 'dev':
+            r = load_dev_file(dev_file)
+        else:
+            r = self.query(query=query)
+ 
         if r.code == 0:
             values = r.data[0]['values']
             if len(values) == 2 and values[1] == "0":
                 code = 0
                 msg = f"已检查 {target} 最近 {last_minute} 分钟是正常的!"
             else:
+                
                 if all(str(item[1]) == "1" for item in values):
                     code = 1
                     msg = f"已检查 {target} 最近 {last_minute} 分钟是异常的!"

pytbox/feishu/endpoints.py

@@ -254,9 +254,9 @@ class MessageEndpoint(Endpoint):
             body=payload
         )
         if r.code == 0:
-            return ReturnResponse(code=0, message=f"{message_id} 回复 emoji [{emoji_type}] 成功")
+            return ReturnResponse(code=0, msg=f"{message_id} 回复 emoji [{emoji_type}] 成功")
         else:
-            return ReturnResponse(code=1, message=f"{message_id} 回复 emoji [{emoji_type}] 失败")
+            return ReturnResponse(code=1, msg=f"{message_id} 回复 emoji [{emoji_type}] 失败")
 
 class BitableEndpoint(Endpoint):
     
@@ -432,10 +432,10 @@ class BitableEndpoint(Endpoint):
             resp = self.parent.request(path=f'/bitable/v1/apps/{app_token}/tables/{table_id}/records/{record_id}',
                                         method='PUT',
                                         body=payload)
-            return ReturnResponse(code=resp.code, message=f"记录已存在, 进行更新", data=resp.data)
+            return ReturnResponse(code=resp.code, msg=f"记录已存在, 进行更新", data=resp.data)
         else:
             resp = self.add_record(app_token, table_id, fields)
-            return ReturnResponse(code=resp.code, message=f"记录不存在, 进行创建", data=resp.data)
+            return ReturnResponse(code=resp.code, msg=f"记录不存在, 进行创建", data=resp.data)
 
     def query_name_by_record_id(self, app_token: str=None, table_id: str=None, field_names: list=None, record_id: str='', name: str=''):
         response = self.query_record(app_token=app_token, table_id=table_id, field_names=field_names)
@@ -967,9 +967,9 @@ class ExtensionsEndpoint(Endpoint):
                                    body=payload)
         if response.code == 0:
             if get == 'open_id':
-                return ReturnResponse(code=0, message=f'根据用户输入的 {user_input}, 获取用户信息成功', data=response.data['user_list'][0]['user_id'])
+                return ReturnResponse(code=0, msg=f'根据用户输入的 {user_input}, 获取用户信息成功', data=response.data['user_list'][0]['user_id'])
         else:
-            return ReturnResponse(code=response.code, message=f"获取时失败, 报错请见 data 字段", data=response.data)
+            return ReturnResponse(code=response.code, msg=f"获取时失败, 报错请见 data 字段", data=response.data)
     
     def format_rich_text(self, text: str, color: Literal['red', 'green', 'yellow', 'blue'], bold: bool=False):
         if bold:

pytbox/mail/client.py

@@ -1,45 +1,11 @@
 #!/usr/bin/env python3
 
 
-from dataclasses import dataclass
-from typing import Generator, Literal
-
+from contextlib import contextmanager
 import yagmail
-from imbox import Imbox
-from imap_tools import MailBox, AND, MailMessageFlags
-from nb_log import get_logger
-
-from src.library.onepassword import my1p
-
-
-log = get_logger('src.library.mail.client')
-
-
-@dataclass
-class MailDetail:
-    """
-    邮件详情数据类。
-    
-    Attributes:
-        uid: 邮件唯一标识符
-        send_from: 发件人邮箱地址
-        send_to: 收件人邮箱地址列表
-        cc: 抄送人邮箱地址列表
-        subject: 邮件主题
-        body_plain: 纯文本正文
-        body_html: HTML格式正文
-        attachment: 附件完整保存路径列表
-    """
-    uid: str=None
-    send_from: str=None
-    send_to: list=None
-    date: str=None
-    cc: list=None
-    subject: str=None
-    body_plain: str=None
-    body_html: str=None
-    attachment: list=None
-    has_attachments: bool=False
+from imap_tools import MailBox, MailMessageFlags, AND
+from .mail_detail import MailDetail
+from ..utils.response import ReturnResponse
 
 
 class MailClient:
@@ -47,114 +13,93 @@ class MailClient:
     _summary_
     '''
     def __init__(self, 
-                 send_mail_address: Literal['service@tyun.cn', 'alert@tyun.cn', 'houmingming@tyun.cn', 'houmdream@163.com', 'houm01@foxmail.com'] = 'service@tyun.cn',
-                 authorization_code: bool=False,
+                 mail_address: str=None,
                  password: str=None
                 ):
         
-        self.mail_address = send_mail_address
-        
-        if password:
-            self.password = password
-        else:
-            if authorization_code:
-                self.password = my1p.get_item_by_title(title=send_mail_address)['授权码']
-            else:
-                self.password = my1p.get_item_by_title(title=send_mail_address)['password']
+        self.mail_address = mail_address
+        self.password = password
 
-        if '163.com' in send_mail_address:
+        if '163.com' in mail_address:
             self.smtp_address = 'smtp.163.com'
             self.imap_address = 'imap.163.com'
-            self.imbox_client = self._create_imbox_object(vendor='163')
-        elif 'foxmail.com' in send_mail_address:
+            # self.imbox_client = self._create_imbox_object()
+        elif 'foxmail.com' in mail_address:
             self.smtp_address = 'smtp.qq.com'
             self.imap_address = 'imap.qq.com'
-            self.imbox_client = self._create_imbox_object(vendor='qq')
+            
         else:
-            raise ValueError(f'不支持的邮箱地址: {send_mail_address}')
-
-        self.mailbox = MailBox(self.imap_address).login(self.mail_address, self.password)
+            raise ValueError(f'不支持的邮箱地址: {mail_address}')
+    
+    @contextmanager
+    def get_mailbox(self, readonly=False):
+        """
+        创建并返回一个已登录的 MailBox 上下文管理器。
+        
+        使用方式:
+            with self.get_mailbox() as mailbox:
+                # 使用 mailbox 进行操作
+                pass
         
-    def _create_imbox_object(self, vendor: Literal['aliyun', 'qq', '163']):
-        return Imbox(self.imap_address,
-                username=self.mail_address,
-                password=self.password,
-                ssl=True,
-                ssl_context=None,
-                starttls=False)
+        Args:
+            readonly (bool): 是否以只读模式打开邮箱，只读模式下不会将邮件标记为已读
+        
+        Yields:
+            MailBox: 已登录的邮箱对象
+        """
+        mailbox = MailBox(self.imap_address).login(self.mail_address, self.password)
+        if readonly:
+            # 以只读模式选择收件箱，防止邮件被标记为已读
+            mailbox.folder.set('INBOX', readonly=True)
+        try:
+            yield mailbox
+        finally:
+            mailbox.logout()
 
-    def send_mail(self, receiver: list=[], cc: list=['houmingming@tyun.cn'], subject: str='', contents: str='', attachments: list=[], tips: str=None):
+    def send_mail(self, receiver: list=None, cc: list=None, subject: str='', contents: str='', attachments: list=None, tips: str=None):
         '''
         _summary_
 
         Args:
-            receiver (list, optional): _description_. Defaults to [].
-            cc (list, optional): _description_. Defaults to ['houmingming@tyun.cn'].
+            receiver (list, optional): _description_. Defaults to None.
+            cc (list, optional): _description_. Defaults to None.
             subject (str, optional): _description_. Defaults to ''.
             contents (str, optional): _description_. Defaults to ''.
-            attachments (list, optional): _description_. Defaults to [].
+            attachments (list, optional): _description_. Defaults to None.
         '''
-        email_signature = """
-————————————————————————————————————————
-以专业成就客户 
-钛信（上海）信息科技有限公司
-Tai Xin（ShangHai) Information Technology Co.,Ltd.
-中国上海市浦东新区达尔文路88号半岛科技园21栋2楼
-Tel:400-920-0057
-Web:www.tyun.cn
-————————————————————————————————————————
-信息安全声明：本邮件包含信息归发件人所在组织所有，发件人所在组织对该邮件拥有所有权利。请接收者注意保密，未经发件人书面许可，不得向任何第三方组织和个人透露本邮件所含信息的全部或部分。以上声明仅适用于工作邮件。
-Information Security Notice: The information contained in this mail is solely property of the sender's organization. This mail communication is confidential. Recipients named above are obligated to maintain secrecy and are not permitted to disclose the contents of this communication to others.
-""" 
-        with yagmail.SMTP(user=self.mail_address, password=my1p.get_item_by_title(self.mail_address)['password'], port=465, host=self.smtp_address) as yag:
-            log.info(f'receiver: {receiver}, cc: {cc}, subject: {subject}, contents: {contents}, attachments: {attachments}')
+        with yagmail.SMTP(user=self.mail_address, password=self.password, port=465, host=self.smtp_address) as yag:
             try:
                 if tips:
-                    contents = contents + '\n' + '<p style="color: red;">本邮件为系统自动发送, 如有问题, 请联系 houmingming@tyun.cn</p>'
-
-                contents = contents + email_signature
+                    contents = contents + '\n' + '<p style="color: red;">本邮件为系统自动发送</p>'
                 yag.send(to=receiver, cc=cc, subject=subject, contents=contents, attachments=attachments)
-                log.info('发送成功!!!')
                 return True
             except Exception as e:
-                log.error(f'发送失败, 报错: {e}')
                 return False
+            
+    def get_mail_list(self, seen: bool=False, readonly: bool=True):
+        '''
+        获取邮件
 
-    def get_mail_list(self, is_read: bool=False) -> Generator:
-        with MailBox(self.imap_address).login(self.mail_address, self.password) as mailbox:
-            for msg in mailbox.fetch(criteria=AND(seen=is_read)):
-                # 处理附件
-                attachment_list = []
-                for att in msg.attachments:
-                    att_dict = {}
-                    att_dict['filename'] = att.filename
-                    att_dict['payload'] = att.payload
-                    att_dict['size'] = att.size
-                    att_dict['content_id'] = att.content_id
-                    att_dict['content_type'] = att.content_type
-                    att_dict['content_disposition'] = att.content_disposition
-                    # att_dict['part'] = att.part
-                    att_dict['size'] = att.size
-                    attachment_list.append(att_dict)
-                
-                if attachment_list:
-                    is_has_attachments = True
-                else:
-                    is_has_attachments = False
+        Args:
+            seen (bool, optional): 默认获取未读邮件, 如果为 True, 则获取已读邮件
+            readonly (bool, optional): 是否以只读模式获取邮件，默认为 True，防止邮件被标记为已读
 
+        Yields:
+            MailDetail: 邮件详情
+        '''
+        with self.get_mailbox(readonly=readonly) as mailbox:
+            for msg in mailbox.fetch(AND(seen=seen)):
                 yield MailDetail(
                     uid=msg.uid,
-                    send_from=msg.from_,
-                    send_to=msg.to,
+                    sent_from=msg.from_,
+                    sent_to=msg.to,
                     date=msg.date,
                     cc=msg.cc,
                     subject=msg.subject,
                     body_plain=msg.text,
-                    body_html=msg.html,
-                    has_attachments=is_has_attachments,
-                    attachment=attachment_list
-                )
-
+                    body_html=msg.html
+                )     
+            
     def mark_as_read(self, uid):
         """
         标记邮件为已读。
@@ -163,13 +108,12 @@ Information Security Notice: The information contained in this mail is solely pr
             uid (str): 邮件的唯一标识符
         """
         try:
-            # 使用 imap_tools 的 flag 方法标记邮件为已读
-            # 第一个参数是 uid，第二个参数是要设置的标志，第三个参数 True 表示添加标志
-            self.mailbox.flag(uid, [MailMessageFlags.SEEN], True)
-            # log.info(f'标注邮件{uid}为已读')
+            with self.get_mailbox() as mailbox:
+                # 使用 imap_tools 的 flag 方法标记邮件为已读
+                # 第一个参数是 uid，第二个参数是要设置的标志，第三个参数 True 表示添加标志
+                mailbox.flag(uid, [MailMessageFlags.SEEN], True)
         except Exception as e:
-            log.error(f'标记邮件{uid}为已读失败: {e}')
-            raise
+            return ReturnResponse(code=1, msg='邮件删除失败', data=e)
     
     def delete(self, uid):
         """
@@ -179,14 +123,15 @@ Information Security Notice: The information contained in this mail is solely pr
             uid (str): 邮件的唯一标识符
         """
         try:
-            # 使用 imap_tools 的 delete 方法删除邮件
-            self.mailbox.delete(uid)
-            log.info(f'删除邮件{uid}')
+            with self.get_mailbox() as mailbox:
+                # 使用 imap_tools 的 delete 方法删除邮件
+                mailbox.delete(uid)
+                # log.info(f'删除邮件{uid}')
         except Exception as e:
-            log.error(f'删除邮件{uid}失败: {e}')
+            # log.error(f'删除邮件{uid}失败: {e}')
             raise
     
-    def move(self, uid: str, destination_folder: str) -> None:
+    def move(self, uid: str, destination_folder: str) -> ReturnResponse:
         """
         移动邮件到指定文件夹。
 
@@ -198,24 +143,25 @@ Information Security Notice: The information contained in this mail is solely pr
             destination_folder (str): 目标文件夹名称。
 
         Returns:
-            None
+            ReturnResponse: 移动邮件结果
 
         Raises:
             Exception: 移动过程中底层 imap 库抛出的异常。
         """
         try:
-            # 使用 imap_tools 的 move 方法移动邮件
-            self.mailbox.move(uid, destination_folder)
-            log.info(f'邮件{uid}已移动到{destination_folder}')
+            with self.get_mailbox() as mailbox:
+                # 使用 imap_tools 的 move 方法移动邮件
+                mailbox.move(uid, destination_folder)
+                return ReturnResponse(code=0, msg=f'邮件 {uid} 移动到 {destination_folder} 成功', data=None)
         except Exception as e:
-            log.error(f'移动邮件{uid}到{destination_folder}失败: {e}')
-            raise
+            return ReturnResponse(code=1, msg=f'邮件 {uid} 移动到 {destination_folder} 失败', data=e)
+
+    def get_folder_list(self):
+        '''
+        获取文件夹列表
+        '''
+        with self.get_mailbox() as mailbox:
+            return ReturnResponse(code=0, msg='获取文件夹列表成功', data=mailbox.folder.list())
 
 if __name__ == '__main__':
-    # ali_mail = MailClient(send_mail_address='houmingming@tyun.cn')
-    # mail = MailClient(send_mail_address='houmingming@tyun.cn')
-    # mail = MailClient(send_mail_address='houmdream@163.com', authorization_code=True)
-    # mail = MailClient(send_mail_address='houm01@foxmail.com', password=my1p.get_item_by_title('QQ'))
-    # 对于阿里云邮箱，使用兼容方法
-    pass
-    # mail.get_mail_list(attachment=True, attachment_path='/tmp')
+    pass