Merge branch 'master' of https://code.fnuoos.com/zhimeng/ad_platform

app/hdl/hdl_register.go

@@ -57,7 +57,7 @@ func RegisterForMedium(c *gin.Context) {
 		Uuid:                        utils.StrToInt(masterId),
 		MediumId:                    utils.StrToInt(mediumId),
 		Kind:                        1,
-		SettlementType:              1,
+		SettlementType:              3,
 		CompanyName:                 "",
 		CompanyAbbreviation:         "",
 		UnifiedSocialCreditCode:     "",
@@ -167,7 +167,7 @@ func RegisterForAgent(c *gin.Context) {
 		Uuid:                        utils.StrToInt(masterId),
 		AgentId:                     utils.StrToInt(agentId),
 		Kind:                        1,
-		SettlementType:              1,
+		SettlementType:              3,
 		CompanyName:                 "",
 		CompanyAbbreviation:         "",
 		UnifiedSocialCreditCode:     "",

app/hdl/hdl_set_center.go

@@ -477,8 +477,8 @@ func ShareIndex(c *gin.Context) {
 	}
 	e.OutSuc(c, md.ShareIndexResp{
 		MasterId:     masterId,
-		AgentDomain:  agentDomain,
-		MediumDomain: mediumDomain,
+		AgentDomain:  "http://" + agentDomain,
+		MediumDomain: "http://" + mediumDomain,
 	}, nil)
 	return
 }

app/router/router.go

@@ -145,7 +145,7 @@ func rSetCenter(r *gin.RouterGroup) {
 		rAppletSetCenter.DELETE("/delete/:id", hdl.AppletDelete)
 		rAppletSetCenter.GET("/authorize", hdl.AppletAuthorize)
 		rAppletSetCenter.GET("/unauthorized", hdl.AppletUnauthorized)
-		rAppletShieldRules := r.Group("/shieldRules")
+		rAppletShieldRules := rAppletSetCenter.Group("/shieldRules")
 		{
 			rAppletShieldRules.POST("/getBlackList", hdl.AppletGetBlackList)
 			rAppletShieldRules.POST("/addBlackList", hdl.AppletAddBlackList)

app/svc/svc_medium_agent.go

@@ -212,7 +212,7 @@ func GetMediumInfo(c *gin.Context, mediumId int) map[string]string {
 		"name":    "",
 	}
 	NewMediumDb := implement2.NewMediumDb(MasterDb(c))
-	NewMediumListDb := implement.NewMediumListDb(MasterDb(c))
+	NewMediumListDb := implement.NewMediumListDb(db.Db)
 	medium := NewMediumDb.GetSuperAdmin(mediumId)
 	if medium != nil {
 		res["account"] = medium.Username