init commit

service/annie-user/cmd/application.toml

@@ -0,0 +1,17 @@
+http_port = 9002
+
+[logger]
+level = "DEBUG"
+method = "CONSOLE"
+track_line = true
+
+[air]
+addr = "air"
+port = 8086
+service_name = "annie-user-app"
+
+[database]
+url = "root:flswld@(mysql:3306)/annie_user?charset=utf8&parseTime=True&loc=Local"
+
+[light]
+port = 10003

service/annie-user/cmd/main.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"annie-user/controller"
+	"annie-user/dao"
+	"annie-user/service"
+	"flswld.com/common/config"
+	"flswld.com/light"
+	"flswld.com/logger"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+)
+
+func main() {
+	filePath := "./application.toml"
+	config.InitConfig(filePath)
+
+	logger.InitLogger()
+	logger.LOG.Info("user start")
+
+	httpProvider := light.NewHttpProvider()
+
+	db := dao.NewDao()
+
+	svc := service.NewService(db)
+	rpcSvc := service.NewRpcService(db, svc)
+
+	rpcProvider := light.NewRpcProvider(rpcSvc)
+
+	// 认证服务
+	rpcWaterAuthConsumer := light.NewRpcConsumer("water-auth")
+
+	rpcHk4eGatewayConsumer := light.NewRpcConsumer("hk4e-gateway")
+
+	_ = controller.NewController(svc, rpcWaterAuthConsumer, rpcHk4eGatewayConsumer)
+
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
+	for {
+		s := <-c
+		logger.LOG.Info("get a signal %s", s.String())
+		switch s {
+		case syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT:
+			rpcProvider.CloseRpcProvider()
+			db.CloseDao()
+			rpcWaterAuthConsumer.CloseRpcConsumer()
+			httpProvider.CloseHttpProvider()
+			logger.LOG.Info("user exit")
+			time.Sleep(time.Second)
+			return
+		case syscall.SIGHUP:
+		default:
+			return
+		}
+	}
+}

service/annie-user/controller/admin_controller.go

@@ -0,0 +1,34 @@
+package controller
+
+import (
+	apiEntity "annie-user/entity/api"
+	"flswld.com/common/entity/dto"
+	waterAuth "flswld.com/water-api/auth"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func (c *Controller) queryUserByUsername(context *gin.Context) {
+	accessToken := c.getAccessToken(context)
+	user, err := waterAuth.WaterQueryUserByAccessToken(c.rpcWaterAuthConsumer, accessToken)
+	if err != nil {
+		context.JSON(http.StatusOK, dto.NewResponseResult(1001, "服务器内部错误", nil))
+		return
+	}
+	if !user.IsAdmin {
+		context.JSON(http.StatusOK, dto.NewResponseResult(10001, "没有访问权限", nil))
+		return
+	}
+	username := context.Query("username")
+	userQuery := c.service.QueryUserByUsername(username)
+	if userQuery == nil {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "未查询到用户", nil))
+		return
+	}
+	userRet := new(apiEntity.User)
+	userRet.Uid = userQuery.Uid
+	userRet.Username = userQuery.Username
+	userRet.Password = userQuery.Password
+	userRet.IsAdmin = userQuery.IsAdmin
+	context.JSON(http.StatusOK, dto.NewResponseResult(0, "查询用户成功", userRet))
+}

service/annie-user/controller/controller.go

