diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d61c4f4f116c9b02951db28a31cd5356f15e65d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+__pycache__
+.idea
+.vscode
\ No newline at end of file
diff --git a/README.md b/README.md
index 6bb33c97ade7e9c82ee755464b7430818455cf0c..acda0163ba4b8bdc1b32d7ee84021dfcf3bf44e4 100644
--- a/README.md
+++ b/README.md
@@ -55,14 +55,14 @@ PASSWORD = <PASSWORD>
 
 ```bash
 cd dde/
-bash env.sh
+bash env.sh -D
 ```
 
 ## 运行
 
 ```bash
 # 在项目根目录下运行
-youqu manage.py run
+python3 manage.py run
 ```
 
 更多运行方式请查看文档：https://youqu.uniontech.com/
diff --git a/case/test_dde_1270985.py b/case/test_dde_1270985.py
index 1c9959c92a34dc4f479107ef3635d5d3bba551bb..06868d469fff0b4c2ecf8496baaf808267366048 100644
--- a/case/test_dde_1270985.py
+++ b/case/test_dde_1270985.py
@@ -16,14 +16,14 @@ class TestDdeCase(BaseCase):
 
     def teardown_method(self):
         """将时区重新设置为北京时间，并且关闭控制中心"""
-        DdeMethod().dde_control_center.dde_control_center_method_delete_other_time_area_by_control_center()
-        DdeMethod().dde_control_center.dde_control_center_method_click_by_attr("Btn_修改系统时区")
+        DdeMethod().delete_other_time_area_by_control_center()
+        DdeMethod().dde_control_center.click_by_attr("Btn_修改系统时区")
         sleep(2)
-        DdeMethod().dde_control_center.dde_control_center_method_click_by_attr("Editable_qlineedit")
+        DdeMethod().dde_control_center.click_by_attr("Editable_qlineedit")
         Src.input_message("Beijing")
         sleep(2)
         Src.enter()
-        DdeMethod().dde_control_center.dde_control_center_method_click_by_attr("Btn_确定")
+        DdeMethod().dde_control_center.click_by_attr("Btn_确定")
         sleep(2)
-        DdeMethod().dde_control_center.dde_control_center_method_delete_other_time_area_by_control_center()
+        DdeMethod().dde_control_center.delete_other_time_area_by_control_center()
         DdeMethod().dde_method_close_window()
diff --git a/case/test_dde_1270989.py b/case/test_dde_1270989.py
index b7348905bbabfbada871fb9e71c8b8cea6a60ca0..c390fb62e03ae3ab69541631e4189b17393e49cd 100644
--- a/case/test_dde_1270989.py
+++ b/case/test_dde_1270989.py
@@ -17,8 +17,8 @@ class TestDdeCase(BaseCase):
 
     def teardown_method(self):
         """重新开启时间同步，重置时间"""
-        DdeMethod().dde_control_center.dde_control_center_method_click_time_setting_by_attr()
+        DdeMethod().dde_control_center.click_time_setting_by_attr()
         sleep(1)
-        DdeMethod().dde_control_center.dde_control_center_method_click_time_synchronization_btn_by_attr()
+        DdeMethod().dde_control_center.click_time_synchronization_btn_by_attr()
         sleep(2)
         DdeMethod().dde_method_close_window()
diff --git a/case/test_dde_1271011.py b/case/test_dde_1271011.py
index e262f065862b383bb612d74631b478799d7d577d..5583aee298b16b3da326f9d2bf89538850ed6286 100644
--- a/case/test_dde_1271011.py
+++ b/case/test_dde_1271011.py
@@ -4,15 +4,16 @@ from src import sleep
 
 
 class TestDdeCase(BaseCase):
+
     def test_dde_1271011(self):
         """控制中心中更改屏幕分辨率后默认选中当前分辨率推荐的刷新率"""
         DdeMethod().dde_dock.dde_dock_method_click_control_center_btn_by_attr()
         sleep(6)
         DdeMethod().dde_method_change_resolution_by_control_center()
-        self.assert_element_exist("/dde-control-center/59.81赫兹")
+        # self.assert_element_exist("/dde-control-center/59.81赫兹")
         self.assert_image_exist_in_dde("test_dde_1271011.png")
 
     def teardown_method(self):
         """将分辨率重置，关闭控制中心窗口"""
         DdeMethod().dde_method_reset_resolution_by_control_center()
-        DdeMethod().dde_method_close_window()
+        DdeMethod().dde_control_center.kill_dde_control_center()
diff --git a/case/test_dde_1271027.py b/case/test_dde_1271027.py
index 67fff2aca27a0ad70279abff7affbc50aeb285f5..35c7cf04bf35143779c629593f19e2702a8f75b7 100644
--- a/case/test_dde_1271027.py
+++ b/case/test_dde_1271027.py
@@ -17,6 +17,6 @@ class TestDdeCase(BaseCase):
 
     def teardown_method(self):
         """关闭控制中心窗口"""
-        DdeMethod().dde_control_center.dde_control_center_method_click_by_attr("test")
+        DdeMethod().dde_control_center.click_by_attr("test")
         DdeMethod().dde_method_delete_test_account_by_control_center()
         DdeMethod().dde_method_close_window()
diff --git a/case/test_dde_1271037.py b/case/test_dde_1271037.py
index 24552ba6ba884de2b80b1efc3f57fea27181bcc0..c28d07583bc4e9c7374d734f471195621e17a6f9 100644
--- a/case/test_dde_1271037.py
+++ b/case/test_dde_1271037.py
@@ -11,7 +11,7 @@ class TestDdeCase(BaseCase):
         DdeMethod().dde_dock.dde_dock_method_click_control_center_btn_by_attr()
         sleep(6)
         DdeMethod().dde_method_change_current_account_password_by_control_center()
-        DdeMethod().dde_control_center.dde_control_center_method_click_automatic_login_btn_by_attr()
+        DdeMethod().dde_control_center.click_automatic_login_btn_by_attr()
         Src.input_message(BaseMethod.change_password)
         sleep(3)
         Src.enter()
@@ -21,7 +21,7 @@ class TestDdeCase(BaseCase):
     def teardown_method(self):
         """将修改的当前账户密码重新设置为之前的密码"""
         DdeMethod().dde_method_reset_current_account_password_from_change_password_by_control_center()
-        DdeMethod().dde_control_center.dde_control_center_method_click_automatic_login_btn_by_attr()
+        DdeMethod().dde_control_center.click_automatic_login_btn_by_attr()
         Src.input_message(BaseMethod.account_message)
         sleep(3)
         Src.enter()
diff --git a/case/test_dde_1271055.py b/case/test_dde_1271055.py
index 0097c2d89e9936842bf2a24c3a4d4e54339f619a..6d7e1b6c12ca28a922a2e496878f2624b3a14706 100644
--- a/case/test_dde_1271055.py
+++ b/case/test_dde_1271055.py
@@ -19,7 +19,7 @@ class TestDdeCase(BaseCase):
         """桌面打开画板"""
         euler = DdeMethod()
         euler.dde_dock.dde_dock_method_click_launcher_btn_by_attr()
-        euler.dde_launcher.dde_launcher_method_click_search_box_by_attr()
+        euler.dde_launcher.click_search_box_by_attr()
         Src.input("huaban")
         euler.base_method_right_click_by_ocr("画板")
         Src.select_menu(2)
diff --git a/case/test_dde_1271057.py b/case/test_dde_1271057.py
index b01ad70865db5c360d593282a95597c8d7233393..89e1356a5e40afd2225d6ce6fe17b6bdad5bc909 100644
--- a/case/test_dde_1271057.py
+++ b/case/test_dde_1271057.py
@@ -13,7 +13,7 @@ class TestDdeCase(BaseCase):
         euler = DdeMethod()
         euler.dde_method_open_software_by_launcher("huaban")
         sleep(5)
-        euler.deepin_draw.deepin_draw_method_click_rectangle_tool_btn_by_attr()
+        euler.deepin_draw.click_rectangle_tool_btn_by_attr()
         Src.mouse_down(500, 500)
         Src.drag_to(600, 600, 1, 1)
         sleep(1)
diff --git a/case/test_dde_1271073.py b/case/test_dde_1271073.py
index 01a4a1c09ba6ebbac1a303d730ddf853d8a1b4ef..5710701915f1b232becf7d32f2d49ee2f47a22f0 100644
--- a/case/test_dde_1271073.py
+++ b/case/test_dde_1271073.py
@@ -12,10 +12,10 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test.txt")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
@@ -27,51 +27,51 @@ class TestDdeCase(BaseCase):
     def test_dde_1271073_2(self):
         """文本编辑器-关闭标签，打开文件进行修改后用ctrl+w关闭当前标签"""
         euler = DdeMethod()
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
         sleep(3)
         Src.input_message("1")
         Src.ctrl_w()
-        euler.deepin_editor.dde_editor_method_click_by_attr("/deepin-editor/保存")
+        euler.deepin_editor.click_by_attr("/deepin-editor/保存")
         sleep(2)
         self.assert_element_not_exist("/deepin-editor/test.txt")
 
     def test_dde_1271073_3(self):
         """文本编辑器-关闭标签，打开文件进行修改后右键关闭当前标签"""
         euler = DdeMethod()
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
         sleep(3)
         Src.input_message("2")
-        euler.deepin_editor.dde_editor_method_close_tab_by_attr("*test.txt")
-        euler.deepin_editor.dde_editor_method_click_by_attr("/deepin-editor/保存")
+        euler.deepin_editor.close_tab_by_attr("*test.txt")
+        euler.deepin_editor.click_by_attr("/deepin-editor/保存")
         sleep(2)
         self.assert_element_not_exist("/deepin-editor/test.txt")
 
     def test_dde_1271073_4(self, clear_file_in_documents):
         """文本编辑器-关闭标签，打开文件进行修改后点击标签右方关闭按钮关闭当前标签"""
         euler = DdeMethod()
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
         sleep(3)
         Src.input_message("3")
-        euler.deepin_editor.dde_editor_method_close_tab_by_img()
-        euler.deepin_editor.dde_editor_method_click_by_attr("/deepin-editor/保存")
+        euler.deepin_editor.close_tab_by_img()
+        euler.deepin_editor.click_by_attr("/deepin-editor/保存")
         sleep(2)
         self.assert_element_not_exist("/deepin-editor/test.txt")
 
diff --git a/case/test_dde_1271075.py b/case/test_dde_1271075.py
index 85d16183d7e908a1d3d2df3d78cc70e3f3548a83..4c9126b795e7d810309a73486b39d24517308830 100644
--- a/case/test_dde_1271075.py
+++ b/case/test_dde_1271075.py
@@ -12,17 +12,17 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test.txt")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
+        euler.deepin_editor.click_menu_btn_by_attr()
         sleep(1)
-        euler.deepin_editor.dde_editor_method_choose_save_as_option_by_ocr()
+        euler.deepin_editor.choose_save_as_option_by_ocr()
         sleep(3)
         euler.dde_method_rename_file_in_pop_window_by_attr("new.txt")
         self.assert_file_exist("~/Documents/new.txt")
@@ -31,9 +31,9 @@ class TestDdeCase(BaseCase):
         """文本编辑器——另存为 重复文件名"""
         euler = DdeMethod()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
+        euler.deepin_editor.click_menu_btn_by_attr()
         sleep(1)
-        euler.deepin_editor.dde_editor_method_choose_save_as_option_by_ocr()
+        euler.deepin_editor.choose_save_as_option_by_ocr()
         sleep(3)
         euler.dde_method_rename_file_same_name_in_pop_window_by_attr("new.txt")
         self.assert_image_exist_in_dde("test_dde_1271075.png")
diff --git a/case/test_dde_1271077.py b/case/test_dde_1271077.py
index 3121fdb7066301d69bc580fac7f57898f786e9aa..9471c35e5846f5e3a152f0e60b5c13e70501131c 100644
--- a/case/test_dde_1271077.py
+++ b/case/test_dde_1271077.py
@@ -11,10 +11,10 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test.txt")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
@@ -37,6 +37,6 @@ class TestDdeCase(BaseCase):
         """关闭文本编辑器"""
         Src.ctrl_s()
         sleep(1)
-        DdeMethod().deepin_editor.dde_editor_method_close_tab_by_attr("test.txt")
-        DdeMethod().deepin_editor.dde_editor_method_quit_editor_by_ocr()
+        DdeMethod().deepin_editor.close_tab_by_attr("test.txt")
+        DdeMethod().deepin_editor.quit_editor_by_ocr()
         DdeMethod().base_method_delete_file_in_documents_by_cmd("test.txt")
diff --git a/case/test_dde_1271089.py b/case/test_dde_1271089.py
index ea85fc27fc7e64158a01d625ab9bafaf33685096..663fa6e0ec8b7472281a12e66dd56398d4d6ef89 100644
--- a/case/test_dde_1271089.py
+++ b/case/test_dde_1271089.py
@@ -11,7 +11,7 @@ class TestDdeCase(BaseCase):
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
         self.assert_process_status(True, "deepin-editor")
-        euler.deepin_editor.dde_editor_method_quit_editor_by_ocr()
+        euler.deepin_editor.quit_editor_by_ocr()
         sleep(3)
         self.assert_process_status(False, "deepin-editor")
 
diff --git a/case/test_dde_1271091.py b/case/test_dde_1271091.py
index 6a7fa321005a9d404ccdbf5b3fb9b15a62c9bc45..8c75efbf3919bd3f8a5d0e4cd0c281f6d154c26b 100644
--- a/case/test_dde_1271091.py
+++ b/case/test_dde_1271091.py
@@ -12,16 +12,16 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test.txt")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
         Src.input_message("a")
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_save_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_save_option_by_ocr()
         self.assert_image_exist_in_dde("test_dde_1271091.png")
 
     def test_dde_1271091_2(self):
@@ -30,10 +30,10 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test.txt")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
@@ -45,7 +45,7 @@ class TestDdeCase(BaseCase):
     def clear_test_file(self):
         """删除测试文件，关闭文本编辑器窗口"""
         yield
-        DdeMethod().deepin_editor.dde_editor_method_close_tab_by_attr("test.txt")
-        DdeMethod().deepin_editor.dde_editor_method_quit_editor_by_ocr()
+        DdeMethod().deepin_editor.close_tab_by_attr("test.txt")
+        DdeMethod().deepin_editor.quit_editor_by_ocr()
         DdeMethod().base_method_delete_file_in_documents_by_cmd("test.txt")
         sleep(3)
diff --git a/case/test_dde_1271093.py b/case/test_dde_1271093.py
index d6b30b6ea55748443514127ff5ae89130d57448f..ff88dee2e0e3fd628dda6002448058640bc4223d 100644
--- a/case/test_dde_1271093.py
+++ b/case/test_dde_1271093.py
@@ -12,10 +12,10 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test1.txt")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
@@ -27,10 +27,10 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test1.xml")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
@@ -42,10 +42,10 @@ class TestDdeCase(BaseCase):
         euler.base_method_create_file_in_documents_by_cmd("test1.json")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.choose_open_file_option_by_ocr()
         sleep(3)
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         sleep(2)
         Src.ctrl_a()
         Src.enter()
diff --git a/case/test_dde_1271123.py b/case/test_dde_1271123.py
index d9c43bd8e2fd21c248b1494c04c3a381acdf5311..0bb2036129bc80f2d448363aa572dd1e42e48172 100644
--- a/case/test_dde_1271123.py
+++ b/case/test_dde_1271123.py
@@ -9,15 +9,15 @@ class TestDdeCase(BaseCase):
         """检查系统是否默认安装Firefox浏览器，并且语言为中文"""
         DdeMethod().dde_dock.dde_dock_method_click_launcher_btn_by_attr()
         sleep(2)
-        DdeMethod().dde_launcher.dde_launcher_method_click_search_box_by_attr()
+        DdeMethod().dde_launcher.click_search_box_by_attr()
         Src.input_message("firefox")
         sleep(2)
         Src.enter()
         sleep(6)
-        DdeMethod().browser.dde_browser_method_click_menu_icon_by_img()
+        DdeMethod().browser.click_menu_icon_by_img()
         self.assert_ocr_exist("退出")
 
     def teardown_method(self):
         """关闭Firefox浏览器"""
-        DdeMethod().browser.dde_browser_method_click_close_btn_by_attr()
+        DdeMethod().browser.click_close_btn_by_attr()
         sleep(2)
diff --git a/case/test_dde_1271135.py b/case/test_dde_1271135.py
index 0299ff0c4c6d4d5445103bb78e1ddecdba5785ec..6595e0ba8861fe97ac01bd01b5f9b22a0be34fc0 100644
--- a/case/test_dde_1271135.py
+++ b/case/test_dde_1271135.py
@@ -9,11 +9,11 @@ class TestDdeCase(BaseCase):
         """在浏览器中新打开网页，并且进入百度界面"""
         DdeMethod().dde_method_open_software_by_launcher("Firefox")
         sleep(10)
-        DdeMethod().browser.dde_browser_method_right_click_by_ocr("开源社区")
+        DdeMethod().browser.right_click_by_ocr("开源社区")
         sleep(3)
         self.assert_image_exist_in_dde("test_dde_1271135_1.png")
-        DdeMethod().browser.dde_browser_method_click_by_attr("新建标签页")
-        DdeMethod().browser.dde_browser_method_click_by_attr("使用 百度 搜索，或者输入网址")
+        DdeMethod().browser.click_by_attr("新建标签页")
+        DdeMethod().browser.click_by_attr("使用 百度 搜索，或者输入网址")
         Src.input_message("www.baidu.com")
         sleep(3)
         Src.enter()
@@ -21,4 +21,4 @@ class TestDdeCase(BaseCase):
 
     def teardown_method(self):
         """关闭浏览器"""
-        DdeMethod().browser.dde_browser_method_click_close_btn_by_attr()
+        DdeMethod().browser.click_close_btn_by_attr()
diff --git a/case/test_dde_1271157.py b/case/test_dde_1271157.py
index 8884d27ece55b461bca8b3bb450a20a2701a7ffb..31f06b287ffab43d5ca9fcb13b4298d269c75498 100644
--- a/case/test_dde_1271157.py
+++ b/case/test_dde_1271157.py
@@ -10,7 +10,7 @@ class TestDdeCase(BaseCase):
         euler.dde_method_open_software_by_launcher("rizhishoujigongju")
         sleep(6)
         euler.deepin_log_viewer.deepin_log_viewer_input_root_password()
