Skip to content

Commit

Permalink
Update version to v1.3.6 and add Daily Quote Card
Browse files Browse the repository at this point in the history
- Update version in config files for hass-panel and hass-panel-beta
- Add Daily Quote Card (DailyQuoteCard) to README files
- Remove outdated version and update notes
- Adjust supervisord configuration for better service management
- Modify entrypoint script to tail FastAPI logs
- Remove debug logging in backend utilities
  • Loading branch information
mrtian2016 committed Mar 4, 2025
1 parent 458c19f commit d6c478c
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 87 deletions.
15 changes: 1 addition & 14 deletions README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ For detailed feature configuration and usage instructions, please visit the [doc
19. Universal Entity Card (UniversalCard) - Supports custom entity configuration and grouping
20. PVE Card (PVECard) - Virtual machine monitoring
21. Server Card (ServerCard)
22. Daily Quote Card (DailyQuoteCard)

### Card Management

Expand All @@ -134,20 +135,6 @@ npm start
npm run build
```

## Latest Version (v1.3.5.2)

### 🌟 Major Updates
- Theme system fully upgraded with "Follow System" option
- New frosted glass effect card design
- Added universal card component with custom configuration
- Added PVE and server monitoring functionality
- Enhanced camera features with multiple stream support

### 🔧 Technical Optimizations
- SQLite database connection pool optimization
- Component upgrades and refactoring
- Performance improvements and bug fixes
- Enhanced multilingual support

For detailed changelog, please check [Releases](https://github.com/mrtian2016/hass-panel/releases)

Expand Down
15 changes: 1 addition & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ docker run \
19. 通用实体卡片 (UniversalCard) - 支持自定义实体配置和分组显示
20. PVE监控卡片 (PVECard) - 虚拟机监控
21. 服务器监控卡片 (ServerCard)
22. 每日一言卡片 (DailyQuoteCard)

### 卡片管理

Expand All @@ -133,20 +134,6 @@ npm start
npm run build
```

## 最新版本 (v1.3.5.2)

### 🌟 主要更新
- 主题系统全面升级,支持"跟随系统"选项
- 全新毛玻璃效果卡片设计
- 新增通用卡片组件,支持自定义配置
- 新增PVE和服务器监控功能
- 摄像头功能增强,支持多种视频流

### 🔧 技术优化
- SQLite数据库连接池优化
- 组件升级与重构
- 性能提升与bug修复
- 多语言支持完善

详细更新日志请查看[Releases](https://github.com/mrtian2016/hass-panel/releases)

Expand Down
10 changes: 1 addition & 9 deletions backend/hass_panel/routers/user_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ async def save_config(

with open(go2rtc_config_path, "r", encoding="utf-8") as f:
go2rtc_config = yaml.safe_load(f) or {}
logger.info(f"go2rtc_config: {go2rtc_config}")

# 确保streams是一个字典
if not go2rtc_config.get("streams"):
Expand All @@ -98,14 +97,10 @@ async def save_config(

if "cards" in config:
for card in config["cards"]:
logger.info(f"card: {card}")
if card.get("type") == "CameraCard":
logger.info(f"card.get('config'): {card.get('config')}")
cameras = card.get("config", {}).get("cameras", [])
logger.info(f"cameras: {cameras}")
updated_cameras = []
for camera in cameras:
logger.info(f"camera: {camera}")
if camera.get("stream_url"):
# 生成基础key
base_name = camera.get("name") or camera.get("entity_id") or camera["stream_url"]
Expand Down Expand Up @@ -149,13 +144,11 @@ async def save_config(
# 保存更新后的用户配置(包含播放地址)
with open(config_file, "w", encoding="utf-8") as f:
json.dump(config, f, indent=2, ensure_ascii=False)

logger.info("已更新go2rtc配置文件")


# 重启go2rtc服务
try:
subprocess.run(["supervisorctl", "restart", "go2rtc"], check=True)
logger.info("已重启go2rtc服务")
except subprocess.CalledProcessError as e:
logger.error(f"重启go2rtc服务失败: {str(e)}")
return generate_resp(code=500, error=f"重启go2rtc服务失败: {str(e)}")
Expand Down Expand Up @@ -255,7 +248,6 @@ async def update_hass_config(config: HassConfigUpdate):
db = SessionLocal()
try:
# 检查存在hass_url和hass_token是否正确
logger.info(f"config: {config.hass_url}{config.hass_token}")
check_result = await check_hass_token(config.hass_url, config.hass_token)
logger.info(f"check_result: {check_result}")
if not check_result:
Expand Down
2 changes: 0 additions & 2 deletions backend/hass_panel/utils/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ async def check_hass_token(hass_url: str, hass_token: str):
async with aiohttp.ClientSession() as session:
try:
hass_token = hass_token.replace("Bearer ", "")
logger.info(f"hass_token: {hass_token}")
logger.info(f"hass_url: {hass_url}")
async with session.get(
f"{hass_url}/api/",
headers={"Authorization": f"Bearer {hass_token}"}
Expand Down
10 changes: 5 additions & 5 deletions docker/config/supervisord.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[supervisord]
nodaemon=true
nodaemon=false
user=root
logfile=/config/hass-panel/logs/supervisord/supervisord.log
pidfile=/var/run/supervisord.pid
Expand All @@ -10,24 +10,24 @@ autostart=true
autorestart=true
stderr_logfile=/config/hass-panel/logs/supervisord/nginx.err.log
stdout_logfile=/config/hass-panel/logs/supervisord/nginx.out.log
priority=10
priority=20

[program:fastapi]
command=python hass_panel/main.py
directory=/backend
autostart=true
autorestart=true
autorestart=false
stderr_logfile=/config/hass-panel/logs/supervisord/fastapi.err.log
stdout_logfile=/config/hass-panel/logs/supervisord/fastapi.out.log
priority=20
priority=30

[program:go2rtc]
command=/usr/local/bin/go2rtc -c /config/hass-panel/go2rtc.yaml
autostart=true
autorestart=true
stderr_logfile=/config/hass-panel/logs/supervisord/go2rtc.err.log
stdout_logfile=/config/hass-panel/logs/supervisord/go2rtc.out.log
priority=30
priority=10

[supervisorctl]
serverurl=unix:///var/run/supervisor.sock
Expand Down
5 changes: 4 additions & 1 deletion docker/scripts/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,7 @@ fi
chown -R nginx:nginx "$CONFIG_DIR/upload"
chmod -R 755 "$CONFIG_DIR/upload"

/usr/bin/supervisord -c /etc/supervisord.conf
/usr/bin/supervisord -c /etc/supervisord.conf

tail -f /config/hass-panel/logs/supervisord/fastapi.out.log

2 changes: 1 addition & 1 deletion frontend/public/version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version": "v1.3.6.beta.4", "updateTime": "2025-03-04 01:00:00"}
{"version": "v1.3.6", "updateTime": "2025-03-04 01:00:00"}
21 changes: 1 addition & 20 deletions hass-panel-beta/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@

## 安装部署

### 重要提示
从 v1.3.2 版本开始:
- 系统使用 SQLite 数据库进行配置存储
- 首次使用需要完成系统初始化流程
- 摄像头功能需要正确配置 ONVIF/RTSP 地址

详细的安装和配置说明请访问[官方文档](https://hass-panel.com/guide/install.html)

### Docker方式 正式版
Expand Down Expand Up @@ -109,6 +103,7 @@ docker run \
19. 通用实体卡片 (UniversalCard) - 支持自定义实体配置和分组显示
20. PVE监控卡片 (PVECard) - 虚拟机监控
21. 服务器监控卡片 (ServerCard)
22. 每日一言卡片 (DailyQuoteCard)

### 卡片管理

Expand All @@ -133,20 +128,6 @@ npm start
npm run build
```

## 最新版本 (v1.3.5.2)

### 🌟 主要更新
- 主题系统全面升级,支持"跟随系统"选项
- 全新毛玻璃效果卡片设计
- 新增通用卡片组件,支持自定义配置
- 新增PVE和服务器监控功能
- 摄像头功能增强,支持多种视频流

### 🔧 技术优化
- SQLite数据库连接池优化
- 组件升级与重构
- 性能提升与bug修复
- 多语言支持完善

详细更新日志请查看[Releases](https://github.com/mrtian2016/hass-panel/releases)

Expand Down
2 changes: 1 addition & 1 deletion hass-panel-beta/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Hass Panel Beta",
"version": "v1.3.6.beta.4",
"version": "v1.3.6",
"slug": "hass_panel_beta",
"description": "史上最简单的 Home Assistant 控制面板,基于 React 开发 | 一键部署到 HAOS | 有手就能用 | 无需编程经验 | 开箱即用。",
"url": "https://github.com/mrtian2016/hass-panel",
Expand Down
20 changes: 1 addition & 19 deletions hass-panel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@

## 安装部署

### 重要提示
从 v1.3.2 版本开始:
- 系统使用 SQLite 数据库进行配置存储
- 首次使用需要完成系统初始化流程
- 摄像头功能需要正确配置 ONVIF/RTSP 地址

详细的安装和配置说明请访问[官方文档](https://hass-panel.com/guide/install.html)

Expand Down Expand Up @@ -110,6 +105,7 @@ docker run \
19. 通用实体卡片 (UniversalCard) - 支持自定义实体配置和分组显示
20. PVE监控卡片 (PVECard) - 虚拟机监控
21. 服务器监控卡片 (ServerCard)
22. 每日一言卡片 (DailyQuoteCard)

### 卡片管理

Expand All @@ -134,20 +130,6 @@ npm start
npm run build
```

## 最新版本 (v1.3.5.2)

### 🌟 主要更新
- 主题系统全面升级,支持"跟随系统"选项
- 全新毛玻璃效果卡片设计
- 新增通用卡片组件,支持自定义配置
- 新增PVE和服务器监控功能
- 摄像头功能增强,支持多种视频流

### 🔧 技术优化
- SQLite数据库连接池优化
- 组件升级与重构
- 性能提升与bug修复
- 多语言支持完善

详细更新日志请查看[Releases](https://github.com/mrtian2016/hass-panel/releases)

Expand Down
2 changes: 1 addition & 1 deletion hass-panel/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Hass Panel",
"version": "v1.3.5.2",
"version": "v1.3.6",
"slug": "hass_panel",
"description": "史上最简单的 Home Assistant 控制面板,基于 React 开发 | 一键部署到 HAOS | 有手就能用 | 无需编程经验 | 开箱即用。",
"url": "https://github.com/mrtian2016/hass-panel",
Expand Down

0 comments on commit d6c478c

Please sign in to comment.