Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,23 @@
3. `sudo ./unserialize_ccloud.sh`

## 修改记录
> ***2020年5月22日***
>> `nginx/ssl_myconf.conf`,`nginx/myconf.conf`
>>> 增加代理获取截图的配置

> ***2020年5月21日***
>> 新增`db_spring/update_lining_gps_tag_ccloud.sql`
>>> - 增加李宁表`device_status`,`device_info`
>>> - 增加素材标签表`wp_media_custom_tag_record`,`wp_custom_tag`
>>> - 增加素材分享表`wp_share_relationships`,`wp_media_share_record`
>>> - 增加节目特性表`wp_program_feature`
>>> - 增减GPS分表字段

>> 新增`add_tables_lining_gps_tag_share_ccloud.sh`建表脚本

>> `app/application.yml`增减配置项
>>> `camera-shot.clean.time-range: 10`

> ***2020年3月30日***
>> `deploy_one_cloud.sh`
>>> 删除睡眠300s,增加重启one-mysql
Expand Down
4 changes: 4 additions & 0 deletions add_tables_lining_gps_tag_share_ccloud.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
deploy_path=`pwd`
cp $deploy_path/db_spring/update_lining_gps_tag_ccloud.sql $deploy_path/mysql/data
sleep 1
docker exec -i one-mysql bash -c "mysql -u root -pkS4pKJF_3kfdsfOoJ <<< 'source /var/lib/mysql/update_lining_gps_tag_ccloud.sql'"
116 changes: 0 additions & 116 deletions app/application - 副本.yml

This file was deleted.

5 changes: 4 additions & 1 deletion app/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ clt:
email:
from: ${spring.mail.username}
cc: ${spring.mail.username}
default-title: Colorlight盒子监控警报
default-title: Colorlight device alarm
default-string-context: 您的盒子上报数据出现异常,请检查!
authentication:
# 双因子认证密钥发行商
Expand Down Expand Up @@ -117,3 +117,6 @@ management:
device:
report:
time: 200000
camera-shot:
clean:
time-range: 10 # 摄像头截图自动清理的时间范围,单位天
Loading