pindo 5.0.6 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da7db67cae593054d94da87ec555ccd0d6ed2691ca9d534729a386b4cc55f360
-  data.tar.gz: 25b281165febd17ac56dfcadd64dcf2e55674e326b28575ff3952007b7dbdc2d
+  metadata.gz: cd1d664dc77bc75c43a1816a8316fafb10351c9133a4e9dabf403f010bd1882a
+  data.tar.gz: 7e4387a7ad42c6830898bd9466a7ea8131ab92429b78ed5ed61479b07eebe44f
 SHA512:
-  metadata.gz: '089d77424e3f53c88de5d9839b6849a11c868e6bf637b485403cec677a0e320cc2292e09fe8c868ecec3950a28e21b060a0867eadcd9b01dd1cab7aaaf8b878d'
-  data.tar.gz: 34a13c1bf0691285cd4d7c76c284c288c445ec2f3e67650d504ccdf1d3c2baa599c91492943ddee6078245372e5ae42746d2cd2bb881f9da0075305f7bd03d66
+  metadata.gz: 305e2b32210bf046c6d56a82cff9f799e9bf73672e812aa28e3c78e378b32bc8c4700f5f4f45cfe39e3301427632f6074c2f6b419778c51a21de15dc19d8a676
+  data.tar.gz: 991b426167216c8c2f95fbd99400314fe807f892a6975300d145ff1e07684611547f6a89df7fbabd634d5f0f076839928fb89a1787977b313e4b1e332029a997

data/lib/pindo/client/bossconfigclient.rb

@@ -49,10 +49,9 @@ module Pindo
 
       def do_login()
 
-        # username = ask('请输入Boss网站的用户名:')
-        # password = ask('请输入Boss网站的密码:')
-        username = "shuangquan"
-        password = "HIsdfUHfwdh"
+        username = ask('请输入Boss网站的用户名:')
+        password = ask('请输入Boss网站的密码:')
+
 
         do_login_req(username:username, password:password)
       end

data/lib/pindo/client/pgyer_feishu_oauth_cli.rb

@@ -10,66 +10,43 @@ require 'base64'
 require 'fileutils'
 require 'pindo/base/aeshelper'
 require 'pindo/config/pindouserlocalconfig'
+require 'pindo/client/httpclient'
 
 module Pindo
  
   class PgyerFeishuOAuthCLI
-    attr_reader :access_token, :refresh_token, :user_info
+    attr_reader :access_token, :username, :expires_at
 
     def initialize(client_id)
       @client_id = client_id
-      @feishu_auth_url = 'https://open.feishu.cn/open-apis/authen/v1/index'
-      @redirect_uri = 'https://jps-new.devtestapp.com/auth/jwt/login'
-      # @state = SecureRandom.hex(16)
-      @state = 'success_login'
+      @feishu_auth_url = 'https://passport.feishu.cn/suite/passport/oauth/authorize?'
+      
+      # 保持原有的redirect_uri，飞书OAuth流程中仍使用这个URL
+      # 前端UI会检测state=terminal_login并自动跳转到localhost:8899
+      @redirect_uri = 'https://pgyerapps.com/login'
+      @pgyer_api_endpoint = 'https://api.pgyerapps.com/api/user/lark_qr_login'
+      
+      @state = 'terminal_login'
+      
       @larkScopeList = [
-        'offline_access',
         'task:task:write',
         'task:section:write',
         'task:custom_field:write',
-        'task:tasklist:write',
+        'task:tasklist:write'
       ];
 
       @access_token = nil
-      @refresh_token = nil
-      @token_expired_at = nil
-
-      @pgyer_token_file = File.join(File::expand_path(Pindoconfig.instance.pindo_dir), ".pgyer_token")
-      
-      # 尝试读取配置文件中的AES密钥
-      begin
-        config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "pgyer_client_config.json")
-        if File.exist?(config_file)
-          config_json = JSON.parse(File.read(config_file))
-          @pgyer_aes_key = config_json["pgyerapps_aes_key"] if config_json["pgyerapps_aes_key"]
-        end
-      rescue => e
-        puts "读取配置文件失败: #{e.message}"
-      end
-      
-      # 如果配置文件中没有找到密钥，则使用默认密钥
-      @pgyer_aes_key ||= ENV['PGYER_AES_KEY'] || "pgyerOauthToken2024"
-
-      # Pgyer API endpoints
-      @pgyer_api_endpoint = 'https://jps-api.devtestapp.com/api/lark_login'
+      @username = nil
+      @expires_at = nil
     end
 
     # 启动授权流程
     def authorize
-      # 先检查是否有存储的令牌
-      if load_token
-        puts "找到已保存的Pgyer令牌，尝试验证..."
-        if validate_pgyer_token
-          puts "已有令牌验证成功！"
-          return true
-        else
-          puts "已有令牌已失效，需要重新授权。"
-        end
-      end
-
+      # 不再检查已存储的令牌，直接开始授权流程
       authorization_uri = build_authorization_uri
       puts "正在打开浏览器进行飞书OAuth授权..."
       puts "授权URI: #{authorization_uri}"
+      puts "注意：授权成功后，网页将自动跳转至本地http://localhost:8899"
       
       # 在浏览器中打开授权URL
       open_browser(authorization_uri)
@@ -77,10 +54,38 @@ module Pindo
       # 启动本地服务器处理回调
       code = start_callback_server
       
+      # 如果自动获取失败，提示用户手动输入
+      if code.nil?
+        puts "自动获取授权码失败，您可以手动输入："
+        puts "1. 授权码 (直接复制'code='后面的内容)"
+        puts "2. 完整回调URL (例如: http://localhost:8899/?code=xxxx...)"
+        print "> "
+        input = STDIN.gets.chomp
+        
+        if input.start_with?("http")
+          # 尝试从URL中提取code
+          begin
+            uri = URI(input)
+            query_params = URI.decode_www_form(uri.query || '').to_h
+            code = query_params['code']
+            if code
+              puts "从URL中成功提取授权码"
+            end
+          rescue => e
+            puts "无法从URL中提取授权码: #{e.message}"
+          end
+        else
+          # 将输入直接作为code
+          code = input unless input.empty?
+        end
+      end
+      
       if code
-        puts "正在使用飞书身份登录Pgyer..."
+        puts "成功获取授权码！正在使用飞书身份登录Pgyer..."
+        puts "code: #{code}"
         if login_pgyer_with_feishu(code:code)
-          store_token
+          puts "Pgyer登录成功！"
+          # 登录成功后，返回true，外部程序可以通过访问access_token属性获取token
           return true
         end
         return false
@@ -91,14 +96,23 @@ module Pindo
     end
 
     # 验证Pgyer令牌
-    def validate_pgyer_token
-      return false unless @access_token
+    def validate_pgyer_token(token = nil, expires_at = nil)
+      token_to_check = token || @access_token
+      expiration_time = expires_at || @expires_at
       
-      # 这里应该调用Pgyer的API验证令牌有效性
-      # 由于没有具体API文档，这里仅做示例
+      # 首先检查token是否存在
+      return false unless token_to_check
+      
+      # 然后检查token是否过期
+      if expiration_time && Time.now.to_i > expiration_time
+        puts "令牌已过期，需要重新登录"
+        return false
+      end
+      
+      # 最后验证token是否有效
       uri = URI("https://www.pgyer.com/api/user/profile")
       request = Net::HTTP::Get.new(uri)
-      request['Authorization'] = "Bearer #{@access_token}"
+      request['Authorization'] = "Bearer #{token_to_check}"
       
       response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
         http.request(request)
@@ -111,118 +125,70 @@ module Pindo
     def login_pgyer_with_feishu(code: nil)
       return false unless code
       
-      uri = URI(@pgyer_api_endpoint)
-      request = Net::HTTP::Post.new(uri)
-      request['Content-Type'] = 'application/json'
-      
-      # 根据Pgyer的API要求构造请求体
-      request.body = {
+      # 构造请求体
+      body_params = {
         code: code,
         redirectUri: @redirect_uri,
         scope: @larkScopeList.join(' ')
-      }.to_json
+      }
       
-      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-        http.request(request)
-      end
+      puts "请求Pgyer API: #{@pgyer_api_endpoint}"
+      puts "请求参数: #{body_params.to_json}"
       
