jpsclient 2.2.0 → 2.3.0

data/lib/jpsclient/api/login.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Create Lark Login
@@ -36,16 +27,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get Swagger Lark Login
@@ -58,16 +40,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # Get Get User By Uuid
@@ -80,16 +53,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/m3u8.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/menu.rb

@@ -15,16 +15,7 @@ module JPSClient
         path = config["url"]
         path = path.gsub("{menuId}", menuId.to_s)
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # Update Menu
@@ -38,16 +29,7 @@ module JPSClient
         path = config["url"]
         path = path.gsub("{menuId}", menuId.to_s)
 
-        response = @http_client.put(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.put(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:put, path, body: params)
       end
 
       # Delete Menu
@@ -61,16 +43,7 @@ module JPSClient
         path = config["url"]
         path = path.gsub("{menuId}", menuId.to_s)
 
-        response = @http_client.delete(path)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.delete(path)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:delete, path)
       end
 
       # Create Menu
@@ -83,16 +56,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get Menus
@@ -105,16 +69,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # Get Role
@@ -127,16 +82,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/modular_client.rb

@@ -87,7 +87,7 @@ module JPSClient
         @token_manager = Token.new(@jps_config)
 
         # 尝试加载已保存的 token
-        if @token_manager.load && @token_manager.valid?
+        if @token_manager.load && @token_manager.loaded?
           @token = @token_manager.to_h
         end
 
@@ -171,50 +171,50 @@ module JPSClient
     end
 
     # 核心登录功能
+    # token 有效性由服务端 401 响应判断，本地不做过期检查
     def do_login(force_login: false)
-      # 使用 token 管理器统一处理
       if force_login
-        # 强制重新登录
-        @token_manager.clear  # 清除旧 token
-        auth = Auth.new(@jps_config)
-        result = auth.login
-
-        if result == :user_cancelled
-          Logger.instance.fancyinfo_error("用户取消了登录操作")
-          return false
-        elsif result == true
-          # 保存新 token
-          @token_manager.save(auth.access_token, auth.username, auth.expires_at)
-          update_token_everywhere()
+        @token_manager.clear
+      else
+        # 本地存在 token，直接使用
+        if @token_manager.load && @token_manager.loaded?
+          update_token_everywhere
           return true
-        else
-          Logger.instance.fancyinfo_error("登录失败，未能获取有效token")
-          return false
         end
+      end
+
+      # 需要重新登录
+      auth = Auth.new(@jps_config)
+      result = auth.login
+
+      if result == :user_cancelled
+        Logger.instance.fancyinfo_error("用户取消了登录操作")
+        return false
+      elsif result == true
+        unless @token_manager.save(auth.get_token_data)
+          Logger.instance.fancyinfo_error("Token 保存失败，下次启动需要重新登录")
+        end
+        update_token_everywhere
+        return true
       else
-        # 尝试加载并验证现有 token
-        if @token_manager.load && @token_manager.valid?
-          update_token_everywhere()
-          return true
-        else
-          # Token 无效或不存在，需要重新登录
-          auth = Auth.new(@jps_config)
-          result = auth.login
-
-          if result == :user_cancelled
-            Logger.instance.fancyinfo_error("用户取消了登录操作")
-            return false
-          elsif result == true
-            # 保存新 token
-            @token_manager.save(auth.access_token, auth.username, auth.expires_at)
-            update_token_everywhere()
-            return true
-          else
-            Logger.instance.fancyinfo_error("登录失败，未能获取有效token")
-            return false
-          end
+        Logger.instance.fancyinfo_error("登录失败，未能获取有效token")
+        return false
+      end
+    end
+
+    # 带 401 重试的统一请求方法
+    def request_with_auth(method, path, **opts)
+      response = @http_client.send(method, path, **opts)
+      result = JPSClient::Response.new(response)
+
+      if result.need_login?
+        if do_login(force_login: true)
+          response = @http_client.send(method, path, **opts)
+          result = JPSClient::Response.new(response)
         end
       end
+
+      result.to_h
     end
 
     private

data/lib/jpsclient/api/nuget.rb

@@ -13,16 +13,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path)
       end
 
     end

data/lib/jpsclient/api/permission.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # 获取权限详情
@@ -37,16 +28,7 @@ module JPSClient
         path = config["url"]
         params = { id: id }
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # 创建权限
@@ -67,16 +49,7 @@ module JPSClient
         }
         body[:description] = description if description
 
-        response = @http_client.post(path, body: body)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: body)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body)
       end
 
       # 更新权限
@@ -97,16 +70,7 @@ module JPSClient
         body[:code] = code if code
         body[:description] = description if description
 
-        response = @http_client.post(path, body: body)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: body)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body)
       end
 
       # 删除权限
@@ -120,16 +84,7 @@ module JPSClient
         path = config["url"]
         body = { id: id }
 
-        response = @http_client.post(path, body: body)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: body)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body)
       end
 
     end

