lhj-tools 0.2.30 → 0.2.32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/lhj/command/jenkins/jenkins_build.rb +16 -10
- data/lib/lhj/helper/yapi/yapi_helper.rb +36 -14
- data/lib/lhj/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 23e4b1ca63b9edadde731a0fba99ad2815029e3a65fca292d80d5ded572f0cca
|
4
|
+
data.tar.gz: 01606d47b8191a85c0cd44b9ec15fa069fa0936da3287325abb72ebf90370ac6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c11804e3e40eb39886babf9347106e959d0bf1366f4f89ab0c62174b844fd7e38656f954c658402944a01e110e14506a9cda195952a6e61e144e313ed78f0038
|
7
|
+
data.tar.gz: aff83c9066ee3975ad45d7ccfa29db7f5cc7bfbe09f8481dd07c5d9d477d67ba2b4e965919935c6f6457e20e9b02af1dfa03637b6318ffc4f501164b1e7442c5
|
@@ -46,16 +46,22 @@ module Lhj
|
|
46
46
|
end
|
47
47
|
|
48
48
|
def handle
|
49
|
-
file = File.join(Lhj::Config.instance.home_dir, 'all_device.txt')
|
50
|
-
File.open(file, 'r+') do |f|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
end
|
49
|
+
# file = File.join(Lhj::Config.instance.home_dir, 'all_device.txt')
|
50
|
+
# File.open(file, 'r+') do |f|
|
51
|
+
# f.each_line do |line|
|
52
|
+
# ma = line.match(/(?<device>[^\s]*)(\s*)(?<name>.*)/)
|
53
|
+
# device = ma[:device]
|
54
|
+
# name = ma[:name].gsub(/(\S*)\s(\S*)\s(.*)/, '\\1-\\2-\\3')
|
55
|
+
# name = name.gsub(/\s/, '')
|
56
|
+
# add_device(device, name)
|
57
|
+
# end
|
58
|
+
# end
|
59
|
+
#
|
60
|
+
api = Lhj::YapiHelper.new(project_id: 694, interface_id: 71426, model_name: 'Result', model_pre: 'ML', language: :java)
|
61
|
+
api_result = api.process
|
62
|
+
ss = api_result.reject { |k, v| v.nil? }
|
63
|
+
# //.map { |key, v| { "#{key}": "```sss #{v}```" } }
|
64
|
+
puts ss
|
59
65
|
|
60
66
|
# api = Lhj::YapiHelper.new(project_id: 694, interface_id: 70595, model_name: 'Order', model_pre: 'AA')
|
61
67
|
# api.process
|
@@ -49,6 +49,19 @@ module Lhj
|
|
49
49
|
print_http_method(res_body['data'], project_info)
|
50
50
|
# print request mock data
|
51
51
|
print_mock_request_data(req_models) if !req_models.nil? && !req_models.empty?
|
52
|
+
model_result
|
53
|
+
end
|
54
|
+
|
55
|
+
def model_result
|
56
|
+
interface_content = @h_file_array.join("\n") if @h_file_array
|
57
|
+
implement_content = @m_file_array.join("\n") if @m_file_array
|
58
|
+
mock_content = @req_mock_array.join("\n") if @req_mock_array
|
59
|
+
{
|
60
|
+
interface: interface_content,
|
61
|
+
implement: implement_content,
|
62
|
+
service: @service_content,
|
63
|
+
mock: mock_content
|
64
|
+
}.reject { |k, v| v.nil? }
|
52
65
|
end
|
53
66
|
|
54
67
|
def save_to_file
|
@@ -99,9 +112,13 @@ module Lhj
|
|
99
112
|
end
|
100
113
|
|
101
114
|
def puts_mock(str)
|
102
|
-
|
103
|
-
|
104
|
-
|
115
|
+
case language
|
116
|
+
when :oc
|
117
|
+
puts str.green
|
118
|
+
@req_mock_array ||= []
|
119
|
+
@req_mock_array << str
|
120
|
+
when :java
|
121
|
+
end
|
105
122
|
end
|
106
123
|
|
107
124
|
def sub_folder_name
|
@@ -339,23 +356,23 @@ module Lhj
|
|
339
356
|
default = m[:default]
|
340
357
|
case type
|
341
358
|
when 'integer'
|
342
|
-
puts_h "int #{key};//#{des} #{default}"
|
359
|
+
puts_h " int #{key};//#{des} #{default}"
|
343
360
|
when 'string'
|
344
|
-
puts_h "String #{key};//#{des} #{default}"
|
361
|
+
puts_h " String #{key};//#{des} #{default}"
|
345
362
|
when 'number'
|
346
|
-
puts_h "double #{key};//#{des} #{default}"
|
363
|
+
puts_h " double #{key};//#{des} #{default}"
|
347
364
|
when 'float'
|
348
|
-
puts_h "double #{key};//#{des} #{default}"
|
365
|
+
puts_h " double #{key};//#{des} #{default}"
|
349
366
|
when 'double'
|
350
|
-
puts_h "double #{key};//#{des} #{default}"
|
367
|
+
puts_h " double #{key};//#{des} #{default}"
|
351
368
|
when 'boolean'
|
352
|
-
puts_h "boolean #{key};//#{des} #{default}"
|
369
|
+
puts_h " boolean #{key};//#{des} #{default}"
|
353
370
|
when 'object'
|
354
|
-
puts_h "#{type_name} #{key};//#{des} #{default}"
|
371
|
+
puts_h " #{type_name} #{key};//#{des} #{default}"
|
355
372
|
when 'array'
|
356
|
-
puts_h "#{type_name}[] #{key};//#{des} #{default}"
|
373
|
+
puts_h " #{type_name}[] #{key};//#{des} #{default}"
|
357
374
|
else
|
358
|
-
puts_h "String #{key};//#{des} #{default}"
|
375
|
+
puts_h " String #{key};//#{des} #{default}"
|
359
376
|
end
|
360
377
|
end
|
361
378
|
|
@@ -371,8 +388,13 @@ module Lhj
|
|
371
388
|
req_model = { name: param_model_name, properties: properties }
|
372
389
|
|
373
390
|
models = [req_model]
|
374
|
-
|
375
|
-
|
391
|
+
case language
|
392
|
+
when :oc
|
393
|
+
print_models(models)
|
394
|
+
print_models_impl(models)
|
395
|
+
when :java
|
396
|
+
print_models_for_java(models)
|
397
|
+
end
|
376
398
|
models
|
377
399
|
end
|
378
400
|
|
data/lib/lhj/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lhj-tools
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.32
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- lihaijian
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-03-
|
11
|
+
date: 2023-03-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: xcodeproj
|