zhangxinlei1996 3 жил өмнө
parent
commit
b370c6ed17

+ 6 - 1
api/etc/usercenter-api.yaml

@@ -11,4 +11,9 @@ GatewayRpcConf:
     Hosts:
       -  192.168.3.240:2379
     Key: gatewayDemo.rpc
-Timeout:  5000
+Timeout:  5000
+Logx:
+  Mode: console #console|file|volume
+  Path: ./logs
+  Level: info #info|error|severe
+  KeepDays: 10

+ 2 - 0
api/internal/config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
 )
@@ -9,4 +10,5 @@ type Config struct {
 	rest.RestConf
 	UserCenterRpcConf zrpc.RpcClientConf
 	GatewayRpcConf    zrpc.RpcClientConf
+	Logx              logx.LogConf
 }

+ 4 - 4
api/usercenter.go

@@ -3,21 +3,20 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"os/signal"
 	"syscall"
 
+	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/config"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/handler"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/entity"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/usercenter"
 	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
-
-	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
 )
 
 var configFile = flag.String("f", "etc/usercenter-api.yaml", "the config file")
@@ -25,11 +24,12 @@ var configFile = flag.String("f", "etc/usercenter-api.yaml", "the config file")
 func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
+	// logx 根据配置初始化
+	logx.MustSetup(c.Logx)
 
 	//前置代理相关
 	var serverCode string = "usercenter"
 	var serverPort int = c.Port
-	log.Println("c.UserCenterRpcConf.Endpoints[0]:", c.GatewayRpcConf.Etcd.Hosts[0])
 	closeNotify, err := node.NewNode(c.GatewayRpcConf.Etcd.Hosts[0]).Register(serverCode, fmt.Sprintf("%d", serverPort))
 	if err != nil {
 		panic(err)

+ 7 - 10
entity/ent.go

@@ -14,6 +14,7 @@ import (
 	resourcepb "bp.jydev.jianyu360.cn/BaseService/resourceCenter/rpc/pb"
 	"bp.jydev.jianyu360.cn/BaseService/resourceCenter/rpc/resource"
 	usercenterclient "bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/usercenter"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 var VarEntInfo = &EntInfo{}
@@ -157,7 +158,6 @@ func (this *EntInfo) Add() (bool, int64) {
 	}
 	return this.Mysql.ExecTx("创建企业", func(tx *sql.Tx) bool {
 		this.Id = int(this.Mysql.InsertByTx(tx, Entniche_info, m))
-		log.Println("---this id:", this.Id, m)
 		//
 		var ok_2 int64
 		if len(this.Competitors) > 0 {
@@ -315,7 +315,7 @@ func (this *Examine) EntExamine() bool {
 		resp, err := this.ResourceLib.PowerHandle(context.Background(), req)
 		//0:失败 1:成功 -1:不在有效期内 -2:数量不足 -3:没有授权
 		if resp.Status == 0 || err != nil {
-			log.Println("信息发布开通失败", this.EntId, resp.Status, "err:", err)
+			logx.Infof("信息发布开通失败", this.EntId, resp.Status, "err:", err)
 			return false
 		}
 
@@ -429,8 +429,8 @@ func (this *List) GetSql() (selectSql, selectCountSql string) {
 	pageNum, _ := strconv.Atoi(this.PageNum)
 	offset := pageNum * limit
 	selectSql += fmt.Sprintf("order by auth_endTime desc limit %v,%v", offset, limit)
-	log.Println("sql:", selectSql)
-	log.Println("sqlcout:", selectCountSql)
+	logx.Info("sql:", selectSql)
+	logx.Info("sqlcout:", selectCountSql)
 	return
 }
 
@@ -490,8 +490,8 @@ func (this *ExamineList) GetSql() (selectSql, countSql string) {
 	pageNum, _ := strconv.Atoi(this.PageNum)
 	offset := pageNum * limit
 	selectSql += fmt.Sprintf(" order by authTime  limit %v,%v", offset, limit)
-	log.Println("sql:", selectSql)
-	log.Println("sqlcout:", countSql)
+	logx.Info("sql:", selectSql)
+	logx.Info("sqlcout:", countSql)
 	return
 }
 
@@ -620,14 +620,12 @@ func (this *UpdateEnt) UpdateEnt() (int64, string) {
 		//冻结
 		req.Type = -1
 	}
-	log.Println("==============>", needUpdate)
 	if needUpdate {
-		log.Println("调用参数:", req)
 		//调用中台服务 开通权限
 		resp, err := this.ResourceLib.PowerHandle(context.Background(), req)
 		//0:失败 1:成功 -1:不在有效期内 -2:数量不足 -3:没有授权
 		if resp.Status == 0 || err != nil {
-			log.Println("信息发布开通", this.EntId, req, "err:", err)
+			logx.Infof("信息发布开通", this.EntId, req, "err:", err)
 			return -1, "失败"
 		}
 	}
@@ -722,7 +720,6 @@ func (this *GetStatusByCodeStruct) GetStatusByCode() (int, bool, string) {
 			if entids != "" {
 				entids = entids[:len(entids)-1]
 			}
-			log.Println(entids, "=========")
 			isin = this.Mysql.CountBySql(`select count(1) from entniche_user where ent_id in(?) and phone =?`, entids, this.Phone) > 0
 		}
 	}

+ 3 - 0
rpc/usercenter.go

@@ -12,6 +12,7 @@ import (
 
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/timetask"
 
+	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
@@ -24,6 +25,8 @@ func main() {
 	flag.Parse()
 	ctx := svc.NewServiceContext(config.ConfigJson)
 	svr := server.NewUserCenterServer(ctx)
+	// logx 根据配置初始化
+	logx.MustSetup(config.ConfigJson.Logx)
 
 	s := zrpc.MustNewServer(config.ConfigJson.RpcServerConf, func(grpcServer *grpc.Server) {
 		pb.RegisterUserCenterServer(grpcServer, svr)

+ 1 - 3
service/entService.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"fmt"
-	"log"
 	"strconv"
 	"time"
 
@@ -96,7 +95,7 @@ func (this *EntService) CreateEnt(data *userCenter.EntAuthReq) (int64, string, i
 			if len(*list) <= 0 {
 				return entity.ErrorCode, APPROVEDMSG, entity.ErrorCode, 0
 			}
-			log.Println(fmt.Printf("查询到该统一社会信用代码存在%v个认证企业中,默认获取第一个企业进行认证,该企业企业id为%v", len(*list), (*list)[0]["ent_id"]))
+			//log.Println(fmt.Printf("查询到该统一社会信用代码存在%v个认证企业中,默认获取第一个企业进行认证,该企业企业id为%v", len(*list), (*list)[0]["ent_id"]))
 			entinfo.Id = common.IntAll((*list)[0]["ent_id"])
 			if entinfo.Update() {
 				return entity.SuccessCode, OKMSG, 1, int64(entinfo.Id)
@@ -184,7 +183,6 @@ func (this *EntService) EntList(data *userCenter.EntListReq) (int64, string, *us
 	i_pageSize, _ := strconv.Atoi(pageSize)
 	list := []*userCenter.EntList{}
 	for _, v := range *r {
-		log.Println(v)
 		list = append(list, &userCenter.EntList{
 			Id:               common.Int64All(v["id"]),                  //机构id
 			ComPanyType:      common.Int64All(v["comPanyType"]),         // 机构性质    1企业   2党政机关事业单位及其他