lhj-tools 0.1.73 → 0.1.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec999ed3fcb4f5fff34b2dc483b5932c77bfd34c59cee78dfcebd7ea1a10fc54
-  data.tar.gz: c0a438db4402ef344ddf83f3acd4f3bca228c9335aa8e8d240bab02ba4745269
+  metadata.gz: 7dc72ca4edb2bdcb5abd9ced2b89e97843bbd4393527e28be7b0c750d3f00be7
+  data.tar.gz: 88b0b3444ba3c78ce03bb2bdcb32eef0fa77ea23eec27f41225ea1a7df9a6aa1
 SHA512:
-  metadata.gz: 9201f7d556c51665acb83d63cbe4978eb6507d99d00b1da5ab92fa064557298242845fec4484d2cf327fc41a6bf1663c3648573627ecb3098338d5c591aa1d04
-  data.tar.gz: 217cc7ee797ee78ab6a074715bf346fc3e044779e2553a20a1b813a63239a3e72611d17e439477912415ba600325ed4f1d597446e213833c6146651419a22a67
+  metadata.gz: 27eb16b78e42d2ea284b68cf6678949367a489a15e9fb6961b8b0d3debe74e30daa76f96079416a7f00530c72c183b1ef842882e04bfb4ecbe4a1a974ba1e37a
+  data.tar.gz: 6426a55e2043d21cfcd35d49b05400db2485e6433982d98348db95ef98f3d6bbce210a020d509cc9a1efe1a7fdf843be857279bc0dc72f0e8eaba490a9772304

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,13 +69,13 @@ 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
         # 6.push to git
         push_to_git if @sync
         # 7.notify robot
-        notify_robot(file_map) if @notify
+        notify_robot(file_map, res_body, project_info) if @notify
       end
 
       def puts_h(str)
@@ -111,7 +117,7 @@ module Lhj
         File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count.positive?
         File.write(service_file, service_code) if service_code
         puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green
-        { h_file: h_file, m_file: m_file, s_file: service_file, api_id: api_id }
+        { h_file: h_file, m_file: m_file, s_file: service_file }
       end
 
       def push_to_git
@@ -121,15 +127,23 @@ module Lhj
         Actions.sh('git push')
       end
 
-      def notify_robot(template_vars)
+      def notify_robot(file_info, interface_info, project_info)
+        temp_vars = file_info.merge({
+                                      api_id: api_id,
+                                      interface_url: "#{project_info['data']['basepath']}#{interface_info['data']['path']}"
+                                    })
         robot_url = 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
         template = Lhj::ErbTemplateHelper.load('oc_code_notify')
-        output = Lhj::ErbTemplateHelper.render(template, template_vars, '-')
+        output = Lhj::ErbTemplateHelper.render(template, temp_vars, '-')
         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
@@ -141,7 +155,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']
@@ -169,8 +183,8 @@ module Lhj
         @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|
@@ -182,6 +196,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
@@ -401,7 +426,7 @@ 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']
@@ -421,7 +446,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.73"
+    VERSION = "0.1.75"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.73
+  version: 0.1.75
 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