优化整体

cache/cache_memory.go

@@ -17,47 +17,47 @@ type CacheMemory struct {
 	mutex *sync.RWMutex
 }
 
-func (this *CacheMemory) GetError() *Error {
+func (that *CacheMemory) GetError() *Error {
 
-	return this.Error
+	return that.Error
 
 }
 
-func (this *CacheMemory) SetError(err *Error) {
-	this.Error = err
+func (that *CacheMemory) SetError(err *Error) {
+	that.Error = err
 }
 
 //获取Cache键只能为string类型
-func (this *CacheMemory) get(key string) interface{} {
-	this.Error.SetError(nil)
-	if this.Map == nil {
-		this.Map = Map{}
+func (that *CacheMemory) get(key string) interface{} {
+	that.Error.SetError(nil)
+	if that.Map == nil {
+		that.Map = Map{}
 	}
 
-	if this.Map[key] == nil {
+	if that.Map[key] == nil {
 		return nil
 	}
-	data := this.Map.Get(key, this.Error).(cacheData)
-	if this.Error.GetError() != nil {
+	data := that.Map.Get(key, that.Error).(cacheData)
+	if that.Error.GetError() != nil {
 		return nil
 	}
 
 	if data.time < time.Now().Unix() {
-		delete(this.Map, key)
+		delete(that.Map, key)
 		return nil
 	}
 	return data.data
 }
 
-func (this *CacheMemory) refreshMap() {
+func (that *CacheMemory) refreshMap() {
 
 	go func() {
-		this.mutex.Lock()
-		defer this.mutex.Unlock()
-		for key, v := range this.Map {
+		that.mutex.Lock()
+		defer that.mutex.Unlock()
+		for key, v := range that.Map {
 			data := v.(cacheData)
 			if data.time <= time.Now().Unix() {
-				delete(this.Map, key)
+				delete(that.Map, key)
 			}
 		}
 
@@ -66,15 +66,15 @@ func (this *CacheMemory) refreshMap() {
 }
 
 //key value ,时间为时间戳
-func (this *CacheMemory) set(key string, value interface{}, time int64) {
-	this.Error.SetError(nil)
+func (that *CacheMemory) set(key string, value interface{}, time int64) {
+	that.Error.SetError(nil)
 	var data cacheData
 
-	if this.Map == nil {
-		this.Map = Map{}
+	if that.Map == nil {
+		that.Map = Map{}
 	}
 
-	dd := this.Map[key]
+	dd := that.Map[key]
 
 	if dd == nil {
 		data = cacheData{}
@@ -85,74 +85,74 @@ func (this *CacheMemory) set(key string, value interface{}, time int64) {
 	data.time = time
 	data.data = value
 
-	this.Map.Put(key, data)
+	that.Map.Put(key, data)
 }
 
-func (this *CacheMemory) delete(key string) {
+func (that *CacheMemory) delete(key string) {
 	del := strings.Index(key, "*")
 	//如果通配删除
 	if del != -1 {
 		key = Substr(key, 0, del)
-		for k, _ := range this.Map {
+		for k, _ := range that.Map {
 			if strings.Index(k, key) != -1 {
-				delete(this.Map, k)
+				delete(that.Map, k)
 
 			}
 		}
 
 	} else {
-		delete(this.Map, key)
+		delete(that.Map, key)
 	}
 
 }
 
-func (this *CacheMemory) Cache(key string, data ...interface{}) *Obj {
+func (that *CacheMemory) Cache(key string, data ...interface{}) *Obj {
 
 	x := RandX(1, 100000)
 	if x > 99950 {
-		this.refreshMap()
+		that.refreshMap()
 	}
-	if this.mutex == nil {
-		this.mutex = &sync.RWMutex{}
+	if that.mutex == nil {
+		that.mutex = &sync.RWMutex{}
 	}
 
 	reData := &Obj{Data: nil}
 
 	if len(data) == 0 {
-		this.mutex.RLock()
-		reData.Data = this.get(key)
-		this.mutex.RUnlock()
+		that.mutex.RLock()
+		reData.Data = that.get(key)
+		that.mutex.RUnlock()
 		return reData
 	}
 	tim := time.Now().Unix()
 
 	if len(data) == 1 && data[0] == nil {
-		this.mutex.Lock()
-		this.delete(key)
-		this.mutex.Unlock()
+		that.mutex.Lock()
+		that.delete(key)
+		that.mutex.Unlock()
 		return reData
 	}
 
 	if len(data) == 1 {
 
-		tim = tim + this.TimeOut
+		tim = tim + that.TimeOut
 
 	}
 	if len(data) == 2 {
-		this.Error.SetError(nil)
-		tempt := ObjToInt64(data[1], this.Error)
+		that.Error.SetError(nil)
+		tempt := ObjToInt64(data[1], that.Error)
 
 		if tempt > tim {
 
 			tim = tempt
-		} else if this.Error.GetError() == nil {
+		} else if that.Error.GetError() == nil {
 
 			tim = tim + tempt
 		}
 	}
-	this.mutex.Lock()
-	this.set(key, data[0], tim)
-	this.mutex.Unlock()
+	that.mutex.Lock()
+	that.set(key, data[0], tim)
+	that.mutex.Unlock()
 	return reData
 
 }