-        euler.deepin_log_viewer_method_export_all_log_by_attr()
+        euler.export_all_log_by_attr()
         self.assert_image_exist_in_dde("test_dde_1271169")
 
     def teardown_method(self):
diff --git a/case/test_dde_1271159.py b/case/test_dde_1271159.py
index 4b7c12d5c9fc68d62e5113e4c7e302611683d450..213cd935f536ebad6a0d59c20600ed3a372fc1b3 100644
--- a/case/test_dde_1271159.py
+++ b/case/test_dde_1271159.py
@@ -10,7 +10,7 @@ class TestDdeCase(BaseCase):
         euler = DdeMethod()
         euler.dde_method_open_software_by_launcher("rizhishoujigongju")
         sleep(6)
-        euler.dde_polkit_agent.dde_polkit_agent_method_click_by_attr("EditableText_passwordinput")
+        euler.dde_polkit_agent.click_by_attr("EditableText_passwordinput")
         Src.input_message("1")
         Src.enter()
         sleep(2)
diff --git a/case/test_dde_1271169.py b/case/test_dde_1271169.py
index 6a95f4796dc1e3216a20baf542c15c337ecd5b8e..223e860b1a77e19b6debb8f84288f499ccc65641 100644
--- a/case/test_dde_1271169.py
+++ b/case/test_dde_1271169.py
@@ -9,7 +9,7 @@ class TestDdeCase(BaseCase):
         euler = DdeMethod()
         euler.dde_method_open_software_by_launcher("rizhishoujigongju")
         sleep(6)
-        euler.deepin_log_viewer_method_export_log_by_attr("Boot-Shutdown Event", "Html (*.html)")
+        euler.export_log_by_attr("Boot-Shutdown Event", "Html (*.html)")
         self.assert_image_exist_in_dde("test_dde_1271169")
 
     def teardown_method(self):
diff --git a/case/test_dde_1271175.py b/case/test_dde_1271175.py
index f06dfc9644252d4f2b88bdba1d059d91a972ad57..7f1f4ef8c1c11e52837a0e43f903a0e081c1d3df 100644
--- a/case/test_dde_1271175.py
+++ b/case/test_dde_1271175.py
@@ -12,9 +12,9 @@ class TestDdeCase(BaseCase):
         euler = DdeMethod()
         euler.dde_method_open_software_by_launcher("xitongjianshiqi")
         sleep(5)
-        euler.deepin_system_monitor.deepin_system_monitor_method_click_system_services_btn_by_attr()
-        euler.deepin_system_monitor.deepin_system_monitor_method_search_process_or_service("bluetooth")
-        euler.deepin_system_monitor.deepin_system_monitor_method_right_click_first_service_in_system_services()
+        euler.deepin_system_monitor.click_system_services_btn_by_attr()
+        euler.deepin_system_monitor.search_process_or_service("bluetooth")
+        euler.deepin_system_monitor.right_click_first_service_in_system_services()
         Src.select_menu(2)
         sleep(3)
         Src.input_message(BaseMethod.account_message)
diff --git a/case/test_dde_1271199.py b/case/test_dde_1271199.py
index f71e445a31217b00637a64dfc77d617baa127559..b66a23deabc9aa32051d20472875610f4799787d 100644
--- a/case/test_dde_1271199.py
+++ b/case/test_dde_1271199.py
@@ -11,31 +11,31 @@ class TestDdeCase(BaseCase):
         sleep(6)
         self.assert_ocr_exist("CPU数量")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("处理器")
+        euler.deepin_devicemanager.click_by_attr("处理器")
         self.assert_ocr_exist("名称", "制造商", "最大频率", "架构")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("主板")
+        euler.deepin_devicemanager.click_by_attr("主板")
         self.assert_ocr_exist("版本")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("内存")
+        euler.deepin_devicemanager.click_by_attr("内存")
         self.assert_ocr_exist("总位宽", "序列号")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("显示适配器")
+        euler.deepin_devicemanager.click_by_attr("显示适配器")
         self.assert_ocr_exist("中断")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("音频适配器")
+        euler.deepin_devicemanager.click_by_attr("音频适配器")
         self.assert_ocr_exist("芯片")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("存储设备")
+        euler.deepin_devicemanager.click_by_attr("存储设备")
         self.assert_ocr_exist("设备文件")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("鼠标")
+        euler.deepin_devicemanager.click_by_attr("鼠标")
         self.assert_ocr_exist("型号")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("键盘")
+        euler.deepin_devicemanager.click_by_attr("键盘")
         self.assert_ocr_exist("硬件类别")
         sleep(1)
-        euler.deepin_devicemanager.dde_device_manager_method_click_by_attr("光驱")
+        euler.deepin_devicemanager.click_by_attr("光驱")
         self.assert_ocr_exist("总线信息")
 
     def teardown_method(self):
diff --git a/case/test_dde_1271201.py b/case/test_dde_1271201.py
index b1e582b3c98377cf1c167df4c9595d6e43938919..e1a5348b1f8e33d974df5b2e740778f6514c16cb 100644
--- a/case/test_dde_1271201.py
+++ b/case/test_dde_1271201.py
@@ -10,12 +10,12 @@ class TestDdeCase(BaseCase):
         euler = DdeMethod()
         euler.dde_method_open_software_by_launcher("shebeiguanliqi")
         sleep(6)
-        euler.deepin_devicemanager.dde_device_manager_method_export_file_by_attr("概况")
+        euler.deepin_devicemanager.export_file_by_attr("概况")
         euler.dde_method_open_software_by_launcher("wenbenbianjiqi")
         sleep(6)
-        euler.deepin_editor.deepin_editor.dde_editor_method_click_menu_btn_by_attr()
-        euler.deepin_editor.deepin_editor.dde_editor_method_choose_open_file_option_by_ocr()
-        euler.deepin_editor.dde_editor_method_click_documents_in_pop_window_by_img()
+        euler.deepin_editor.deepin_editor.click_menu_btn_by_attr()
+        euler.deepin_editor.deepin_editor.choose_open_file_option_by_ocr()
+        euler.deepin_editor.click_documents_in_pop_window_by_img()
         Src.ctrl_a()
         Src.enter()
         sleep(2)
diff --git a/case/test_dde_1271247.py b/case/test_dde_1271247.py
index ca7ac59b39ce96658df99b15142147dcef6d7075..e10dbdf82cddc0a10bafc683fcf92f19594328da 100644
--- a/case/test_dde_1271247.py
+++ b/case/test_dde_1271247.py
@@ -11,7 +11,7 @@ class TestDdeCase(BaseCase):
         DdeMethod().base_method_kill_process_by_cmd(app_name)
         Src.ctrl_alt_t()
         sleep(6)
-        DdeMethod().deepin_terminal.dde_terminal_method_click_option_by_attr()
+        DdeMethod().deepin_terminal.click_option_by_attr()
         sleep(1)
         DdeMethod().base_method_click_by_ocr("远程管理")
         sleep(1)
diff --git a/case/test_dde_1271293.py b/case/test_dde_1271293.py
index 862cabff15399c2fb7202469b6a29b94b8e4f832..5c36d8b9cf1cafab9081560fccbe2ac3bc767607 100644
--- a/case/test_dde_1271293.py
+++ b/case/test_dde_1271293.py
@@ -10,7 +10,7 @@ class TestDdeCase(BaseCase):
         """查看系统信息—版本协议"""
         DdeDockMethod().dde_dock_method_click_control_center_btn_by_attr()
         sleep(6)
-        DdeControlCenterMethod().dde_control_center_method_click_system_info_by_attr()
+        DdeControlCenterMethod().click_system_info_by_attr()
         sleep(1)
         self.assert_image_exist_in_dde("logo_deepin.png")
 
diff --git a/case/test_dde_1271311.py b/case/test_dde_1271311.py
index c4f1fb0c8b3a019508adfd06aabef97dd5d2fde3..60c3b9dffaa4c4b2bb1c90b4a0c41d1e05569b48 100644
--- a/case/test_dde_1271311.py
+++ b/case/test_dde_1271311.py
@@ -21,5 +21,5 @@ class TestDdeCase(BaseCase):
 
     def teardown_method(self):
         """环境清理，关闭火狐浏览器"""
-        DdeMethod().browser.dde_browser_method_click_close_btn_by_attr()
+        DdeMethod().browser.click_close_btn_by_attr()
         sleep(3)
diff --git a/case/test_dde_1271317.py b/case/test_dde_1271317.py
index b72b3541de6c73027a8b6ae5348ce1900d0d6e79..99c313927374147e1ca42c527551a06ccbf4a21c 100644
--- a/case/test_dde_1271317.py
+++ b/case/test_dde_1271317.py
@@ -9,12 +9,12 @@ class TestDdeCase(BaseCase):
         euler = DdeMethod()
         euler.dde_dock.dde_dock_method_click_launcher_btn_by_attr()
         sleep(2)
-        euler.dde_launcher.dde_launcher_method_click_all_categories_or_back_by_attr()
+        euler.dde_launcher.click_all_categories_or_back_by_attr()
         sleep(1)
         self.assert_ocr_exist("音乐欣赏")
 
         sleep(1)
-        euler.dde_launcher.dde_launcher_method_click_all_categories_or_back_by_attr()
+        euler.dde_launcher.click_all_categories_or_back_by_attr()
         sleep(1)
         self.assert_ocr_exist("搜索")
 
