pingan_api 0.0.6 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/pingan_api/base.rb +6 -3
  3. data/lib/pingan_api/models/assistance/operation_send_request.rb +0 -1
  4. data/lib/pingan_api/models/assistance/salvation_query_response.rb +2 -1
  5. data/lib/pingan_api/models/assistance/salvation_receive_response.rb +0 -1
  6. data/lib/pingan_api/models/extensions/map.rb +4 -0
  7. data/lib/pingan_api/templates/assistance/operation_send_request.xml.erb +6 -6
  8. data/lib/pingan_api/templates/assistance/salvation_receive_response.xml.erb +3 -4
  9. data/lib/pingan_api/templates/samples/assistance/salvation_receive_response.xml.erb +2 -4
  10. data/lib/pingan_api/version.rb +2 -2
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 28bbe1f03977e57973be6bb66b4b99ac27e4fd11
4
- data.tar.gz: 3bb189d298709c7a3c6932172a01d293588f0942
3
+ metadata.gz: 6034e377df491bbd6661177df11cac41f919df32
4
+ data.tar.gz: 10151d9e1260f5713a46d7ce45798448e45231f5
5
5
  SHA512:
6
- metadata.gz: e5eea31a50d4afb9bfe66d17fd508f93f88aa5d6387b7a041ca2a89699b5bee2fe83bbd6a11b7ee712483136365bd3b04fc3d7d95fc6db839762fa5d321df535
7
- data.tar.gz: a11d2a78fc4b52e1856f51f5913d44b82d48c1c945d19a97c2c734d43a52c6d1b15ef7a03af00a394cdb0e64d3c8a313ef7748a1b630a2459435caf9ce637c33
6
+ metadata.gz: b5fd4403b6ec4d28fb56538f80510e4ba4c1d1e474cb5f6e6d715dd062ece9704842b0f2e8393fec3f4d3cbc1acef5c652e4d9a5febd22cc9ef498e644d82037
7
+ data.tar.gz: fa8610af10cddff123de18404dd75112a9c9553d3218080391faf4744fd43889e5605c93c20dfdb5d34074609f6632ff7b2758a54b8ce3661efa838fa5af8991
data/lib/pingan_api/base.rb CHANGED
@@ -21,8 +21,8 @@ module PinganApi
21
21
  http.cert = OpenSSL::X509::Certificate.new(pem)
22
22
  http.key = OpenSSL::PKey::RSA.new(pem)
23
23
 
24
- request = Net::HTTP::Post.new("/", initheader = {'Content-Type' =>'text/html;charset=GBK'})
25
- request.body = body.encode('gbk')
24
+ request = Net::HTTP::Post.new("/", initheader = {'Content-Type' =>'application/xml;charset=GBK'})
25
+ request.body = body.encode('GBK')
26
26
 
27
27
  return send_request_and_log(http, request)
28
28
  end
@@ -33,9 +33,12 @@ module PinganApi
33
33
  #log.write_request(request)
34
34
  #begin
35
35
  # TODO, save response
36
+ #File.open("tmp/#{Time.now.to_i}_request.xml", "w") { |file| file.write request.body }
36
37
  res = http.request(request)
37
38
  #log.write_response(res)
38
- return res.body
39
+ #File.open("tmp/#{Time.now.to_i}_response.xml", "w") { |file| file.write res.body.force_encoding("GBK") }
40
+
41
+ return res.body.force_encoding("GBK")
39
42
  #rescue => e
40
43
  #log.write_error(e.to_s)
41
44
  # return nil
data/lib/pingan_api/models/assistance/operation_send_request.rb CHANGED
@@ -41,7 +41,6 @@ module PinganApi
41
41
  :salvation_person_telno,
42
42
  :salvation_intending_time,
43
43
  :salvation_person_workno,
44
- :salvation_inteding_time,
45
44
  :act_gps_x,
46
45
  :act_gps_y,
47
46
  :act_salvation_place,
data/lib/pingan_api/models/assistance/salvation_query_response.rb CHANGED
@@ -19,6 +19,7 @@ module PinganApi
19
19
  :pa_rslt_mesg,
20
20
  :salvation_id,
21
21
  :report_name,
22
+ :report_telephone,
22
23
  :salvation_object,
23
24
  :car_mark,
24
25
  :car_type,
@@ -30,7 +31,7 @@ module PinganApi
30
31
  :supplement_info,
31
32
  :operator_id,
32
33
  :callerno,
33
- :salvation_fee,
34
+ :salvation_fee_type,
34
35
  :obligate_field,
35
36
  :gps_x,
36
37
  :gps_y,
data/lib/pingan_api/models/assistance/salvation_receive_response.rb CHANGED
@@ -13,7 +13,6 @@ module PinganApi
13
13
  :bk_serial,
14
14
  :pa_acct_datetime,
15
15
  :business_no,
16
- :ft_serial,
17
16
  :region_code,
18
17
  :pa_rslt_code,
19
18
  :pa_rslt_mesg,
data/lib/pingan_api/models/extensions/map.rb CHANGED
@@ -38,6 +38,10 @@ module PinganApi
38
38
  unless hash["Request"].nil?
39
39
  hash_all = hash["Request"]["Head"].merge(hash["Request"]["Body"]["Apply"])
40
40
  end
41
+ # fuck pingan dev 100000.times
42
+ unless hash["RESPONSE"].nil?
43
+ hash_all = hash["RESPONSE"]["Head"].merge(hash["RESPONSE"]["Body"]["Apply"])
44
+ end
41
45
 
42
46
  instance = self.new
43
47
  instance.mapping(hash_all)
data/lib/pingan_api/templates/assistance/operation_send_request.xml.erb CHANGED
@@ -20,10 +20,10 @@
20
20
  <BEGIN_POINT><%= begin_point %></BEGIN_POINT>
21
21
  <SALVATION_FEE_TYPE><%= salvation_fee_type %></SALVATION_FEE_TYPE>
22
22
  <SALVATION_STATE><%= salvation_state %></SALVATION_STATE>
23
- <DATE_CONNECTING><%= date_connecting.strftime('%Y-%m-%d %H:%M:%S') %></DATE_CONNECTING>
24
- <DATE_DISPATCH><%= date_dispatch.strftime('%Y-%m-%d %H:%M:%S') %></DATE_DISPATCH>
25
- <DATE_ARRIVE><%= date_arrive.strftime('%Y-%m-%d %H:%M:%S') %></DATE_ARRIVE>
26
- <DATE_FINISHED><%= date_finished.strftime('%Y-%m-%d %H:%M:%S') %></DATE_FINISHED>
23
+ <DATE_CONNECTING><%= date_connecting.strftime('%Y-%m-%d %H:%M:%S') unless date_connecting.nil? %></DATE_CONNECTING>
24
+ <DATE_DISPATCH><%= date_dispatch.strftime('%Y-%m-%d %H:%M:%S') unless date_dispatch.nil? %></DATE_DISPATCH>
25
+ <DATE_ARRIVE><%= date_arrive.strftime('%Y-%m-%d %H:%M:%S') unless date_arrive.nil? %></DATE_ARRIVE>
26
+ <DATE_FINISHED><%= date_finished.strftime('%Y-%m-%d %H:%M:%S') unless date_finished.nil? %></DATE_FINISHED>
27
27
  <DRAG_DISTANCE><%= drag_distance %></DRAG_DISTANCE>
28
28
  <SALVATION_RESULT><%= salvation_result %></SALVATION_RESULT>
29
29
  <QUIT_REASON><%= quit_reason %></QUIT_REASON>
@@ -33,11 +33,11 @@
33
33
  <END_POINT><%= end_point %></END_POINT>
34
34
  <SALVATION_FEE_PT><%= salvation_fee_pt %></SALVATION_FEE_PT>
35
35
  <SALVATION_OBJECT_AA><%= salvation_object_aa %></SALVATION_OBJECT_AA>
36
- <SALVATION_HELP_TIME><%= salvation_help_time.strftime('%Y-%m-%d %H:%M:%S') %></SALVATION_HELP_TIME>
36
+ <SALVATION_HELP_TIME><%= salvation_help_time.strftime('%Y-%m-%d %H:%M:%S') unless salvation_help_time.nil? %></SALVATION_HELP_TIME>
37
37
  <SALVATION_PERSON_NAME><%= salvation_person_name %></SALVATION_PERSON_NAME>
38
38
  <SALVATION_PERSON_TELNO><%= salvation_person_telno %></SALVATION_PERSON_TELNO>
