fix线的颜色
ecs,rds配置
Merge branch 'newui' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	views/main.ejs