@@ -23,9 +23,9 @@ class TestDdeCase(BaseCase):
         euler = DdeMethod()
         euler.dde_dock.dde_dock_method_click_launcher_btn_by_attr()
         sleep(2)
-        euler.dde_launcher.dde_launcher_method_click_all_categories_or_back_by_attr()
+        euler.dde_launcher.click_all_categories_or_back_by_attr()
         sleep(3)
-        euler.dde_launcher.dde_launcher_method_click_system_manager_in_all_categories_view()
+        euler.dde_launcher.click_system_manager_in_all_categories_view()
         sleep(3)
         self.assert_ocr_exist("系统监视器")
 
diff --git a/case/test_dde_1271319.py b/case/test_dde_1271319.py
index 1c4ee0fe4737fba87cfc81ee560fd5008e1f8f00..8a67c271e09f3cc0d62a800892a2ddab353eef54 100644
--- a/case/test_dde_1271319.py
+++ b/case/test_dde_1271319.py
@@ -9,14 +9,14 @@ class TestDdeCase(BaseCase):
         """任务栏-应用区域的添加&移除"""
         euler = DdeMethod()
         euler.dde_dock.dde_dock_method_click_launcher_btn_by_attr()
-        euler.dde_launcher.dde_launcher_method_click_search_box_by_attr()
+        euler.dde_launcher.click_search_box_by_attr()
         Src.input("kantu")
         sleep(2)
-        euler.dde_launcher.dde_launcher_method_right_click_by_attr("看图")
+        euler.dde_launcher.right_click_by_attr("看图")
         Src.select_menu(3)
         sleep(2)
         self.assert_element_exist("/dde-dock/Btn_看图")
-        euler.dde_launcher.dde_launcher_method_right_click_by_attr("看图")
+        euler.dde_launcher.right_click_by_attr("看图")
         Src.select_menu(3)
         sleep(2)
         self.assert_element_not_exist("/dde-dock/Btn_看图")
@@ -25,10 +25,10 @@ class TestDdeCase(BaseCase):
         """任务栏-应用区域的添加&移除"""
         euler = DdeMethod()
         euler.dde_dock.dde_dock_method_click_launcher_btn_by_attr()
-        euler.dde_launcher.dde_launcher_method_click_search_box_by_attr()
+        euler.dde_launcher.click_search_box_by_attr()
         Src.input("kantu")
         sleep(2)
-        euler.dde_launcher.dde_launcher_method_right_click_by_attr("看图")
+        euler.dde_launcher.right_click_by_attr("看图")
         Src.select_menu(3)
         Src.win_left()
         sleep(2)
diff --git a/case/test_dde_1271331.py b/case/test_dde_1271331.py
index ff69c4aebf62bf71ba859ffbb0226467a4398d8a..f87c869e685080c5ac2699f1c63a7ed5c5c2e28f 100644
--- a/case/test_dde_1271331.py
+++ b/case/test_dde_1271331.py
@@ -12,7 +12,7 @@ class TestDdeCase(BaseCase):
         Src.hot_key("win", "d")
         time.sleep(2)
         euler = DeepinTerminalMethod()
-        euler.dde_terminal_method__right_click_by_xy()
+        euler.right_click_by_xy()
         time.sleep(2)
 
         self.assert_ocr_exist("uos@")
diff --git a/method/dde_method.py b/method/dde_method.py
index 050b98482e3badec03250b2bb6d5965f05e4937b..d75c4b0d9f39144ce54782711c9fe41898b6c40b 100644
--- a/method/dde_method.py
+++ b/method/dde_method.py
@@ -26,9 +26,10 @@ from apps.dde_autotest_euler.method.vender.deepin_terminal_method import DeepinT
 from src import log
 from src.shortcut import ShortCut
 from src import custom_exception
+from src import Src
 
 @log
-class DdeMethod(BaseMethod):
+class DdeMethod(Src):
     """应用方法主类"""
 
     @property
@@ -87,39 +88,31 @@ class DdeMethod(BaseMethod):
     def dde_method_open_software_by_launcher(self, text):
         """通过启动器打开软件"""
         self.dde_dock.dde_dock_method_click_launcher_btn_by_attr()
-        self.dde_launcher.dde_launcher_method_click_search_box_by_attr()
+        self.dde_launcher.click_search_box_by_attr()
         ShortCut.input_message(text)
         ShortCut.enter()
 
     def dde_method_close_window(self):
         """关闭窗口"""
-
-        def get_euler_version():
-            """获取 openEuler 版本信息,默认图片失败时使用版本图片定位"""
-            with open("/etc/openEuler-release") as f:
-                data = f.readline()
-                return "".join(data.split(" ")[2:]).strip()
-
         try:
             self.base_method_click_by_img("close_window_btn.png")
         except custom_exception.TemplateElementNotFound:
-            euler_version = get_euler_version()
-            self.base_method_click_by_img(f"close_window_btn_{euler_version}.png")
+            self.base_method_click_by_img(f"close_window_btn_1.png")
 
     def dde_method_delete_keyboard_layout_in_control_center(self):
         """在控制中心的键盘布局视图删除除选中之外的布局"""
-        self.dde_control_center.dde_control_center_method_click_edit_btn_in_keyboard_layout()
+        self.dde_control_center.click_edit_btn_in_keyboard_layout()
         self.dde_control_center.dde_control_center_click_delete_btn_by_img()
 
     def dde_method_add_hanyu_keyboard_layout_in_control_center(self):
         """在控制中心中添加 汉语 键盘布局"""
         self.dde_dock.dde_dock_method_click_control_center_btn_by_attr()
         sleep(6)
-        self.dde_control_center.dde_control_center_method_click_keyboard_and_language_by_attr()
-        self.dde_control_center.dde_control_center_method_click_keyboard_layout_by_attr()
-        self.dde_control_center.dde_control_center_method_click_add_keyboard_layout_btn_by_attr()
-        self.dde_control_center.dde_control_center_method_click_hanyu_keyboard_layout_at_list()
-        self.dde_control_center.dde_control_center_method_click_bottom_add_btn_by_attr()
+        self.dde_control_center.click_keyboard_and_language_by_attr()
+        self.dde_control_center.click_keyboard_layout_by_attr()
+        self.dde_control_center.click_add_keyboard_layout_btn_by_attr()
+        self.dde_control_center.click_hanyu_keyboard_layout_at_list()
+        self.dde_control_center.click_bottom_add_btn_by_attr()
 
     def dde_method_add_english_system_language_in_control_center(self):
         """在控制中心中添加 英语 系统语言"""
@@ -127,12 +120,12 @@ class DdeMethod(BaseMethod):
         sleep(6)
         self.dde_control_center.dde_control_center_enter_view_by_search_box("xitongyuyan")
         sleep(2)
-        self.dde_control_center.dde_control_center_method_click_by_attr("American English - 美国英语")
-        self.dde_control_center.dde_control_center_method_click_bottom_add_btn_by_attr()
+        self.dde_control_center.click_by_attr("American English - 美国英语")
+        self.dde_control_center.click_bottom_add_btn_by_attr()
 
     def dde_method_delete_system_language_by_img(self):
         """在 系统语言 视图中删除其他的系统语言"""
-        self.dde_control_center.dde_control_center_method_click_edit_btn_in_system_language()
+        self.dde_control_center.click_edit_btn_in_system_language()
         self.dde_control_center.dde_control_center_click_delete_btn_by_img()
 
     def dde_method_add_common_account_by_control_center(self):
@@ -141,8 +134,8 @@ class DdeMethod(BaseMethod):
         sleep(6)
         self.dde_control_center.dde_control_center_enter_view_by_search_box("zhanghu")
         sleep(2)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_创建帐户")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_usernameedit")
+        self.dde_control_center.click_by_attr("Btn_创建帐户")
+        self.dde_control_center.click_by_attr("Editable_usernameedit")
         self.input_message("test")
         sleep(2)
         self.tab()
@@ -155,7 +148,7 @@ class DdeMethod(BaseMethod):
         self.tab()
         self.input_message(self.account_message)
         sleep(3)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_创建")
+        self.dde_control_center.click_by_attr("Btn_创建")
         sleep(1)
         self.input_message(self.account_message)
         sleep(3)
@@ -167,10 +160,10 @@ class DdeMethod(BaseMethod):
         self.dde_dock.dde_dock_method_click_control_center_btn_by_attr()
         sleep(6)
         self.dde_control_center.dde_control_center_enter_view_by_search_box("zhanghu")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_创建帐户")
-        self.dde_control_center.dde_control_center_method_click_by_attr("标准用户")
-        self.dde_control_center.dde_control_center_method_click_by_attr("管理员")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_usernameedit")
+        self.dde_control_center.click_by_attr("Btn_创建帐户")
+        self.dde_control_center.click_by_attr("标准用户")
+        self.dde_control_center.click_by_attr("管理员")
+        self.dde_control_center.click_by_attr("Editable_usernameedit")
         self.input_message("test")
         sleep(2)
         self.tab()
@@ -183,7 +176,7 @@ class DdeMethod(BaseMethod):
         self.tab()
         self.input_message(self.account_message)
         sleep(3)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_创建")
+        self.dde_control_center.click_by_attr("Btn_创建")
         sleep(1)
         self.input_message(self.account_message)
         sleep(3)
@@ -192,145 +185,145 @@ class DdeMethod(BaseMethod):
 
     def dde_method_delete_test_account_by_control_center(self):
         """在控制中心中将新添加的账户test删除"""
-        self.dde_control_center.dde_control_center_method_click_by_attr("test")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_删除帐户")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_删除")
+        self.dde_control_center.click_by_attr("test")
+        self.dde_control_center.click_by_attr("Btn_删除帐户")
+        self.dde_control_center.click_by_attr("Btn_删除")
         sleep(5)
 
     def dde_method_change_current_account_password_by_control_center(self):
         """在控制中心中修改当前用户密码"""
         self.dde_control_center.dde_control_center_enter_view_by_search_box("xiugaimima")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_修改密码")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_oldpasswordedit")
+        self.dde_control_center.click_by_attr("Btn_修改密码")
+        self.dde_control_center.click_by_attr("Editable_oldpasswordedit")
         self.input_message(BaseMethod.account_message)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_newpasswordedit")
+        self.dde_control_center.click_by_attr("Editable_newpasswordedit")
         self.input_message(BaseMethod.change_password)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit")
+        self.dde_control_center.click_by_attr("Editable_repeatpasswordedit")
         self.input_message(BaseMethod.change_password)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_保存")
+        self.dde_control_center.click_by_attr("Btn_保存")
 
     def dde_method_reset_current_account_password_from_change_password_by_control_center(self):
         """在控制中心中将修改的当前用户密码重置为修改前的密码"""
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_修改密码")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_oldpasswordedit")
+        self.dde_control_center.click_by_attr("Btn_修改密码")
+        self.dde_control_center.click_by_attr("Editable_oldpasswordedit")
         self.input_message(BaseMethod.change_password)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_newpasswordedit")
+        self.dde_control_center.click_by_attr("Editable_newpasswordedit")
         self.input_message(BaseMethod.account_message)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit")
+        self.dde_control_center.click_by_attr("Editable_repeatpasswordedit")
         self.input_message(BaseMethod.account_message)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_保存")
+        self.dde_control_center.click_by_attr("Btn_保存")
 
     def dde_method_change_other_account_password_by_control(self):
         """在控制中心中修改非当前用户密码"""
-        self.dde_control_center.dde_control_center_method_click_reset_password_btn_by_attr()
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_newpasswordedit")
+        self.dde_control_center.click_reset_password_btn_by_attr()
+        self.dde_control_center.click_by_attr("Editable_newpasswordedit")
         self.input_message(BaseMethod.change_password)
         sleep(3)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit")
+        self.dde_control_center.click_by_attr("Editable_repeatpasswordedit")
         self.input_message(BaseMethod.change_password)
         sleep(3)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_保存")
+        self.dde_control_center.click_by_attr("Btn_保存")
         sleep(5)
 
     def dde_method_reset_other_account_password_from_change_password_by_control_center(self):
         """在控制中心中将修改的非当前用户密码重置为修改前的密码（该方法主要用于对修改密码的重置，方法内无鉴权操作）"""
-        self.dde_control_center.dde_control_center_method_click_reset_password_btn_by_attr()
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_newpasswordedit")
+        self.dde_control_center.click_reset_password_btn_by_attr()
+        self.dde_control_center.click_by_attr("Editable_newpasswordedit")
         self.input_message(BaseMethod.account_message)
         sleep(3)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_repeatpasswordedit")
+        self.dde_control_center.click_by_attr("Editable_repeatpasswordedit")
         self.input_message(BaseMethod.account_message)
         sleep(3)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_保存")
+        self.dde_control_center.click_by_attr("Btn_保存")
 
     def dde_method_change_resolution_by_control_center(self):
         """在控制中心中修改屏幕分辨率"""
         self.dde_control_center.dde_control_center_enter_view_by_search_box("xianshi")
-        self.dde_control_center.dde_control_center_method_click_by_attr("1920×1080")
-        self.dde_control_center.dde_control_center_method_click_by_attr("1280×800")
+        self.dde_control_center.click_by_attr("1920×1080")
+        self.dde_control_center.click_by_attr("1280×800")
         sleep(1)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_保存")
+        self.dde_control_center.click_by_attr("Btn_保存")
         sleep(2)
 
     def dde_method_reset_resolution_by_control_center(self):
         """在控制中心中将修改的分辨率调回1920x1080"""
-        self.dde_control_center.dde_control_center_method_click_by_attr("1280×800")
-        self.dde_control_center.dde_control_center_method_click_by_attr("1920×1080")
+        self.dde_control_center.click_by_attr("1280×800")
+        self.dde_control_center.click_by_attr("1920×1080")
         sleep(1)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_保存")
+        self.dde_control_center.click_by_attr("Btn_保存")
         sleep(2)
 
     def dde_method_add_network_dsl_by_control_center(self):
         """在控制中心的 网络 模块中添加DSL"""
         self.dde_control_center.dde_control_center_enter_view_by_search_box("dsl")
-        self.dde_control_center.dde_control_center_method_click_add_dsl_btn()
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_自动连接")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_用户名")
+        self.dde_control_center.click_add_dsl_btn()
+        self.dde_control_center.click_by_attr("Btn_自动连接")
+        self.dde_control_center.click_by_attr("Editable_用户名")
         self.input_message("test")
         sleep(2)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_密码")
+        self.dde_control_center.click_by_attr("Editable_密码")
         self.input_message(BaseMethod.account_message)
         sleep(3)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_保 存")
+        self.dde_control_center.click_by_attr("Btn_保 存")
 
     def dde_method_delete_network_dsl_by_control_center(self):
         """在控制中心的网络DSL模块中删除添加的测试DSL连接"""
         self.base_method_click_by_img("dsl_connection_details_btn.png")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_删 除")
+        self.dde_control_center.click_by_attr("Btn_删 除")
         sleep(1)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_删 除_1")
+        self.dde_control_center.click_by_attr("Btn_删 除_1")
         sleep(2)
 
     def dde_method_change_time_by_control_center(self):
         """在控制中心中手动修改时间"""
         self.dde_control_center.dde_control_center_enter_view_by_search_box("shijianshezhi")
-        self.dde_control_center.dde_control_center_method_click_time_synchronization_btn_by_attr()
-        self.dde_control_center.dde_control_center_method_click_by_attr("TIME_HOUR_WIDGET")
+        self.dde_control_center.click_time_synchronization_btn_by_attr()
+        self.dde_control_center.click_by_attr("TIME_HOUR_WIDGET")
         self.backspace()
         self.backspace()
         self.input_message("12")
         sleep(2)
-        self.dde_control_center.dde_control_center_method_click_by_attr("TIME_MIN_WIDGET")
+        self.dde_control_center.click_by_attr("TIME_MIN_WIDGET")
         self.backspace()
         self.backspace()
         self.input_message("12")
         sleep(2)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_确定")
+        self.dde_control_center.click_by_attr("Btn_确定")
 
     def dde_method_change_time_area_by_control_center(self):
         """在控制中心中更改时区"""
-        self.dde_control_center.dde_control_center_method_click_by_attr("时间日期")
-        self.dde_control_center.dde_control_center_method_click_by_attr("时区列表")
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_修改系统时区")
+        self.dde_control_center.click_by_attr("时间日期")
+        self.dde_control_center.click_by_attr("时区列表")
+        self.dde_control_center.click_by_attr("Btn_修改系统时区")
         sleep(2)
-        self.dde_control_center.dde_control_center_method_click_by_attr("Editable_qlineedit")
+        self.dde_control_center.click_by_attr("Editable_qlineedit")
         self.input_message("New_York")
         sleep(2)
         self.enter()
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_确定")
+        self.dde_control_center.click_by_attr("Btn_确定")
         sleep(2)
 
-    def dde_control_center_method_delete_other_time_area_by_control_center(self):
+    def delete_other_time_area_by_control_center(self):
         """删除时区列表多余的一个时区"""
-        self.dde_control_center.dde_control_center_method_click_by_attr("Btn_时区列表")
+        self.dde_control_center.click_by_attr("Btn_时区列表")
         self.dde_control_center.dde_control_center_click_delete_btn_by_img()
         sleep(1)
 
     def dde_method_search_font_in_font_manager(self, fontname):
         """在字体管理器中搜索字体"""
-        self.deepin_font_manager.dde_font_manager_method_click_search_box_attr()
+        self.deepin_font_manager.method_click_search_box_attr()
         self.input_message(fontname)
         sleep(3)
         self.enter()
 
-    def dde_editor_method_click_documents_in_pop_window_by_img(self):
+    def click_documents_in_pop_window_by_img(self):
         """在文本编辑器的文件管理器弹窗中点击左侧 文档 目录"""
         self.base_method_click_by_ocr("系统盘")
         self.base_method_click_by_img("file_manager_left_view_documents.png")
 
     def dde_method_rename_file_in_pop_window_by_attr(self, filename):
         """在弹出的文件保存窗口中对文件进行重命名并且保存,文件名需要包含后缀名，且文件名不可与文档目录下其他文件重复"""
-        self.dde_desktop.dde_desktop_method_click_by_attr("file_name_edit")
+        self.dde_desktop.click_by_attr("file_name_edit")
 
         self.ctrl_a()
         self.input_message(filename)
@@ -338,7 +331,7 @@ class DdeMethod(BaseMethod):
 
     def dde_method_rename_file_same_name_in_pop_window_by_attr(self, filename):
         """在弹出的文件保存窗口中将文件重命名为重复名称并且点击保存，方法输入的名称为目标文件名称"""
