From f22e059172e7dcaba77428f37be5437595ce90e8 Mon Sep 17 00:00:00 2001
From: hoteas <925970985@qq.com>
Date: Wed, 29 Apr 2020 23:02:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=A7=BB=E5=8A=A8=E5=88=B0go?=
 =?UTF-8?q?lang=E7=BB=84=E7=BB=87=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml      | 36 +++++++++++++++++++++++++++++++++---
 cache/cache_redis.go     |  2 +-
 dri/download/download.go |  2 +-
 dri/upload/upload.go     |  2 +-
 example/main.go          |  4 ++--
 manage/manage.go         |  2 +-
 tools/db/auto.go         |  6 +++---
 tools/mysql/mysql.go     |  2 +-
 tools/sqlite/sqlite.go   |  2 +-
 9 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 743c38e..53cf7e2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b2aca021-ff30-4cbf-8dc9-8cdd4f4c39dc" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cache/cache_redis.go" beforeDir="false" afterPath="$PROJECT_DIR$/cache/cache_redis.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dri/download/download.go" beforeDir="false" afterPath="$PROJECT_DIR$/dri/download/download.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dri/upload/upload.go" beforeDir="false" afterPath="$PROJECT_DIR$/dri/upload/upload.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/manage/manage.go" beforeDir="false" afterPath="$PROJECT_DIR$/manage/manage.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/db/auto.go" beforeDir="false" afterPath="$PROJECT_DIR$/tools/db/auto.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/mysql/mysql.go" beforeDir="false" afterPath="$PROJECT_DIR$/tools/mysql/mysql.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/sqlite/sqlite.go" beforeDir="false" afterPath="$PROJECT_DIR$/tools/sqlite/sqlite.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -19,6 +27,7 @@
   <component name="GOROOT" path="D:/app/go64" />
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="ProjectId" id="1TPrQqMMb4T7xS6v0afE7E8yl1y" />
   <component name="ProjectViewState">
@@ -75,7 +84,8 @@
       <workItem from="1582182838832" duration="14000" />
       <workItem from="1582292274571" duration="542000" />
       <workItem from="1582294370646" duration="8304000" />
-      <workItem from="1587612026715" duration="25000" />
+      <workItem from="1587612026715" duration="645000" />
+      <workItem from="1588172125238" duration="365000" />
     </task>
     <task id="LOCAL-00001" summary="清理">
       <created>1573372845218</created>
@@ -154,7 +164,14 @@
       <option name="project" value="LOCAL" />
       <updated>1582301621585</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="删除老分支库改新代码库">
+      <created>1587612208516</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1587612208516</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -181,12 +198,25 @@
     <MESSAGE value="增加访问ip打印等功能" />
     <MESSAGE value="优化初步使用" />
     <MESSAGE value="增加log文件存取，以及增加LOG函数" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加log文件存取，以及增加LOG函数" />
+    <MESSAGE value="删除老分支库改新代码库" />
+    <option name="LAST_COMMIT_MESSAGE" value="删除老分支库改新代码库" />
   </component>
   <component name="WindowStateProjectService">
     <state x="313" y="119" key="#GOROOT" timestamp="1587612050202">
       <screen x="0" y="0" width="1440" height="920" />
     </state>
     <state x="313" y="119" key="#GOROOT/0.0.1440.920@0.0.1440.920" timestamp="1587612050202" />
+    <state x="298" y="57" key="CommitChangelistDialog2" timestamp="1587612207786">
+      <screen x="0" y="0" width="1440" height="920" />
+    </state>
+    <state x="298" y="57" key="CommitChangelistDialog2/0.0.1440.920@0.0.1440.920" timestamp="1587612207786" />
+    <state x="313" y="194" key="Vcs.Push.Dialog.v2" timestamp="1587612553622">
+      <screen x="0" y="0" width="1440" height="920" />
+    </state>
+    <state x="313" y="194" key="Vcs.Push.Dialog.v2/0.0.1440.920@0.0.1440.920" timestamp="1587612553622" />
+    <state x="499" y="378" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1588172143499">
+      <screen x="0" y="0" width="1440" height="920" />
+    </state>
+    <state x="499" y="378" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1440.920@0.0.1440.920" timestamp="1588172143499" />
   </component>
 </project>
