yol_qy_weixin 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 492bc402556844ff268a6cc561decc01273d6c625cfbe3d6fead5cd990a3c543
-  data.tar.gz: f245159f2eb8175688c586950c1ddc4e0ef20f2a1837f430ceab8898b6bf3581
+  metadata.gz: 16810fce99de51f9a49c445ca9e00d4c79f0fe207956e37730e49f457080103f
+  data.tar.gz: f9b822c1704f8736b878b5535992814f4a68e341a80d809edbca4a0a813b14b6
 SHA512:
-  metadata.gz: '04889e7bf6966e97dd0b9bb3e5d68cd686216a8cd9878f616388f12915d3789ac1de792452b97fabd968a6673dd2364b1acb30fbd8dfe8893cbd28bbe2de80a0'
-  data.tar.gz: e8eb257736eff86043bfe00a2a5e98fd2135d106d825dbe472eec07b9e82d0da0a4ac0a8add84cc84a72fffebe68a4de3cb7f659bff6a03bb93817c06fcee519
+  metadata.gz: 7ad1d2656261536b48e87c23d7e448fe3be79dda0f7c061c24d8b4570b3608cdae0e3163c374723c74561a8a36527220ca7be5490c46d1903c588a31d9a20d06
+  data.tar.gz: 14de072312d66e3bab849bfaed5e0dac430ca8b8101ddd0ec19840379e2b504c5876e6397f73611adb57baa506b969d1e4763ab1f223242a0097ca492b3779df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yol_qy_weixin (0.0.3)
+    yol_qy_weixin (0.0.4)
       multi_xml
       nokogiri
       roxml

data/README.md

@@ -6,76 +6,95 @@ https://rubygems.org/gems/yol_qy_weixin
 
 [![Gem Version](https://badge.fury.io/rb/yol_qy_weixin.svg)](http://badge.fury.io/rb/yol_qy_weixin)
 
-**企业号对应多个管理组，请前往 `设置` => `权限管理` 任意创建一个管理组，在管理组最下角即可获取 CorpID Secret**
-
 **有问题请及时提issue**
 
 ```ruby
-gem "qy_wechat_api", git: "https://github.com/lanrion/qy_wechat_api.git"
+gem "yol_qy_weixin", git: "https://github.com/luojie2019/yol_qy_weixin.git"
 ```
 
 # 配置
 
-## jsticket、suite_token存储方案
-如果你是在Rails框架下，默认情况下直接使用Rails.cache，如果你想独立cache，请配置如下：
+## 安装依赖Installation
+
+Add this line to your application's Gemfile:
+
 ```ruby
-QyWechatApi.configure do |config|
-  config.cache_store = YourCustomCacheStore
-end
+gem 'yol_qy_weixin'
 ```
-cache_store按照Rails.cache的接口实现，强烈建议使用ActiveSupport::Cache
+## 配置 corpid secret
 
-## 日志配置
-如果你是在Rails框架下，默认情况下直接使用Rails.logger，如果你想独立cache，请配置如下：
 ```ruby
-QyWechatApi.configure do |config|
-  config.logger = YourCustomLogger
-end
-```
-logger按照Rails.logger的接口实现，强烈建议使用ActiveSupport::Logger
+# 目录
 
-## Token 存储方案（TODO: 待重构直接使用cache_store）
+file: your_project/config/qy_weixin.yml
 
-### 对象存储
-如果你是单个企业号，建议使用这个方案，无需任何配置即可使用。
+.your_project/
+├── app
+├── bin
+├── config
+│   ├── redis.yml
+│   ├── database.yml
+│   ├── qy_weixin.yml
+```
 
-### Redis 存储
-```ruby
-redis = Redis.new(host: "127.0.0.1", port: "6379")
+```yml
+defaults: &defaults
+  corpid: '1**'
+  secret: '2**'
 
-namespace = "qy_wechat_api:redis_storage"
+development: &development
+  <<: *defaults
 
-# cleanup keys in the current namespace when restart server everytime.
-exist_keys = redis.keys("#{namespace}:*")
-exist_keys.each{|key|redis.del(key)}
+test:
+  <<: *defaults
 
-redis_with_ns = Redis::Namespace.new("#{namespace}", redis: redis)
+production:
+  corpid: <%= ENV.fetch('QY_WEIXIN_CORPID') { '1**'' } %>
+  secret: <%= ENV.fetch('QY_WEIXIN_SECRET') { '2**'' } %>
+```
 
-QyWechatApi.configure do |config|
-  config.redis = redis_with_ns
-end
+## 读取配置
+```ruby
+# 读取qy_weixin.yml配置
+qy_weixin_config = YAML::load(ERB.new(File.read("#{Rails.root}/config/qy_weixin.yml")).result)[Rails.env]
 ```
+如果你是在Rails框架下，也可以使用Settingslogic读取yml配置：
+```ruby
+# 引用gem
+gem 'settingslogic', '2.0.9'
+
+# your_project/app/settings/weixin_setting.rb
+class WeixinSetting < Settingslogic
+  source "#{Rails.root}/config/weixin.yml"
+  namespace Rails.env
+end
 
-# API基本用法
+corpid = WeixinSetting.corpid
+corp_secret = WeixinSetting.secret
+```
 
-请务必结合：http://qydev.weixin.qq.com/wiki/index.php 理解以下API参数使用。
+**说明：redis配置请参考官方文档https://github.com/redis/redis-rb/blob/master/README.md**
 
-## 初始化
+## 实例对象
 
 ```ruby
-group_client = QyWechatApi::Client.new(corpid, corpsecret)
+# 目录 file: your_project/config/initializers/qy_weixin.rb
 
-# 为了确保用户输入的corpid, corpsecret是准确的，请务必执行：
-group_client.is_valid?
+QyWexinClient = YolQyWeixin::Client.new(
+	corpid: qy_weixin_config["corpid"],
+	secret: qy_weixin_config["secret"],
+	redis: RedisClient
+)
 ```
 
-如果需要使用通过第三方应用 **获取企业号access_token** API 获取的 access_token
-做如下处理：
+
+# 基本用法
+
+如果需要获取的 access_token
 
 ```ruby
-options = {access_token: "access_token"}
-# redis_key 也可定制
-group_client = QyWechatApi::Client.new(corpid, corpsecret, options)
+access_token = QyWexinClient.get_access_token
+# 对应企业微信官方文档：https://work.weixin.qq.com/api/doc/90000/90135/91039
 ```
 
 ## 部门

data/lib/yol_qy_weixin/client.rb

@@ -17,4 +17,4 @@ module YolQyWeixin
       @redis  = options[:redis]  || YolQyWeixin.configuration.redis
     end
   end
-end
+end

data/lib/yol_qy_weixin/connections/base.rb

@@ -18,26 +18,22 @@ module YolQyWeixin
       end
 
       def get_access_token
-        # access_token = redis.find("access_token_#{appid}")
-
-        # if access_token.nil?
-        #   access_token_res = get_token(corpid, secret)
-
-        #   # TODO:
-        #   access_token     = JSON.parse(access_token_res)["access_token"] rescue nil
-
-        #   if access_token.nil?
-        #     raise Exception.new("Weixin access token authorize false, appid: #{appid},
-        #                          appsecret: #{appsecret}, access_token_res: #{access_token_res.to_s}")
-        #   else
-        #     redis.save("access_token_#{appid}", access_token)
-        #     redis.expire("access_token_#{appid}", 7200)
-        #   end
-        # end
-
-        # access_token
-        access_token_res = get_token(corpid, secret)
-        access_token     = access_token_res["access_token"] rescue nil
+        if redis.nil?
+          access_token_res = get_token(corpid, secret)
+          access_token = access_token_res["access_token"] rescue nil
+        else
+          access_token = redis.get("qywx_access_token")
+          if access_token.nil?
+            access_token_res = get_token(corpid, secret)
+            access_token = access_token_res["access_token"] rescue nil
+            if access_token.nil?
+              raise Exception.new("QyWeixin access token authorize false, corpid: #{corpid}")
+            else
+              redis.set("qywx_access_token", access_token)
+              redis.expire("qywx_access_token", 7200)
+            end
+          end
+        end
         access_token
       end
 

data/lib/yol_qy_weixin/connections/user.rb

@@ -1,12 +1,20 @@
 module YolQyWeixin
   module Connection
     module User
+      def get_user_id(code)
+        http_get(user_info_url(open_id))
+      end
+
       def get_user_info(open_id)
         http_get(user_info_url(open_id))
       end
 
       private
 
+      def user_id_url(code)
+        "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?access_token=#{get_access_token}&code=#{code}"
+      end
+
       def user_info_url(open_id)
         "https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token=#{get_access_token}&userid=#{open_id}"
       end

data/lib/yol_qy_weixin/version.rb

@@ -1,3 +1,3 @@
 module YolQyWeixin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/yol_qy_weixin.gemspec

@@ -6,8 +6,8 @@ require 'yol_qy_weixin/version'
 Gem::Specification.new do |spec|
   spec.name          = "yol_qy_weixin"
   spec.version       = YolQyWeixin::VERSION
-  spec.authors       = ["cjl"]
-  spec.email         = ["chenjialiang@yeezon.com"]
+  spec.authors       = ["luojie2019"]
+  spec.email         = ["luojie@yolanda.hk"]
   spec.summary       = %q{Shop middleware for Weixin.}
   spec.description   = ""
   spec.homepage      = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yol_qy_weixin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
-- cjl
+- luojie2019
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: ''
 email:
-- chenjialiang@yeezon.com
+- luojie@yolanda.hk
 executables: []
 extensions: []
 extra_rdoc_files: []