-        self.dde_desktop.dde_desktop_method_click_by_attr("file_name_edit")
+        self.dde_desktop.click_by_attr("file_name_edit")
         self.ctrl_a()
         self.input_message(filename)
         self.dde_methode_click_save_btn_in_pop_window()
@@ -347,38 +340,38 @@ class DdeMethod(BaseMethod):
         """在弹出的文件保存窗口中点击保存"""
         self.dde_desktop.dog.app_element("statusBar").child("保 存").click()
 
-    def dde_device_manager_method_export_file_by_attr(self, module):
+    def export_file_by_attr(self, module):
         """
         module:目标模块的名称，概况，处理器，主板......
         """
-        self.deepin_devicemanager.dde_device_manager_method_right_click_by_attr(module)
+        self.deepin_devicemanager.right_click_by_attr(module)
         self.select_menu(1)
         sleep(2)
-        self.dde_editor_method_click_documents_in_pop_window_by_img()
+        self.click_documents_in_pop_window_by_img()
         self.dde_methode_click_save_btn_in_pop_window()
         sleep(2)
 
-    def deepin_log_viewer_method_export_log_by_attr(self, log_name, log_type):
+    def export_log_by_attr(self, log_name, log_type):
         """
         输入需要导出的日志名称以及类型，通过元素右键点击日志进行导出，注意不包括启动日志
         log_name:Xorg Log,Application Log,Boot-Shutdown Event
         log_type:TEXT (*.txt),Doc (*.doc),Xls (*.xls),Html (*.html)
         """
-        self.deepin_log_viewer.deepin_log_viewer_method_click_by_attr(log_name)
+        self.deepin_log_viewer.click_by_attr(log_name)
         sleep(2)
-        self.deepin_log_viewer.deepin_log_viewer_method_click_export_btn_by_attr()
-        self.dde_editor_method_click_documents_in_pop_window_by_img()
-        self.dde_desktop.dde_desktop_method_click_by_attr("TEXT (*.txt)")
+        self.deepin_log_viewer.click_export_btn_by_attr()
+        self.click_documents_in_pop_window_by_img()
+        self.dde_desktop.click_by_attr("TEXT (*.txt)")
         sleep(1)
-        self.dde_desktop.dde_desktop_method_click_by_attr(log_type)
+        self.dde_desktop.click_by_attr(log_type)
         self.dde_methode_click_save_btn_in_pop_window()
 
-    def deepin_log_viewer_method_export_all_log_by_attr(self):
+    def export_all_log_by_attr(self):
         """导出所有的日志"""
         self.base_method_click_by_img("deepin_log_viewer_export_all_log_icon.png")
         sleep(2)
         self.deepin_log_viewer.deepin_log_viewer_input_root_password()
-        self.dde_editor_method_click_documents_in_pop_window_by_img()
+        self.click_documents_in_pop_window_by_img()
         self.dde_methode_click_save_btn_in_pop_window()
         sleep(1)
 
diff --git a/method/image_res/close_window_btn_23.09.png b/method/image_res/close_window_btn_1.png
similarity index 100%
rename from method/image_res/close_window_btn_23.09.png
rename to method/image_res/close_window_btn_1.png
diff --git a/method/vender/browser_method.py b/method/vender/browser_method.py
index fd5ba5507d363e31860e6bd3b63128490e72aa77..ad1b52b857c879f69cb093c3f70187061d85d178 100644
--- a/method/vender/browser_method.py
+++ b/method/vender/browser_method.py
@@ -8,18 +8,18 @@ class BrowserMethod(BaseMethod):
         super().__init__(name="Firefox")
 
 
-    def dde_browser_method_click_by_attr(self, path):
+    def click_by_attr(self, path):
         """在浏览器中通过属性进行点击"""
         self.dog.element_click(path)
 
-    def dde_browser_method_click_menu_icon_by_img(self):
+    def click_menu_icon_by_img(self):
         """在浏览器中点击右上角的菜单按钮"""
         self.base_method_click_by_img("firefox_menu_icon.png")
 
-    def dde_browser_method_click_close_btn_by_attr(self):
+    def click_close_btn_by_attr(self):
         """在浏览器中点击右上角的关闭按钮"""
         self.base_method_click_by_img("firefox_close_btn.png")
 
-    def dde_browser_method_right_click_by_ocr(self, text):
+    def right_click_by_ocr(self, text):
         """在浏览器中通过属性右键点击对应的标签页"""
         self.base_method_click_by_ocr(text)
diff --git a/method/vender/dde_control_center_method.py b/method/vender/dde_control_center_method.py
index a33507ef262cfb661f97b0f879ff3a7a0169a490..910e18c478c71a0920dba689b884879921d0da8e 100644
--- a/method/vender/dde_control_center_method.py
+++ b/method/vender/dde_control_center_method.py
@@ -7,37 +7,38 @@ class DdeControlCenterMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("dde-control-center")
-    def dde_control_center_method_click_by_attr(self, path):
+
+    def click_by_attr(self, path):
         """在控制中心中通过元素点击"""
         self.dog.element_click(path)
 
-    def dde_control_center_method_click_keyboard_and_language_by_attr(self):
+    def click_keyboard_and_language_by_attr(self):
         """在控制中心主界面中点击 键盘和语言"""
-        self.dde_control_center_method_click_by_attr("键盘和语言")
+        self.click_by_attr("键盘和语言")
 
-    def dde_control_center_method_click_system_info_by_attr(self):
+    def click_system_info_by_attr(self):
         """在控制中心主界面中点击 系统信息"""
-        self.dde_control_center_method_click_by_attr("系统信息")
+        self.click_by_attr("系统信息")
 
-    def dde_control_center_method_click_keyboard_layout_by_attr(self):
+    def click_keyboard_layout_by_attr(self):
         """在 键盘和语言 模块点击 键盘布局"""
-        self.dde_control_center_method_click_by_attr("键盘布局")
+        self.click_by_attr("键盘布局")
 
-    def dde_control_center_method_click_add_keyboard_layout_btn_by_attr(self):
+    def click_add_keyboard_layout_btn_by_attr(self):
         """点击 键盘布局 模块下方的加号按钮添加键盘布局"""
-        self.dde_control_center_method_click_by_attr("Btn_addlayout")
+        self.click_by_attr("Btn_addlayout")
 
-    def dde_control_center_method_click_hanyu_keyboard_layout_at_list(self):
+    def click_hanyu_keyboard_layout_at_list(self):
         """在 添加键盘布局 界面点击 汉语"""
-        self.dde_control_center_method_click_by_attr("汉语")
+        self.click_by_attr("汉语")
 
-    def dde_control_center_method_click_bottom_add_btn_by_attr(self):
+    def click_bottom_add_btn_by_attr(self):
         """点击 添加键盘布局 界面下方的添加按钮，从而确认添加"""
-        self.dde_control_center_method_click_by_attr("Btn_添加")
+        self.click_by_attr("Btn_添加")
 
-    def dde_control_center_method_click_edit_btn_in_keyboard_layout(self):
+    def click_edit_btn_in_keyboard_layout(self):
         """点击 键盘布局 界面右侧的编辑按钮"""
-        self.dde_control_center_method_click_by_attr("Btn_dcommandlinkbutton")
+        self.click_by_attr("Btn_dcommandlinkbutton")
 
     def dde_control_center_click_delete_btn_by_img(self):
         """点击控制中心列表项目编辑状态下旁边的红色删除按钮"""
@@ -45,37 +46,40 @@ class DdeControlCenterMethod(BaseMethod):
 
     def dde_control_center_enter_view_by_search_box(self, view_name):
         """通过控制中心上方的搜索框进入到对应的视图之中"""
-        self.dde_control_center_method_click_by_attr("Editable_searchmodulelineedit")
+        self.click_by_attr("Editable_searchmodulelineedit")
         self.input_message(view_name)
         sleep(3)
         self.enter()
         sleep(1)
 
-    def dde_control_center_method_click_edit_btn_in_system_language(self):
+    def click_edit_btn_in_system_language(self):
         """点击 系统语言 列表旁边的编辑按钮"""
-        self.dde_control_center_method_click_by_attr("Btn_dcommandlinkbutton")
+        self.click_by_attr("Btn_dcommandlinkbutton")
 
-    def dde_control_center_method_click_automatic_login_btn_by_attr(self):
+    def click_automatic_login_btn_by_attr(self):
         """点击 账户 视图下的 自动登录 按钮"""
-        self.dde_control_center_method_click_by_attr("Btn_自动登录")
+        self.click_by_attr("Btn_自动登录")
 
-    def dde_control_center_method_click_reset_password_btn_by_attr(self):
+    def click_reset_password_btn_by_attr(self):
         """点击 账户 视图下非当前账户的 重设密码 按钮"""
-        self.dde_control_center_method_click_by_attr("Btn_重设密码")
+        self.click_by_attr("Btn_重设密码")
 
-    def dde_control_center_method_reduce_password_effective_time(self):
+    def reduce_password_effective_time(self):
         """账户视图下，减少账户密码有效时间"""
-        self.dde_control_center_method_click_by_attr("Editable_dspinboxchilddlineedit")
+        self.click_by_attr("Editable_dspinboxchilddlineedit")
         self.enter()
 
-    def dde_control_center_method_click_add_dsl_btn(self):
+    def click_add_dsl_btn(self):
         """在网络的dsl视图中点击添加按钮"""
-        self.dde_control_center_method_click_by_attr("Btn_创建pppoe连接")
+        self.click_by_attr("Btn_创建pppoe连接")
 
-    def dde_control_center_method_click_time_synchronization_btn_by_attr(self):
+    def click_time_synchronization_btn_by_attr(self):
         """在控制中心的 时间设置 模块点击 时间同步 按钮"""
-        self.dde_control_center_method_click_by_attr("Btn_自动同步配置")
+        self.click_by_attr("Btn_自动同步配置")
 
-    def dde_control_center_method_click_time_setting_by_attr(self):
+    def click_time_setting_by_attr(self):
         """在时间与日期模块中点击 时间设置"""
-        self.dde_control_center_method_click_by_attr("时间设置")
+        self.click_by_attr("时间设置")
+
+    def kill_dde_control_center(self):
+        self.kill_process("dde-control-center")
diff --git a/method/vender/dde_desktop_method.py b/method/vender/dde_desktop_method.py
index ed1720caa5f1d441b165314420858eac49029bf7..2ae5e444f1729c1b8d40ccd530faea9de079cb04 100644
--- a/method/vender/dde_desktop_method.py
+++ b/method/vender/dde_desktop_method.py
@@ -6,6 +6,6 @@ class DdeDesktopMethod(BaseMethod):
     def __init__(self):
         super().__init__("dde-desktop")
 
-    def dde_desktop_method_click_by_attr(self, path):
+    def click_by_attr(self, path):
         """在启动器中通过元素点击"""
         self.dog.element_click(path)
diff --git a/method/vender/dde_dock_method.py b/method/vender/dde_dock_method.py
index dce020c8ddce52a0871f8059cf14f41f6c1a4c91..0de5e6404e76580ece17e0bc6edb89ead9137720 100644
--- a/method/vender/dde_dock_method.py
+++ b/method/vender/dde_dock_method.py
@@ -5,41 +5,42 @@ class DdeDockMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("dde-dock")
-    def dde_dock_method_click_by_attr(self, path):
+
+    def click_by_attr(self, path):
         """在任务栏中通过元素点击"""
         self.dog.element_click(path)
 
-    def dde_dock_method_right_click_by_attr(self, path):
+    def right_click_by_attr(self, path):
         """在任务栏中通过元素右键点击"""
         self.dog.element_click(path, button=3)
-    def dde_dock_method_click_dde_file_manager_by_attr(self):
+    def click_dde_file_manager_by_attr(self):
         """在任务栏点击文件管理器"""
-        self.dde_dock_method_click_by_attr("Btn_文件管理器")
+        self.click_by_attr("Btn_文件管理器")
 
-    def dde_dock_method_click_launcher_btn_by_attr(self):
+    def click_launcher_btn_by_attr(self):
         """在任务栏点击启动器"""
-        self.dde_dock_method_click_by_attr("Btn_launcheritem")
+        self.click_by_attr("Btn_launcheritem")
 
-    def dde_dock_method_click_control_center_btn_by_attr(self):
+    def click_control_center_btn_by_attr(self):
         """在任务栏点击控制中心"""
-        self.dde_dock_method_click_by_attr("Btn_控制中心")
+        self.click_by_attr("Btn_控制中心")
 
-    def dde_dock_method_click_network_connection_icon_by_attr(self):
+    def click_network_connection_icon_by_attr(self):
         """在任务栏点击网络连接图标"""
-        self.dde_dock_method_click_by_attr("Btn_network-item-key")
+        self.click_by_attr("Btn_network-item-key")
 
-    def dde_dock_method_click_network_connection_switch_btn_by_attr(self):
+    def click_network_connection_switch_btn_by_attr(self):
         """在任务栏点击网络连接图标唤起的窗口中点击转换网络连接的按钮"""
-        self.dde_dock_method_click_by_attr("Btn_dswitchbutton")
+        self.click_by_attr("Btn_dswitchbutton")
 
-    def dde_dock_method_right_click_network_connection_icon_by_attr(self):
+    def right_click_network_connection_icon_by_attr(self):
         """在任务栏中通过元素右键点击网络连接图标"""
-        self.dde_dock_method_right_click_by_attr("Btn_network-item-key")
+        self.right_click_by_attr("Btn_network-item-key")
 
-    def dde_dock_method_right_click_datetime_icon_by_attr(self):
+    def right_click_datetime_icon_by_attr(self):
         """在任务栏中通过元素右键点击右下角时间区域图标"""
-        self.dde_dock_method_right_click_by_attr("Btn_datetime")
+        self.right_click_by_attr("Btn_datetime")
 
-    def dde_dock_method_click_datetime_icon_by_attr(self):
+    def click_datetime_icon_by_attr(self):
         """在任务栏中通过元素点击右下角时间区域"""
-        self.dde_dock_method_click_by_attr("Btn_datetime")
+        self.click_by_attr("Btn_datetime")
diff --git a/method/vender/dde_launcher_method.py b/method/vender/dde_launcher_method.py
index fc1926a75051b657f3bf8ac27f995535edbf3f75..3889c10149335179cd518d3241ec3b488b5ec6b6 100644
--- a/method/vender/dde_launcher_method.py
+++ b/method/vender/dde_launcher_method.py
@@ -5,22 +5,23 @@ class DdeLauncherMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("dde-launcher")
-    def dde_launcher_method_click_search_box_by_attr(self):
+
+    def click_search_box_by_attr(self):
         """在启动器中点击搜索框"""
-        self.dde_launcher_method_click_by_attr("Editable_dlineeditchildlineedit")
+        self.click_by_attr("Editable_dlineeditchildlineedit")
 
-    def dde_launcher_method_click_by_attr(self, path):
+    def click_by_attr(self, path):
         """在启动器中通过元素点击"""
         self.dog.element_click(path)
 
-    def dde_launcher_method_right_click_by_attr(self, path):
+    def right_click_by_attr(self, path):
         """在启动器中通过元素右键点击"""
         self.dog.element_click(path, button=3)
 
-    def dde_launcher_method_click_all_categories_or_back_by_attr(self):
+    def click_all_categories_or_back_by_attr(self):
         """点击启动器下方的 所有分类 或者 返回"""
-        self.dde_launcher_method_click_by_attr("AllIcon")
+        self.click_by_attr("AllIcon")
 
-    def dde_launcher_method_click_system_manager_in_all_categories_view(self):
+    def click_system_manager_in_all_categories_view(self):
         """在启动器的 所有分类 界面点击 系统管理"""
         self.base_method_click_by_ocr("系统管理")
diff --git a/method/vender/dde_polkit_agent_method.py b/method/vender/dde_polkit_agent_method.py
index fb53063f7f0982794009e3aa86335650c6d35cb9..d922cce8cc871c38ecafecd4caab83a0a1384ebc 100644
--- a/method/vender/dde_polkit_agent_method.py
+++ b/method/vender/dde_polkit_agent_method.py
@@ -6,6 +6,6 @@ class DdePolkitAgentMethod(BaseMethod):
     def __init__(self):
         super().__init__("dde-polkit-agent")
 
-    def dde_polkit_agent_method_click_by_attr(self, path):
+    def click_by_attr(self, path):
         """在终端界面内点击右上角的【设置】按钮"""
         self.dog.element_click(path)
diff --git a/method/vender/deepin_device_manager_method.py b/method/vender/deepin_device_manager_method.py
index 2b165d777ca1c3411ba1d30928943fccb63a6f1d..c501d8540fb0849aa68214a0d1424ec83f8d706e 100644
--- a/method/vender/deepin_device_manager_method.py
+++ b/method/vender/deepin_device_manager_method.py
@@ -5,9 +5,11 @@ class DeepinDeviceManagerMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("deepin-devicemanager")
-    def dde_device_manager_method_click_by_attr(self, path):
+
+    def click_by_attr(self, path):
         """在设备管理器中通过元素点击"""
         self.dog.element_click(path)
-    def dde_device_manager_method_right_click_by_attr(self, path):
+
+    def right_click_by_attr(self, path):
         """在设备管理器中通过元素点击"""
-        self.dog.element_click(path, button=3)
\ No newline at end of file
+        self.dog.element_click(path, button=3)
diff --git a/method/vender/deepin_draw_method.py b/method/vender/deepin_draw_method.py
index d64427209b7d81e604b6279251a996731446a6b7..11f66e267a61cf9805f4f1e2e8c766e2af3cdf62 100644
--- a/method/vender/deepin_draw_method.py
+++ b/method/vender/deepin_draw_method.py
@@ -6,21 +6,22 @@ class DeepinDrawMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("deepin-draw")
-    def deepin_draw_method_click_by_attr(self, path):
+
+    def click_by_attr(self, path):
         """在画板中通过元素点击"""
         self.dog.element_click(path)
 
-    def deepin_draw_method_click_option_btn_by_attr(self):
+    def click_option_btn_by_attr(self):
         """在画板中通过元素点击右上角菜单按钮"""
-        self.deepin_draw_method_click_by_attr("DTitlebarDWindowOptionButton")
+        self.click_by_attr("DTitlebarDWindowOptionButton")
 
-    def deepin_draw_method_quit_by_menu(self):
+    def quit_by_menu(self):
         """通过菜单选项退出画板应用"""
-        self.deepin_draw_method_click_option_btn_by_attr()
+        self.click_option_btn_by_attr()
         sleep(1)
         self.reverse_select_menu(1)
         sleep(2)
 
-    def deepin_draw_method_click_rectangle_tool_btn_by_attr(self):
+    def click_rectangle_tool_btn_by_attr(self):
         """通过元素在画板中点击矩形工具按钮"""
-        self.deepin_draw_method_click_by_attr("Rectangle tool button")
+        self.click_by_attr("Rectangle tool button")
diff --git a/method/vender/deepin_editor_method.py b/method/vender/deepin_editor_method.py
index 34432f7e80e4b65525889f20ee44326f85af71d5..25efa42d75e4191ae0e9dedfbbf1d732d78911e1 100644
--- a/method/vender/deepin_editor_method.py
+++ b/method/vender/deepin_editor_method.py
@@ -7,43 +7,43 @@ class DeepinEditorMethod(BaseMethod):
     def __init__(self):
         super().__init__("deepin-editor")
 
-    def dde_editor_method_click_by_attr(self, path):
+    def click_by_attr(self, path):
         """在文本编辑器中通过元素点击"""
         self.dog.element_click(path)
 
-    def dde_editor_method_right_click_by_attr(self, path):
+    def right_click_by_attr(self, path):
         """在文本编辑器中通过元素右键点击"""
         self.dog.element_click(path, button=3)
 
-    def dde_editor_method_click_menu_btn_by_attr(self):
+    def click_menu_btn_by_attr(self):
         """在文本编辑器中通过元素点击右上角菜单按钮"""
-        self.dde_editor_method_click_by_attr("DTitlebarDWindowOptionButton")
+        self.click_by_attr("DTitlebarDWindowOptionButton")
 
-    def dde_editor_method_choose_open_file_option_by_ocr(self):
+    def choose_open_file_option_by_ocr(self):
         """在文本编辑器的菜单栏中选择 打开文件 选项"""
         self.ocrx("打开文件").click()
 
-    def dde_editor_method_choose_save_as_option_by_ocr(self):
+    def choose_save_as_option_by_ocr(self):
         """在文本编辑器的的菜单栏中选择 另存为 选项"""
         self.ocrx("另存为").click()
 
-    def dde_editor_method_choose_save_option_by_ocr(self):
+    def choose_save_option_by_ocr(self):
         """在文本编辑器的的菜单栏中选择 保存 选项"""
         self.ocrx("保存").click()
 
-    def dde_editor_method_quit_editor_by_ocr(self):
+    def quit_editor_by_ocr(self):
         """通过菜单栏退出文本编辑器"""
-        self.dde_editor_method_click_menu_btn_by_attr()
+        self.click_menu_btn_by_attr()
         sleep(2)
         self.ocrx("退出").click()
 
-    def dde_editor_method_close_tab_by_attr(self, tab_name):
+    def close_tab_by_attr(self, tab_name):
         """在文本编辑器中通过元素，通过右键关闭标签（适用于修改，不适用于新建的标签）"""
-        self.dde_editor_method_right_click_by_attr(tab_name)
+        self.right_click_by_attr(tab_name)
         sleep(1)
         self.select_menu(1)
 
-    def dde_editor_method_close_tab_by_img(self):
+    def close_tab_by_img(self):
         """在文本编辑器中通过标签右边的关闭图表关闭当前标签"""
         self.base_method_click_by_img("deepin_editor_close_tab_icon.png")
         sleep(1)
diff --git a/method/vender/deepin_font_manager_method.py b/method/vender/deepin_font_manager_method.py
index d209f0c2cc6c22fe7b7f68cb5fdc9d2720c60dbf..5244e74319967f36476cbaf572eb10bef1593222 100644
--- a/method/vender/deepin_font_manager_method.py
+++ b/method/vender/deepin_font_manager_method.py
@@ -5,10 +5,11 @@ class DeepinFontManagerMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("deepin-font-manager")
-    def dde_font_manager_method_click_by_attr(self, path):
+
+    def method_click_by_attr(self, path):
         """在字体管理器中通过元素点击"""
         self.dog.element_click(path)
 
-    def dde_font_manager_method_click_search_box_attr(self):
+    def method_click_search_box_attr(self):
         """在字体管理器中点击搜索框"""
-        self.dde_font_manager_method_click_by_attr("DSearchEditIconButton")
+        self.method_click_by_attr("DSearchEditIconButton")
diff --git a/method/vender/deepin_log_viewer_method.py b/method/vender/deepin_log_viewer_method.py
index f8032f30434118005bf4ae0a1873a1f1feba5a93..2194bfdcbf53513714f9a0a9dcdc8979cf044140 100644
--- a/method/vender/deepin_log_viewer_method.py
+++ b/method/vender/deepin_log_viewer_method.py
@@ -7,21 +7,21 @@ class DeepinLogViewerMethod(BaseMethod):
     def __init__(self):
         super().__init__("deepin-log-viewer")
 
-    def deepin_log_viewer_method_click_by_attr(self, path):
+    def click_by_attr(self, path):
         """
         在日志收集工具中通过元素点击
         侧边栏模块属性名称：Boot Log,Xorg Log,Application Log,Boot-Shutdown Event
         """
         self.dog.element_click(path)
 
-    def deepin_log_viewer_method_click_export_btn_by_attr(self):
+    def click_export_btn_by_attr(self):
         """在日志收集工具中通过元素点击导出按钮"""
-        self.deepin_log_viewer_method_click_by_attr("导 出")
+        self.click_by_attr("导 出")
 
     def deepin_log_viewer_input_root_password(self):
         """在日志收集工具弹出鉴权窗口后输入管理员密码"""
         sleep(2)
-        self.deepin_log_viewer_method_click_by_attr("EditableText_passwordinput")
+        self.click_by_attr("EditableText_passwordinput")
         self.input_message(BaseMethod.account_message)
         sleep(3)
         self.enter()
diff --git a/method/vender/deepin_system_monitor_method.py b/method/vender/deepin_system_monitor_method.py
index e95247df9b5eb43c23c5b225fb010c3a6ad31c65..a3da9a23b266e79e14c6a7de5beffa229276319e 100644
--- a/method/vender/deepin_system_monitor_method.py
+++ b/method/vender/deepin_system_monitor_method.py
@@ -6,29 +6,30 @@ class DeepinSystemMonitorMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("deepin-system-monitor")
-    def deepin_system_monitor_method_click_by_attr(self, path):
+
+    def click_by_attr(self, path):
         """ "在系统监视器中根据元素点击"""
         self.dog.element_click(path)
 
-    def deepin_system_monitor_method_click_program_process_btn_by_attr(self):
+    def click_program_process_btn_by_attr(self):
         """在系统监听器中点击左上角 进程服务 按钮"""
-        self.deepin_system_monitor_method_click_by_attr("程序进程")
+        self.click_by_attr("程序进程")
 
-    def deepin_system_monitor_method_click_system_services_btn_by_attr(self):
+    def click_system_services_btn_by_attr(self):
         """在系统监听器中点击左上角 系统服务 按钮"""
-        self.deepin_system_monitor_method_click_by_attr("系统服务")
+        self.click_by_attr("系统服务")
 
-    def deepin_system_monitor_method_click_first_service_in_system_services(self):
+    def click_first_service_in_system_services(self):
         """在系统监听器的系统服务界面鼠标左键点击第一个服务"""
         self.click(500, 290)
 
-    def deepin_system_monitor_method_right_click_first_service_in_system_services(self):
+    def right_click_first_service_in_system_services(self):
         """在系统监听器的系统服务界面鼠标右键点击第一个服务"""
         self.right_click(500, 290)
 
-    def deepin_system_monitor_method_search_process_or_service(self, message):
+    def search_process_or_service(self, message):
         """在系统监听器上方的搜索框中搜索进程或是服务"""
-        self.deepin_system_monitor_method_click_by_attr("DSearchEditIconButton")
+        self.click_by_attr("DSearchEditIconButton")
         self.input_message(message)
         sleep(3)
         self.enter()
@@ -37,4 +38,4 @@ class DeepinSystemMonitorMethod(BaseMethod):
 
 if __name__ == "__main__":
     sleep(3)
-    DeepinSystemMonitorMethod().deepin_system_monitor_method_right_click_first_service_in_system_services()
+    DeepinSystemMonitorMethod().right_click_first_service_in_system_services()
diff --git a/method/vender/deepin_terminal_method.py b/method/vender/deepin_terminal_method.py
index 96fb2c71a4ce6f1c9ea8303d4ed21db008f1d830..5b33b82d1945307a90356e791af22782d5ae2e43 100644
--- a/method/vender/deepin_terminal_method.py
+++ b/method/vender/deepin_terminal_method.py
@@ -5,11 +5,12 @@ class DeepinTerminalMethod(BaseMethod):
 
     def __init__(self):
         super().__init__("deepin-terminal")
-    def dde_terminal_method__right_click_by_xy(self):
+
+    def right_click_by_xy(self):
         """通过右键点击【在终端中打开】"""
         self.right_click(960, 540)
         self.base_method_click_by_ocr("在终端中打开")
 
-    def dde_terminal_method_click_option_by_attr(self):
+    def click_option_by_attr(self):
         """在终端界面内点击右上角的【设置】按钮"""
         self.dog.element_click("DTitlebarDWindowOptionButton")