Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: is_in_container函数现在能更好的检测是否在容器中 #298

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

clq321
Copy link
Contributor

@clq321 clq321 commented Jul 8, 2024

修复之前,如果本机用Docker运行了任何东西,例如MySQL,但PHP和Swoole并没有在Docker里面跑,也会被认为是在容器中,现已修复该问题

Copy link

boring-cyborg bot commented Jul 8, 2024

Thanks for opening this pull request! Please check out our contributing guidelines. 感谢您开启此拉取请求!请查看我们的 贡献者指南

@dosubot dosubot bot added size:XS This PR changes 0-9 lines, ignoring generated files. bug labels Jul 8, 2024
@clq321 clq321 closed this Jul 8, 2024
@clq321 clq321 reopened this Jul 8, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jul 9, 2024
@zds-s zds-s merged commit d129ec7 into mineadmin:master Jul 9, 2024
8 of 12 checks passed
Copy link

boring-cyborg bot commented Jul 9, 2024

Awesome work, congrats on your first merged pull request! 祝贺你的第一个拉取请求被合并!

@zds-s
Copy link
Member

zds-s commented Jul 9, 2024

感谢

zds-s added a commit that referenced this pull request Jul 9, 2024
* Fix(filterExecuteAttributes): Utilizing memory address pointers (#294)

* LoginListener.php: 修复因为多点登录复用同一个token导致该账号最近一次登录的设备登出就无法获得正确的用户在线情况 (#295)

SystemUserService.php: 1. 重写 token-key 正则匹配 2. kickUser 保证获取到所有token,一次性全部下线。 3. hasTokenBlack 只判断传入token所在scene的情况,否则会导致判断多重scene而导致在线用户监控列表出错。

* FIX : 用户信息password字段隐藏.避免安全隐患. (#297)

* LoginListener.php: 修复因为多点登录复用同一个token导致该账号最近一次登录的设备登出就无法获得正确的用户在线情况
SystemUserService.php: 1. 重写 token-key 正则匹配 2. kickUser 保证获取到所有token,一次性全部下线。 3. hasTokenBlack 只判断传入token所在scene的情况,否则会导致判断多重scene而导致在线用户监控列表出错。

* fix 用户返回信息会出现password字段,虽然是加密过的字段,但依旧存在安全隐患。故隐藏。

* UserAuthService.php 修复因为隐藏password导致user模型 toarray之后无法获取password导致登录流程出错的问题

* UserAuthService.php fix:获取主键value 而不是主键 key (Tab 按快了)

* Fix: 优化 is_in_container 函数(#298)

---------

Co-authored-by: PeopleSea <[email protected]>
Co-authored-by: ShaBaoFa <[email protected]>
Co-authored-by: clq321 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug lgtm This PR has been approved by a maintainer size:XS This PR changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants