modify the sql and jsp
merge
modify the ldap
Merge pull request #593 from youyong205/master

refactor