清理所有的unwrap()
#45
Merged
清理所有的unwrap()
#45
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 将配置项函数改为返回Result，避免使用不合理的默认值 - 修复htycommons模块中的unwrap调用，使用unwrap_or、unwrap_or_else或?操作符 - 修复htyuc模块中的unwrap调用 - 修复htyuc_models模块中的unwrap调用 - 修复所有构建错误，确保项目可以成功编译
- 修复db.rs中POOL_SIZE解析的错误处理 - 使用unwrap_or_else直接格式化错误消息，避免冗余的map_err转换
- 修复raw_find_all_tags、raw_register_verify、raw_update_hty_gonggao等函数 - 修复update_tongzhi_status_by_id、raw_update_official_account_openid等函数 - 修复raw_register_rollback、raw_register中的unionid和openid处理 - 修复raw_update_user_group、raw_create_user_group函数 - 修复raw_update_template_data、raw_update_template、raw_create_template_data等函数 - 修复raw_create_or_update_userinfo_with_roles、verify_username等函数 - 修复raw_create_or_update_apps_with_roles、raw_create_or_update_roles等函数 - 使用ok_or_else和match模式替换unwrap，提供更清晰的错误信息
- htyuc/src/lib.rs: 修复raw_find_user_with_info_by_token、raw_sudo2、wx_qr_login、raw_login2_with_unionid等函数中的unwrap()调用 - htyuc_models/src/wx.rs: 修复微信相关函数中的unwrap()调用，包括get_or_save_wx_access_token、fn_get_jsapi_ticket、push_wx_message等 - 使用ok_or_else、if let、match等安全错误处理方式替代unwrap()
- htyuc/src/ddl.rs: 修复generate_cert_key_pair和UserAppInfo查找中的unwrap()调用 - htyuc/src/notifications.rs: 修复所有微信推送消息构建函数中的unwrap()调用 - htyuc_models/src/models.rs: 修复大量模型转换和查询函数中的unwrap()调用 - htyuc_models/src/wx.rs: 修复create_with_info_with_tx和serde_json::to_string的调用 - htyuc_remote/src/remote_calls.rs: 修复app_id、app_status和user_infos的unwrap()调用 - upyun_tool/src/upyun.rs: 修复path.file_name()的unwrap()调用 - 使用ok_or_else、if let、match、expect等安全错误处理方式替代unwrap()
liweinan
commented
Nov 22, 2025
htycommons/src/web.rs
Outdated
| }), | ||
| }) | ||
| .unwrap() | ||
| .unwrap_or_else(|_| "{\"r\":false,\"d\":null,\"e\":\"AuthorizationErr\",\"hty_err\":{\"code\":\"InternalErr\",\"reason\":null}}".to_string()) |
Contributor
Author
There was a problem hiding this comment.
这里应该用已有结构或者方法构建，而不是手工组成string.
liweinan
commented
Nov 22, 2025
htycommons/src/web.rs
Outdated
| }), | ||
| }) | ||
| .unwrap() | ||
| .unwrap_or_else(|_| "{\"r\":false,\"d\":null,\"e\":\"HtySudoerTokenErr\",\"hty_err\":{\"code\":\"AuthenticationFailed\",\"reason\":\"HtySudoerTokenErr\"}}".to_string()) |
Contributor
Author
There was a problem hiding this comment.
这里应该用已有结构或者方法构建，而不是手工组成string.
liweinan
commented
Nov 22, 2025
htyuc/src/lib.rs
Outdated
| let in_user = HtyUser::find_by_hty_id( | ||
| &token.hty_id.clone().unwrap()[..], | ||
| &hty_id[..], |
- htycommons/src/web.rs: wrap_auth_err和wrap_sudo_err使用HtyResponse结构体构建，移除手工JSON字符串 - htyuc/src/lib.rs: 移除不必要的切片操作，直接使用&hty_id而不是&hty_id[..]
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.