lhj-tools 0.1.72 → 0.1.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1414ebd1811cbc9f773ed21506171acd5aa5399a5b9a9d3a74634ff8ef93e882
-  data.tar.gz: e0b5c1dab6b128c8e8a8518f8b38c4d0e3c3b4de8cd4c61746591fc602878c5d
+  metadata.gz: f86764f14d88348e59221a4e339765a6ec4488a815d179a710d15e7c415471a1
+  data.tar.gz: 9f5635a3e149ce527aea1c298fa7a39316c446e75aaed941d23c6010ce0896de
 SHA512:
-  metadata.gz: d0c41abe42ed5812635dc7c9a235efb9c2bce06054aba7c977ab82f7693d04e38151e91f68b8e78f22efb1d7d69ba502cca7c5024a74ca1f3364e089d4e1cf0d
-  data.tar.gz: 989dd03e74941a8b10623179c785367db74d8b615bac7e84d564718c0cacffb5b545ceb8d565a63687c440153e5a5493c0f8e6e1821b19e959f97da0b1f8f65e
+  metadata.gz: 144bfb6d35d9190b81ed1715dd518c2b707971815a3412f279f673faffb4c6dd36768c05c86da1249d9eed7328620a0588fe62a3753b249fd9fd8625726bb0d3
+  data.tar.gz: 6d875c726247374420c5b2856614283a817078e073517a3dc5849b7a9258567eefffc9df76f3d54ec58836f647ef922ea6169c5fe9211d53630ab39a2fe78570

data/lib/lhj/command/yapi.rb

@@ -13,6 +13,9 @@ module Lhj
       self.summary = '通过yapi接口生成请求'
       self.description = '执行`lhj api`生成接口模型'
 
+      API_INTERFACE_URL = 'api/interface/get?id='.freeze
+      API_PROJECT_URL = 'api/project/get?id='.freeze
+
       def self.options
         [
           %w[--id api的id],
@@ -39,7 +42,7 @@ module Lhj
         @config_model_name = 'Result'
         @model_default_suffix = 'Model'
         @type_trans = {}
-        @http_url = ''
+        @base_url = 'http://yapi.xx.com'
         super
       end
 
@@ -49,13 +52,16 @@ module Lhj
 
       def process(config_file)
         load_config(config_file)
-        res_body = req_api_model
+        res_body = get_interface_api_model
         unless res_body['errcode'].to_i.zero?
           puts '请执行 lhj yapi-init 初始化配置'.red
           return
         end
         return unless res_body && !res_body.empty?
 
+        # get project info
+        project_id = res_body['data']['project_id']
+        project_info = get_project_info(project_id)
         # 1.print request result
         result_model_name = print_res_body_model(res_body)
         # 2.print request json body
@@ -63,10 +69,9 @@ module Lhj
         # 3.print request param
         print_req_query(res_body['data'])
         # 4.print request method
-        service_code = print_http_method(res_body['data'], result_model_name, param_model_name)
+        service_code = print_http_method(res_body['data'], project_info, result_model_name, param_model_name)
         # 5.save to file
         file_map = save_to_file(service_code) if @save
-        puts file_map
         # 6.push to git
         push_to_git if @sync
         # 7.notify robot
@@ -101,7 +106,7 @@ module Lhj
 
       def save_to_file(service_code)
         name = model_name
-        file_name = gen_model_name('')
+        file_name = gen_model_name
         unless File.exist?(File.expand_path(sub_folder_name, '.'))
           FileUtils.mkdir_p(File.expand_path(sub_folder_name, '.'))
         end
@@ -129,8 +134,12 @@ module Lhj
         Lhj::Dingtalk.post_message_robot(robot_url, '生成代码', output)
       end
 
-      def url_str
-        "#{@http_url}#{api_id}"
+      def interface_url_str
+        "#{@base_url}/#{API_INTERFACE_URL}#{api_id}"
+      end
+
+      def project_url_str(project_id)
+        "#{@base_url}/#{API_PROJECT_URL}#{project_id}"
       end
 
       def yml_file
@@ -142,7 +151,7 @@ module Lhj
         config.each do |k, v|
           @http_headers << "#{k}=#{v}" if k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid')
         end
-        @http_url = config['url']
+        @base_url = config['base_url']
         @config_id = config['id']
         @config_model_pre = config['model_pre']
         @config_model_suffix = config['model_suffix']
@@ -162,12 +171,16 @@ module Lhj
         @model_result_name || @config_model_name
       end
 
+      def req_model_name
+        'Param'
+      end
+
       def model_suffix
         @config_model_suffix || @model_default_suffix
       end
 
-      def req_api_model
-        uri = URI.parse(url_str)
+      def get_interface_api_model
+        uri = URI.parse(interface_url_str)
         req = Net::HTTP::Get.new(uri)
         req['Cookie'] = @http_headers.join('; ')
         res = Net::HTTP.start(uri.hostname, uri.port) do |http|
@@ -179,6 +192,17 @@ module Lhj
         res_json
       end
 
+      def get_project_info(project_id)
+        url = project_url_str(project_id)
+        uri = URI.parse(url)
+        req = Net::HTTP::Get.new(uri)
+        req['Cookie'] = @http_headers.join('; ')
+        res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+          http.request(req)
+        end
+        JSON.parse(res.body)
+      end
+
       def print_res_body_model(res_json)
         res_body = fetch_res_boy(res_json)
         return unless res_body
@@ -228,7 +252,7 @@ module Lhj
         result = res_body['properties']['detailMsg']
         return unless result['type'] == 'object' || result['type'] == 'array'
 
-        result['name'] = gen_model_name('')
+        result['name'] = gen_model_name
         result
       end
 
@@ -236,14 +260,18 @@ module Lhj
         return if !res_json || !res_json['data'] || !res_json['data']['req_body_other']
 
         result = JSON.parse(res_json['data']['req_body_other'])
-        result['name'] = gen_model_name('')
+        result['name'] = gen_model_name(nil, :req)
         result
       end
 
-      def gen_model_name(name)
-        n = name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { Regexp.last_match(0).upcase }
-        n = model_name if n.length <= 0
-        "#{model_pre}#{n}#{model_suffix}"
+      def gen_model_name(property_name = nil, type = :res)
+        name = model_name
+        name = req_model_name if type == :req
+        unless property_name.nil?
+          name = property_name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { Regexp.last_match(0).upcase }
+          name = property_name.gsub(/^\w/) { Regexp.last_match(0).upcase } if name.length <= 0
+        end
+        "#{model_pre}#{name}#{model_suffix}"
       end
 
       def handle_model(model, &block)
@@ -394,11 +422,13 @@ module Lhj
         end
       end
 
-      def print_http_method(data, result_model_name, param_model_name)
+      def print_http_method(data, project_info, result_model_name, param_model_name)
         return unless data
 
         path = data['path']
-        path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('') if path
+        if path
+          path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('')
+        end
         path_key = "k#{path_name}URL"
         mth = data['method']
         mth = 'JSON' if data['req_body_is_json_schema']
@@ -412,7 +442,7 @@ module Lhj
           yapi_vars = { title: data['title'],
                         desc: data['desc'],
                         username: data['username'],
-                        path: path,
+                        path: "#{project_info['data']['basepath']}#{path}",
                         path_key: path_key,
                         path_name: path_name,
                         result_model_name: result_model_name,

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.72"
+    VERSION = "0.1.74"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.72
+  version: 0.1.74
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2022-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj