Merge branch 'master' of http://192.168.3.207:10080/group3/SwordFish_Interface_Service

api/v1/projects.go

@@ -2,7 +2,6 @@ package v1
 
 import (
 	"encoding/json"
-	"net/http"
 	"sfbase/global"
 	"sfis/middleware"
 	"sfis/service"
@@ -46,7 +45,6 @@ func getProjectsList(c *gin.Context) {
 			return service.ProjectListData(projectName, winner, bidTime, false)
 		}, param, requestIP)
 	}
-	c.JSON(http.StatusOK, nil)
 }
 
 
@@ -67,7 +65,6 @@ func getProjectsListDetail(c *gin.Context) {
 			return service.ProjectListData("", winner, "", true)
 		}, param, requestIP)
 	}
-	c.JSON(http.StatusOK, nil)
 }
 
 //获取项目详情
@@ -91,5 +88,4 @@ func getProjectDetail(c *gin.Context) {
 	if id != "" {
 		data = service.ProjectDetailData(id)
 	}*/
-	c.JSON(200, nil)
 }

main.go

@@ -45,6 +45,7 @@ func main() {
 		global.Logger.Info("初始化产品缓存信息,", zap.Any("产品数量:", len(apis)))
 	}
 	lock.UserLockMap["sfGSVYRQMAAgkGBAUBJg4f"] = &sync.Mutex{}
+	lock.UserLockMap["sfPQRYRQMAAwcGBwYBCgcA"] = &sync.Mutex{}
 	//全局redis的使用?
 	redis.InitRedis(global.BaseConfig.RedisSession.RedisToken)
 	//启动web server

test/project/project_test.go

@@ -81,7 +81,7 @@ func Test_ProjectDetails(t *testing.T) {
 	data["project_id"] = []string{projectId}
 	data["app_id"] = []string{appID}
 	now := time.Now().Unix()
-	bs, _ := utils.HttpPostForm("http://localhost:8080/sfis/api/v1/projectList", map[string]string{
+	bs, _ := utils.HttpPostForm("http://localhost:8080/sfis/api/v1/projectDetail", map[string]string{
 		"token":     utils.MD5(fmt.Sprintf("%s%d%s", appID, now, secretKey)),
 		"timestamp": fmt.Sprint(now),
 	}, data)

utils/api_util.go

@@ -24,14 +24,19 @@ func Check(appID string, productID int, context *gin.Context, getData func() ([]
 	userProduct := &model.UserProduct{}
 	db.GetSFISDB().First(userProduct, &model.UserProduct{AppID: appID, ProductID: productID})
 	//userLock.Unlock()
-	if userProduct.InterfaceStatus != 0 {
+	if userProduct.ID == 0 {
+		response.FailWithDetailed(response.InterfaceDeleted, nil, "该用户接口未购买", context)
+		return
+	}else if userProduct.InterfaceStatus != 0 {
 		response.FailWithDetailed(response.InterfaceDeleted, nil, "该用户接口暂不提供服务", context)
+		return
 	}
 	//2.2 取用户(产品余量|钱包账户余额)校验-必须加锁
 	costModel := userProduct.CostModel //扣费模式 0扣余量,1-扣余额
 	product := GetProductByID(productID)
 	userLock.Lock()
 	log.Println(param + "锁住......")
+
 	db.GetSFISDB().First(userProduct, &model.UserProduct{AppID: appID, ProductID: productID})
 	// costModel = 0
 	switch costModel {

utils/cost_by_left_num.go

@@ -34,6 +34,7 @@ func costByLeftNum(getData func() ([]map[string]interface{}, int, error), appID
 	} else {
 		err = errors.New("剩余量不足")
 	}
+	log.Println("1111111",err)
 	return datas, err
 }