-      if response.code == '200'
-        begin
-          result = JSON.parse(response.body)
-          if !result['meta'].nil? && result['meta']['code'] == 200 && !result['data'].nil? && !result['data']['token'].nil?
-            @access_token = result['data']['token']
-            @username = result['data']['token']
-            @user_id = result['data']['user_id']
-
-            return true
-          else
-            puts "Pgyer登录失败: #{result['message'] || '未知错误'}"
-            return false
-          end
-        rescue JSON::ParserError
-          puts "解析Pgyer响应失败"
-          return false
-        end
-      else
-        puts "Pgyer登录请求失败: HTTP #{response.code}"
-        return false
-      end
-
-    end
-
-
-    # 加载存储的令牌
-    def load_token
-      return false unless File.exist?(@pgyer_token_file)
+      # 使用HttpClient发送请求
+      con = HttpClient.create_instance_with_proxy
       
       begin
-        encrypted_data = File.read(@pgyer_token_file)
-        json_data = aes_decrypt(encrypted_data, @pgyer_aes_key)
-        token_data = JSON.parse(json_data)
+        res = con.post do |req|
+          req.url @pgyer_api_endpoint
+          req.headers['Content-Type'] = 'application/json'
+          req.body = body_params.to_json
+        end
         
-        @access_token = token_data['token']
-        @user_info = token_data['user_info'] if token_data['user_info']
-        @token_expired_at = Time.at(token_data['expires_at']) if token_data['expires_at']
+        puts "API响应状态码: #{res.status}"
         
-        # 检查令牌是否过期
-        if @token_expired_at && Time.now >= @token_expired_at
-          puts "令牌已过期，需要重新授权"
+        # 处理响应
+        result = nil
+        if !res.body.nil?
+          begin
+            result = JSON.parse(res.body)
+            # puts "解析后的响应: #{result.inspect}"
+            
+            if result['code'] == 200 && !result['data'].nil? && !result['data']['token'].nil?
+              @access_token = result['data']['token']
+              @username = result['data']['username'] if result['data']['username']
+              # 设置token有效期为7天后
+              @expires_at = Time.now.to_i + 6 * 24 * 60 * 60  # 7天的秒数
+              return true
+            else
+              error_msg = result['meta'] && result['meta']['message'] ? result['meta']['message'] : '未知错误'
+              puts "Pgyer登录失败: #{error_msg}"
+              return false
+            end
+          rescue => e
+            puts "解析响应失败: #{e.message}"
+            puts "原始响应: #{res.body[0..200]}"
+            return false
+          end
+        else
+          puts "请求返回空响应"
           return false
         end
-        
-        return true
-      rescue => e
-        puts "加载令牌失败: #{e.message}"
-        return false
-      end
-    end
-
-    # 存储令牌
-    def store_token
-      return false unless @access_token
-      
-      token_data = {
-        'token' => @access_token,
-        'user_info' => @user_info,
-        'expires_at' => Time.now.to_i + 7*24*60*60  # 假设令牌有效期为7天
-      }
-      
-      encrypted_data = aes_encrypt(token_data.to_json, @pgyer_aes_key)
-      
-      begin
-        File.open(@pgyer_token_file, 'w') do |f|
-          f.write(encrypted_data)
-        end
-        puts "令牌已安全存储"
-        return true
       rescue => e
-        puts "存储令牌失败: #{e.message}"
+        puts "请求过程中出错: #{e.class} - #{e.message}"
         return false
       end
     end
 
     private
 
-    # AES加密
-    def aes_encrypt(data, key)
-      # 使用Pindo的AESHelper类进行真正的AES加密
-      AESHelper::aes_128_ecb_encrypt(key, data)
-    end
-
-    # AES解密
-    def aes_decrypt(encrypted_data, key)
-      # 使用Pindo的AESHelper类进行真正的AES解密
-      AESHelper::aes_128_ecb_decrypt(key, encrypted_data)
-    end
 
     # 构建授权URI
     def build_authorization_uri
       uri = URI(@feishu_auth_url)
 
-
-
       params = {
-        'app_id' => @client_id,
+        'client_id' => @client_id,
         'redirect_uri' => @redirect_uri,
         'response_type' => 'code',
         'state' => @state,
@@ -249,61 +215,194 @@ module Pindo
     # 启动本地服务器处理回调
     def start_callback_server
       code = nil
-      uri = URI(@redirect_uri)
+      
+      puts "启动本地服务器，监听端口8899..."
+      
+      # 使用本地8899端口处理回调，不管redirect_uri配置如何
       server = WEBrick::HTTPServer.new(
-        Port: uri.port,
+        Port: 8899,
         Logger: WEBrick::Log.new("/dev/null"),
         AccessLog: []
       )
 
-      path = uri.path.empty? ? '/' : uri.path
-      server.mount_proc path do |req, res|
-        query_params = URI.decode_www_form(req.query_string || '').to_h
-        
-        if query_params['state'] != @state
-          res.body = "状态不匹配，可能存在CSRF攻击风险"
-        elsif query_params['error']
-          res.body = "授权错误: #{query_params['error']}"
-        elsif query_params['code']
-          code = query_params['code']
-          res.body = <<-HTML
-          <!DOCTYPE html>
-          <html>
-          <head>
-            <title>飞书授权成功</title>
-            <style>
-              body { font-family: Arial, sans-serif; text-align: center; padding: 40px; }
-              .container { max-width: 600px; margin: 0 auto; }
-              .success { color: #4CAF50; }
-            </style>
-          </head>
-          <body>
-            <div class="container">
-              <h1 class="success">授权成功！</h1>
-              <p>飞书OAuth授权已完成，您现在可以关闭此窗口并返回命令行。</p>
-            </div>
-          </body>
-          </html>
-          HTML
-        else
-          res.body = "未获取到授权码"
-        end
+      # 处理根路径的请求
+      server.mount_proc '/' do |req, res|
+        begin
+          # puts "接收到请求: #{req.request_line}"
+          # puts "请求参数: #{req.query_string}"
+          
+          # 安全解析请求参数
+          begin
+            query_params = URI.decode_www_form(req.query_string || '').to_h
+            puts "解析的参数: #{query_params.inspect}"
+          rescue => e
+            puts "解析请求参数失败: #{e.message}"
+            query_params = {}
+          end
+          
+          # if query_params['state'] != @state
+          #   puts "状态不匹配: 接收到 #{query_params['state']}，期望 #{@state}"
+          #   res.content_type = "text/html; charset=UTF-8"
+          #   res.body = "状态不匹配，可能存在CSRF攻击风险"
+          # elsif query_params['error']
+          if query_params['error']
+            puts "授权错误: #{query_params['error']}"
+            res.content_type = "text/html; charset=UTF-8"
+            res.body = "授权错误: #{query_params['error']}"
+          elsif query_params['code']
+            code = query_params['code']
+            puts "成功获取授权码: #{code}"
+            res.content_type = "text/html; charset=UTF-8"
+            res.body = <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <head>
+              <meta charset="UTF-8">
+              <title>飞书授权成功</title>
+              <style>
+                body { font-family: Arial, sans-serif; text-align: center; padding: 40px; }
+                .container { max-width: 600px; margin: 0 auto; }
+                .success { color: #4CAF50; }
+                .code { font-family: monospace; background: #f5f5f5; padding: 10px; border-radius: 4px; word-break: break-all; }
+                .countdown { font-weight: bold; color: #FF5722; }
+                .autoclose-banner { 
+                  background-color: #333; color: white; padding: 10px; 
+                  position: fixed; top: 0; left: 0; right: 0;
+                  display: flex; justify-content: space-between; align-items: center;
+                }
+                .close-btn {
+                  background: #f44336; color: white; border: none;
+                  padding: 5px 10px; cursor: pointer; border-radius: 3px;
+                }
+              </style>
+              <script>
+                // 尝试多种方法关闭窗口
+                function attemptClose() {
+                  try {
+                    // 方法1: 最基本的关闭尝试
+                    window.close();
+                    
+                    // 方法2: 对于某些浏览器需要历史记录操作
+                    window.history.back();
+                    
+                    // 方法3: 空白页替换
+                    window.location.href = "about:blank";
+                    
+                    // 方法4: 尝试使用opener关系
+                    if (window.opener) {
+                      window.opener.focus();
+                      window.close();
+                    }
+                    
+                    // 如果以上方法都失败了，显示手动关闭提示
+                    setTimeout(function() {
+                      document.getElementById('close-message').style.display = 'block';
+                      document.getElementById('countdown-container').style.display = 'none';
+                    }, 1000);
+                  } catch (e) {
+                    console.error("关闭窗口失败:", e);
+                    document.getElementById('close-message').style.display = 'block';
+                    document.getElementById('countdown-container').style.display = 'none';
+                  }
+                }
+                
+                // 倒计时函数
+                var secondsLeft = 3;
+                function updateCountdown() {
+                  document.getElementById('countdown').innerText = secondsLeft;
+                  if (secondsLeft <= 0) {
+                    attemptClose();
+                  } else {
+                    secondsLeft -= 1;
+                    setTimeout(updateCountdown, 1000);
+                  }
+                }
+                
+                // 初始化
+                window.onload = function() {
+                  updateCountdown();
+                }
+              </script>
+            </head>
+            <body>
+              <div class="autoclose-banner">
+                <span>授权成功! 此窗口将自动关闭 (<span id="countdown" class="countdown">3</span>)</span>
+                <button class="close-btn" onclick="attemptClose()">立即关闭</button>
+              </div>
+              
+              <div class="container">
+                <h1 class="success">飞书授权成功！</h1>
+                <p>已获取授权码，正在返回命令行...</p>
+                
+                <div id="countdown-container">
+                  <p>此窗口将在 <span id="countdown-text" class="countdown">3</span> 秒后自动关闭</p>
+                </div>
+                
+                <div id="close-message" style="display: none;">
+                  <p>自动关闭失败，请手动关闭此窗口</p>
+                  <button class="close-btn" onclick="attemptClose()">尝试再次关闭</button>
+                </div>
+                
+                <p>授权码：</p>
+                <div class="code">#{code}</div>
+              </div>
+              
+              <script>
+                // 同步倒计时显示
+                document.getElementById('countdown-text').innerText = secondsLeft;
+              </script>
+            </body>
+            </html>
+            HTML
+          else
+            puts "未获取到授权码"
+            res.content_type = "text/html; charset=UTF-8"
+            res.body = "未获取到授权码"
+          end
 
-        server.shutdown
+          # 给用户更多时间看到页面内容，并让JavaScript倒计时完成
+          puts "4秒后关闭服务器..."
+          Thread.new do
+            sleep 4  # 设置为4秒，比JavaScript的3秒稍长一点，确保客户端有足够时间执行
+            server.shutdown
+          end
+        rescue => e
+          puts "处理请求时出错: #{e.class} - #{e.message}"
+          puts e.backtrace.join("\n")
+          
+          # 确保即使出错也返回有效的响应
+          res.content_type = "text/html; charset=UTF-8"
+          res.body = "处理请求时出错"
+          
+          # 出错时也关闭服务器
+          Thread.new do
+            sleep 4  # 与正常情况保持一致
+            server.shutdown
+          end
+        end
       end
-
+      
       # 捕获Ctrl+C以允许用户中断
       trap('INT') { server.shutdown }
       
-      # 在线程中运行服务器，最多等待2分钟
+      # puts "正在监听http://localhost:8899等待飞书重定向..."
+      # puts "您也可以手动访问: http://localhost:8899/?code=YOUR_CODE&state=terminal_login"
+      
+      # 在线程中运行服务器，最多等待3分钟
       thread = Thread.new { server.start }
       begin
-        thread.join(120) # 最多等待2分钟
+        thread.join(180) # 最多等待3分钟
       rescue Timeout::Error
         puts "授权超时"
         server.shutdown
       end
 
+      if code
+        puts "成功获取授权码: #{code}"
+      else
+        puts "未获取到授权码"
+      end
+
       code
     end
 

data/lib/pindo/client/pgyerclient.rb

@@ -1,9 +1,8 @@
-
 require 'uri'
 require 'pindo/base/aeshelper'
 require 'pindo/config/pindouserlocalconfig'
 require 'pindo/client/httpclient'
-
+require 'pindo/client/pgyer_feishu_oauth_cli'
 
 module Pindo
 
@@ -35,124 +34,44 @@ module Pindo
 
       end
 
-      def get_faraday_instance
-
-      end
-
-
       def do_login(force_login:false)
 
+        login_success = false
+        need_req_login = true
 
-
-          login_success = false
-          @token = load_token()
-          if !@token.nil? && !@token["token"].nil? && !force_login
-              login_success = true
-
-              # puts "用户#{@token["username"]}登录pgyer成功!!!"
-              # puts
-
-          else
-              username = nil
-              if !@token.nil? && !@token["username"].nil?
-                  username = @token["username"]
-                  checksum_password = nil
-                  if !@token["password"].nil?
-                    checksum_password = @token["password"]
-                  end
-              end
-              token = do_login_req(username:username, checksum_password:checksum_password)
-              if !token.nil? && !token["token"].nil?
-                  @token = token
-                  login_success = true
-              end
-          end
-
-          return login_success
-      end
-
-      def do_login_req(username:nil, checksum_password:nil)
-
-
-          login_name = username
-          if login_name.nil? || login_name.empty?
-              login_name = ask('请输入pgger网站的usernmae:') || nil
-          end
-
-          checksum_pass = checksum_password
-          if checksum_pass.nil? || checksum_pass.empty?
-              login_passwork = ask('请输入pgger网站的密码:') || nil
-              checksum_pass = Digest::MD5.hexdigest(login_passwork)
-          end
-
-        if !login_name.nil? && !login_name.empty? && !checksum_pass.nil? && !checksum_pass.empty?
-
+        if force_login
+            need_req_login = true
         else
-            raise Informative, "请输入正确的用户名和密码！"
-        end
-
-
-        Funlog.instance.fancyinfo_start("正在登录pgyer...")
-
-
-        result_data = do_send_code(username:login_name)
-
-
-          boss_url = @baseurl + @request_config["do_login"]
-          body_params = {
-              username:login_name,
-              phoneCode:result_data["msg"],
-              password:checksum_pass
-          }
-
-          # puts JSON.pretty_generate(body_params)
-
-          login_response_data = nil
-
-          begin
-
-        con = HttpClient.create_instance_with_proxy
-        res = con.post do |req|
-            req.url boss_url
-            req.headers['Content-Type'] = 'application/json'
-            req.body = body_params.to_json
+            @token = load_token()
+            if !@token.nil? && !@token["token"].nil? && !@token["username"].nil?
+                # 检查token是否已过期（超过7天）
+                if @token["expires_at"] && Time.now.to_i < @token["expires_at"]
+                    need_req_login = false
+                else
+                    Funlog.instance.fancyinfo_error("令牌已过期，需要重新登录...")
+                    login_success = true
+                end
+            else
+                need_req_login = true
+            end
         end
-
-        if !res.body.nil?
-
-            login_response_data = JSON.parse(res.body)
+        if need_req_login
+            login_handle = PgyerFeishuOAuthCLI.new("cli_a7db8213883ed00d")
+            result = login_handle.authorize
+            @token = {}
+            @token["token"] = login_handle.access_token
+            @token["username"] = login_handle.username
+            @token["expires_at"] = login_handle.expires_at
+            store_token(token:@token)
+            login_success = true
+        else
+            login_success = true
         end
 
-          rescue => error
-              Funlog.instance.fancyinfo_error("pgyer登录失败!")
-              puts "登录失败，请重试!!!"
-          end
-
-
-
-          # puts JSON.pretty_generate(login_response_data)
-
-          if !login_response_data.nil? && !login_response_data["code"].nil? && login_response_data["code"].to_s.eql?("200")
-
-              token = {}
-              token= login_response_data["data"]
-              token["password"] = checksum_pass
-              # puts JSON.pretty_generate(token)
-              store_token(token:token)
-
-              Funlog.instance.fancyinfo_success("用户:#{@token["username"]}登录pgyer成功!")
-
-          else
-              if File.exist?(@pgyer_token_file)
-                FileUtils.rm_rf(@pgyer_token_file)
-              end
-              Funlog.instance.fancyinfo_error("pgyer登录失败!")
-          end
-
-          return token
-
+        return login_success
       end
 
+
       def load_token()
 
           @token = nil
@@ -165,6 +84,12 @@ module Pindo
                 temp_token = data_string
                 temp_token = JSON.parse(data_string)
                 if !temp_token.nil? && !temp_token["token"].nil? && !temp_token["username"].nil?
+                    # 检查token是否已过期
+                    if temp_token["expires_at"] && Time.now.to_i > temp_token["expires_at"]
+                        Funlog.instance.fancyinfo_error("令牌已过期，需要重新登录...")
+                        return nil
+                    end
+                    
                     @token = temp_token
                     Funlog.instance.fancyinfo_success("读取pgyer token成功!")
                 end

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "5.0.6"
+  	VERSION = "5.0.7"
 
   	class VersionCheck
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.0.7
 platform: ruby
 authors:
 - wade