修改配置

yangfu
conf/dev.conf
deploy/k8s/dev/opp.yaml
internal/utils/sql.go
protocol/auth.go
services/auth/auth.go
--- a/conf/dev.conf
查看文件 @aa15d81
+++ b/conf/dev.conf
查看文件 @aa15d81
@@ -8,7 +8,7 @@ mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
 #日志
 log_level = "${LOG_LEVEL||debug}"
-aliyun_logs_access ="app.log"
+aliyun_logs_access ="${aliyun_logs_access||app.log}"
 #redis相关配置
@@ -22,9 +22,12 @@ yunpian_app_key ="0bf6fb10a11a68a95dee80901eb545b5"
 #存储 http://ability.fjmaimaimai.com:8080/
 source_host ="http://192.168.139.137:8080/"
 source_virtual_path=file/opp
-source_path =~/www/opp
+source_path ="${aliyun_file_access||~/www/opp}
 #网易云信 IM
 net_im_base_url ="https://api.netease.im/nimserver"
 net_im_app_secret ="a8d231f5c13a"
-net_im_app_key ="9c5410602597a7fe367aeeebd8210262"
+net_im_app_key ="9c5410602597a7fe367aeeebd8210262"
+
+#统一用户中心
+user_center_url ="http://user.fjmaimaimai.com"
--- a/deploy/k8s/dev/opp.yaml
查看文件 @aa15d81
+++ b/deploy/k8s/dev/opp.yaml
查看文件 @aa15d81
@@ -51,6 +51,8 @@ spec:
         volumeMounts:
         - mountPath: /opt/logs
           name: accesslogs
+        - mountPath: /var/www/opp/file
+            name: suplusupload-pvc1
         env:
         - name: ENTERPRISE_SERVICE_HOST
           valueFrom:
@@ -87,6 +89,11 @@ spec:
           value: "stdout"
         - name: aliyun_logs_access
           value: "/opt/logs/opp_app.log"
+        - name: aliyun_file_access
+          value: "/var/www/opp/file"
       volumes:
       - name: accesslogs
-        emptyDir: {}
+        emptyDir: {}
+      - name: suplusupload-pvc1
+          persistentVolumeClaim:
+            claimName: suplusupload-pvc
--- a/internal/utils/sql.go
查看文件 @aa15d81
+++ b/internal/utils/sql.go
查看文件 @aa15d81
@@ -6,6 +6,7 @@ import (
 	"github.com/astaxie/beego/orm"
 	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"reflect"
+	"strings"
 )
 // 更新指定表的几个列
@@ -88,3 +89,70 @@ func ExecuteSqlByRoll(isCheck bool, sqlSlice ...*SqlData) bool {
 	}
 	return true
 }
+
+//PrintLogSql 打印sql语句
+func PrintLogSql(sql string, param ...interface{}) {
+	format := `SQL EXCEUTE:[%s]-%s`
+	parmformat := `[%v]`
+	var p strings.Builder
+	for i := range param {
+		p.WriteString(fmt.Sprintf(parmformat, param[i]))
+	}
+	log.Debug(format, sql, p.String())
+}
+
+//ExecuteQueryOne 执行原生sql查询单条记录;结果用结构体接收
+func ExecuteQueryOne(result interface{}, sqlstr string, param ...interface{}) error {
+	PrintLogSql(sqlstr, param...)
+	var err error
+	o := orm.NewOrm()
+	err = ExecuteQueryOneWithOrmer(o, result, sqlstr, param)
+	return err
+}
+
+//ExecuteQueryOneWithOrmer 执行原生sql查询单条
+func ExecuteQueryOneWithOrmer(o orm.Ormer, result interface{}, sqlstr string, param ...interface{}) error {
+	PrintLogSql(sqlstr, param...)
+	var err error
+	err = o.Raw(sqlstr, param).QueryRow(result)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+//ExecuteQuerySql 执行原生sql查询多条记录
+func ExecuteQueryAll(result interface{}, sqlstr string, param ...interface{}) error {
+	PrintLogSql(sqlstr, param...)
+	var err error
+	o := orm.NewOrm()
+	err = ExecuteQueryAllWithOrmer(o, result, sqlstr, param)
+	return err
+}
+
+//ExecuteQueryOneWithOrmer 执行原生sql查询多条记录
+func ExecuteQueryAllWithOrmer(o orm.Ormer, result interface{}, sqlstr string, param ...interface{}) error {
+	PrintLogSql(sqlstr, param...)
+	var (
+		err error
+	)
+	_, err = o.Raw(sqlstr, param).QueryRows(result)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func ExecuteSQLWithOrmer(o orm.Ormer, sqlstr string, param ...interface{}) error {
+	PrintLogSql(sqlstr, param...)
+	var (
+		err error
+	)
+	r, err := o.Raw(sqlstr, param...).Exec()
+	if err != nil {
+		return err
+	}
+	num, _ := r.RowsAffected()
+	log.Debug("RowsAffected:%d", num)
+	return nil
+}
--- a/protocol/auth.go
查看文件 @aa15d81
+++ b/protocol/auth.go
查看文件 @aa15d81
@@ -9,7 +9,7 @@ const (
 const TokenExpire = 3600
-const SmscodeDayLimitTime =10 //短信验证码每天最多发10次
+const SmscodeDayLimitTime = 10 //短信验证码每天最多发10次
 var Nums = []byte("0123456789")
@@ -36,6 +36,21 @@ type LoginResponse struct {
 	AuthCode string `json:"authCode"`
 }
+/*统一用户中心登录*/
+type LoginUserCenterRequest struct {
+	Phone    string `json:"phone"`
+	PassWord string `json:"password"`
+}
+
+type LoginUserCenterResponse struct {
+	Id       int64  `json:"id"`
+	Phone    string `json:"phone"`
+	NickName string `json:"nickname"`
+	Avatar   string `json:"avatar"`
+	Token    string `json:"token"`
+	Accid    string `json:"accid"`
+}
+
 /*SmsCode*/
 type SmsCodeRequest struct {
 	Phone    string `json:"phone" valid:"Required;Mobile"`
--- a/services/auth/auth.go
查看文件 @aa15d81
+++ b/services/auth/auth.go
查看文件 @aa15d81
@@ -48,6 +48,9 @@ func Login(header *protocol.RequestHeader, request *protocol.LoginRequest) (rsp 
 	}
 	switch request.GrantType {
 	case protocol.LoginTypePassPord:
+		if beego.BConfig.RunMode != "dev" {
+
+		}
 		if strings.Compare(user.Passwd, request.PassWord) == 0 {
 			goto Success
 		} else {
@@ -279,7 +282,7 @@ func SmsCode(request *protocol.SmsCodeRequest) (rsp *protocol.SmsCodeResponse, e
 			smsInfo.CreateTime = time.Now().Unix()
 		}
 		if smsInfo.Count >= protocol.SmscodeDayLimitTime { //TODO:limit send time
-			err=protocol.NewErrWithMessage(1011)
+			err = protocol.NewErrWithMessage(1011)
 			return
 		}
 		goto Send
@@ -321,7 +324,7 @@ func CheckSmsCode(phone, code, sendType string) (result bool, err error) {
 	result = false
 	if value, err = redis.Hget(sendType, phone); err != nil { //protocol.SmsLoginCode
 		log.Error(fmt.Sprintf("smscode not exists"))
-		err =protocol.NewErrWithMessage(1009,fmt.Errorf("smscode expire"))
+		err = protocol.NewErrWithMessage(1009, fmt.Errorf("smscode expire"))
 		return
 	}
 	if err = json.Unmarshal([]byte(value), &smsInfo); err != nil {
@@ -330,19 +333,19 @@ func CheckSmsCode(phone, code, sendType string) (result bool, err error) {
 	}
 	if smsInfo.ErrorCount >= 5 {
 		log.Error(fmt.Sprintf("smscode over error times"))
-		err =protocol.NewErrWithMessage(1009)
+		err = protocol.NewErrWithMessage(1009)
 		return
 	}
 	if (smsInfo.LastTime + 60*5) < time.Now().Unix() {
-		log.Error(fmt.Sprintf("smscode expire %v < %v", (smsInfo.LastTime+60*5), time.Now().Unix()))
-		err =protocol.NewErrWithMessage(1009)
+		log.Error(fmt.Sprintf("smscode expire %v < %v", (smsInfo.LastTime + 60*5), time.Now().Unix()))
+		err = protocol.NewErrWithMessage(1009)
 		goto Fail
 	}
 	if smsInfo.Code == code {
 		result = true
 		return
 	} else {
-		log.Error("smscode not equal:",smsInfo.Code,code)
+		log.Error("smscode not equal:", smsInfo.Code, code)
 		err = protocol.NewErrWithMessage(1012)
 		goto Fail
 	}
@@ -351,8 +354,8 @@ Fail:
 		smsInfo.ErrorCount += 1
 		if e := redis.Hset(sendType, phone, common.AssertJson(smsInfo), -1); e != nil {
 			log.Error(e)
-			if err==nil{
-				err =e
+			if err == nil {
+				err = e
 			}
 			return
 		}