lhj-tools 0.2.28 → 0.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e94e1905e459e9be531bc985e002c26e743c7c642d2489fb4f8ed5eb0ec84c29
-  data.tar.gz: c381978186ef918f95428253f355ba7abef8e5d3310e905efadcac868b4b5e26
+  metadata.gz: c152ebec555059e05a8fe9ab9496de443546851059e51ae9799b3e8918dfee41
+  data.tar.gz: f73adfd0888a178b7b8d2ed60411fdd3b1b7a0673038b7e975173b7d4d375bc3
 SHA512:
-  metadata.gz: 8f01e8a6806633435912ac4a87fbd9bf5821ebfe5c8dcc39b994628edb0e832b5605508324e6252945fb35faa263b7673668733d294201ed7a8417bb1e145b43
-  data.tar.gz: d107bd31f5334a85265af95da2b1cf45bbb3f765582b9f20304b38f10c420fc50ef5ef56a3d405a4081aa1980b41503fbd34adfc0d1847fc7c8321439eebd3bb
+  metadata.gz: 659978a2a7ce730bed42798f2ba53e178dfb8078b468286374efdbfc2d6849e6fe86f76b5d1300815904409670231a286b1a9b6dc8f37903c1647b24565fc979
+  data.tar.gz: e3162198e303cf3a5298d0ca8b417807adc6b71f4317c40ef16c9d7d60091557bc876ecd4292141f2ab41d21555d0d235a251380fa6c84ee38f44de8c368a81e

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

@@ -30,15 +30,41 @@ module Lhj
         super
       end
 
+      def add_device(udid, name)
+        post_data = {
+          'data' => {
+            'attributes' => {
+              'name' => name,
+              'platform' => 'IOS',
+              'udid' => udid
+            },
+            'type' => 'devices'
+          }
+        }
+        res = Lhj::ConnectAPI.post('https://api.appstoreconnect.apple.com/v1/devices', post_data)
+        puts res.body
+      end
+
       def handle
-        api = Lhj::YapiHelper.new(project_id: 694, interface_id: 70595, model_name: 'Order', model_pre: 'AA')
-        api.process
-        file_list = api.save_to_file
-        key = Lhj::IOSRobotConfig.app_key
-        secret = Lhj::IOSRobotConfig.app_secret
-        conversation_id = 'cid31Wevlrdq9L4Q0WugLb0tw=='
-        user_ids = []
-        file_list.each { |f| Lhj::Dingtalk.upload_file_and_notify(key, secret, f, conversation_id, user_ids) }
+        file = File.join(Lhj::Config.instance.home_dir, 'all_device.txt')
+        File.open(file, 'r+') do |f|
+          f.each_line do |line|
+            ma = line.match(/(?<device>[^\s]*)(\s*)(?<name>.*)/)
+            device = ma[:device]
+            name = ma[:name].gsub(/(\S*)\s(\S*)\s(.*)/, '\\1-\\2-\\3')
+            name = name.gsub(/\s/, '')
+            add_device(device, name)
+          end
+        end
+        
+        # api = Lhj::YapiHelper.new(project_id: 694, interface_id: 70595, model_name: 'Order', model_pre: 'AA')
+        # api.process
+        # file_list = api.save_to_file
+        # key = Lhj::IOSRobotConfig.app_key
+        # secret = Lhj::IOSRobotConfig.app_secret
+        # conversation_id = 'cid31Wevlrdq9L4Q0WugLb0tw=='
+        # user_ids = []
+        # file_list.each { |f| Lhj::Dingtalk.upload_file_and_notify(key, secret, f, conversation_id, user_ids) }
 
         #
         #

data/lib/lhj/command/sync_dingding_user.rb

