modify the jsp
Merge pull request #431 from jialinsun/master

chengjunxia bootcamp task modify & merge request
refactor the alert module
modify the alert Manager
Merge pull request #434 from youyong205/master

refactor
resolve conflicts
merge