diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index edb47798b..7d868f3e3 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -13,6 +13,8 @@ https://docs.djangoproject.com/en/1.10/ref/settings/ import os import sys +from django.urls import reverse_lazy + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) PROJECT_DIR = os.path.dirname(BASE_DIR) @@ -98,6 +100,8 @@ TEMPLATES = [ # WSGI_APPLICATION = 'jumpserver.wsgi.application' +LOGIN_REDIRECT_URL = reverse_lazy('index') + # Database # https://docs.djangoproject.com/en/1.10/ref/settings/#databases diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index eb4f4e80e..138ea6d5a 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -27,7 +27,7 @@ from django.http import HttpResponseRedirect urlpatterns = [ - url(r'^$', TemplateView.as_view(template_name='base.html')), + url(r'^$', TemplateView.as_view(template_name='base.html'), name='index'), url(r'^(api/)?users/', include('users.urls')), url(r'^assets/', include('assets.urls')), url(r'^terminal/', include('webterminal.urls')), diff --git a/apps/static/img/logo.png b/apps/static/img/logo.png index 0d8ff20a6..f3cf2d261 100644 Binary files a/apps/static/img/logo.png and b/apps/static/img/logo.png differ diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html index c6e93da6c..0c13ebe76 100644 --- a/apps/users/templates/users/login.html +++ b/apps/users/templates/users/login.html @@ -1,5 +1,4 @@ {% load static %} -{#{% load bootstrap %}#} @@ -14,7 +13,7 @@ -{# #} + @@ -23,33 +22,39 @@
-

Welcome to IN+

+ +

欢迎使用Jumpserver开源跳板机

- Perfectly designed and precisely prepared admin theme with over 50 pages with extra new web app views. + Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互联网企业高效 用户、资产、权限、审计 管理

- Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. + 我们自五湖四海，我们对开源精神无比敬仰和崇拜，我们对完美、整洁、优雅 无止境的追求

- When an unknown printer took a galley of type and scrambled it to make a type specimen book. + 专注自动化运维，努力打造 易用、稳定、安全、自动化 的跳板机, 这是我们的不懈的追求和动力

- It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. + 永远年轻，永远热泪盈眶 stay foolish stay hungry

-
+
登录
+ + {% csrf_token %} + {% if form.errors %} +

用户名/密码 不正确, 请重试

+ {% endif %}
- +
- +
@@ -58,12 +63,12 @@

- Do not have an account? +{# Do not have an account?#}

- Create an account +{# Create an account#}

- Inspinia we app framework base on Bootstrap 3 © 2014 +{# Inspinia we app framework base on Bootstrap 3 © 2014#}

@@ -71,10 +76,10 @@
- Copyright Example Company + Copyright Jumpserver.org
- © 2014-2015 + © 2014-2016
diff --git a/apps/users/views.py b/apps/users/views.py index 55b834fac..136957839 100644 --- a/apps/users/views.py +++ b/apps/users/views.py @@ -24,31 +24,31 @@ from .utils import AdminUserRequiredMixin, ssh_key_gen logger = logging.getLogger('jumpserver.users.views') -class UserLoginView(FormView): - template_name = 'users/login.html' - form_class = UserLoginForm - success_url = reverse_lazy('users:user-list') - - def get(self, request, *args, **kwargs): - if self.request.user.is_staff: - return HttpResponseRedirect(reverse('users:user-list')) - return super(UserLoginView, self).get(request, *args, **kwargs) - - def form_valid(self, form): - username = form.cleaned_data.get('username', '') - password = form.cleaned_data.get('password', '') - - user = authenticate(username=username, password=password) - if user is not None and user.is_staff: - login(self.request, user) - return HttpResponseRedirect(self.success_url) - - logger.warning('Login user [%(username)s] password error' % {'username': username}) - return render(self.request, self.template_name, context={'form': form, 'error': '密码错误'}) - - def form_invalid(self, form): - logger.warning('Login form commit invalid.') - return super(UserLoginView, self).form_invalid(form) +# class UserLoginView(FormView): +# template_name = 'users/login.html' +# form_class = UserLoginForm +# success_url = reverse_lazy('users:user-list') +# +# def get(self, request, *args, **kwargs): +# if self.request.user.is_staff: +# return HttpResponseRedirect(reverse('users:user-list')) +# return super(UserLoginView, self).get(request, *args, **kwargs) +# +# def form_valid(self, form): +# username = form.cleaned_data.get('username', '') +# password = form.cleaned_data.get('password', '') +# +# user = authenticate(username=username, password=password) +# if user is not None and user.is_staff: +# login(self.request, user) +# return HttpResponseRedirect(self.success_url) +# +# logger.warning('Login user [%(username)s] password error' % {'username': username}) +# return render(self.request, self.template_name, context={'form': form, 'error': '密码错误'}) +# +# def form_invalid(self, form): +# logger.warning('Login form commit invalid.') +# return super(UserLoginView, self).form_invalid(form) class UserListView(AdminUserRequiredMixin, ListView):