diff --git a/plugins/ldap/index.py b/plugins/ldap/index.py index 5466217d2..9c65a1a58 100755 --- a/plugins/ldap/index.py +++ b/plugins/ldap/index.py @@ -302,6 +302,13 @@ def submitRedisConf(): reload() return mw.returnJson(True, '设置成功') +def installPreInspection(): + slapd_path = '/etc/ldap/slapd.d' + if not os.path.exists(slapd_path): + return "需要手动执行:apt install -y slapd ldap-utils" + return 'ok' + + if __name__ == "__main__": func = sys.argv[1] if func == 'status': @@ -320,6 +327,8 @@ if __name__ == "__main__": print(initdInstall()) elif func == 'initd_uninstall': print(initdUinstall()) + elif func == 'install_pre_inspection': + print(installPreInspection()) elif func == 'run_info': print(runInfo()) elif func == 'conf': diff --git a/plugins/ldap/info.json b/plugins/ldap/info.json index 8efe39382..f577d7547 100755 --- a/plugins/ldap/info.json +++ b/plugins/ldap/info.json @@ -6,6 +6,7 @@ "shell": "install.sh", "versions":["1.0"], "tip": "soft", + "install_pre_inspection":true, "checks": "server/ldap", "path": "server/ldap", "display": 1, diff --git a/plugins/ldap/install.sh b/plugins/ldap/install.sh index fc7a181bb..0a595abc0 100755 --- a/plugins/ldap/install.sh +++ b/plugins/ldap/install.sh @@ -31,7 +31,10 @@ Install_App() Uninstall_App() { + apt remove -y slapd ldap-utils rm -rf $serverPath/ldap/version.pl + rm -rf $serverPath/ldap + rm -rf /etc/ldap echo "卸载ldap成功" } diff --git a/web/templates/default/login.html b/web/templates/default/login.html index c361e6c3c..d9763bc2b 100755 --- a/web/templates/default/login.html +++ b/web/templates/default/login.html @@ -205,7 +205,7 @@ $('#login-button').click(function(){ var data = 'username='+username+'&password='+password+'&code='+code; var loadT = layer.msg("正在登录中...",{icon:16,time:0,shade: [0.3, '#000']}); $.post('/do_login',data,function(rdata){ - console.log('do_login',rdata); + // console.log('do_login',rdata); layer.close(loadT); if(!rdata.status || rdata.status < 0){ if(username == 'admin' && rdata.msg.indexOf('用户名') != -1){