2637309949 4 vuotta sitten
vanhempi
commit
b1548041db

+ 4 - 4
internal/logic/auth/loginbyweixinlogic.go

@@ -38,7 +38,7 @@ func (l *LoginByWeixinLogic) LoginByWeixin(req types.LoginByWeixinRequest) (*typ
 	}
 	err = l.svcCtx.SqlConn.Transact(func(session sqlx.Session) error {
 		var user model.User
-		err := session.QueryRowPartial(&user, fmt.Sprintf("select %s from user where `weixin_openid` = ? limit 1", model.UserRows), userInfo.OpenID)
+		err := session.QueryRowPartial(&user, fmt.Sprintf("select %s from i2bill_user where `weixin_openid` = ? limit 1", model.UserRows), userInfo.OpenID)
 		if err == sqlc.ErrNotFound {
 			user.Username = utils.GetUUID()
 			user.Password = ""
@@ -49,7 +49,7 @@ func (l *LoginByWeixinLogic) LoginByWeixin(req types.LoginByWeixinRequest) (*typ
 			user.Avatar = userInfo.AvatarUrl
 			user.Gender = userInfo.Gender
 			user.Nickname = userInfo.NickName
-			_, err = session.Exec(`insert into user (%s) values (
+			_, err = session.Exec(`insert into i2bill_user (%s) values (
 				mobile, avatar, weixin_openid, password, birthday, register_time, last_login_time, nickname, erp_id, username, gender, user_level_id, register_ip, last_login_ip
 			)`,
 				user.Mobile, user.Avatar, user.WeixinOpenid, user.Password, user.Birthday, user.RegisterTime, user.LastLoginTime, user.Nickname, user.ErpId, user.Username, user.Gender, user.UserLevelId, user.RegisterIp, user.LastLoginIp)
@@ -57,7 +57,7 @@ func (l *LoginByWeixinLogic) LoginByWeixin(req types.LoginByWeixinRequest) (*typ
 				logx.Error(err)
 				return err
 			}
-			err = session.QueryRowPartial(&user, fmt.Sprintf("select %s from user where `weixin_openid` = ? limit 1", model.UserRows), userInfo.OpenID)
+			err = session.QueryRowPartial(&user, fmt.Sprintf("select %s from i2bill_user where `weixin_openid` = ? limit 1", model.UserRows), userInfo.OpenID)
 			if err != nil {
 				logx.Error(err)
 				return err
@@ -74,7 +74,7 @@ func (l *LoginByWeixinLogic) LoginByWeixin(req types.LoginByWeixinRequest) (*typ
 
 		user.LastLoginIp = ""
 		user.LastLoginTime = utils.GetTimestamp()
-		_, err = session.Exec(`update user set 
+		_, err = session.Exec(`update i2bill_user set 
 		mobile = ?, avatar = ?, weixin_openid = ?, password = ?, birthday = ?, register_time = ?, last_login_time = ?, nickname = ?, erp_id = ?, username = ?, gender = ?, user_level_id = ?, register_ip = ?, last_login_ip = ? where id = ?`, user.Mobile, user.Avatar, user.WeixinOpenid, user.Password, user.Birthday, user.RegisterTime, user.LastLoginTime, user.Nickname, user.ErpId, user.Username, user.Gender, user.UserLevelId, user.RegisterIp, user.LastLoginIp, user.Id)
 		if err != nil {
 			logx.Error(err)

+ 1 - 1
internal/logic/user/bindmobilelogic.go

@@ -31,7 +31,7 @@ func (l *BindMobileLogic) BindMobile(req types.BindMobileRequest) (*types.BindMo
 		logx.Error(err)
 		return nil, err
 	}
-	_, err = l.svcCtx.SqlConn.Exec(`update user set mobile = ? where id = ?`, mobile, l.UserId)
+	_, err = l.svcCtx.SqlConn.Exec(`update i2bill_user set mobile = ? where id = ?`, mobile, l.UserId)
 	if err != nil {
 		logx.Error(err)
 		return nil, err

+ 1 - 1
internal/logic/user/getuserlogic.go

@@ -29,7 +29,7 @@ func NewGetUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) GetUserLog
 
 func (l *GetUserLogic) GetUser() (*types.InfoResponse, error) {
 	var user model.User
-	err := l.svcCtx.SqlConn.QueryRowPartial(&user, "select id, erp_id, avatar, birthday, username, nickname, gender, mobile from user where `id` = ? limit 1", l.UserId)
+	err := l.svcCtx.SqlConn.QueryRowPartial(&user, "select id, erp_id, avatar, birthday, username, nickname, gender, mobile from i2bill_user where `id` = ? limit 1", l.UserId)
 	if err != nil {
 		logx.Error(err)
 		return nil, err

+ 11 - 2
internal/logic/user/logic_test.go

@@ -1,13 +1,22 @@
 package user
 
 import (
+	"context"
+	"flag"
 	"fmt"
 	"testing"
 
+	"git.i2edu.net/i2/go-zero/core/conf"
+	"git.i2edu.net/i2/i2-bill-api/internal/config"
 	"git.i2edu.net/i2/i2-bill-api/internal/logic/auth"
+	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 )
 
 func TestCreateJWT(t *testing.T) {
-	l := new(auth.LoginByWeixinLogic)
-	fmt.Println(l.CreateJWT(1624415746, l.svcCtx.Config.JwtAuth.AccessSecret, nil, 1000))
+	var configFile = flag.String("f", "etc/i2bill-api.yaml", "the config file")
+	var c config.Config
+	conf.MustLoad(*configFile, &c)
+	ctx := svc.NewServiceContext(c)
+	l := auth.NewLoginByWeixinLogic(context.TODO(), ctx)
+	fmt.Println(l.CreateJWT(1624415746, c.JwtAuth.AccessSecret, nil, 1000))
 }

+ 1 - 1
model/user.sql → model/i2bill_user.sql

@@ -1,5 +1,5 @@
 
-DROP TABLE IF EXISTS `user`;
+DROP TABLE IF EXISTS `i2bill_user`;
 CREATE TABLE `i2bill_user` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   `erp_id` varchar(36) NOT NULL DEFAULT '',

+ 1 - 1
model/usermodel.go → model/i2billusermodel.go

@@ -66,7 +66,7 @@ type (
 func NewUserModel(conn sqlx.SqlConn, c cache.CacheConf) UserModel {
 	return &defaultUserModel{
 		CachedConn: sqlc.NewConn(conn, c),
-		table:      "`user`",
+		table:      "`i2bill_user`",
 	}
 }