This commit is contained in:
hoteas 2017-08-23 02:07:13 +00:00
parent 2dc47959bf
commit e47004c638
2 changed files with 57 additions and 29 deletions

View File

@ -26,7 +26,7 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="const.go" pinned="false" current-in-tab="true">
<file leaf-file-name="const.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/const.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
@ -36,6 +36,19 @@
</provider>
</entry>
</file>
<file leaf-file-name="context.go" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/context.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="40" column="16" lean-forward="false" selection-start-line="40" selection-start-column="16" selection-end-line="40" selection-end-column="16" />
<folding>
<element signature="e#16#65#0" expanded="true" />
<marker date="1503454050929" expanded="true" signature="715:832" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="error.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/error.go">
<provider selected="true" editor-type-id="text-editor">
@ -118,18 +131,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="var.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/var.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="24" lean-forward="true" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
<folding>
<marker date="1502936006492" expanded="true" signature="821:829" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -170,13 +171,13 @@
<option value="$PROJECT_DIR$/base.go" />
<option value="$PROJECT_DIR$/config/config.json" />
<option value="$PROJECT_DIR$/example/main.go" />
<option value="$PROJECT_DIR$/context.go" />
<option value="$PROJECT_DIR$/base_context.go" />
<option value="$PROJECT_DIR$/db.go" />
<option value="$PROJECT_DIR$/cache_db.go" />
<option value="$PROJECT_DIR$/cache_memory.go" />
<option value="$PROJECT_DIR$/obj.go" />
<option value="$PROJECT_DIR$/session.go" />
<option value="$PROJECT_DIR$/context.go" />
</list>
</option>
</component>
@ -261,6 +262,32 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="hotime" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="External Libraries" />
<option name="myItemType" value="com.jetbrains.php.config.library.PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="GOPATH &lt;hotime&gt;" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="go.hoteas.com" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="hotime" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="example" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="hotime" />
@ -530,7 +557,7 @@
<workItem from="1502760226287" duration="153000" />
<workItem from="1502935911308" duration="1724000" />
<workItem from="1503366689326" duration="2378000" />
<workItem from="1503451223794" duration="2730000" />
<workItem from="1503451223794" duration="2825000" />
</task>
<task id="LOCAL-00001">
<created>1500458878821</created>
@ -641,7 +668,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="60987000" />
<option name="totallyTimeSpent" value="61082000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -654,8 +681,9 @@
</component>
<component name="ToolWindowManager">
<frame x="55" y="-8" width="1873" height="1096" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30777717" 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" show_stripe_button="true" weight="0.30777717" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32846716" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@ -951,17 +979,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/context.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="15" lean-forward="false" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
<folding>
<element signature="e#16#65#0" expanded="true" />
<marker date="1503453848297" expanded="true" signature="715:840" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/example/main.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
@ -1090,5 +1107,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/context.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="40" column="16" lean-forward="false" selection-start-line="40" selection-start-column="16" selection-end-line="40" selection-end-column="16" />
<folding>
<element signature="e#16#65#0" expanded="true" />
<marker date="1503454050929" expanded="true" signature="715:832" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

View File

@ -38,7 +38,7 @@ func (this *Context) Display(statu int, data interface{}) {
tpe := this.Config.GetMap("error").GetString(ObjToStr(statu))
if tpe == "" {
this.LastErr.SetError(errors.New("找不到对应的错误码"))
this.SetError(errors.New("找不到对应的错误码"))
}
temp["type"] = tpe