diff --git a/main.py b/main.py index bd63a63..6b33b57 100644 --- a/main.py +++ b/main.py @@ -223,12 +223,15 @@ province_patterns = [ # 软件著作权奖 software_patterns = [ - ("软件名称", r"软件名称[::](.*?)"), + ("证书号", r"证书号[::]([\w-]+)"), + ("软件名称", r"软件名称[::](.*?)[^\u4e00-\u9fa5]\n"), ("著作权人", r"著[\s]*作[\s]*权[\s]*人[\s]*[::](.+?)\n",), - ("开发完成日期", r"\d{4}年\d{1,2}月\d{1,2}日"), - ("首次发表日期", r"[::](.+?)"), - ("权力取得方式", r"[::](.+?)"), - ("登记号", r"登[\s]*记[\s]*号[::](.+?)"), + ("开发完成日期", r"开发完成日期[::](.+?)\n"), + ("首次发表日期", r"首次发表日期[::](.+?)\n"), + ("权利取得方式", r"权利取得方式[::](.+?)\n"), + ("权利范围", r"权利范围[::](.+?)\n"), + ("登记号", r"登[\s]*记[\s]*号[::](.+?)\n"), + ("颁发日期", r"\d{4}年\d{1,2}月\d{1,2}日") ] @app.post(