Fix bugs

Jeff Lai
1 parent 6d4f6ca1
Showing 2 changed files with 8 additions and 7 deletions Show diff stats
lib/dingtalk/api/base.rb
lib/dingtalk/api/suite.rb
@@ -2,6 +2,7 @@ module Dingtalk
   module Api
     class Base
       attr_accessor :corp_id
+      attr_accessor :permanent_code
       ACCESS_TOKEN = "access_token"
       JS_TICKET = "js_ticket"
  
@@ -24,9 +25,9 @@ module Dingtalk
  
       def set_js_ticket
         key = "#{corp_id}_#{JS_TICKET}"
-        res = http_get('get_jsapi_ticket')
-        redis.set(key, res['suite_access_token'])
-        redis.expire(key, 7200)
+        res = http_get("get_jsapi_ticket?access_token=#{access_token}")
+        redis.set(key, res['ticket'])
+        redis.expire(key, res['expires_in'])
         redis.get(key)
       end
  
@@ -43,8 +44,9 @@ module Dingtalk
         end
  
         def http_get(url, params = {})
-          p = default_params.merge(params)
-          res = RestClient.get(request_url(url), p.to_json, content_type: :json)
+          res = RestClient.get(request_url(url))
+          #p = default_params.merge(params)
+          #res = RestClient.get(request_url(url), p.to_json, content_type: :json)
           JSON.parse(res)
         end
  
@@ -36,11 +36,10 @@ module Dingtalk
  
       def set_corp_access_token(corp_id, permanent_code)
         params = {
-          suite_access_token: suite_access_token,
           permanent_code: permanent_code,
           auth_corpid: corp_id
         }
-        res = http_post('get_corp_token', params)
+        res = http_post("get_corp_token?suite_access_token=#{suite_access_token}", params)
         redis.set("#{corp_id}_#{ACCESS_TOKEN}", res['access_token'])
         redis.expire("#{corp_id}_#{ACCESS_TOKEN}", EXPIRATION)
         redis.get("#{corp_id}_#{ACCESS_TOKEN}")
...	...	@@ -2,6 +2,7 @@ module Dingtalk
2	2	module Api
3	3	class Base
4	4	attr_accessor :corp_id
	5	+ attr_accessor :permanent_code
5	6	ACCESS_TOKEN = "access_token"
6	7	JS_TICKET = "js_ticket"
7	8
...	...	@@ -24,9 +25,9 @@ module Dingtalk
24	25
25	26	def set_js_ticket
26	27	key = "#{corp_id}_#{JS_TICKET}"
27		- res = http_get('get_jsapi_ticket')
28		- redis.set(key, res['suite_access_token'])
29		- redis.expire(key, 7200)
	28	+ res = http_get("get_jsapi_ticket?access_token=#{access_token}")
	29	+ redis.set(key, res['ticket'])
	30	+ redis.expire(key, res['expires_in'])
30	31	redis.get(key)
31	32	end
32	33
...	...	@@ -43,8 +44,9 @@ module Dingtalk
43	44	end
44	45
45	46	def http_get(url, params = {})
46		- p = default_params.merge(params)
47		- res = RestClient.get(request_url(url), p.to_json, content_type: :json)
	47	+ res = RestClient.get(request_url(url))
	48	+ #p = default_params.merge(params)
	49	+ #res = RestClient.get(request_url(url), p.to_json, content_type: :json)
48	50	JSON.parse(res)
49	51	end
50	52
...	...
...	...	@@ -36,11 +36,10 @@ module Dingtalk
36	36
37	37	def set_corp_access_token(corp_id, permanent_code)
38	38	params = {
39		- suite_access_token: suite_access_token,
40	39	permanent_code: permanent_code,
41	40	auth_corpid: corp_id
42	41	}
43		- res = http_post('get_corp_token', params)
	42	+ res = http_post("get_corp_token?suite_access_token=#{suite_access_token}", params)
44	43	redis.set("#{corp_id}_#{ACCESS_TOKEN}", res['access_token'])
45	44	redis.expire("#{corp_id}_#{ACCESS_TOKEN}", EXPIRATION)
46	45	redis.get("#{corp_id}_#{ACCESS_TOKEN}")
...	...