Merge pull request #381 from liangliangyy/dev

升级依赖

oauth/oauthmanager.py

@@ -65,13 +65,13 @@ class BaseOauthManager(metaclass=ABCMeta):
     def get_oauth_userinfo(self):
         pass
 
-    def do_get(self, url, params):
-        rsp = requests.get(url=url, params=params)
+    def do_get(self, url, params, headers=None):
+        rsp = requests.get(url=url, params=params, headers=headers)
         logger.info(rsp.text)
         return rsp.text
 
-    def do_post(self, url, params):
-        rsp = requests.post(url, params)
+    def do_post(self, url, params, headers=None):
+        rsp = requests.post(url, params, headers=headers)
         logger.info(rsp.text)
         return rsp.text
 
@@ -263,11 +263,9 @@ class GitHubOauthManager(BaseOauthManager):
 
     def get_oauth_userinfo(self):
 
-        params = {
-            'access_token': self.access_token
-        }
-        rsp = self.do_get(self.API_URL, params)
-
+        rsp = self.do_get(self.API_URL, params={}, headers={
+            "Authorization": "token " + self.access_token
+        })
         try:
             datas = json.loads(rsp)
             user = OAuthUser()
@@ -279,7 +277,6 @@ class GitHubOauthManager(BaseOauthManager):
             user.matedata = rsp
             if 'email' in datas and datas['email']:
                 user.email = datas['email']
-
             return user
         except Exception as e:
             logger.error(e)

requirements.txt

@@ -1,15 +1,5 @@
-appdirs==1.4.3
-asgiref==3.2.3
-asn1crypto==1.3.0
-astroid==2.3.3
-attrs==19.3.0
-bottle==0.12.18
-certifi==2019.11.28
-cffi==1.14.0
-chardet==3.0.4
 coverage==5.0.3
-cryptography==2.8
-Django==3.0.3
+Django==3.0.4
 django-appconf==1.0.3
 django-autoslug==1.9.6
 django-compressor==2.4
@@ -20,9 +10,6 @@ django-mdeditor==0.1.17
 django-uuslug==1.2.0
 elasticsearch==7.5.1
 elasticsearch-dsl==7.1.0
-idna==2.9
-ipaddress==1.0.23
-isort==4.3.21
 jieba==0.42.1
 jsonpickle==1.3
 lazy-object-proxy==1.4.3
@@ -30,15 +17,10 @@ markdown2==2.3.8
 mccabe==0.6.1
 mistune==0.8.4
 mysqlclient==1.4.6
-olefile==0.46
-packaging==20.1
 Pillow==7.0.0
-pycparser==2.19
 Pygments==2.5.2
 pylint==2.4.4
 pyparsing==2.4.6
-python-dateutil==2.8.1
-python-logstash==0.4.6
 python-memcached==1.59
 python-slugify==4.0.0
 pytz==2019.3
@@ -46,14 +28,6 @@ raven==6.10.0
 rcssmin==1.0.6
 requests==2.23.0
 rjsmin==1.1.0
-six==1.14.0
-sqlparse==0.3.0
-text-unidecode==1.3
-typed-ast==1.4.1
-Unidecode==1.1.1
-urllib3==1.25.8
-webencodings==0.5.1
 WeRoBot==1.10.1
 Whoosh==2.7.4
-wrapt==1.12.0
-xmltodict==0.12.0
+python-logstash==0.4.6