39
39
  <SALVATION_PERSON_WORKNO><%= salvation_person_workno %></SALVATION_PERSON_WORKNO>
40
- <SALVATION_INTENDING_TIME><%= salvation_intending_time %></SALVATION_INTENDING_TIME>
40
+ <SALVATION_INTENDING_TIME><%= salvation_intending_time.strftime('%Y-%m-%d %H:%M:%S') unless salvation_intending_time.nil? %></SALVATION_INTENDING_TIME>
41
41
  <ACT_GPS_X><%= act_gps_x %></ACT_GPS_X>
42
42
  <ACT_GPS_Y><%= act_gps_y %></ACT_GPS_Y>
43
43
  <ACT_SALVATION_PLACE><%= act_salvation_place %></ACT_SALVATION_PLACE>
data/lib/pingan_api/templates/assistance/salvation_receive_response.xml.erb CHANGED
@@ -1,4 +1,4 @@
1
- <?xml version="1.0" encoding="GBK" ?>
1
+ <?xml version="1.0" encoding="utf-8" ?>
2
2
  <Response>
3
3
  <Head>
4
4
  <TRAN_CODE><%= tran_code %></TRAN_CODE>
@@ -7,7 +7,6 @@
7
7
  <PA_ACCT_DATE><%= pa_acct_datetime.strftime('%Y%m%d') %></PA_ACCT_DATE>
8
8
  <PA_ACCT_TIME><%= pa_acct_datetime.strftime('%H:%M:%S') %></PA_ACCT_TIME>
9
9
  <BUSINESS_NO><%= business_no %></BUSINESS_NO>
10
- <FT_SERIAL><%= ft_serial %></FT_SERIAL>
11
10
  <REGION_CODE><%= region_code %></REGION_CODE>
12
11
  <PA_RSLT_CODE><%= pa_rslt_code %></PA_RSLT_CODE>
13
12
  <PA_RSLT_MESG><%= pa_rslt_mesg %></PA_RSLT_MESG>
@@ -15,8 +14,8 @@
15
14
  <Body>
16
15
  <Apply>
17
16
  <SALVATION_ID><%= salvation_id %></SALVATION_ID>
18
- <RESULT_TIME><%= result_time.strftime('%Y-%m-%d %H:%M:%S') %></RESULT_TIME>
17
+ <RESULT_TIME><%= result_time.strftime('%Y%m%d %H:%M:%S') %></RESULT_TIME>
19
18
  <SALVATION_FACTORY_ID><%= salvation_factory_id %></SALVATION_FACTORY_ID>
20
19
  </Apply>
21
20
  </Body>
22
- </Response>
21
+ </Response>
data/lib/pingan_api/templates/samples/assistance/salvation_receive_response.xml.erb CHANGED
@@ -1,4 +1,4 @@
1
- <?xml version="1.0" encoding="GBK"?>
1
+ <?xml version="1.0" encoding="utf-8"?>
2
2
  <Response>
3
3
  <Head>
4
4
  <!--交易码（必填）-->
@@ -13,8 +13,6 @@
13
13
  <PA_ACCT_TIME/>
14
14
  <!--业务唯一标识号-->
15
15
  <BUSINESS_NO/>
16
- <!--前置交易流水号-->
17
- <FT_SERIAL/>
18
16
  <!--地区码-->
19
17
  <REGION_CODE/>
20
18
  <!--返回结果代码（必填），999999表示成功，其它均表示失败-->
@@ -26,7 +24,7 @@
26
24
  <Apply>
27
25
  <!--救援单号 唯一代表一个救援商案件-->
28
26
  <SALVATION_ID>String</SALVATION_ID>
29
- <!--响应时间 需定义时间格式：YYYY-MM-DD HH24:MI:SS-->
27
+ <!--响应时间 需定义时间格式：YYYYMMDD HH24:MI:SS-->
30
28
  <RESULT_TIME>String</RESULT_TIME>
31
29
  <!--救援公司ID -->
32
30
  <SALVATION_FACTORY_ID>String</SALVATION_FACTORY_ID>
data/lib/pingan_api/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PinganApi
2
- VERSION = "0.0.6"
3
- end
2
+ VERSION = "0.1.0"
3
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pingan_api
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - liuzelei
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-15 00:00:00.000000000 Z
11
+ date: 2014-02-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler