Merge branch 'dev' of http://119.23.72.7/sunlong_v5/kaopu-server into dev

.gitignore

@@ -14,4 +14,5 @@ Homestead.json
 /storage/debugbar
 .DS_Store?
 .DS_Store
-/configs
\ No newline at end of file
+/configs
+cmd/cmd.exe

cmd/algorithm/static/add_score.go

-package main

cmd/main.go

-package main
-
-import (
-	"flag"
-	"context"
-	"kaopu-server/internal/service"
-	"github.com/bilibili/kratos/pkg/conf/paladin"
-	"github.com/bilibili/kratos/pkg/log"
-	
-	
-	
-)
-
-func main() {
-	//获取输入参数
-	flag.Parse()
-	if err := paladin.Init(); err != nil {
-		panic(err)
-	}
-
-	//初始化日志目录
-	log.Init(&log.Config{Dir: "logs"})
-	defer log.Close()
-	log.Info("caipu-server start")
-
-	//声明service层
-	svc := service.New()
-	ctx := context.Background()
-	//调用会员服务
-	svc.GetUserList(ctx)
-	
-}

cmd/static/add_score.go

+package static

cmd/algorithm/static/company_info.go → cmd/static/company_info.go

-package main
+package static
 
 import "fmt"
 

cmd/algorithm/static/enterprise_credit.go → cmd/static/enterprise_credit.go

-package main
+package static
 
 //企业征信
\ No newline at end of file

cmd/algorithm/static/history_bussiness.go → cmd/static/history_bussiness.go

-package main
+package static
 
 //历史交易
\ No newline at end of file

cmd/algorithm/static/personal_credit.go → cmd/static/personal_credit.go

-package main
+package static
 
 //个人征信
\ No newline at end of file

configs/mysql.toml

 
-[demo]
+[liexin_credit]
 	addr = "192.168.2.232:3306"
 	dsn = "liexin_credit:liexin_credit#zsyM@tcp(192.168.2.232:3306)/liexin_credit?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"
 	readDSN = ["liexin_credit:liexin_credit#zsyM@tcp(192.168.2.232:3306)/liexin_credit?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"]
@@ -8,4 +8,5 @@
 	idleTimeout ="4h"
 	queryTimeout = "200ms"
 	execTimeout = "300ms"
-	tranTimeout = "400ms"
\ No newline at end of file
+	tranTimeout = "400ms"
+

internal/dao/dao.go

@@ -39,7 +39,7 @@ func checkErr(err error) {
 func New() (Dao) {
 	var (
 		dc struct {
-			Demo *sql.Config
+			Liexin_credit *sql.Config
 		}
 		rc struct {
 			Demo       *redis.Config
@@ -55,7 +55,7 @@ func New() (Dao) {
 	checkErr(paladin.Get("memcache.toml").UnmarshalTOML(&mc))
 	return &dao{
 		// mysql
-		db: sql.NewMySQL(dc.Demo),
+		db: sql.NewMySQL(dc.Liexin_credit),
 		// redis
 		redis:       redis.NewPool(rc.Demo),
 		redisExpire: int32(time.Duration(rc.DemoExpire) / time.Second),