lhj-tools 0.2.25 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1172af22907b68257770cdd7996d7dc8f90500e6427b9fde02e5ac59f451a3e
-  data.tar.gz: 1a9ed45b72d8542823a406f59b508788ac347911a5b1d4b687faad1a74dde193
+  metadata.gz: 0cd0cf9fa51bf5e5ec87fbca804a09979f31353bc6c85e7b39bd53135a92c503
+  data.tar.gz: d1bded3032e77cd2fa59f83c47743079c986c4110816352206dec3348c9b28a9
 SHA512:
-  metadata.gz: 3d3c41fc6ae30f4536d83d89630107c0d2cc4fa8f597895a231d827ebc2d63205141f3a1737db0a60bba28a007263af510190267041d4a2442056b77db5ada16
-  data.tar.gz: 16bd226cda26f4b469015dfb7fcdedbcb28a86f044543ba072e9fe0f8fe9fd3347d4371631c8b54e5de51955a6a46dc960a3f595d264a95daa540bea0d6fae20
+  metadata.gz: 1718fdbdf8e3582362c6dfc82b77af13ae8159301312c99fc65ea7b26a6c50e64c7466722899f65c3198513fb8362bcc7970d8a68ca61ecf41ae7232d157c4e0
+  data.tar.gz: 8ffdc538278b52a894e32e4352981e2692cbefda23c2c0430078e7e5b23189cb357de5e3cc6522caf478e751d7a156023edfb6c56504cc4d479002b83ec98a2c

data/lib/lhj/command/jenkins/jenkins_build.rb

@@ -1,4 +1,5 @@
 require 'jenkins_api_client'
+require 'nokogiri'
 
 module Lhj
   class Command
@@ -30,27 +31,22 @@ module Lhj
       end
 
       def handle
-        job_name = '更新分支功能描述'
+        job_name = 'aom_uat_haijian'
+        # job_name = 'aom_uat_haijian'
         server_ip = Lhj::JenkinsConfig.server_ip
         server_port = Lhj::JenkinsConfig.server_port
         username = Lhj::JenkinsConfig.username
         password = Lhj::JenkinsConfig.password
         client = JenkinsApi::Client.new(server_ip: server_ip, server_port: server_port, username: username, password: password)
 
-        # puts client.job.get_config(job_name)
-
-        update_job(job_name, :string, 'AA', '这是一个测试', 'WWWW描述')
+        client.job.list_all.each do |a|
+          add_property(client, a, 'WEBHOOK', 'https://oapi.dingtalk.com/robot/sendBySession?session=bd640dea6cd28b6c880c4f3cc0945c8f', 'Webhook url')
+        end
+        # puts client.job.get_config('aomi_uat')
+        #
       end
 
-      def update_job(job_name, param_type, param_key, param_value, param_desc)
-        server_ip = Lhj::JenkinsConfig.server_ip
-        server_port = Lhj::JenkinsConfig.server_port
-        username = Lhj::JenkinsConfig.username
-        password = Lhj::JenkinsConfig.password
-        client = JenkinsApi::Client.new(server_ip: server_ip, server_port: server_port, username: username, password: password)
-
-        property_arr = client.job.get_build_params(job_name)
-        puts property_arr
+      def update_job(client, job_name, param_key, param_value, param_desc)
         xml = client.job.get_config(job_name)
         n_xml = Nokogiri::XML(xml)
         params = n_xml.xpath('//parameterDefinitions').first
@@ -68,6 +64,30 @@ module Lhj
         client.job.post_config(job_name, xml_modified)
       end
 
+      def add_property(client, job_name, param_key, param_value, param_desc)
+        xml = client.job.get_config(job_name)
+        n_xml = Nokogiri::XML(xml)
+        params = n_xml.xpath('//parameterDefinitions').first
+        return if params
+
+        pro = n_xml.xpath('//properties').first
+        c_xml = <<~DESC
+          <hudson.model.ParametersDefinitionProperty>
+              <parameterDefinitions>
+                <hudson.model.StringParameterDefinition>
+                  <name>WEBHOOK</name>
+                  <description>webhook url</description>
+                  <defaultValue>https://oapi.dingtalk.com/robot/sendBySession?session=cd8539f8472e2f5d39a6beef94ffc569</defaultValue>
+                  <trim>true</trim>
+                </hudson.model.StringParameterDefinition>
+              </parameterDefinitions>
+            </hudson.model.ParametersDefinitionProperty>
+        DESC
+        pro.add_child(c_xml)
+        xml_modified = n_xml.to_xml
+        client.job.post_config(job_name, xml_modified)
+      end
+
       def create_tester(email, id)
         names = email.split('@') if email =~ /@/
         first_name = names[1] if names && names.length > 1

data/lib/lhj/command/yapi.rb

@@ -30,6 +30,7 @@ module Lhj
         @id = argv.option('id')
         @model_pre_name = argv.option('model-pre')
         @model_result_name = argv.option('model-name')
+        @webhook = argv.option('webhook')
         @language = argv.option('lan', 'oc')
         @save = argv.flag?('save', false)
         @sync = argv.flag?('sync', false)
@@ -241,7 +242,7 @@ module Lhj
       end
 
       def robot_url
-        @config_robot_url || 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+        @webhook || @config_robot_url || 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
       end
 
       def property_mapper

data/lib/lhj/helper/dingtalk_helper.rb

@@ -10,11 +10,21 @@ module Lhj
       post_message_robot(robot_url, title, message)
     end
 
+    def self.post_message_at_users(title, message, users)
+      robot_url = Lhj::DingTalkConfig.dingtalk_robot
+      post_message_robot_at_users(robot_url, title, message, users)
+    end
+
     def self.post_text_message(message)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
       post_text_message_robot(robot_url, message)
     end
 
+    def self.post_text_message_at_users(message, users)
+      robot_url = Lhj::DingTalkConfig.dingtalk_robot
+      post_text_message_robot_at_users(robot_url, message, users)
+    end
+
     def self.post_card_message(title, message, btns)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
       post_card_message_robot(robot_url, title, message, btns)
@@ -30,11 +40,21 @@ module Lhj
       http_post(robot_url, http_body)
     end
 
+    def self.post_message_robot_at_users(robot_url, title, message, users)
+      http_body = markdown_body_message_users(title, message, users)
+      http_post(robot_url, http_body)
+    end
+
     def self.post_text_message_robot(robot_url, message)
       http_body = text_body_message(message)
       http_post(robot_url, http_body)
     end
 
+    def self.post_text_message_robot_at_users(robot_url, message, users)
+      http_body = text_body_message_users(message, users)
+      http_post(robot_url, http_body)
+    end
+
     def self.post_card_message_robot(robot_url, title, message, btns)
       http_body = action_card_body_message(title, message, btns, :vertical)
       http_post(robot_url, http_body)
@@ -61,6 +81,14 @@ module Lhj
       }.to_json
     end
 
+    def self.text_body_message_users(message, users)
+      {
+        'at' => { 'atUserIds' => users, 'isAtAll' => false },
+        'msgtype' => 'text',
+        'text' => { 'content' => message }
+      }.to_json
+    end
+
     def self.markdown_body_message(title, message)
       {
         'msgtype' => 'markdown',
@@ -68,6 +96,14 @@ module Lhj
       }.to_json
     end
 
+    def self.markdown_body_message_users(title, message, users)
+      {
+        'at' => { 'atUserIds' => users, 'isAtAll' => false },
+        'msgtype' => 'markdown',
+        'markdown' => { 'title' => title, 'text' => message }
+      }.to_json
+    end
+
     # btns: [{'title'=>'内容不错', 'actionURL'=>'https://www.baidu.com'}]
     def self.action_card_body_message(title, message, btns, orientation = :vertical)
       btn_orientation = orientation == :vertical ? '1' : '0'

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.25'
+  VERSION = '0.2.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.27
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj