.idea/workspace.xml in eric_weixin-0.0.6 vs .idea/workspace.xml in eric_weixin-0.0.7
- old
+ new
@@ -1,10 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="825e533a-b0a1-462f-abd1-eefea8ff703f" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/message_log.rb" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/moudles/mult_customer.rb" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/moudles/snsapi.rb" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/moudles/two_dimension_code.rb" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/lib/eric_weixin/reply_message.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/moudles/reply_message.rb" />
+ <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" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin.rb" />
+ <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" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/model/template_message_log.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/template_message_log.rb" />
+ <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" />
+ <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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="eric_weixin.iws" />
<ignored path=".idea/workspace.xml" />
<option name="TRACKING_ENABLED" value="true" />
@@ -24,40 +35,80 @@
<component name="FavoritesManager">
<favorites_list name="eric_weixin" />
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="eric_weixin.gemspec" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
+ <file leaf-file-name="aa.erb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="684">
- <caret line="28" column="68" selection-start-line="28" selection-start-column="68" selection-end-line="28" selection-end-column="68" />
+ <state vertical-scroll-proportion="-1.3333334" vertical-offset="0" max-vertical-offset="144">
+ <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="version.rb" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb">
+ <file leaf-file-name="snsapi.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/snsapi.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.02549575" vertical-offset="0" max-vertical-offset="706">
- <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
+ <state vertical-scroll-proportion="23.538462" vertical-offset="702" max-vertical-offset="1422">
+ <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="eric_weixin.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin.rb">
+ <file leaf-file-name="access_token.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="279" max-vertical-offset="972">
- <caret line="18" column="2" selection-start-line="18" selection-start-column="2" selection-end-line="18" selection-end-column="2" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1008">
+ <caret line="0" column="17" selection-start-line="0" selection-start-column="7" selection-end-line="0" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="reply_message.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/reply_message.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="918" max-vertical-offset="1566">
+ <caret line="66" column="81" selection-start-line="66" selection-start-column="81" selection-end-line="67" selection-end-column="83" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="mult_customer.rb" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/mult_customer.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.6523605" vertical-offset="650" max-vertical-offset="1116">
+ <caret line="53" column="7" selection-start-line="53" selection-start-column="7" selection-end-line="53" selection-end-column="7" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="two_dimension_code.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/two_dimension_code.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="432">
+ <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="version.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="162">
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
<setting name="OPEN_NEW_TAB" value="true" />
@@ -71,33 +122,42 @@
<list>
<option value="$PROJECT_DIR$/lib/app/models/public_account.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/models/public_account.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/model/public_account.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/public_account.rb" />
- <option value="$PROJECT_DIR$/lib/eric_weixin/reply_message.rb" />
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/model/news.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/model/article.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/model/article_news.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/base_controller.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/views/weixin/aa.erb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/big_application_controller.rb" />
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb" />
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" />
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" />
- <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" />
<option value="$PROJECT_DIR$/eric_weixin.gemspec" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/config/routes.rb" />
+ <option value="$PROJECT_DIR$/Gemfile.lock" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/reply_message.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/template_message_log.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/message_log.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/moudles/user_location.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" />
<option value="$PROJECT_DIR$/lib/eric_weixin.rb" />
<option value="$PROJECT_DIR$/lib/eric_weixin/version.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/moudles/two_dimension_code.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/moudles/snsapi.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/moudles/reply_message.rb" />
+ <option value="$PROJECT_DIR$/lib/eric_weixin/app/moudles/mult_customer.rb" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1440" />
- <option name="height" value="829" />
+ <option name="height" value="832" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
@@ -121,11 +181,10 @@
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="eric_weixin" />
@@ -228,10 +287,36 @@
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="moudles" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="eric_weixin" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="eric_weixin" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="lib" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="eric_weixin" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -264,26 +349,29 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="LayoutCode.rearrangeEntriesRuby" value="false" />
<property name="FullScreen" value="false" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/lib/eric_weixin/app/moudles" />
+ <recent name="$PROJECT_DIR$/lib/eric_weixin/app/model" />
+ <recent name="$PROJECT_DIR$/lib/eric_weixin/config" />
<recent name="$PROJECT_DIR$/lib/eric_weixin/app/controllers" />
<recent name="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin" />
- <recent name="$PROJECT_DIR$/lib/eric_weixin/app/model" />
- <recent name="$PROJECT_DIR$/lib/app/models" />
</key>
<key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/lib/eric_weixin/app/moudles" />
<recent name="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin" />
<recent name="$PROJECT_DIR$/lib/eric_weixin/app/model" />
<recent name="$PROJECT_DIR$/lib/eric_weixin" />
<recent name="$PROJECT_DIR$/lib/eric_weixin/model" />
</key>
@@ -385,32 +473,52 @@
<updated>1430705513351</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1440" height="829" extended-state="0" />
+ <frame x="0" y="23" width="1440" height="832" extended-state="0" />
<editor active="true" />
<layout>
<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" />
- <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" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32971507" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<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" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21573949" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<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" />
<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" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25178826" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21459228" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
- <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" />
<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" />
<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" />
- <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" />
<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" />
+ <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" />
</layout>
+ <layout-to-restore>
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19402985" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2746781" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <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" />
+ <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" />
+ <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" />
+ </layout-to-restore>
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
@@ -425,61 +533,15 @@
<option name="myTodoPanelSettings">
<TodoPanelSettings />
</option>
</component>
<component name="XDebuggerManager">
- <breakpoint-manager />
+ <breakpoint-manager>
+ <option name="time" value="1" />
+ </breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="504" max-vertical-offset="684">
- <caret line="28" column="68" selection-start-line="28" selection-start-column="68" selection-end-line="28" selection-end-column="68" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="774">
- <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="1710">
- <caret line="17" column="10" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="612" max-vertical-offset="3438">
- <caret line="34" column="24" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="414" max-vertical-offset="702">
- <caret line="23" column="2" selection-start-line="23" selection-start-column="2" selection-end-line="23" selection-end-column="55" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Gemfile">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="180">
- <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
<caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<folding />
@@ -636,11 +698,11 @@
<state vertical-scroll-proportion="0.0" vertical-offset="324" max-vertical-offset="450">
<caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/reply_message.rb">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/reply_message.rb">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="791" max-vertical-offset="1656">
<caret line="70" column="27" selection-start-line="70" selection-start-column="27" selection-end-line="70" selection-end-column="27" />
</state>
</provider>
@@ -671,11 +733,11 @@
<state vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="216">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/reply_message.rb">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/reply_message.rb">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="504" max-vertical-offset="1656">
<caret line="28" column="24" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
</state>
</provider>
@@ -723,98 +785,148 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="414">
<caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/reply_message.rb">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/article_news.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5955056" vertical-offset="677" max-vertical-offset="1656">
- <caret line="70" column="27" selection-start-line="70" selection-start-column="27" selection-end-line="70" selection-end-column="27" />
+ <state vertical-scroll-proportion="0.11031665" vertical-offset="0" max-vertical-offset="979">
+ <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/article_news.rb">
+ <entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.11031665" vertical-offset="0" max-vertical-offset="979">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
+ <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb">
+ <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="172" max-vertical-offset="918">
- <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="684">
+ <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb">
+ <entry file="file://$PROJECT_DIR$/Gemfile.lock">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="1415" max-vertical-offset="2052">
- <caret line="105" column="15" selection-start-line="105" selection-start-column="15" selection-end-line="105" selection-end-column="15" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="378">
+ <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126">
- <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
+ <state vertical-scroll-proportion="0.32642487" vertical-offset="0" max-vertical-offset="3438">
+ <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Gemfile">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/template_message_log.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
- <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+ <state vertical-scroll-proportion="1.1317716" vertical-offset="271" max-vertical-offset="1314">
+ <caret line="58" column="21" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/message_log.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="774">
- <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
+ <caret line="18" column="216" selection-start-line="18" selection-start-column="216" selection-end-line="18" selection-end-column="216" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="21" max-vertical-offset="3438">
- <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
+ <state vertical-scroll-proportion="-4.1538463" vertical-offset="1260" max-vertical-offset="2826">
+ <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="76" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/access_token.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1008">
+ <caret line="0" column="17" selection-start-line="0" selection-start-column="7" selection-end-line="0" selection-end-column="17" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="162">
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="1710">
- <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
+ <state vertical-scroll-proportion="0.06703911" vertical-offset="216" max-vertical-offset="1782">
+ <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="684">
- <caret line="28" column="68" selection-start-line="28" selection-start-column="68" selection-end-line="28" selection-end-column="68" />
+ <state vertical-scroll-proportion="-1.3333334" vertical-offset="0" max-vertical-offset="144">
+ <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/eric_weixin.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="279" max-vertical-offset="972">
- <caret line="18" column="2" selection-start-line="18" selection-start-column="2" selection-end-line="18" selection-end-column="2" />
+ <state vertical-scroll-proportion="0.37818182" vertical-offset="44" max-vertical-offset="666">
+ <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb">
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/two_dimension_code.rb">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.02549575" vertical-offset="0" max-vertical-offset="706">
- <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="432">
+ <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="1.9776536" vertical-offset="0" max-vertical-offset="1548">
+ <caret line="59" column="17" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/snsapi.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="23.538462" vertical-offset="702" max-vertical-offset="1422">
+ <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/reply_message.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="918" max-vertical-offset="1566">
+ <caret line="66" column="81" selection-start-line="66" selection-start-column="81" selection-end-line="67" selection-end-column="83" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/moudles/mult_customer.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.6523605" vertical-offset="650" max-vertical-offset="1116">
+ <caret line="53" column="7" selection-start-line="53" selection-start-column="7" selection-end-line="53" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</component>