@@ -0,0 +1,78 @@
+package controller
+
+import (
+	"annie-user/service"
+	"flswld.com/common/config"
+	"flswld.com/light"
+	waterAuth "flswld.com/water-api/auth"
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"strconv"
+	"strings"
+)
+
+type Controller struct {
+	service                *service.Service
+	rpcWaterAuthConsumer   *light.Consumer
+	rpcHk4eGatewayConsumer *light.Consumer
+}
+
+func NewController(service *service.Service, rpcWaterAuthConsumer *light.Consumer, rpcHk4eGatewayConsumer *light.Consumer) (r *Controller) {
+	r = new(Controller)
+	r.service = service
+	r.rpcWaterAuthConsumer = rpcWaterAuthConsumer
+	r.rpcHk4eGatewayConsumer = rpcHk4eGatewayConsumer
+	go r.registerRouter()
+	return r
+}
+
+func (c *Controller) getAccessToken(context *gin.Context) string {
+	accessToken := context.GetHeader("Authorization")
+	divIndex := strings.Index(accessToken, " ")
+	if divIndex > 0 {
+		payload := accessToken[divIndex+1:]
+		return payload
+	} else {
+		return ""
+	}
+}
+
+// access_token鉴权
+func (c *Controller) authorize() gin.HandlerFunc {
+	return func(context *gin.Context) {
+		valid, err := waterAuth.WaterVerifyAccessToken(c.rpcWaterAuthConsumer, c.getAccessToken(context))
+		if err == nil && valid == true {
+			// 验证通过
+			context.Next()
+			return
+		}
+		// 验证不通过
+		context.Abort()
+		context.JSON(http.StatusOK, gin.H{
+			"code": "10001",
+			"msg":  "没有访问权限",
+		})
+	}
+}
+
+func (c *Controller) registerRouter() {
+	if config.CONF.Logger.Level == "DEBUG" {
+		gin.SetMode(gin.DebugMode)
+	} else {
+		gin.SetMode(gin.ReleaseMode)
+	}
+	engine := gin.Default()
+	// 未认证接口
+	engine.POST("/user/reg", c.userRegister)
+	engine.Use(c.authorize())
+	// 认证接口
+	engine.POST("/user/update/pwd", c.userUpdatePassword)
+	// 管理员
+	admin := engine.Group("/user/admin")
+	{
+		admin.GET("/query/user", c.queryUserByUsername)
+	}
+	port := strconv.FormatInt(int64(config.CONF.HttpPort), 10)
+	portStr := ":" + port
+	_ = engine.Run(portStr)
+}

service/annie-user/controller/user_controller.go

@@ -0,0 +1,93 @@
+package controller
+
+import (
+	apiEntity "annie-user/entity/api"
+	dbEntity "annie-user/entity/db"
+	"flswld.com/common/entity/dto"
+	"flswld.com/common/utils/endec"
+	"flswld.com/logger"
+	waterAuth "flswld.com/water-api/auth"
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"regexp"
+)
+
+func (c *Controller) userRegister(context *gin.Context) {
+	userRegInfo := new(apiEntity.User)
+	err := context.BindJSON(&userRegInfo)
+	if err != nil {
+		context.JSON(http.StatusOK, gin.H{
+			"code": 10003,
+			"msg":  "参数错误",
+		})
+		return
+	}
+	username := userRegInfo.Username
+	password := userRegInfo.Password
+	if len(username) < 6 || len(username) > 20 {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "用户名为6-20位字符", nil))
+		return
+	}
+	if len(password) < 8 || len(password) > 20 {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "密码为8-20位字符", nil))
+		return
+	}
+	ok, err := regexp.MatchString("^[a-zA-Z0-9]{6,20}$", username)
+	if err != nil || !ok {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "用户名只能包含大小写字母和数字", nil))
+		return
+	}
+	user := c.service.QueryUserByUsername(username)
+	if user != nil {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "用户名已注册", nil))
+		return
+	}
+	user = new(dbEntity.User)
+	user.Username = username
+	user.Password = password
+	ok = c.service.RegisterUser(user)
+	if !ok {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "用户注册失败", nil))
+		return
+	}
+	logger.LOG.Info("user register success, username: %v", username)
+	context.JSON(http.StatusOK, dto.NewResponseResult(0, "用户注册成功", nil))
+}
+
+func (c *Controller) userUpdatePassword(context *gin.Context) {
+	accessToken := c.getAccessToken(context)
+	user, err := waterAuth.WaterQueryUserByAccessToken(c.rpcWaterAuthConsumer, accessToken)
+	if err != nil {
+		context.JSON(http.StatusOK, dto.NewResponseResult(1001, "服务器内部错误", nil))
+		return
+	}
+	json := make(map[string]string)
+	err = context.BindJSON(&json)
+	if err != nil {
+		context.JSON(http.StatusOK, gin.H{
+			"code": 10003,
+			"msg":  "参数错误",
+		})
+		return
+	}
+	oldPassword := json["oldPassword"]
+	newPassword := json["newPassword"]
+	if len(oldPassword) < 8 || len(oldPassword) > 20 || len(newPassword) < 8 || len(newPassword) > 20 {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "密码为8-20位字符", nil))
+		return
+	}
+	dbUser := c.service.QueryUserByUsername(user.Username)
+	if dbUser.Password != endec.Md5Str(oldPassword) {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "旧密码错误", nil))
+		return
+	}
+	dbUser.Password = endec.Md5Str(newPassword)
+	ok := c.service.UpdateUser(dbUser)
+	if !ok {
+		context.JSON(http.StatusOK, dto.NewResponseResult(-1, "修改密码失败", nil))
+		return
+	}
+	context.JSON(http.StatusOK, dto.NewResponseResult(0, "修改密码成功", nil))
+	// TODO 处理各种失效
+	_ = c.rpcHk4eGatewayConsumer.CallFunction("RpcManager", "UserPasswordChange", &dbUser.Uid, &ok)
+}

service/annie-user/dao/dao.go

@@ -0,0 +1,30 @@
+package dao
+
+import (
+	"flswld.com/common/config"
+	"flswld.com/logger"
+	"github.com/jinzhu/gorm"
+	_ "github.com/jinzhu/gorm/dialects/mysql"
+)
+
+type Dao struct {
+	db *gorm.DB
+}
+
+func NewDao() (r *Dao) {
+	r = new(Dao)
+	db, err := gorm.Open("mysql", config.CONF.Database.Url)
+	if err != nil {
+		logger.LOG.Error("db open error: %v", err)
+		panic(err)
+	}
+	if config.CONF.Logger.Level == "DEBUG" {
+		db.LogMode(true)
+	}
+	r.db = db
+	return r
+}
+
+func (d *Dao) CloseDao() {
+	_ = d.db.Close()
+}

service/annie-user/dao/user_dao.go

@@ -0,0 +1,37 @@
+package dao
+
+import (
+	dbEntity "annie-user/entity/db"
+)
+
+func (d *Dao) InsertUser(user *dbEntity.User) error {
+	db := d.db
+	err := db.Create(user).Error
+	return err
+}
+
+func (d *Dao) UpdateUser(user *dbEntity.User) error {
+	db := d.db
+	db = db.Model(&user)
+	err := db.Updates(user).Error
+	return err
+}
+
+func (d *Dao) QueryUser(user *dbEntity.User) ([]dbEntity.User, error) {
+	var userList []dbEntity.User
+	db := d.db
+	if user.Uid != 0 {
+		db = db.Where("`uid` = ?", user.Uid)
+	}
+	if user.Username != "" {
+		db = db.Where("`username` = ?", user.Username)
+	}
+	if user.Password != "" {
+		db = db.Where("`password` = ?", user.Password)
+	}
+	if user.IsAdmin != false {
+		db = db.Where("`is_admin` = ?", user.IsAdmin)
+	}
+	err := db.Find(&userList).Error
+	return userList, err
+}

service/annie-user/entity/api/user_entity.go

@@ -0,0 +1,8 @@
+package api
+
+type User struct {
+	Uid      uint64 `json:"uid"`
+	Username string `json:"username"`
+	Password string `json:"password"`
+	IsAdmin  bool   `json:"isAdmin"`
+}

service/annie-user/entity/db/user_entity.go

@@ -0,0 +1,12 @@
+package db
+
+type User struct {
+	Uid      uint64 `gorm:"column:uid;primary_key;auto_increment"`
+	Username string `gorm:"column:username"`
+	Password string `gorm:"column:password"`
+	IsAdmin  bool   `gorm:"column:is_admin"`
+}
+
+func (User) TableName() string {
+	return "user"
+}

service/annie-user/go.mod

