打包客户端

Author: aaronchen2k

internal/pkg/config/model.go

@@ -8,6 +8,7 @@ import (
 type Config struct {
 	MaxSize     int64       `mapstructure:"max-size" json:"burst" yaml:"max-size"`
 	System      System      `mapstructure:"system" json:"system" yaml:"system"`
+	Mail        Mail        `mapstructure:"mail" json:"mail" yaml:"mail"`
 	Limit       Limit       `mapstructure:"limit" json:"limit" yaml:"limit"`
 	Zap         myZap.Zap   `mapstructure:"zap" json:"zap" yaml:"zap"`
 	Redis       Redis       `mapstructure:"redis" json:"redis" yaml:"redis"`
@@ -34,6 +35,13 @@ type System struct {
 	TimeFormat    string `mapstructure:"time-format" json:"timeFormat" yaml:"time-format"`
 }
 
+type Mail struct {
+	SmtpAddress string `mapstructure:"smtpAddress" json:"smtpAddress" yaml:"smtpAddress"`
+	SmtpPort    int    `mapstructure:"smtpPort" json:"smtpPort" yaml:"smtpPort"`
+	Account     string `mapstructure:"account" json:"account" yaml:"account"`
+	Password    string `mapstructure:"password" json:"password" yaml:"password"`
+}
+
 type Limit struct {
 	Disable bool    `mapstructure:"disable" json:"disable" yaml:"disable"`
 	Limit   float64 `mapstructure:"limit" json:"limit" yaml:"limit"`

internal/pkg/consts/consts.go

@@ -41,11 +41,6 @@ const (
 	ExtractorErr = "extractor_err"
 	ContentErr   = "content_err"
 
-	EmailSmtpAddress = "smtp.exmail.qq.com"
-	EmailSmtpPort    = 465
-	EmailAccount     = "chenqi@deeptest.com"
-	EmailPassword    = ""
-
 	HttpRequestTimeout = 60 * time.Second
 	DeepestKey         = "com_deeptest_prop_for_selection"
 	KEY_BASE_URL       = "_base_url_"

internal/server/modules/service/account.go

@@ -110,12 +110,14 @@ func (s *AccountService) Register(tenantId consts.TenantId, req v1.RegisterReq)
 
 	s.UserRepo.Register(tenantId, &user)
 
-	//mp := map[string]string{
-	//	"name": user.Name,
-	//	"sys":  consts.Sys,
-	//	"url":  consts.Url,
-	//}
-	//_mailUtils.Send(user.Email, _i118Utils.Sprintf("register_success"), "register-success", mp)
+	if config.CONFIG.System.Name == "deeptest" {
+		mp := map[string]string{
+			"name": user.Name,
+			"sys":  consts.Sys,
+			"url":  consts.Url,
+		}
+		_mailUtils.Send(user.Email, _i118Utils.Sprintf("register_success"), "register-success", mp)
+	}
 
 	return
 }

pkg/lib/mail/mail.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/aaronchen2k/deeptest"
+	"github.com/aaronchen2k/deeptest/internal/pkg/config"
 	"github.com/aaronchen2k/deeptest/internal/pkg/consts"
 	"github.com/aaronchen2k/deeptest/pkg/lib/comm"
 	"github.com/aaronchen2k/deeptest/pkg/lib/i118"
@@ -20,18 +21,13 @@ import (
 	"strings"
 )
 
-// name
-// inviter
-// sys
-// url
-// vcode
-
 func Send(to, subject, tmpl string, mp map[string]string) (err error) {
 	d := gomail.NewDialer(
-		consts.EmailSmtpAddress,
-		consts.EmailSmtpPort,
-		consts.EmailAccount,
-		consts.EmailPassword)
+		config.CONFIG.Mail.SmtpAddress,
+		config.CONFIG.Mail.SmtpPort,
+		config.CONFIG.Mail.Account,
+		config.CONFIG.Mail.Password)
+
 	s, err := d.Dial()
 	if err != nil {
 		return

res/server.yaml

@@ -9,6 +9,13 @@ limit:
   disable: true
   limit: 0
   burst: 5
+
+mail:
+  smtpAddress: smtp.exmail.qq.com
+  smtpPort: 465
+  account: mail@deeptest.com
+  password:
+
 max-size: 1024
 maxsize: 1024
 mcs:
@@ -44,7 +51,7 @@ saas:
     appSecret: ""
   host: ""
 system:
-  name: ""
+  name: "deeptest"
   sysEnv: ""
   level: debug
   serverAddress: 0.0.0.0:8085
@@ -54,6 +61,7 @@ system:
   db-type: mysql
   cache-type: redis
   time-format: "2006-01-02 15:04:05"
+
 thirdparty:
   username: ""
   password: ""

xdoc/notes.txt

@@ -68,9 +68,6 @@ npm config set ELECTRON_MIRROR=https://npm.taobao.org/mirrors/electron/
 scp -r ~/work/qiniu/deeptest/* lighthouse@111.231.16.35:~/work/qiniu/deeptest
 nohup light-server -s ~/work/qiniu/deeptest > ~/light-server.log 2>&1 &
 
-git push -f github dt:main
-git push -f github feature/chenqi99/var_in_params:feature/chenqi99/var_in_params
-
 测试：
 基本Websocket
     ws://111.231.16.35:9090/ws
@@ -87,6 +84,10 @@ gRPC
     ${_do_something('test ' + g_var1 + ' ' + escape('https://baidu.com'))}
     int2=='101' && function(x) {return x + 100} (6) == 106
 
+# 版本库
+git push -f github dt:main
+git push -f github feature/chenqi99/var_in_params:feature/chenqi99/var_in_params
+
 # 打包命令
 ENV=dp rm -rf bin && make default