Merge branch 'master' into sendmsg

# Conflicts:
#	src/services/http.ts
#	src/test/msgInput.test.ts

.vscode/launch.json

@@ -7,6 +7,20 @@
       "command": "pnpm run tauri:dev",
       "cwd": "${workspaceFolder}"
     },
+    {
+      "type": "node-terminal",
+      "name": "tauri:ios:dev",
+      "request": "launch",
+      "command": "pnpm run tauri:ios:dev",
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "node-terminal",
+      "name": "tauri:android:dev",
+      "request": "launch",
+      "command": "pnpm run tauri:android:dev",
+      "cwd": "${workspaceFolder}"
+    },
     {
       "type": "node-terminal",
       "name": "tauri:build",

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "css.customData": [".vscode/tailwindcss.json"],
-}
+    "css.customData": [
+        ".vscode/tailwindcss.json"
+    ],
+    "java.configuration.updateBuildConfiguration": "disabled",
+}

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## <small>2.6.1 (2025-01-17)</small>
+
+* fix(Android): :bug: 修复安卓启动配置 (#191) ([5176aee](https://github.com/HuLaSpark/HuLa/commit/5176aee)), closes [#191](https://github.com/HuLaSpark/HuLa/issues/191)
+* fix(build): :bug: 去除alsa-sys的安装 ([b5f8402](https://github.com/HuLaSpark/HuLa/commit/b5f8402))
+* fix(build): :bug: 修复ubuntu alsa-sys包版本 (#145) ([0840d7e](https://github.com/HuLaSpark/HuLa/commit/0840d7e)), closes [#145](https://github.com/HuLaSpark/HuLa/issues/145)
+* fix(build): :bug: 修复ubuntu CI打包问题 (#144) ([c4f46f8](https://github.com/HuLaSpark/HuLa/commit/c4f46f8)), closes [#144](https://github.com/HuLaSpark/HuLa/issues/144)
+* fix(common): :bug: 修复系统托盘状态切换问题 (#153) ([00e2a89](https://github.com/HuLaSpark/HuLa/commit/00e2a89)), closes [#153](https://github.com/HuLaSpark/HuLa/issues/153)
+* fix(common): :bug: 修复set_badge_count方法没有处理报错问题 (#140) ([4d4bd9c](https://github.com/HuLaSpark/HuLa/commit/4d4bd9c)), closes [#140](https://github.com/HuLaSpark/HuLa/issues/140)
+* fix(component): :bug: 修复tray设置窗口大小问题 (#149) ([7aaabb2](https://github.com/HuLaSpark/HuLa/commit/7aaabb2)), closes [#149](https://github.com/HuLaSpark/HuLa/issues/149)
+* fix(docker): :bug: 修改docker-compose配置 (#162) ([e1b1984](https://github.com/HuLaSpark/HuLa/commit/e1b1984)), closes [#162](https://github.com/HuLaSpark/HuLa/issues/162)
+* fix(mobile): :bug: 修复ios移动端页面问题 (#185) ([af7d388](https://github.com/HuLaSpark/HuLa/commit/af7d388)), closes [#185](https://github.com/HuLaSpark/HuLa/issues/185)
+* fix(renovate): :bug: 修复renovate bot配置 (#164) ([0dd59a5](https://github.com/HuLaSpark/HuLa/commit/0dd59a5)), closes [#164](https://github.com/HuLaSpark/HuLa/issues/164)
+* fix(service): :bug: 优化浏览器指纹 (#175) ([a2b3c32](https://github.com/HuLaSpark/HuLa/commit/a2b3c32)), closes [#175](https://github.com/HuLaSpark/HuLa/issues/175)
+* fix(service): :bug: 增加浏览器指纹作为唯一值解决netty关联channel的问题 (#171) ([a5b5f89](https://github.com/HuLaSpark/HuLa/commit/a5b5f89)), closes [#171](https://github.com/HuLaSpark/HuLa/issues/171)
+* fix(view): :bug: 修复系统托盘无法变化成多列表操作 (#150) ([cb08e62](https://github.com/HuLaSpark/HuLa/commit/cb08e62)), closes [#150](https://github.com/HuLaSpark/HuLa/issues/150)
+* fix(view): :bug: 修复setSize方法导致无法修改窗口大小问题 ([412db5c](https://github.com/HuLaSpark/HuLa/commit/412db5c)), closes [#139](https://github.com/HuLaSpark/HuLa/issues/139)
+* perf(mobile): :zap: 优化ios整体页面 (#186) ([2feb359](https://github.com/HuLaSpark/HuLa/commit/2feb359)), closes [#186](https://github.com/HuLaSpark/HuLa/issues/186)
+* perf(view): :zap: 优化聊天框用户信息操作选项 (#173) ([b024757](https://github.com/HuLaSpark/HuLa/commit/b024757)), closes [#173](https://github.com/HuLaSpark/HuLa/issues/173)
+* perf(view): :zap: 优化win的托盘闪烁和消息提示 (#142) ([4e49700](https://github.com/HuLaSpark/HuLa/commit/4e49700)), closes [#142](https://github.com/HuLaSpark/HuLa/issues/142)
+* perf(worker): :zap: 使用worker优化计时器不准确问题 (#190) ([000fcc2](https://github.com/HuLaSpark/HuLa/commit/000fcc2)), closes [#190](https://github.com/HuLaSpark/HuLa/issues/190)
+* feat(android): :sparkles: 新增android兼容 (#170) ([684b95c](https://github.com/HuLaSpark/HuLa/commit/684b95c)), closes [#170](https://github.com/HuLaSpark/HuLa/issues/170)
+* feat(mobile): :sparkles: 新增移动端兼容 (#169) ([3607c9d](https://github.com/HuLaSpark/HuLa/commit/3607c9d)), closes [#169](https://github.com/HuLaSpark/HuLa/issues/169) [#61](https://github.com/HuLaSpark/HuLa/issues/61)
+* feat(mobile): :sparkles: 增加ios下拉刷新功能 (#189) ([837d2b3](https://github.com/HuLaSpark/HuLa/commit/837d2b3)), closes [#189](https://github.com/HuLaSpark/HuLa/issues/189)
+* feat(scripts): :sparkles: 新增环境检测脚本(用于检测用户当前系统环境) (#166) ([3983bf7](https://github.com/HuLaSpark/HuLa/commit/3983bf7)), closes [#166](https://github.com/HuLaSpark/HuLa/issues/166)
+* feat(service): :sparkles: http错误提示 (#184) ([cd03444](https://github.com/HuLaSpark/HuLa/commit/cd03444)), closes [#184](https://github.com/HuLaSpark/HuLa/issues/184)
+* feat(service): :sparkles: http请求重试 (#178) ([2d0f3e0](https://github.com/HuLaSpark/HuLa/commit/2d0f3e0)), closes [#178](https://github.com/HuLaSpark/HuLa/issues/178)
+* feat(system): :sparkles: 新增linxu系统ubuntu兼容 (#148) ([373d87c](https://github.com/HuLaSpark/HuLa/commit/373d87c)), closes [#148](https://github.com/HuLaSpark/HuLa/issues/148)
+* feat(view): :sparkles: 增加透明高斯模糊开关 (#177) ([cefe53d](https://github.com/HuLaSpark/HuLa/commit/cefe53d)), closes [#177](https://github.com/HuLaSpark/HuLa/issues/177)
+* !45 fix(view): :bug:修复群聊问题 ([b0432d6](https://github.com/HuLaSpark/HuLa/commit/b0432d6)), closes [#152](https://github.com/HuLaSpark/HuLa/issues/152)
+* Http请求重试并抛出错误 (#181) ([16c4dea](https://github.com/HuLaSpark/HuLa/commit/16c4dea)), closes [#181](https://github.com/HuLaSpark/HuLa/issues/181)
+* Test actions (#147) ([9755340](https://github.com/HuLaSpark/HuLa/commit/9755340)), closes [#147](https://github.com/HuLaSpark/HuLa/issues/147)
+* build: 升级依赖 (#161) ([498f490](https://github.com/HuLaSpark/HuLa/commit/498f490)), closes [#161](https://github.com/HuLaSpark/HuLa/issues/161) [#156](https://github.com/HuLaSpark/HuLa/issues/156) [#155](https://github.com/HuLaSpark/HuLa/issues/155) [#157](https://github.com/HuLaSpark/HuLa/issues/157) [#158](https://github.com/HuLaSpark/HuLa/issues/158) [#159](https://github.com/HuLaSpark/HuLa/issues/159)
+* chore: 发布 v2.6.0 ([f411af6](https://github.com/HuLaSpark/HuLa/commit/f411af6))
+* ci: :ferris_wheel: 优化CI配置 (#141) ([6b47049](https://github.com/HuLaSpark/HuLa/commit/6b47049)), closes [#141](https://github.com/HuLaSpark/HuLa/issues/141)
+
 ## 2.6.0 (2025-01-05)
 
 * feat(system): :sparkles: 新增linxu系统ubuntu兼容 (#148) ([43d1561](https://github.com/HuLaSpark/HuLa/commit/43d1561)), closes [#148](https://github.com/HuLaSpark/HuLa/issues/148)

README.en.md

@@ -24,6 +24,7 @@
 <p align="center">
   gitee：<a href="https://gitee.com/HulaSpark/HuLa/stargazers"><img src="https://gitee.com/HulaSpark/HuLa/badge/star.svg?theme=gvp" alt="star"></a>
   github：<a href="https://gitee.com/link?target=https://github.com/HulaSpark/HuLa/stargazers"><img src="https://img.shields.io/github/stars/HulaSpark/HuLa" alt="star"></a>
+  gitcode：<a href="https://gitcode.com/HuLaSpark/HuLa"><img src="https://gitcode.com/HuLaSpark/HuLa/star/badge.svg" alt="star"></a>
 </p>
 <p align="center">
   WeChat: <img src="https://img.shields.io/badge/cy2439646234-07C160?logo=wechat&logoColor=fff">
@@ -52,15 +53,25 @@ HuLa is an instant messaging system developed with Tauri, Vite 5, Vue 3, and Typ
 
 ![img_3.png](preview/img_3.png)
 
-![img_4.png](preview/img_4.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_4.png" alt="img_4.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_5.png](preview/img_5.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_5.png" alt="img_5.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_6.png](preview/img_6.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_6.png" alt="img_6.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_6.png](preview/img_7.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_7.png" alt="img_7.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_6.png](preview/img_8.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_8.png" alt="img_8.png" style="border-radius: 8px; display: block;"  />
+</div>
 
 ## Thanks to the following contributors!
 
@@ -95,7 +106,9 @@ Downloading the installation package on the web page will indicate that the inst
 
 #### 1. Open "System Settings" - "Security & Privacy", as shown in the figure, check the box: Allow apps downloaded from "Any Source" to run:
 
-![img.png](preview/img_9.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_9.png" alt="img_9.png" style="border-radius: 8px; display: block;"  />
+</div>
 
 #### 2. If an error is reported, run the following command in the terminal to resolve the problem:
 
@@ -117,6 +130,8 @@ use **pnpm run commit** to invoke the _git commit_ interaction and follow the pr
 
 **The final interpretation of this disclaimer belongs to the developer**
 
-## License
+## HuLa社区讨论群
+<img src="preview/wx.jpg" width="240" height="280" alt="微信群二维码" style="border-radius: 12px;" />
 
+## License
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FHuLaSpark%2FHuLa.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FHuLaSpark%2FHuLa?ref=badge_large)

README.md

@@ -24,6 +24,7 @@
 <p align="center">
   gitee：<a href="https://gitee.com/HulaSpark/HuLa/stargazers"><img src="https://gitee.com/HulaSpark/HuLa/badge/star.svg?theme=gvp" alt="star"></a>
   github：<a href="https://gitee.com/link?target=https://github.com/HulaSpark/HuLa/stargazers"><img src="https://img.shields.io/github/stars/HulaSpark/HuLa" alt="star"></a>
+  gitcode：<a href="https://gitcode.com/HuLaSpark/HuLa"><img src="https://gitcode.com/HuLaSpark/HuLa/star/badge.svg" alt="star"></a>
 </p>
 <p align="center">
   微信: <img src="https://img.shields.io/badge/cy2439646234-07C160?logo=wechat&logoColor=fff">
@@ -52,15 +53,25 @@ HuLa 是一个基于 Tauri、Vite 5、Vue 3 和 TypeScript 构建的即时通讯
 
 ![img_3.png](preview/img_3.png)
 
-![img_4.png](preview/img_4.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_4.png" alt="img_4.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_5.png](preview/img_5.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_5.png" alt="img_5.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_6.png](preview/img_6.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_6.png" alt="img_6.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_6.png](preview/img_7.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_7.png" alt="img_7.png" style="border-radius: 8px; display: block;"  />
+</div>
 
-![img_6.png](preview/img_8.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_8.png" alt="img_8.png" style="border-radius: 8px; display: block;"  />
+</div>
 
 ## 感谢以下贡献者们！
 
@@ -95,7 +106,9 @@ pnpm run tauri:build
 
 #### 1. 打开 “系统设置” - “安全性与隐私”，如图勾选：允许 “任何来源” 下载的 App 运行：
 
-![img.png](preview/img_9.png)
+<div style="padding: 28px; display: inline-block;">
+  <img src="preview/img_9.png" alt="img_9.png" style="border-radius: 8px; display: block;"  />
+</div>
 
 #### 2. 如果还报错，请在终端执行以下命令解决：
 
@@ -117,6 +130,8 @@ sudo xattr -rd com.apple.quarantine 你的安装包路径/HuLa.app
 
 **本免责声明的最终解释权归开发者所有**
 
+## HuLa社区讨论群
+<img src="preview/wx.jpg" width="240" height="280" alt="微信群二维码" style="border-radius: 12px;" />
 
-## License
+## 许可证
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FHuLaSpark%2FHuLa.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FHuLaSpark%2FHuLa?ref=badge_large)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "hula",
   "type": "module",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=18.x",
@@ -62,20 +62,21 @@
     "@tauri-apps/api": "2.2.0",
     "@tauri-apps/plugin-autostart": "2.2.0",
     "@tauri-apps/plugin-clipboard-manager": "2.2.0",
-    "@tauri-apps/plugin-fs": "~2",
+    "@tauri-apps/plugin-dialog": "^2.2.0",
+    "@tauri-apps/plugin-fs": "~2.2.0",
     "@tauri-apps/plugin-http": "2.2.0",
     "@tauri-apps/plugin-notification": "^2.2.0",
     "@tauri-apps/plugin-os": "2.2.0",
     "@tauri-apps/plugin-process": "2.2.0",
     "@tauri-apps/plugin-shell": "^2.2.0",
     "@tauri-apps/plugin-sql": "^2.0.1",
-    "@tauri-apps/plugin-updater": "~2",
+    "@tauri-apps/plugin-updater": "~2.3.1",
     "colorthief": "^2.6.0",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.11",
     "dompurify": "^3.2.3",
     "grapheme-splitter": "^1.0.4",
-    "hula-emojis": "^1.2.3",
+    "hula-emojis": "^1.2.5",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "naive-ui": "^2.41.0",
@@ -90,24 +91,24 @@
     "@babel/eslint-parser": "^7.25.9",
     "@commitlint/cli": "^19.6.0",
     "@commitlint/config-conventional": "^19.6.0",
-    "@release-it/bumper": "^6.0.1",
-    "@release-it/conventional-changelog": "9.0.4",
+    "@release-it/bumper": "^7.0.0",
+    "@release-it/conventional-changelog": "10.0.0",
     "@rollup/plugin-terser": "^0.4.4",
     "@tauri-apps/cli": "2.0.4",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.14.14",
+    "@types/node": "^22.10.7",
     "@typescript-eslint/eslint-plugin": "7.1.0",
     "@typescript-eslint/parser": "^7.15.0",
-    "@unocss/preset-uno": "^0.65.3",
-    "@unocss/reset": "^0.65.3",
-    "@unocss/transformer-directives": "^0.65.3",
-    "@unocss/transformer-variant-group": "^0.65.3",
-    "@unocss/vite": "^0.65.3",
+    "@unocss/preset-uno": "^65.4.2",
+    "@unocss/reset": "^65.4.2",
+    "@unocss/transformer-directives": "^65.4.2",
+    "@unocss/transformer-variant-group": "^65.4.2",
+    "@unocss/vite": "^65.4.2",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vitejs/plugin-vue-jsx": "^4.1.1",
-    "@vitest/coverage-v8": "^2.1.8",
-    "@vitest/ui": "^2.1.8",
+    "@vitest/coverage-v8": "^3.0.1",
+    "@vitest/ui": "^3.0.1",
     "@vue/test-utils": "^2.4.6",
     "@vueuse/core": "^12.0.0",
     "chalk": "^5.3.0",
@@ -123,14 +124,13 @@
     "lint-staged": "^15.2.7",
     "oxlint": "^0.2.18",
     "prettier": "^3.3.2",
-    "release-it": "^17.11.0",
+    "release-it": "^18.1.0",
     "sass": "1.83.0",
     "typescript": "^5.7.2",
-    "unplugin-auto-import": "^0.18.6",
-    "unplugin-vue-components": "^0.27.5",
+    "unplugin-auto-import": "^19.0.0",
+    "unplugin-vue-components": "^28.0.0",
     "vite": "6.0.7",
-    "vite-plugin-vue-devtools": "^7.6.8",
-    "vitest": "^2.1.8",
+    "vitest": "^3.0.1",
     "vue-tsc": "^2.2.0"
   },
   "config": {