\ No newline at end of file
diff --git a/cache/cache_redis.go b/cache/cache_redis.go
index c7baf78..1688053 100644
--- a/cache/cache_redis.go
+++ b/cache/cache_redis.go
@@ -1,7 +1,7 @@
 package cache
 
 import (
-	. "code.hoteas.com/hoteas/hotime"
+	. "code.hoteas.com/golang/hotime"
 	"github.com/garyburd/redigo/redis"
 	"strings"
 	"time"
diff --git a/dri/download/download.go b/dri/download/download.go
index abe4924..6ad0801 100644
--- a/dri/download/download.go
+++ b/dri/download/download.go
@@ -2,7 +2,7 @@ package download
 
 import (
 	"bytes"
-	"code.hoteas.com/hoteas/hotime"
+	"code.hoteas.com/golang/hotime"
 	"io"
 	"io/ioutil"
 	"net/http"
diff --git a/dri/upload/upload.go b/dri/upload/upload.go
index d87565a..0b5a043 100644
--- a/dri/upload/upload.go
+++ b/dri/upload/upload.go
@@ -1,7 +1,7 @@
 package upload
 
 import (
-	"code.hoteas.com/hoteas/hotime"
+	"code.hoteas.com/golang/hotime"
 	"errors"
 	"io"
 	"mime/multipart"
diff --git a/example/main.go b/example/main.go
index 71d64f4..9066f02 100644
--- a/example/main.go
+++ b/example/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"code.hoteas.com/hoteas/hotime"
-	"code.hoteas.com/hoteas/hotime/tools/db"
+	"code.hoteas.com/golang/hotime"
+	"code.hoteas.com/golang/hotime/tools/db"
 	"fmt"
 	//"go.hoteas.com/hotime/cache"
 	"golang.org/x/net/websocket"
diff --git a/manage/manage.go b/manage/manage.go
index 5bbac12..38fdbe6 100644
--- a/manage/manage.go
+++ b/manage/manage.go
@@ -1,7 +1,7 @@
 package manage
 
 import (
-	"code.hoteas.com/hoteas/hotime"
+	"code.hoteas.com/golang/hotime"
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
 	"golang.org/x/net/websocket"
diff --git a/tools/db/auto.go b/tools/db/auto.go
index b648fa2..261ea10 100644
--- a/tools/db/auto.go
+++ b/tools/db/auto.go
@@ -1,9 +1,9 @@
 package db
 
 import (
-	"code.hoteas.com/hoteas/hotime"
-	"code.hoteas.com/hoteas/hotime/tools/mysql"
-	"code.hoteas.com/hoteas/hotime/tools/sqlite"
+	"code.hoteas.com/golang/hotime"
+	"code.hoteas.com/golang/hotime/tools/mysql"
+	"code.hoteas.com/golang/hotime/tools/sqlite"
 	"strings"
 )
 
diff --git a/tools/mysql/mysql.go b/tools/mysql/mysql.go
index 4d290be..23cfb3a 100644
--- a/tools/mysql/mysql.go
+++ b/tools/mysql/mysql.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
-	"code.hoteas.com/hoteas/hotime"
+	"code.hoteas.com/golang/hotime"
 	"database/sql"
 	_ "github.com/go-sql-driver/mysql"
 )
diff --git a/tools/sqlite/sqlite.go b/tools/sqlite/sqlite.go
index bea0e04..e7d9534 100644
--- a/tools/sqlite/sqlite.go
+++ b/tools/sqlite/sqlite.go
@@ -1,7 +1,7 @@
 package sqlite
 
 import (
-	"code.hoteas.com/hoteas/hotime"
+	"code.hoteas.com/golang/hotime"
 	"database/sql"
 	_ "github.com/mattn/go-sqlite3"
 )