jpsclient 2.2.0 → 2.3.0

data/lib/jpsclient/api/archived_outdated/survey_category.rb

@@ -15,16 +15,7 @@ module JPSClient
         path = config["url"]
         path = path.gsub("{categoryId}", categoryId.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
 
       # Create Survey Category
@@ -37,16 +28,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 Weights
@@ -59,16 +41,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 Survey Categories
@@ -81,16 +54,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
     end
   end

data/lib/jpsclient/api/archived_outdated/tool_category.rb

@@ -15,16 +15,7 @@ module JPSClient
         path = config["url"]
         path = path.gsub("{categoryId}", categoryId.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 Tool Category
@@ -38,16 +29,7 @@ module JPSClient
         path = config["url"]
         path = path.gsub("{categoryId}", categoryId.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 Tool Category
@@ -60,16 +42,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 Weights
@@ -82,16 +55,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 Tool Categories
@@ -104,16 +68,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/bug.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
 
       # Get List
@@ -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
 
       # Create Delete
@@ -58,16 +40,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 Create
@@ -80,16 +53,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 Fields
@@ -102,16 +66,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 Detail
@@ -124,16 +79,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/category.rb

@@ -16,16 +16,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
 
       # 获取分类树形结构
@@ -40,16 +31,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
 
       # 创建分类
@@ -79,16 +61,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
 
       # 更新分类
@@ -110,16 +83,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
 
       # 删除分类
@@ -135,16 +99,7 @@ module JPSClient
         # POST请求，ID作为body参数
         params = { id: id }
 
-        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
 
       # 分类排序
@@ -175,16 +130,7 @@ module JPSClient
         path = config["url"]
         params = { items: items }
 
-        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
 
       # 按类型获取分类列表（便捷方法）

data/lib/jpsclient/api/cert.rb

@@ -11,18 +11,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path)
-        result = JPSClient::Response.new(response)
-
-        # 处理 401 错误，自动重新登录
-        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/collect.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
 
       # Delete Collect
@@ -36,16 +27,7 @@ module JPSClient
 
         path = config["url"]
 
-        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
     end
   end

data/lib/jpsclient/api/collection.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 Update
@@ -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 List
@@ -58,16 +40,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 Detail
@@ -80,16 +53,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 Delete
@@ -102,16 +66,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 Create
@@ -124,16 +79,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 Bind
@@ -146,16 +92,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
     end
   end

data/lib/jpsclient/api/commit_log.rb

@@ -24,16 +24,7 @@ module JPSClient
         body_params[:description] = params[:description] if params.key?(:description)
         body_params[:fileUrls] = params[:fileUrls] if params[:fileUrls]
 
-        response = @http_client.post(path, body: body_params)
-        result = JPSClient::Response.new(response)
-
-        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
 
       # 发送提交记录消息通知
@@ -68,17 +59,7 @@ module JPSClient
         body_params[:endTimestamp] = params[:endTimestamp] if params[:endTimestamp]
         body_params[:indexNo] = params[:indexNo] if params[: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
 
       # 获取提交记录简要信息
@@ -94,16 +75,7 @@ module JPSClient
           commitId: commitId
         }
 
-        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
 
       # 预览提交记录
@@ -125,16 +97,7 @@ module JPSClient
 
         get_params[:onlyCliff] = params[:onlyCliff] if params.key?(:onlyCliff)
 
-        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
 
       # 获取提交记录列表
@@ -175,17 +138,7 @@ 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)
-
-        # 处理 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

data/lib/jpsclient/api/creative.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
 
       # Get Top Publishers
@@ -36,16 +27,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