eric_weixin 0.0.4 → 0.0.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: edd8f9ab314fe25f8a18eaaf41ecd03f987e3bfe
4
- data.tar.gz: cb42319995a05c4c4cf3599fb9bfee7eb8fd8d88
3
+ metadata.gz: ebdc82e097dba89b5eba57e5977f0d22fb77a5f4
4
+ data.tar.gz: 91ea18571d601543296a65789d725792ac94b54d
5
5
  SHA512:
6
- metadata.gz: 7477e5a165cc6f6351f19869c9730376d280d41ced2fec567a1890bf3f9b5ed3f10b81e0fefc6f1d052a450a217a3d49df5cbbcaa1825b81fcc045eef3ff7d4f
7
- data.tar.gz: d5bc7dfef7a84d5629cf5f526302e1041774fa5849587889b515e36298094db7550e4c449bad5a56705fa35e8632a23045837680c1174e1feb6257b66580798b
6
+ metadata.gz: 0df80bc3a81fb025fc9da4040404be874b40581a329c1bc9d0bc835409ae468e04a8a61eb8ce38ad0c77519eb5ad11545e9772d62e319414bdb403cd1b511000
7
+ data.tar.gz: a28ddd6d511c192bd52c72ddfe9bd296c09037039f69d6676a4b643063d13567c2bb138989c8233b349d154ca92c2906a26dc4c672dce819c7b5a8eae2370ed7
data/.idea/workspace.xml CHANGED
@@ -2,8 +2,10 @@
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
4
  <list default="true" id="825e533a-b0a1-462f-abd1-eefea8ff703f" name="Default" comment="">
5
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb" />
5
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" />
6
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" />
6
7
  <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/version.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/version.rb" />
8
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" />
7
9
  <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" />
8
10
  <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9
11
  </list>
@@ -28,61 +30,81 @@
28
30
  </component>
29
31
  <component name="FileEditorManager">
30
32
  <leaf>
31
- <file leaf-file-name="reply_message_rule.rb" pinned="false" current="false" current-in-tab="false">
32
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb">
33
+ <file leaf-file-name="weixin_controller.rb" pinned="false" current="false" current-in-tab="false">
34
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
33
35
  <provider selected="true" editor-type-id="text-editor">
34
- <state vertical-scroll-proportion="0.0" vertical-offset="1415" max-vertical-offset="2052">
35
- <caret line="105" column="15" selection-start-line="105" selection-start-column="15" selection-end-line="105" selection-end-column="15" />
36
+ <state vertical-scroll-proportion="0.0" vertical-offset="558" max-vertical-offset="774">
37
+ <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
36
38
  <folding />
37
39
  </state>
38
40
  </provider>
39
41
  </entry>
40
42
  </file>
41
- <file leaf-file-name="eric_weixin.gemspec" pinned="false" current="false" current-in-tab="false">
43
+ <file leaf-file-name="weixin_user.rb" pinned="false" current="false" current-in-tab="false">
44
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb">
45
+ <provider selected="true" editor-type-id="text-editor">
46
+ <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="1710">
47
+ <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
48
+ <folding />
49
+ </state>
50
+ </provider>
51
+ </entry>
52
+ </file>
53
+ <file leaf-file-name="public_account.rb" pinned="false" current="false" current-in-tab="false">
54
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
55
+ <provider selected="true" editor-type-id="text-editor">
56
+ <state vertical-scroll-proportion="0.0" vertical-offset="21" max-vertical-offset="3438">
57
+ <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
58
+ <folding />
59
+ </state>
60
+ </provider>
61
+ </entry>
62
+ </file>
63
+ <file leaf-file-name="eric_weixin.gemspec" pinned="false" current="true" current-in-tab="true">
42
64
  <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
43
65
  <provider selected="true" editor-type-id="text-editor">
44
- <state vertical-scroll-proportion="0.0" vertical-offset="299" max-vertical-offset="702">
45
- <caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" />
66
+ <state vertical-scroll-proportion="0.48441926" vertical-offset="0" max-vertical-offset="706">
67
+ <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
46
68
  <folding />
47
69
  </state>
48
70
  </provider>
