From 3b2d69dde3ae175bf00981e0d95e7e8cafd5f3a1 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 27 七月 2021 14:45:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/pubsub/esutil
---
.idea/workspace.xml | 111 +++++++++++++++++++++++++++++++------------------------
1 files changed, 62 insertions(+), 49 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e5fc6b3..5a9e8e5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="1fb5f475-f58f-4cd4-ab82-c1d23d0fd3da" name="Default Changelist" comment="fix url" />
+ <list default="true" id="2be7b635-bdd4-48e1-8bd6-40cf39b3fb96" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -9,17 +11,31 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file pinned="false" current-in-tab="true">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/EsApi.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-459">
- <caret line="290" selection-start-line="290" selection-end-line="290" />
+ <state relative-caret-position="816">
+ <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/EsClient.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2688">
+ <caret line="166" selection-start-line="166" selection-end-line="166" />
</state>
</provider>
</entry>
</file>
</leaf>
+ </component>
+ <component name="FindInProjectRecents">
+ <findStrings>
+ <find>Aiocean</find>
+ </findStrings>
</component>
<component name="GOROOT" path="D:\Go" />
<component name="Git.Settings">
@@ -33,16 +49,18 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="1912" />
+ <option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
- <option name="height" value="1056" />
+ <option name="height" value="1176" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -54,15 +72,12 @@
<select />
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
- <property name="GO_FMT" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1569659117288" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1591409471677" />
<property name="go.gopath.indexing.explicitly.defined" value="true" />
<property name="go.sdk.automatically.set" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -86,71 +101,69 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="1fb5f475-f58f-4cd4-ab82-c1d23d0fd3da" name="Default Changelist" comment="" />
- <created>1569658990638</created>
+ <changelist id="2be7b635-bdd4-48e1-8bd6-40cf39b3fb96" name="Default Changelist" comment="" />
+ <created>1590646278483</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1569658990638</updated>
- <workItem from="1569658991953" duration="138000" />
+ <updated>1590646278483</updated>
+ <workItem from="1590646280118" duration="7715000" />
+ <workItem from="1592791749821" duration="1208000" />
+ <workItem from="1592795412897" duration="22000" />
+ <workItem from="1627366945406" duration="26000" />
</task>
- <task id="LOCAL-00001" summary="fix url">
- <created>1569659102248</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1569659102248</updated>
- </task>
- <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="138000" />
+ <option name="totallyTimeSpent" value="8971000" />
</component>
<component name="ToolWindowManager">
- <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
+ <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
<layout>
- <window_info id="Image Layers" />
- <window_info id="Designer" />
- <window_info id="UI Designer" />
- <window_info id="Capture Tool" />
- <window_info id="Favorites" side_tool="true" />
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.116204694" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
- <window_info anchor="bottom" id="Database Changes" />
- <window_info anchor="bottom" id="Version Control" />
- <window_info anchor="bottom" id="Terminal" />
- <window_info anchor="bottom" id="Event Log" side_tool="true" />
+ <window_info id="Image Layers" order="2" />
+ <window_info id="Designer" order="3" />
+ <window_info id="UI Designer" order="4" />
+ <window_info id="Capture Tool" order="5" />
+ <window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" weight="0.329718" />
+ <window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
- <window_info anchor="right" id="Palette" />
- <window_info anchor="right" id="Theme Preview" />
- <window_info anchor="right" id="Maven" />
- <window_info anchor="right" id="Capture Analysis" />
- <window_info anchor="right" id="Palette	" />
- <window_info anchor="right" id="Database" />
+ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" order="8" />
+ <window_info anchor="bottom" id="Database Changes" order="9" />
+ <window_info anchor="bottom" id="Terminal" order="10" />
+ <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Palette" order="3" />
+ <window_info anchor="right" id="Theme Preview" order="4" />
+ <window_info anchor="right" id="Maven" order="5" />
+ <window_info anchor="right" id="Capture Analysis" order="6" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Database" order="8" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
- <component name="VcsManagerConfiguration">
- <MESSAGE value="fix url" />
- <option name="LAST_COMMIT_MESSAGE" value="fix url" />
- </component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/EsApi.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-459">
- <caret line="290" selection-start-line="290" selection-end-line="290" />
+ <state relative-caret-position="816">
+ <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/EsClient.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2688">
+ <caret line="166" selection-start-line="166" selection-end-line="166" />
</state>
</provider>
</entry>
--
Gitblit v1.8.0