@@ -0,0 +1,102 @@
+require 'lhj/config'
+require 'highline'
+
+module Lhj
+  class Command
+    # sync code to pod
+    class SyncDingdingUser < Command
+      self.summary = '同步dingding_user'
+
+      def handle
+        sync_data
+      end
+
+      def sync_data
+        key = Lhj::IOSRobotConfig.app_key
+        secret = Lhj::IOSRobotConfig.app_secret
+        token = Lhj::Dingtalk.get_token(key, secret)
+        handle_dept(token, nil)
+      end
+
+      def handle_dept(token, dept_id)
+        dept_array = fetch_department(token, dept_id)
+        dept_array.each do |d|
+          dept_json = { 'dept_id' => d['dept_id'], 'name' => d['name'], 'parent_id' => d['parent_id'] }.to_json
+          save_dept(dept_json)
+          user_ids = fetch_user_ids(token, d['dept_id'])
+          user_ids.each do |id|
+            user = fetch_user_info(token, id)
+            user_json = { 'avatar' => user['avatar'],
+                          'dept_id' => d['dept_id'],
+                          'email' => user['email'],
+                          'job_number' => user['job_number'],
+                          'mobile' => user['mobile'],
+                          'name' => user['name'],
+                          'telephone' => user['telephone'],
+                          'title' => user['title'],
+                          'unionid' => user['unionid'],
+                          'userid' => user['userid'],
+                          'work_place' => user['work_place'] }.to_json
+            save_user(user_json)
+          end
+          handle_dept(token, d['dept_id'])
+        end
+      end
+
+      def fetch_department(token, dept_id)
+        url = URI("https://oapi.dingtalk.com/topapi/v2/department/listsub?access_token=#{token}")
+        https = Net::HTTP.new(url.host, url.port)
+        https.use_ssl = true
+        request = Net::HTTP::Post.new(url)
+        request['Content-Type'] = 'application/json'
+        request.body = { 'dept_id' => dept_id }.to_json if dept_id
+        response = https.request(request)
+        res_json = JSON.parse(response.body)
+        res_json['result']
+      end
+
+      def fetch_user_ids(token, dept_id)
+        url = URI("https://oapi.dingtalk.com/topapi/user/listid?access_token=#{token}")
+        https = Net::HTTP.new(url.host, url.port)
+        https.use_ssl = true
+        request = Net::HTTP::Post.new(url)
+        request['Content-Type'] = 'application/json'
+        request.body = { 'dept_id' => dept_id }.to_json if dept_id
+        response = https.request(request)
+        res_json = JSON.parse(response.body)
+        res_json['result']['userid_list']
+      end
+
+      def fetch_user_info(token, user_id)
+        url = URI("https://oapi.dingtalk.com/topapi/v2/user/get?access_token=#{token}")
+        https = Net::HTTP.new(url.host, url.port)
+        https.use_ssl = true
+        request = Net::HTTP::Post.new(url)
+        request['Content-Type'] = 'application/json'
+        request.body = { 'userid' => user_id }.to_json
+        response = https.request(request)
+        res_json = JSON.parse(response.body)
+        res_json['result']
+      end
+
+      def save_dept(json)
+        url = URI("#{Lhj::IOSRobotConfig.base_url}/dept/create")
+        http = Net::HTTP.new(url.host, url.port)
+        request = Net::HTTP::Post.new(url)
+        request['Content-Type'] = 'application/json'
+        request.body = json
+        http.request(request)
+      end
+
+      def save_user(json)
+        url = URI("#{Lhj::IOSRobotConfig.base_url}/user/create")
+        http = Net::HTTP.new(url.host, url.port)
+        request = Net::HTTP::Post.new(url)
+        request['Content-Type'] = 'application/json'
+        request.body = json
+        http.request(request)
+      end
+
+    end
+  end
+end

data/lib/lhj/command.rb

@@ -35,6 +35,7 @@ module Lhj
     require 'lhj/command/pgyer_upload'
     require 'lhj/command/duplicate_imageset'
     require 'lhj/command/jenkins/jenkins_build'
+    require 'lhj/command/sync_dingding_user'
 
     self.abstract_command = true
     self.command = 'lhj'

data/lib/lhj/helper/dingtalk_helper.rb

@@ -241,5 +241,25 @@ module Lhj
       send_group_message(token, msg_body) if msg_body
     end
 
+    def self.markdown_notify(conversation_id, user_ids, title, markdown)
+      key = Lhj::IOSRobotConfig.app_key
+      secret = Lhj::IOSRobotConfig.app_secret
+      token = get_token(key, secret)
+      msg_key = 'sampleMarkdown'
+      msg_param = sample_markdown_param(title, markdown)
+      msg_body = group_message_body(key, conversation_id, user_ids, msg_key, msg_param)
+      send_group_message(token, msg_body)
+    end
+
+    def self.text_notify(conversation_id, user_ids, content)
+      key = Lhj::IOSRobotConfig.app_key
+      secret = Lhj::IOSRobotConfig.app_secret
+      token = get_token(key, secret)
+      msg_key = 'sampleText'
+      msg_param = sample_text_param(content)
+      msg_body = group_message_body(key, conversation_id, user_ids, msg_key, msg_param)
+      send_group_message(token, msg_body)
+    end
+
   end
 end

data/lib/lhj/helper/ios_robot_config.rb

@@ -26,5 +26,9 @@ module Lhj
     def self.app_secret
       config['app_secret']
     end
+
+    def self.base_url
+      config['base_url']
+    end
   end
 end

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -371,6 +371,7 @@ files:
 - lib/lhj/command/refactor_rename.rb
 - lib/lhj/command/rename_image.rb
 - lib/lhj/command/reverse_import.rb
+- lib/lhj/command/sync_dingding_user.rb
 - lib/lhj/command/sync_pod_code.rb
 - lib/lhj/command/sync_pod_repo.rb
 - lib/lhj/command/sync_pod_version.rb