diff --git a/yazhaiTest/lib/login.js b/yazhaiTest/lib/login.js
index 8a8648e..8fcf44d 100644
--- a/yazhaiTest/lib/login.js
+++ b/yazhaiTest/lib/login.js
@@ -1041,6 +1041,20 @@ function login_twitter(network) { //登录方法，并将twitter 作为参数�
}, log).then(function (p) {
var r2 = JSON.parse(localStorage.getItem('hello'));
console.log(r2.twitter)
+ $.ajax({
+ url:$ip+'third/login',
+ data:{
+ openid:'cEGECNgXN3ZN00r3Zb82vwh55',
+ opentype:8,
+ authToken:r2.twitter.oauth_token,
+ authSecret:r2.twitter.oauth_token_secret,
+ nickname:p.name,
+ facepath:p.thumbnail
+ },
+ success:function(data){
+ console.log('推特登录',data)
+ }
+ })
//已获取用户信息，在此处理
// window.location.href = "footseenlogin://" + encodeURIComponent("www.firefly.live?secret=" + r2.twitter.oauth_token_secret + "&token=" + r2.twitter.oauth_token + "&name=" + p.name + "&profileImageUrl=" + p.thumbnail + "&id=" + r2.twitter.user_id);
// window.location.href = ;
diff --git a/yazhaiTest/lineBack.html b/yazhaiTest/lineBack.html
index e69de29..cf2a8cc 100644
--- a/yazhaiTest/lineBack.html
+++ b/yazhaiTest/lineBack.html
@@ -0,0 +1,68 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="X-UA-Compatible" content="ie=edge">
+ <title>LINE Login Demo</title>
+ <style>
+ #timeJump {
+ display: none;
+ }
+ </style>
+</head>
+
+<body>
+ <!-- <h1 id="timeJump">登錄成功，<span id="jTime">5</span>秒后返回App</h1> -->
+ <script type="text/javascript" src="lib/jquery-3.1.1.min.js"></script>
+ <script>
+ var urlParam = url_get_params();
+ $.ajax({
+ url: 'https://api.line.me/oauth2/v2.1/token',
+ data: {
+ grant_type: 'authorization_code',
+ code: urlParam.code,
+ redirect_uri: 'http://www.firefly.live/login/line-callback.html',
+ client_id: '1654468829',
+ client_secret: 'd70325add488ea05fd25ba84c6d91b6c'
+ },
+ type: 'POST',
+ success: function (res) {
+ var mAutho = res;
+ $.ajax({
+ url: 'https://api.line.me/oauth2/v2.1/verify',
+ type: 'POST',
+ data: {
+ client_id: '1654468829',
+ id_token: mAutho.id_token
+ },
+ success: function (res) {
+ console.log(res)
+
+ // window.location.href = "footseenlogin://" + encodeURIComponent("www.firefly.live?token=" + mAutho.id_token + "&name=" + res.name + "&profileImageUrl=" + res.iss + "&id=" + res.sub);
+ }
+ })
+
+ }
+ })
+ function lineGo(){
+
+ }
+ function url_get_params() {
+ var url = location.href;
+ var theRequest = new Object();
+ if (url.indexOf("?") != -1) {
+ var str = url.substr(url.indexOf("?") + 1);
+ strs = str.split("&");
+ for (var i = 0; i < strs.length; i++) {
+ theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+ }
+ }
+ return theRequest;
+ }
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/yazhaiTest/pc.html b/yazhaiTest/pc.html
index 004d335..480d6bf 100644
--- a/yazhaiTest/pc.html
+++ b/yazhaiTest/pc.html
@@ -317,6 +317,8 @@
<script src="lib/default.js?v='20220407'"></script>
<script src="lib/login.js?v=20220620"></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
+<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jsrsasign/8.0.20/jsrsasign-all-min.js"></script> -->
+
<script>
$(function(){
// var html=[]
@@ -324,6 +326,9 @@ $(function(){
// html+='<meta name="google-signin-client_id" content="534183685500-ag0vai0jh6todldi4rg6lvp0gcsojk0n.apps.googleusercontent.com">'
// $("head").append(html)
// $(".google-login").attr("src","https://apis.google.com/js/platform.js")
+ // var strings='eyJhbGciOiJSUzI1NiIsImtpZCI6IjJiMDllNzQ0ZDU4Yzk5NTVkNGYyNDBiNmE5MmY3YjM3ZmVhZDJmZjgiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJuYmYiOjE2NTU3MjY3MzksImF1ZCI6IjUzNDE4MzY4NTUwMC1hZzB2YWkwamg2dG9kbGRpNHJnNmx2cDBnY3Nvamswbi5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsInN1YiI6IjExNjU2MDI0NDUzNDA2NzMwNDk0NSIsImVtYWlsIjoiNDA1NzA4MTIyQHFxLmNvbSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJhenAiOiI1MzQxODM2ODU1MDAtYWcwdmFpMGpoNnRvZGxkaTRyZzZsdnAwZ2Nzb2prMG4uYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJuYW1lIjoi5p2O55m9IiwicGljdHVyZSI6Imh0dHBzOi8vbGgzLmdvb2dsZXVzZXJjb250ZW50LmNvbS9hL0FBVFhBSng2TTAwOVdBV0NtRTlBZUhZajJHYnhrRE5Bb1NRS3BqNHFrZm9nPXM5Ni1jIiwiZ2l2ZW5fbmFtZSI6IueZvSIsImZhbWlseV9uYW1lIjoi5p2OIiwiaWF0IjoxNjU1NzI3MDM5LCJleHAiOjE2NTU3MzA2MzksImp0aSI6IjM2YzdmZTk2ODg3NTQzODVkMTM4OWVhZGRlODJmOTgzMjQwZWFmY2QifQ.QL0TPz2C7lEvAfcnYRbfUwO39R0GsS6QkZboNpF6X7RWblxeKnm8CRWaqtosPbMNXqi42U7Cbkjb3rnD5GqTixRoYDeCceZzAhgQh4fNqs1_vU3gsQ0cBhqVYycbGo8hi6h-zFcMLMbM8hml3NvJqc1TYdhSDW3BdeaegBu2esLpgY4ac0Ick86-TnJH6Gj-U2WGU0QabbaEfbG1MSe-FslBEcE-Y9vbP4Wfzm0K1PCnooBv2Saj4HPBMuAhluHHXiejfU8MvLT8AaJH0oKlBJ_yH01OOGSiqQhM8qt3jaEC4lNVghePtSpjcflwY4_p-0vxewL4uH5szZnbVhPL0Q'
+ // var userinfo = JSON.parse(decodeURIComponent(escape(window.atob(strings.replace(/-/g, "+").replace(/_/g, "/")))));
+ // console.log(userinfo)
loginGo()
var scrollOk=true;
var pageNumber=1