Merge branch 'master' of 10.7.100.160:/job/safesite

safesite/static/safesite/mystatic/js/util.js

@@ -1,10 +1,16 @@
 var csrftoken = $.cookie('csrftoken');
 $.ajaxSetup({
     beforeSend: function(xhr, settings) {
-        if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+        xhr.setRequestHeader("X-CSRFToken", csrftoken);
-            xhr.setRequestHeader("X-CSRFToken", csrftoken);
+    },
+    complete:function(xhr, status){
+        if(xhr.status==405){
+            $.messager.alert('错误','超时请重新登陆!','error',function(){
+                top.location = "http://" + window.location.host;
+            });
         }
     }
+
 });
 function photoCompress(file, w, objDiv) {
     var ready = new FileReader();

safesite/templates/companyinfo.html

@@ -31,7 +31,7 @@ function submitForm() {
     // jquery 表单提交
     $("#companyform").ajaxSubmit(function(result) {
         // 对于表单提交成功后处理，result为表单正常提交后返回的内容
-    	if (result.code === 1) {        		 
+    	if (result.code == 1) {        		 
     		$.messager.show({
 	msg:'保存成功',
 	timeout:1000,

safesite/templates/index.html

@@ -18,7 +18,6 @@
     <script type="text/javascript" src="/static/safesite/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/echarts.min.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/chart.js"></script>
-    <script type="text/javascript" src="/static/safesite/mystatic/js/util.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/loading.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/layer/layer.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/datagrid-export.js"></script>
@@ -26,6 +25,8 @@
     <script src="https://cdn.bootcss.com/ckeditor/4.8.0/ckeditor.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/openlayer/ol.js"></script>
     <script src="https://cdn.bootcss.com/jquery.form/4.2.1/jquery.form.min.js"></script>
+    <script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
+    <script type="text/javascript" src="/static/safesite/mystatic/js/util.js"></script>
     <style type="text/css">
         .easyui-linkbutton:hover
 

safesite/views.py

@@ -239,28 +239,30 @@ def check_login(func):
         if is_login:
             return func(request,*args,**kwargs)
         else:
-            try:
+            return HttpResponse(status=405)
-                auth = request.META.get('HTTP_AUTHORIZATION').split()
+            # try:
-                # 用户通过 API 获取数据验证流程
+            #     auth = request.META.get('HTTP_AUTHORIZATION').split()
-                if auth[0].lower() == 'token':
+            #     # 用户通过 API 获取数据验证流程
-                    try:
+            #     if auth[0].lower() == 'token':
-                        dict = jwt.decode(auth[1], 'safeyun', algorithms=['HS256'])
+            #         try:
-                        userid = dict.get('data').get('userid')
+            #             dict = jwt.decode(auth[1], 'safeyun', algorithms=['HS256'])
-                    except jwt.ExpiredSignatureError:
+            #             userid = dict.get('data').get('userid')
-                        return JsonResponse({"status_code": 401, "message": "Token expired"})
+            #         except jwt.ExpiredSignatureError:
-                    except jwt.InvalidTokenError:
+            #             return JsonResponse({"status_code": 401, "message": "Token expired"})
-                        return JsonResponse({"status_code": 401, "message": "Invalid token"})
+            #         except jwt.InvalidTokenError:
-                    except Exception as e:
+            #             return JsonResponse({"status_code": 401, "message": "Invalid token"})
-                        return JsonResponse({"status_code": 401, "message": "Can not get user object"})
+            #         except Exception as e:
-                    try:
+            #             return JsonResponse({"status_code": 401, "message": "Can not get user object"})
-                        user = User.objects.get(userid=userid)
+            #         try:
-                    except user.DoesNotExist:
+            #             user = User.objects.get(userid=userid)
-                        return JsonResponse({"status_code": 401, "message": "User Does not exist"})
+            #         except user.DoesNotExist:
-                else:
+            #             return JsonResponse({"status_code": 401, "message": "User Does not exist"})
-                    return JsonResponse({"status_code": 401, "message": "Not support auth type"})
+            #     else:
-            except AttributeError:
+            #         return JsonResponse({"status_code": 401, "message": "Not support auth type"})
-                #return JsonResponse({"code": 401, "message": "No authenticate header"})
+            # except AttributeError:
-                return redirect('login')
+            #     return JsonResponse({"code": 401, "message": "No authenticate header"})
+            # except:
+            #     return JsonResponse({"code": 401, "message": "please login!"})
     return warpper
 
 #存储文件
@@ -277,6 +279,8 @@ def upfile(req):
     return JsonResponse({"code":1,"filename":file_name,"filepath":filepath})
 
 def login(req):
+    if req.session.get('userid', None):
+        return redirect('index')
     if req.method == 'POST':
         username = req.POST.get('username')
         password = req.POST.get('password')
@@ -284,15 +288,16 @@ def login(req):
         if user:
             #比较成功，跳转index
             req.session['userid'] = user[0].userid
-            req.session.set_expiry(60*30)
+            # req.session.set_expiry(60*30)
             return redirect('index')
         else:
             return render(req,'login.html',{'msg':'用户名或密码错误！'})
     else:
         return render(req,'login.html')
 
-@check_login
 def index(req):
+    if not req.session.get('userid', None):
+        return redirect('login')
     userid = req.session['userid']
     user=User.objects.get(userid=userid)
     companyname = user.usecomp.partname