@@ -0,0 +1,51 @@
+module annie-user
+
+go 1.19
+
+require flswld.com/common v0.0.0-incompatible
+
+replace flswld.com/common => ../../common
+
+require flswld.com/logger v0.0.0-incompatible
+
+replace flswld.com/logger => ../../logger
+
+require flswld.com/air-api v0.0.0-incompatible // indirect
+
+replace flswld.com/air-api => ../../air-api
+
+require flswld.com/light v0.0.0-incompatible
+
+replace flswld.com/light => ../../light
+
+require flswld.com/annie-user-api v0.0.0-incompatible
+
+replace flswld.com/annie-user-api => ../annie-user-api
+
+require flswld.com/water-api v0.0.0-incompatible
+
+replace flswld.com/water-api => ../../water-api
+
+require (
+	github.com/gin-gonic/gin v1.6.3
+	github.com/jinzhu/gorm v1.9.16
+)
+
+require (
+	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.13.0 // indirect
+	github.com/go-playground/universal-translator v0.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.2.0 // indirect
+	github.com/go-sql-driver/mysql v1.5.0 // indirect
+	github.com/golang/protobuf v1.3.3 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.9 // indirect
+	github.com/leodido/go-urn v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
+	github.com/ugorji/go/codec v1.1.7 // indirect
+	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
+)

service/annie-user/go.sum

@@ -0,0 +1,80 @@
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
+github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
+github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
+github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
+github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
+github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
+github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM=
+golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

service/annie-user/service/rpc_service.go

@@ -0,0 +1,17 @@
+package service
+
+import (
+	"annie-user/dao"
+)
+
+type RpcService struct {
+	dao     *dao.Dao
+	service *Service
+}
+
+func NewRpcService(dao *dao.Dao, service *Service) (r *RpcService) {
+	r = new(RpcService)
+	r.service = service
+	r.dao = dao
+	return r
+}

service/annie-user/service/rpc_user_service.go

@@ -0,0 +1,28 @@
+package service
+
+import (
+	dbEntity "annie-user/entity/db"
+	"errors"
+	rpcEntity "flswld.com/annie-user-api/entity"
+	"flswld.com/common/utils/object"
+	"flswld.com/logger"
+)
+
+func (s *RpcService) RpcQueryUser(user *rpcEntity.User, res *[]rpcEntity.User) error {
+	dbUser := new(dbEntity.User)
+	dbUser.Uid = user.Uid
+	dbUser.Username = user.Username
+	dbUser.Password = user.Password
+	dbUser.IsAdmin = user.IsAdmin
+	userList, err := s.dao.QueryUser(dbUser)
+	if err != nil {
+		logger.LOG.Error("QueryUser error: %v", err)
+		return errors.New("query user error")
+	}
+	err = object.ObjectDeepCopy(userList, res)
+	if err != nil {
+		logger.LOG.Error("ObjectDeepCopy error: %v", err)
+		return errors.New("query user error")
+	}
+	return nil
+}

service/annie-user/service/service.go

@@ -0,0 +1,15 @@
+package service
+
+import (
+	"annie-user/dao"
+)
+
+type Service struct {
+	dao *dao.Dao
+}
+
+func NewService(dao *dao.Dao) (r *Service) {
+	r = new(Service)
+	r.dao = dao
+	return r
+}

service/annie-user/service/user_service.go

@@ -0,0 +1,43 @@
+package service
+
+import (
+	dbEntity "annie-user/entity/db"
+	"flswld.com/common/utils/endec"
+	"flswld.com/logger"
+)
+
+func (s *Service) RegisterUser(user *dbEntity.User) bool {
+	user.Password = endec.Md5Str(user.Password)
+	user.IsAdmin = false
+	err := s.dao.InsertUser(user)
+	if err != nil {
+		logger.LOG.Error("insert user to db error: %v", err)
+		return false
+	}
+	return true
+}
+
+func (s *Service) UpdateUser(user *dbEntity.User) bool {
+	err := s.dao.UpdateUser(user)
+	if err != nil {
+		logger.LOG.Error("update user from db error: %v", err)
+		return false
+	}
+	return true
+}
+
+func (s *Service) QueryUserByUsername(username string) *dbEntity.User {
+	userList, err := s.dao.QueryUser(&dbEntity.User{Username: username})
+	if err != nil {
+		logger.LOG.Error("query user from db error: %v", err)
+		return nil
+	}
+	if len(userList) == 0 {
+		return nil
+	} else if len(userList) == 1 {
+		return &(userList[0])
+	} else {
+		logger.LOG.Error("find not only one user")
+		return nil
+	}
+}