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

Merge master #366

Merged
merged 228 commits into from
Oct 23, 2024
Merged

Merge master #366

merged 228 commits into from
Oct 23, 2024

Conversation

zds-s
Copy link
Member

@zds-s zds-s commented Oct 23, 2024

No description provided.

jnewer and others added 28 commits June 14, 2024 18:23
* fix:修复变量注释不自动提示问题

* cs-fix

---------

Co-authored-by: jikang <[email protected]>
…d a double space around the 'th =' assignment, which was inconsistent with the other environment variable assignments in the file. This commit removes the extra space to maintain consistency and improve readability. (#279)
* Remove auto cs-fix

* Remove other workflow

* Apply cs fix
* 修复因 storage_mode是int类型获取文件系统不正确导致无法删除OSS或其他文件系统文件

* fix

* 修改用户更新个人资料过滤不存在的字段、修复手机号码验证传递null会报错的问题
feat: 字典分类新增list接口
* Apply cs fix

* Upgrade actions/create-release:v4

* Upgrade components to 2.0.1

* Update composer.json

* Update actions

* Update swoole version

* Revert "Update swoole version"

This reverts commit b585d39.
…295)

SystemUserService.php: 1. 重写 token-key 正则匹配 2. kickUser 保证获取到所有token,一次性全部下线。 3. hasTokenBlack 只判断传入token所在scene的情况,否则会导致判断多重scene而导致在线用户监控列表出错。
* 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 按快了)
* Add App Store .gitignore Entry and Include install.lock in Repository

* fix [BUG] 后台菜单的level字段出错 #244

* Apply cs-fix

---------

Co-authored-by: wlfpanda <[email protected]>
* fix dept level bug

fix dept level bug
修改参数名防止歧义

* composer cs
- 更新项目创建命令。
- 完善应用市场描述,详细介绍可下载的各种基础应用、插件、前端组件等资源。
- 新增重要提示,帮助用户在项目设置过程中避免常见问题。
* 插件内多语言,内聚

* fix(ci): 修复ci测试和cs fix检查

---------

Co-authored-by: WenRenHai <[email protected]>
@dosubot dosubot bot added the size:XL This PR changes 500-999 lines, ignoring generated files. label Oct 23, 2024
@zds-s zds-s merged commit a861054 into 2.0 Oct 23, 2024
165 of 228 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size:XL This PR changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.