feat:修改

api/etc/resource.yaml

@@ -3,8 +3,8 @@ Host: 0.0.0.0
 Port: 1006
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
-  Key: resource.api
+  - 192.168.3.206:2379
+  Key: resource11.api
 Mysql:
   BaseService:
     DBName: base_service

go.mod

@@ -3,11 +3,11 @@ module bp.jydev.jianyu360.cn/BaseService/resourceCenter
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20220706083640-79084ff2be42
+	app.yhyue.com/moapp/jybase v0.0.0-20220719064915-2fef79005dfa
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
 	github.com/stretchr/testify v1.8.0
 	github.com/zeromicro/go-zero v1.3.5
-	google.golang.org/grpc v1.47.0
+	google.golang.org/grpc v1.48.0
 	google.golang.org/protobuf v1.28.0
 )
 

go.sum

@@ -3,8 +3,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220415064050-37ce64b3e2d4/go.mod h1:qNRA0sHu
 app.yhyue.com/moapp/jybase v0.0.0-20220418104200-46c3fff161c7/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-app.yhyue.com/moapp/jybase v0.0.0-20220706083640-79084ff2be42 h1:w/xdk5xh7Re7k6aq7Bkb1yonBQs92SvmO2Ytfp8xF4Q=
-app.yhyue.com/moapp/jybase v0.0.0-20220706083640-79084ff2be42/go.mod h1:FjBF25AYoBrPhVKTXGXWcmEAbBT0ATTK6KJMOA+I80Q=
+app.yhyue.com/moapp/jybase v0.0.0-20220719064915-2fef79005dfa h1:fGlW3FjP2VeJCH6hZ2Oc1lwi5lI3n3U8JeLVCPKs+9c=
+app.yhyue.com/moapp/jybase v0.0.0-20220719064915-2fef79005dfa/go.mod h1:FjBF25AYoBrPhVKTXGXWcmEAbBT0ATTK6KJMOA+I80Q=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
 bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.mod h1:Yj4oabIGItuMoF0BXYLz2XAnF581kxgXBrvlUtIJrkI=
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4 h1:zl5eZrKDBENVVBUiPpzyQQ0/SBdGUmZS3thXycSEO1g=
@@ -959,8 +959,9 @@ google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzI
 google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
 google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
+google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

public/service/surplus.go

@@ -29,6 +29,11 @@ func Surplus(appid, function_code string, user_id, ent_id, ent_user_id int64) (i
 		return -1, 0, 0, errors.New("不在有效期内")
 	}
 	if function.Power_rule == 1 { //只对周期进行校验
+		for _, v := range *myPowers {
+			if v.Power_type == 2 && !Base_ent_empower.HasEmpower(appid, function_code, ent_id, ent_user_id) {
+				return -3, 0, 0, errors.New("没有对该用户进行授权")
+			}
+		}
 		return 1, 0, 0, nil
 	}
 	if function.Power_rule == 2 { //周期+数量校验

test/resource.go

@@ -60,8 +60,9 @@ func CancelPowerHandle() {
 func CheckPower() {
 	r, err := c.CheckPower(context.Background(), &pb.CheckPowerReq{
 		Appid:        "10000",
-		FunctionCode: "xxfb_gyxx_add",
-		EntId:        14829,
+		FunctionCode: "znsj_kf_use",
+		EntId:        14184,
+		EntUserId:    4271,
 	})
 	log.Println("----------", r.Status, err)
 }
@@ -79,7 +80,7 @@ func Deduction() {
 
 //资源扣减
 func ReEmpower() {
-	r, err := c.ReEmpower(context.Background(), &pb.ReEmpowerReq{
+	r, err := c.ReEmpower(context.Background(), &pb.EmpowerReq{
 		Appid:        "10000",
 		FunctionCode: "znsj_kf_use",
 		EntId:        14184,