data/lib/jpsclient/api/project.rb

@@ -19,19 +19,8 @@ module JPSClient
 
         params.each { |key,value| get_params[key] = value } if params
 
-        response = @http_client.get(path, params: get_params)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.get(path, params: get_params)
-          result = JPSClient::Response.new(response)
-        end
-
         # 处理响应数据格式
-        response_data = result.to_h
+        response_data = request_with_auth(:get, path, params: get_params)
         if response_data && response_data['data'] && response_data['data']['projects']
           # 新的API格式：返回 projects 数组
           response_data['data'] = response_data['data']['projects']
@@ -52,16 +41,7 @@ module JPSClient
         get_params = { projectId: project_id }
         get_params[:projectName] = project_name if project_name
 
-        response = @http_client.get(path, params: get_params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: get_params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: get_params)
       end
 
     end

data/lib/jpsclient/api/project_package.rb

@@ -45,18 +45,7 @@ module JPSClient
         # 移除值为nil的键
         body_params.compact!
 
-        response = @http_client.post(path, body: body_params, timeout: timeout)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.post(path, body: body_params, timeout: timeout)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body_params, timeout: timeout)
       end
 
       # 上传 NuGet 包
@@ -110,39 +99,7 @@ module JPSClient
           end
         end
 
-        response = @http_client.post(path, body: body_params)
-
-        if ENV['PINDO_DEBUG']
-          puts "[DEBUG]upload_nuget_package  HTTP 响应:"
-          puts "[DEBUG]upload_nuget_package    状态码: #{response.code}" if response.respond_to?(:code)
-          puts "[DEBUG]upload_nuget_package    响应体: #{response.body}" if response.respond_to?(:body)
-        end
-
-        result = JPSClient::Response.new(response)
-
-        if ENV['PINDO_DEBUG']
-          puts "[DEBUG]upload_nuget_package 解析后的结果:"
-          puts "[DEBUG]upload_nuget_package   #{result.to_h.inspect}"
-        end
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          puts "[DEBUG]upload_nuget_package 需要重新登录，执行自动登录..." if ENV['PINDO_DEBUG']
-          do_login(force_login: true)
-          # 重试请求
-          puts "[DEBUG]upload_nuget_package 重新发送请求..." if ENV['PINDO_DEBUG']
-          response = @http_client.post(path, body: body_params)
-
-          if ENV['PINDO_DEBUG']
-            puts "[DEBUG]upload_nuget_package 重试后的响应:"
-            puts "[DEBUG]upload_nuget_package   状态码: #{response.code}" if response.respond_to?(:code)
-            puts "[DEBUG]upload_nuget_package   响应体: #{response.body}" if response.respond_to?(:body)
-          end
-
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body_params)
       end
 
       # 获取项目包列表
@@ -176,11 +133,8 @@ module JPSClient
         get_params[:startTimestamp] = params[:startTimestamp] if params[:startTimestamp]
         get_params[:endTimestamp] = params[:endTimestamp] if params[:endTimestamp]
 
-        response = @http_client.get(path, params: get_params)
-        result = JPSClient::Response.new(response)
-
         # 处理响应数据格式
-        response_data = result.to_h
+        response_data = request_with_auth(:get, path, params: get_params)
         if response_data && response_data['data'] && response_data['data']['packages']
           # 新的API格式：返回 packages 数组
           response_data['data'] = response_data['data']['packages']
@@ -200,18 +154,7 @@ module JPSClient
         description: description
         }.compact # 移除nil值
 
-        response = @http_client.post(path, body: body_params)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.post(path, body: body_params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body_params)
       end
 
       # 签名项目包
@@ -225,18 +168,7 @@ module JPSClient
         certId: certId
         }
 
-        response = @http_client.post(path, body: body_params)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.post(path, body: body_params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body_params)
       end
 
       # 发送项目包消息
@@ -255,18 +187,7 @@ module JPSClient
         # 添加可选参数
         body_params[:indexNo] = indexNo if indexNo
 
-        response = @http_client.post(path, body: body_params)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.post(path, body: body_params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body_params)
       end
 
       # 绑定提交记录到项目包
@@ -280,18 +201,7 @@ module JPSClient
         projectPackageIds: projectPackageIds
         }
 
-        response = @http_client.post(path, body: body_params)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.post(path, body: body_params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: body_params)
       end
 
       # 预览项目包
@@ -309,18 +219,7 @@ module JPSClient
         projectId: params[:projectId]
         }.compact # 移除nil值
 
-        response = @http_client.get(path, params: get_params)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.get(path, params: get_params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: get_params)
       end
 
       # 获取项目包绑定列表
@@ -333,18 +232,7 @@ module JPSClient
         projectId: projectId
         }
 
-        response = @http_client.get(path, params: get_params)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        if result.need_login?
-          do_login(force_login: true)
-          # 重试请求
-          response = @http_client.get(path, params: get_params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: get_params)
       end
 
     end