49
71
  </entry>
50
72
  </file>
51
- <file leaf-file-name="version.rb" pinned="false" current="true" current-in-tab="true">
73
+ <file leaf-file-name="version.rb" pinned="false" current="false" current-in-tab="false">
52
74
  <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb">
53
75
  <provider selected="true" editor-type-id="text-editor">
54
- <state vertical-scroll-proportion="0.04522613" vertical-offset="0" max-vertical-offset="398">
76
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="162">
55
77
  <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
56
78
  <folding />
57
79
  </state>
58
80
  </provider>
59
81
  </entry>
60
82
  </file>
61
- <file leaf-file-name="access_token.rb" pinned="false" current="false" current-in-tab="false">
62
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb">
83
+ <file leaf-file-name="eric_weixin.rb" pinned="false" current="false" current-in-tab="false">
84
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin.rb">
63
85
  <provider selected="true" editor-type-id="text-editor">
64
- <state vertical-scroll-proportion="0.0" vertical-offset="172" max-vertical-offset="918">
65
- <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
86
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="450">
87
+ <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
66
88
  <folding />
67
89
  </state>
68
90
  </provider>
69
91
  </entry>
70
92
  </file>
71
- <file leaf-file-name="weixin_controller.rb" pinned="false" current="false" current-in-tab="false">
72
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
93
+ <file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false">
94
+ <entry file="file://$PROJECT_DIR$/Gemfile">
73
95
  <provider selected="true" editor-type-id="text-editor">
74
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="576">
75
- <caret line="10" column="53" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="53" />
96
+ <state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="180">
97
+ <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
76
98
  <folding />
77
99
  </state>
78
100
  </provider>
79
101
  </entry>
80
102
  </file>
81
- <file leaf-file-name="weixin_user.rb" pinned="false" current="false" current-in-tab="false">
82
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb">
103
+ <file leaf-file-name="aa.erb" pinned="false" current="false" current-in-tab="false">
104
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
83
105
  <provider selected="true" editor-type-id="text-editor">
84
- <state vertical-scroll-proportion="0.0" vertical-offset="412" max-vertical-offset="1710">
85
- <caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
106
+ <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
107
+ <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
86
108
  <folding />
87
109
  </state>
88
110
  </provider>
@@ -106,7 +128,6 @@
106
128
  <option value="$PROJECT_DIR$/lib/eric_weixin/model/public_account.rb" />
107
129
  <option value="$PROJECT_DIR$/lib/eric_weixin/public_account.rb" />
108
130
  <option value="$PROJECT_DIR$/lib/eric_weixin/reply_message.rb" />
109
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" />
110
131
  <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb" />
111
132
  <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/news.rb" />
112
133
  <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/article.rb" />
@@ -115,19 +136,20 @@
115
136
  <option value="$PROJECT_DIR$/lib/eric_weixin/app/views/weixin/aa.erb" />
116
137
  <option value="$PROJECT_DIR$/eric_weixin.gemspec" />
117
138
  <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/big_application_controller.rb" />
118
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" />
119
139
  <option value="$PROJECT_DIR$/lib/eric_weixin.rb" />
120
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" />
121
140
  <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb" />
141
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" />
142
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" />
143
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" />
144
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" />
122
145
  <option value="$PROJECT_DIR$/lib/eric_weixin/version.rb" />
123
146
  </list>
124
147
  </option>
125
148
  </component>
126
149
  <component name="ProjectFrameBounds">
127
- <option name="x" value="1665" />
128
150
  <option name="y" value="23" />
129
151
  <option name="width" value="1440" />
130
- <option name="height" value="830" />
152
+ <option name="height" value="829" />
131
153
  </component>
132
154
  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
133
155
  <OptionsSetting value="true" id="Add" />
@@ -206,6 +228,96 @@
206
228
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
207
229
  </PATH_ELEMENT>
208
230
  </PATH>
231
+ <PATH>
232
+ <PATH_ELEMENT>
233
+ <option name="myItemId" value="eric_weixin" />
234
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
235
+ </PATH_ELEMENT>
236
+ <PATH_ELEMENT>
237
+ <option name="myItemId" value="eric_weixin" />
238
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
239
+ </PATH_ELEMENT>
240
+ <PATH_ELEMENT>
241
+ <option name="myItemId" value="lib" />
242
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
243
+ </PATH_ELEMENT>
244
+ <PATH_ELEMENT>
245
+ <option name="myItemId" value="eric_weixin" />
246
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
247
+ </PATH_ELEMENT>
248
+ <PATH_ELEMENT>
249
+ <option name="myItemId" value="app" />
250
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
251
+ </PATH_ELEMENT>
252
+ <PATH_ELEMENT>
253
+ <option name="myItemId" value="views" />
254
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
255
+ </PATH_ELEMENT>
256
+ <PATH_ELEMENT>
257
+ <option name="myItemId" value="eric_weixin" />
258
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
259
+ </PATH_ELEMENT>
260
+ <PATH_ELEMENT>
261
+ <option name="myItemId" value="weixin" />
262
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
263
+ </PATH_ELEMENT>
264
+ </PATH>
265
+ <PATH>
266
+ <PATH_ELEMENT>
267
+ <option name="myItemId" value="eric_weixin" />
268
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
269
+ </PATH_ELEMENT>
270
+ <PATH_ELEMENT>
271
+ <option name="myItemId" value="eric_weixin" />
272
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
273
+ </PATH_ELEMENT>
274
+ <PATH_ELEMENT>
275
+ <option name="myItemId" value="lib" />
276
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
277
+ </PATH_ELEMENT>
278
+ <PATH_ELEMENT>
279
+ <option name="myItemId" value="eric_weixin" />
280
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
281
+ </PATH_ELEMENT>
282
+ <PATH_ELEMENT>
283
+ <option name="myItemId" value="app" />
284
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
285
+ </PATH_ELEMENT>
286
+ <PATH_ELEMENT>
287
+ <option name="myItemId" value="model" />
288
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
289
+ </PATH_ELEMENT>
290
+ </PATH>
291
+ <PATH>
292
+ <PATH_ELEMENT>
293
+ <option name="myItemId" value="eric_weixin" />
294
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
295
+ </PATH_ELEMENT>
296
+ <PATH_ELEMENT>
297
+ <option name="myItemId" value="eric_weixin" />
298
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
299
+ </PATH_ELEMENT>
300
+ <PATH_ELEMENT>
301
+ <option name="myItemId" value="lib" />
302
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
303
+ </PATH_ELEMENT>
304
+ <PATH_ELEMENT>
305
+ <option name="myItemId" value="eric_weixin" />
306
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
307
+ </PATH_ELEMENT>
308
+ <PATH_ELEMENT>
309
+ <option name="myItemId" value="app" />
310
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
311
+ </PATH_ELEMENT>
312
+ <PATH_ELEMENT>
313
+ <option name="myItemId" value="controllers" />
314
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
315
+ </PATH_ELEMENT>
316
+ <PATH_ELEMENT>
317
+ <option name="myItemId" value="weixin" />
318
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
319
+ </PATH_ELEMENT>
320
+ </PATH>
209
321
  </subPane>
210
322
  </pane>
211
323
  </panes>
@@ -329,24 +441,24 @@
329
441
  <servers />
330
442
  </component>
331
443
  <component name="ToolWindowManager">
332
- <frame x="1665" y="23" width="1440" height="830" extended-state="6" />
444
+ <frame x="0" y="23" width="1440" height="829" extended-state="6" />
333
445
  <editor active="true" />
334
446
  <layout>
335
447
  <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
336
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
448
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
337
449
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
338
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.42040816" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
339
450
  <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
340
451
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
341
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24606581" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
452
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24821173" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
342
453
  <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
343
454
  <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
344
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
455
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
345
456
  <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
346
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
457
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
347
458
  <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
348
459
  <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
349
460
  <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
461
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.42098093" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
350
462
  <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
351
463
  <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
352
464
  <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -372,11 +484,146 @@
372
484
  <breakpoint-manager />
373
485
  </component>
374
486
  <component name="editorHistoryManager">
487
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
488
+ <provider selected="true" editor-type-id="text-editor">
489
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="774">
490
+ <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
491
+ <folding />
492
+ </state>
493
+ </provider>
494
+ </entry>
495
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb">
496
+ <provider selected="true" editor-type-id="text-editor">
497
+ <state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="1710">
498
+ <caret line="17" column="10" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
499
+ <folding />
500
+ </state>
501
+ </provider>
502
+ </entry>
503
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
504
+ <provider selected="true" editor-type-id="text-editor">
505
+ <state vertical-scroll-proportion="0.0" vertical-offset="612" max-vertical-offset="3438">
506
+ <caret line="34" column="24" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" />
507
+ <folding />
508
+ </state>
509
+ </provider>
510
+ </entry>
511
+ <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
512
+ <provider selected="true" editor-type-id="text-editor">
513
+ <state vertical-scroll-proportion="0.0" vertical-offset="414" max-vertical-offset="702">
514
+ <caret line="23" column="2" selection-start-line="23" selection-start-column="2" selection-end-line="23" selection-end-column="55" />
515
+ <folding />
516
+ </state>
517
+ </provider>
518
+ </entry>
519
+ <entry file="file://$PROJECT_DIR$/Gemfile">
520
+ <provider selected="true" editor-type-id="text-editor">
521
+ <state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="180">
522
+ <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
523
+ <folding />
524
+ </state>
525
+ </provider>
526
+ </entry>
527
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
528
+ <provider selected="true" editor-type-id="text-editor">
529
+ <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
530
+ <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
531
+ <folding />
532
+ </state>
533
+ </provider>
534
+ </entry>
535
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
536
+ <provider selected="true" editor-type-id="text-editor">
537
+ <state vertical-scroll-proportion="0.0" vertical-offset="192" max-vertical-offset="774">
538
+ <caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
539
+ <folding />
540
+ </state>
541
+ </provider>
542
+ </entry>
543
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
544
+ <provider selected="true" editor-type-id="text-editor">
545
+ <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="3438">
546
+ <caret line="34" column="24" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" />
547
+ <folding />
548
+ </state>
549
+ </provider>
550
+ </entry>
551
+ <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
552
+ <provider selected="true" editor-type-id="text-editor">
553
+ <state vertical-scroll-proportion="0.0" vertical-offset="261" max-vertical-offset="702">
554
+ <caret line="23" column="2" selection-start-line="23" selection-start-column="2" selection-end-line="23" selection-end-column="55" />
555
+ <folding />
556
+ </state>
557
+ </provider>
558
+ </entry>
559
+ <entry file="file://$PROJECT_DIR$/Gemfile">
560
+ <provider selected="true" editor-type-id="text-editor">
561
+ <state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="180">
562
+ <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
563
+ <folding />
564
+ </state>
565
+ </provider>
566
+ </entry>
567
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
568
+ <provider selected="true" editor-type-id="text-editor">
569
+ <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
570
+ <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
571
+ <folding />
572
+ </state>
573
+ </provider>
574
+ </entry>
575
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
576
+ <provider selected="true" editor-type-id="text-editor">
577
+ <state vertical-scroll-proportion="0.0" vertical-offset="192" max-vertical-offset="774">
578
+ <caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
579
+ <folding />
580
+ </state>
581
+ </provider>
582
+ </entry>
583
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
584
+ <provider selected="true" editor-type-id="text-editor">
585
+ <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="3438">
586
+ <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
587
+ <folding />
588
+ </state>
589
+ </provider>
590
+ </entry>
591
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
592
+ <provider selected="true" editor-type-id="text-editor">
593
+ <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
594
+ <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
595
+ <folding />
596
+ </state>
597
+ </provider>
598
+ </entry>
599
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
600
+ <provider selected="true" editor-type-id="text-editor">
601
+ <state vertical-scroll-proportion="0.0" vertical-offset="192" max-vertical-offset="774">
602
+ <caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
603
+ <folding />
604
+ </state>
605
+ </provider>
606
+ </entry>
607
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
608
+ <provider selected="true" editor-type-id="text-editor">
609
+ <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="3438">
610
+ <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
611
+ <folding />
612
+ </state>
613
+ </provider>
614
+ </entry>
615
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
616
+ <provider selected="true" editor-type-id="text-editor">
617
+ <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
618
+ <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
619
+ <folding />
620
+ </state>
621
+ </provider>
622
+ </entry>
375
623
  <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb">
376
624
  <provider selected="true" editor-type-id="text-editor">
377
625
  <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2070">
378
626
  <caret line="73" column="66" selection-start-line="73" selection-start-column="53" selection-end-line="73" selection-end-column="66" />
379
- <folding />
380
627
  </state>
381
628
  </provider>
382
629
  </entry>
@@ -486,14 +733,6 @@
486
733
  </state>
487
734
  </provider>
488
735
  </entry>
489
- <entry file="file://$PROJECT_DIR$/Gemfile">
490
- <provider selected="true" editor-type-id="text-editor">
491
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="707">
492
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
493
- <folding />
494
- </state>
495
- </provider>
496
- </entry>
497
736
  <entry file="file://$PROJECT_DIR$/LICENSE.txt">
498
737
  <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
499
738
  <state />
@@ -532,85 +771,95 @@
532
771
  </state>
533
772
  </provider>
534
773
  </entry>
535
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
774
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/reply_message.rb">
536
775
  <provider selected="true" editor-type-id="text-editor">
537
- <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="108">
538
- <caret line="0" column="8" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" />
776
+ <state vertical-scroll-proportion="0.5955056" vertical-offset="677" max-vertical-offset="1656">
777
+ <caret line="70" column="27" selection-start-line="70" selection-start-column="27" selection-end-line="70" selection-end-column="27" />
539
778
  </state>
540
779
  </provider>
541
780
  </entry>
542
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin.rb">
781
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/article_news.rb">
543
782
  <provider selected="true" editor-type-id="text-editor">
544
- <state vertical-scroll-proportion="0.33094996" vertical-offset="0" max-vertical-offset="979">
545
- <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
783
+ <state vertical-scroll-proportion="0.11031665" vertical-offset="0" max-vertical-offset="979">
784
+ <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
546
785
  </state>
547
786
  </provider>
548
787
  </entry>
549
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
788
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb">
550
789
  <provider selected="true" editor-type-id="text-editor">
551
- <state vertical-scroll-proportion="0.018386109" vertical-offset="36" max-vertical-offset="3438">
552
- <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="46" />
790
+ <state vertical-scroll-proportion="0.0" vertical-offset="172" max-vertical-offset="918">
791
+ <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
792
+ <folding />
553
793
  </state>
554
794
  </provider>
555
795
  </entry>
556
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/reply_message.rb">
796
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb">
557
797
  <provider selected="true" editor-type-id="text-editor">
558
- <state vertical-scroll-proportion="0.5955056" vertical-offset="677" max-vertical-offset="1656">
559
- <caret line="70" column="27" selection-start-line="70" selection-start-column="27" selection-end-line="70" selection-end-column="27" />
798
+ <state vertical-scroll-proportion="0.0" vertical-offset="1415" max-vertical-offset="2052">
799
+ <caret line="105" column="15" selection-start-line="105" selection-start-column="15" selection-end-line="105" selection-end-column="15" />
560
800
  </state>
561
801
  </provider>
562
802
  </entry>
563
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/article_news.rb">
803
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
564
804
  <provider selected="true" editor-type-id="text-editor">
565
- <state vertical-scroll-proportion="0.11031665" vertical-offset="0" max-vertical-offset="979">
566
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
805
+ <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
806
+ <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
807
+ <folding />
567
808
  </state>
568
809
  </provider>
569
810
  </entry>
570
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb">
811
+ <entry file="file://$PROJECT_DIR$/Gemfile">
571
812
  <provider selected="true" editor-type-id="text-editor">
572
- <state vertical-scroll-proportion="0.0" vertical-offset="172" max-vertical-offset="918">
573
- <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
813
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
814
+ <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
574
815
  <folding />
575
816
  </state>
576
817
  </provider>
577
818
  </entry>
578
819
  <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
579
820
  <provider selected="true" editor-type-id="text-editor">
580
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="576">
581
- <caret line="10" column="53" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="53" />
821
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="774">
822
+ <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
823
+ <folding />
824
+ </state>
825
+ </provider>
826
+ </entry>
827
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
828
+ <provider selected="true" editor-type-id="text-editor">
829
+ <state vertical-scroll-proportion="0.0" vertical-offset="21" max-vertical-offset="3438">
830
+ <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
582
831
  <folding />
583
832
  </state>
584
833
  </provider>
585
834
  </entry>
586
835
  <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb">
587
836
  <provider selected="true" editor-type-id="text-editor">
588
- <state vertical-scroll-proportion="0.0" vertical-offset="412" max-vertical-offset="1710">
589
- <caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
837
+ <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="1710">
838
+ <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
590
839
  <folding />
591
840
  </state>
592
841
  </provider>
593
842
  </entry>
594
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb">
843
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb">
595
844
  <provider selected="true" editor-type-id="text-editor">
596
- <state vertical-scroll-proportion="0.0" vertical-offset="1415" max-vertical-offset="2052">
597
- <caret line="105" column="15" selection-start-line="105" selection-start-column="15" selection-end-line="105" selection-end-column="15" />
845
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="162">
846
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
598
847
  <folding />
599
848
  </state>
600
849
  </provider>
601
850
  </entry>
602
- <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
851
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin.rb">
603
852
  <provider selected="true" editor-type-id="text-editor">
604
- <state vertical-scroll-proportion="0.0" vertical-offset="299" max-vertical-offset="702">
605
- <caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" />
853
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="450">
854
+ <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
606
855
  <folding />
607
856
  </state>
608
857
  </provider>
609
858
  </entry>
610
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb">
859
+ <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
611
860
  <provider selected="true" editor-type-id="text-editor">
612
- <state vertical-scroll-proportion="0.04522613" vertical-offset="0" max-vertical-offset="398">
613
- <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
861
+ <state vertical-scroll-proportion="0.48441926" vertical-offset="0" max-vertical-offset="706">
862
+ <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
614
863
  <folding />
615
864
  </state>
616
865
  </provider>
@@ -18,9 +18,20 @@ module EricWeixin
18
18
  render xml: message
19
19
  end
20
20
 
21
+ def snsapi_api
22
+ require "base64"
23
+ weixin_public_account = EricWeixin::PublicAccount.where(name: params["public_account_name"]).first
24
+ response = RestClient.get "https://api.weixin.qq.com/sns/oauth2/access_token?appid=#{weixin_public_account.weixin_app_id}&secret=#{weixin_public_account.weixin_secret_key}&code=#{params[:code]}&grant_type=authorization_code"
25
+ result_hash = JSON.parse(response.body)
26
+ url = "#{Base64.decode64(params["url"])}&openid=#{result_hash['openid']}"
27
+ redirect_to url
28
+ end
29
+
21
30
  def aa
22
31
  @ee = 12
23
32
  end
24
33
 
34
+
35
+
25
36
  end
26
37
  end
@@ -46,7 +46,7 @@ module EricWeixin
46
46
  # "url":"http://m.wsq.qq.com/264164362"
47
47
  # },
48
48
  # {
49
- # "name":"辣妈奶爸",
49
+ # "name":"辣妈奶爸", 13818518038 余老师
50
50
  # "sub_button":[
51
51
  # {
52
52
  # "type":"click",
@@ -38,7 +38,7 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
38
38
  weixin_user.save!
39
39
  end
40
40
  wx_user_data = public_account.get_user_data_from_weixin_api openid
41
- weixin_user.update_attributes(wx_user_data)
41
+ weixin_user.update_attributes(wx_user_data.select{|k,v| ["subscribe", "openid", "nickname", "sex", "language", "city", "province", "country", "headimgurl", "subscribe_time", "remark"].include? k })
42
42
  weixin_user
43
43
  end
44
44
  end
@@ -1 +1,2 @@
1
- <%=@ee%>
1
+ <%=@ee%>
2
+ <%=params[:openid]%>
@@ -1,3 +1,3 @@
1
1
  module EricWeixin
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eric_weixin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - 刘晓琦
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-07 00:00:00.000000000 Z
11
+ date: 2015-05-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler