Skip to content

Commit fb39544

Browse files
CoderWanFengCoderWanFeng
committed
Merge branch 'develop'
2 parents a84c373 + 22b475b commit fb39544

42 files changed

Lines changed: 65 additions & 20 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README-EN.md‎

Lines changed: 1 addition & 1 deletion

‎README.md‎

Lines changed: 7 additions & 1 deletion

‎contributors/wangpeng/pinyin_gui.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: UTF-8 -*-
22
'''
3-
@作者 ：B站/抖音/微博/小红书/公众号，都叫：程序员晚枫，微信：CoderWanFeng
3+
@作者 ：B站/抖音/微博/小红书/公众号，都叫：程序员晚枫，微信：python-office
44
@读者群 ：http://www.python4office.cn/wechat-group/
55
@学习网站 ：https://www.python-office.com
66
@代码日期 ：2023/9/26 21:46

‎examples/PyOfficeRobot/001-发一条信息.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
# 首先，将PyOfficeRobot模块导入到我们的代码块中。
44
import PyOfficeRobot
55

6+
# who 后面写的微信好友的昵称/备注名，message是发送的内容
67
PyOfficeRobot.chat.send_message(who='小红书：程序员晚枫', message='你好')
78
# PyOfficeRobot.chat.send_message(who='每天进步一点点', message='你好')

‎examples/PyOfficeRobot/002-发文件.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
import PyOfficeRobot
44

55
# PyOfficeRobot.file.send_file(who='每天进步一点点', file=r'C:\Users\Lenovo\Desktop\temp\0.jpg')
6+
# who 后面写的微信好友的昵称/备注名，file是文件路径
67
PyOfficeRobot.file.send_file(who='B站：程序员晚枫', file=r'C:\Users\Lenovo\Desktop\temp\0.jpg')

‎examples/PyOfficeRobot/003-根据关键词回复.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
"关注了吗？": "必须的",
99
"投币了吗？": "三连走起",
1010
}
11+
# keywords 中 前面一个引号里的内容是好友发来的消息，后面一个引号里的内容是回复给好友的消息
1112
PyOfficeRobot.chat.chat_by_keywords(who='抖音：程序员晚枫', keywords=keywords)
1213
# PyOfficeRobot.chat.chat_by_keywords(who='每天进步一点点', keywords=keywords)

‎examples/PyOfficeRobot/004-定时发送.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
import PyOfficeRobot
44

55
# PyOfficeRobot.chat.send_message_by_time(who='每天进步一点点', message='你好', time='21:51:55')
6+
# who 后面写的微信好友的昵称/备注名，message是发送的内容， time是发送的时间，24小时制
67
PyOfficeRobot.chat.send_message_by_time(who='快手：程序员晚枫', message='你好', time='21:51:55')

‎examples/PyOfficeRobot/005-自定义功能.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
"来个密码": office.tools.passwordtools(),
1010
}
1111
# PyOfficeRobot.chat.chat_by_keywords(who='每天进步一点点', keywords=keywords)
12+
# office.tools.passwordtools() 会生成一个随机的8位数密码
1213
PyOfficeRobot.chat.chat_by_keywords(who='知乎：程序员晚枫', keywords=keywords)

‎examples/readme.md‎

Lines changed: 3 additions & 3 deletions

‎office/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from office.api import wechat
1111
from office.api import word
1212
from office.api import markdown
13+
from office.api import ocr
1314
# 以下是beta版本
1415
from office.api.testApi import ruiming
1516

@@ -19,4 +20,4 @@
1920
2、请+【项目交流群】：http://www.python4office.cn/wechat-group
2021
3、本开源项目的【源代码】：https://github.com/CoderWanFeng/python-office"""
2122

22-
__version__ = '1.0.1'
23+
__version__ = '1.0.3'

0 commit comments

Comments
 (0)