升级同时支持http与https

.gitignore

@@ -1 +1,2 @@
 /.idea/*
+.idea

.idea/hotime.iml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/hotime.iml" filepath="$PROJECT_DIR$/.idea/hotime.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.idea/workspace.xml

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="b2aca021-ff30-4cbf-8dc9-8cdd4f4c39dc" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/cache/cache_redis.go" beforeDir="false" afterPath="$PROJECT_DIR$/cache/cache_redis.go" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Go File" />
-      </list>
-    </option>
-  </component>
-  <component name="GOROOT" path="D:/app/go64" />
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1TPrQqMMb4T7xS6v0afE7E8yl1y" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="DefaultGoTemplateProperty" value="Go File" />
-    <property name="GO_FMT" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="go.import.settings.migrated" value="true" />
-    <property name="go.sdk.automatically.set" value="true" />
-    <property name="go.tried.to.enable.integration.vgo.integrator" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\gopath\src\code.hoteas.com\hoteas\hotime\tools" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="go build code.hoteas.com/hoteas/hotime/example" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
-      <module name="hotime" />
-      <working_directory value="$PROJECT_DIR$/" />
-      <kind value="PACKAGE" />
-      <filePath value="$PROJECT_DIR$/example/main.go" />
-      <package value="code.hoteas.com/hoteas/hotime/example" />
-      <directory value="$PROJECT_DIR$/" />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Go Build.go build code.hoteas.com/hoteas/hotime/example" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="b2aca021-ff30-4cbf-8dc9-8cdd4f4c39dc" name="Default Changelist" comment="" />
-      <created>1573372557346</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1573372557346</updated>
-      <workItem from="1573372558521" duration="18000" />
-      <workItem from="1573372583551" duration="5522000" />
-      <workItem from="1582172338195" duration="5196000" />
-      <workItem from="1582181939594" duration="501000" />
-      <workItem from="1582182581675" duration="242000" />
-      <workItem from="1582182838832" duration="14000" />
-      <workItem from="1582292274571" duration="542000" />
-      <workItem from="1582294370646" duration="8304000" />
-      <workItem from="1587612026715" duration="25000" />
-    </task>
-    <task id="LOCAL-00001" summary="清理">
-      <created>1573372845218</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1573372845218</updated>
-    </task>
-    <task id="LOCAL-00002" summary="清理">
-      <created>1573372887175</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1573372887175</updated>
-    </task>
-    <task id="LOCAL-00003" summary="自动设置数据库">
-      <created>1573375369161</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1573375369161</updated>
-    </task>
-    <task id="LOCAL-00004" summary="自动设置数据库">
-      <created>1573375745411</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1573375745411</updated>
-    </task>
-    <task id="LOCAL-00005" summary="自动设置数据库">
-      <created>1573375887561</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1573375887561</updated>
-    </task>
-    <task id="LOCAL-00006" summary="数据库缓存">
-      <created>1573380045254</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1573380045254</updated>
-    </task>
-    <task id="LOCAL-00007" summary="增加跨域配置，以及增加配置说明">
-      <created>1582179656809</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1582179656809</updated>
-    </task>
-    <task id="LOCAL-00008" summary="增加访问ip打印等功能">
-      <created>1582182399676</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1582182399676</updated>
-    </task>
-    <task id="LOCAL-00009" summary="增加访问ip打印等功能">
-      <created>1582182736196</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1582182736196</updated>
-    </task>
-    <task id="LOCAL-00010" summary="优化初步使用">
-      <created>1582292694027</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1582292694027</updated>
-    </task>
-    <task id="LOCAL-00011" summary="增加log文件存取，以及增加LOG函数">
-      <created>1582301621585</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1582301621585</updated>
-    </task>
-    <option name="localTasksCounter" value="12" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="清理" />
-    <MESSAGE value="自动设置数据库" />
-    <MESSAGE value="数据库缓存" />
-    <MESSAGE value="增加跨域配置，以及增加配置说明" />
-    <MESSAGE value="增加访问ip打印等功能" />
-    <MESSAGE value="优化初步使用" />
-    <MESSAGE value="增加log文件存取，以及增加LOG函数" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加log文件存取，以及增加LOG函数" />
-  </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" />
-  </component>
-</project>

application.go

@@ -127,7 +127,9 @@ func (this *Application) Run(router Router) {
 			ch <- 1
 
 		}()
-	} else if ObjToCeilInt(this.TLSPort) != 0 {
+	}
+
+	if ObjToCeilInt(this.TLSPort) != 0 {
 		go func() {
 
 			App[this.TLSPort] = this
@@ -139,7 +141,8 @@ func (this *Application) Run(router Router) {
 			ch <- 2
 
 		}()
-	} else {
+	}
+	if ObjToCeilInt(this.Port) == 0 && ObjToCeilInt(this.TLSPort) == 0 {
 		logFmt("没有端口启用", 2, LOG_INFO)
 		return
 

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"

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"

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"

example/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"code.hoteas.com/hoteas/hotime"
+	"code.hoteas.com/golang/hotime"
-	"code.hoteas.com/hoteas/hotime/tools/db"
+	"code.hoteas.com/golang/hotime/tools/db"
 	"fmt"
 	//"go.hoteas.com/hotime/cache"
 	"golang.org/x/net/websocket"

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"

tools/db/auto.go

@@ -1,9 +1,9 @@
 package db
 
 import (
-	"code.hoteas.com/hoteas/hotime"
+	"code.hoteas.com/golang/hotime"
-	"code.hoteas.com/hoteas/hotime/tools/mysql"
+	"code.hoteas.com/golang/hotime/tools/mysql"
-	"code.hoteas.com/hoteas/hotime/tools/sqlite"
+	"code.hoteas.com/golang/hotime/tools/sqlite"
 	"strings"
 )
 

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"
 )

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"
 )