diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3fceb37..3a6594a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,10 @@
-
-
-
-
-
-
-
+
+
+
@@ -31,14 +27,42 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,88 +70,58 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -147,7 +141,11 @@
limit
Ping
+ SESSION_TYPE
+
+ MUTEX_SESSION_TYPE
+
-
-
@@ -177,10 +173,13 @@
-
+
+
+
+
@@ -198,7 +197,7 @@
-
+
@@ -215,6 +214,7 @@
+
@@ -223,8 +223,8 @@
-
-
+
+
@@ -236,47 +236,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -469,7 +436,12 @@
-
+
+
+
+
+
+
1500458878821
@@ -604,11 +576,18 @@
1503507485133
-
+
+ 1504168369028
+
+
+
+ 1504168369028
+
+
-
+
@@ -620,10 +599,10 @@
-
+
-
+
@@ -665,73 +644,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -743,7 +655,6 @@
-
@@ -795,7 +706,6 @@
-
@@ -861,21 +771,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -932,29 +827,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -962,23 +838,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -986,7 +845,6 @@
-
@@ -994,7 +852,6 @@
-
@@ -1002,22 +859,134 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/const.go b/const.go
index 4d88c38..efa5695 100644
--- a/const.go
+++ b/const.go
@@ -10,9 +10,10 @@ const (
MUTEX_MAP = "HOTIME-MAP"
MUTEX_SLICE = "HOTIME-SLICE"
MUTEX_MEMORY_CACHE = "HOTIME-MUTEX-MEMORYCACHE"
+ MUTEX_HOTIME_SYSTEM_ERR="HOTIME-SYSTEM-ERR"
)
//锁关键字
const (
- SESSION_TYPE = "SESSION-TYPE#"
+ MUTEX_SESSION_TYPE = "SESSION-TYPE#"
)
\ No newline at end of file
diff --git a/error.go b/error.go
index 35a9800..3b0d6bb 100644
--- a/error.go
+++ b/error.go
@@ -15,7 +15,7 @@ func(this *Error)GetError()error{
func(this *Error)SetError(err error,loglevel ...int){
- SafeMutex("HOTIME-SYSTEM-ERR", func() interface{} {
+ SafeMutex(MUTEX_HOTIME_SYSTEM_ERR, func() interface{} {
this.err=nil
if err==nil{
this.err=err
diff --git a/session.go b/session.go
index 57ae874..dab8064 100644
--- a/session.go
+++ b/session.go
@@ -12,10 +12,10 @@ type SessionIns struct {
func (this *SessionIns) set() {
if this.ShortCache != nil {
- this.ShortCache.Cache(SESSION_TYPE+this.SessionId, this.Map)
+ this.ShortCache.Cache(MUTEX_SESSION_TYPE+this.SessionId, this.Map)
}
if this.LongCache != nil {
- this.LongCache.Cache(SESSION_TYPE+this.SessionId, this.Map)
+ this.LongCache.Cache(MUTEX_SESSION_TYPE+this.SessionId, this.Map)
}
}
@@ -44,23 +44,23 @@ func (this *SessionIns) Session(key string, data ...interface{}) *Obj {
func (this *SessionIns) get() {
if this.ShortCache != nil {
- this.Map = this.ShortCache.Cache(SESSION_TYPE + this.SessionId).ToMap()
+ this.Map = this.ShortCache.Cache(MUTEX_SESSION_TYPE + this.SessionId).ToMap()
if this.Map != nil {
return
}
}
if this.LongCache != nil {
- this.Map = this.LongCache.Cache(SESSION_TYPE + this.SessionId).ToMap()
+ this.Map = this.LongCache.Cache(MUTEX_SESSION_TYPE + this.SessionId).ToMap()
if this.Map != nil {
if this.ShortCache != nil {
- this.ShortCache.Cache(SESSION_TYPE+this.SessionId, this.Map)
+ this.ShortCache.Cache(MUTEX_SESSION_TYPE+this.SessionId, this.Map)
}
return
}
}
this.Map = Map{}
- this.ShortCache.Cache(SESSION_TYPE+this.SessionId, this.Map)
+ this.ShortCache.Cache(MUTEX_SESSION_TYPE+this.SessionId, this.Map)
return
}