Merge branch 'dev/v1.0.4_wjh' into feature/v1.0.4

* dev/v1.0.4_wjh:
  xg

api/internal/logic/prpnameasslogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	elastic "app.yhyue.com/moapp/jybase/esv7"
+	. "app.yhyue.com/moapp/jybase/es"
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
 	"context"
@@ -10,8 +10,7 @@ import (
 )
 
 var (
-	INDEX      = "bidding"
-	findfields = `"projectp_name", "project_id"`
+	findfields = `"project_name", "id"`
 )
 
 type PrPnameAssLogic struct {
@@ -31,8 +30,8 @@ func NewPrPnameAssLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrPnam
 func (l *PrPnameAssLogic) PrPnameAss(req *types.PnameAssReq) (resp *types.Reply, err error) {
 	resp = &types.Reply{}
 	if req.ProjectName != "" {
-		esq := `{"query": {"bool": {"must": [{"match": {"projectname.pname": [` + req.ProjectName + ` ]}}]}}}`
-		binfo := elastic.GetAllByNgram(INDEX, INDEX, esq, findfields, "", "", 0, 10, 0, false)
+		esq := `{"query": {"bool": {"must": [{"match": {"project_name.pname": "` + req.ProjectName + `" }}]}}}`
+		binfo := GetAllByNgram("transaction_info", "transaction_info", esq, "", "", findfields, 0, 10, 0, false)
 		if binfo != nil && len(*binfo) > 0 {
 			resp.Error_code = 0
 			resp.Data = *binfo

api/logs/access.log

@@ -1,6 +1,63 @@
-{"@timestamp":"2024-04-17T18:01:25.448+08:00","caller":"common/initconfig.go:70","content":"info--日志记录","level":"info"}
-{"@timestamp":"2024-04-17T18:01:25.448+08:00","caller":"common/initconfig.go:70","content":"error--日志记录","level":"info"}
-{"@timestamp":"2024-04-17T18:01:25.624+08:00","caller":"common/initconfig.go:125","content":"--初始化 mongodb--","level":"info"}
-{"@timestamp":"2024-04-17T18:01:25.625+08:00","caller":"common/initconfig.go:134","content":"--初始化 mongodb Bidding --","level":"info"}
-{"@timestamp":"2024-04-17T18:01:25.625+08:00","caller":"common/initconfig.go:145","content":"--初始化 mongodb ent --","level":"info"}
-{"@timestamp":"2024-04-17T18:01:25.626+08:00","caller":"common/initconfig.go:156","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:38:51.909+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:38:51.909+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:38:52.092+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-20T16:38:52.092+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-20T16:38:52.092+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:38:52.093+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:39:14.730+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54002 - PostmanRuntime/7.37.3","duration":"9010.9ms","level":"info","span":"68d106663570d168","trace":"4896d28e6ed4aee84f8861a0d144112a"}
+{"@timestamp":"2024-04-20T16:42:48.160+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:42:48.160+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:42:48.339+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-20T16:42:48.340+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-20T16:42:48.340+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:42:48.340+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:43:02.629+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54131 - PostmanRuntime/7.37.3","duration":"9009.7ms","level":"info","span":"97e686079048374f","trace":"b7d39466bcf5743c1abc866743ce1392"}
+{"@timestamp":"2024-04-20T16:46:44.494+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:46:44.494+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:46:44.666+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-20T16:46:44.667+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-20T16:46:44.667+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:46:44.667+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:46:58.173+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54281 - PostmanRuntime/7.37.3","duration":"9005.4ms","level":"info","span":"7662394332ffa162","trace":"4e4506048182ee5cfeec7818d49380ee"}
+{"@timestamp":"2024-04-20T16:49:08.450+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:49:08.450+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:49:08.624+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:49:30.036+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54342 - PostmanRuntime/7.37.3","duration":"9007.0ms","level":"info","span":"488b40d93de93c59","trace":"814ede86df6a8da3e0f1aa0f24eb78ac"}
+{"@timestamp":"2024-04-20T16:50:34.581+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54366 - PostmanRuntime/7.37.3","duration":"9012.3ms","level":"info","span":"4de78596462a4c66","trace":"8205893c70b0c11537d3e237ba211fa1"}
+{"@timestamp":"2024-04-20T16:51:41.341+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:51:41.341+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:51:41.549+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-20T16:51:41.550+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-20T16:51:41.550+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:51:41.550+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:51:47.631+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54416 - PostmanRuntime/7.37.3","duration":"58.5ms","level":"info","span":"685ecb138491f303","trace":"0f931b71eb157b02db68c3a19f8e2fc9"}
+{"@timestamp":"2024-04-20T16:53:42.473+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:53:42.473+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T16:53:42.651+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-20T16:53:42.651+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-20T16:53:42.652+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:53:42.653+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T16:53:52.142+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54792 - PostmanRuntime/7.37.3","duration":"68.7ms","level":"info","span":"02b7fc04dadcba3a","trace":"73ef3cfc1e70978c0c7a6441123dc490"}
+{"@timestamp":"2024-04-20T17:13:13.526+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T17:13:13.527+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-20T17:13:13.723+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-20T17:13:13.723+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-20T17:13:13.724+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-20T17:13:13.724+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-22T09:19:05.081+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-22T09:19:05.081+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-22T09:19:05.481+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-22T09:19:05.481+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-22T09:19:05.482+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-22T09:19:05.482+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-22T09:19:16.858+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:59248 - PostmanRuntime/7.37.3","duration":"2348.5ms","level":"info","span":"6509359ada07ebaf","trace":"3239429b5336223141bdfbbb7a160a97"}
+{"@timestamp":"2024-04-22T09:21:01.787+08:00","caller":"common/initconfig.go:71","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-04-22T09:21:01.787+08:00","caller":"common/initconfig.go:71","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-04-22T09:21:01.949+08:00","caller":"common/initconfig.go:126","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-04-22T09:21:01.949+08:00","caller":"common/initconfig.go:135","content":"--初始化 mongodb Bidding --","level":"info"}
+{"@timestamp":"2024-04-22T09:21:01.950+08:00","caller":"common/initconfig.go:146","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-22T09:21:01.950+08:00","caller":"common/initconfig.go:157","content":"--初始化 mongodb ent --","level":"info"}
+{"@timestamp":"2024-04-22T09:21:18.476+08:00","caller":"handler/loghandler.go:155","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:59567 - PostmanRuntime/7.37.3","duration":"18.1ms","level":"info","span":"3f74d18cc81383d4","trace":"209b4579e57f68927f6a0c6e6a043e48"}

api/logs/slow.log

@@ -0,0 +1,6 @@
+{"@timestamp":"2024-04-20T16:39:14.730+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54002 - PostmanRuntime/7.37.3 - slowcall(9010.9ms)","duration":"9010.9ms","level":"slow","span":"68d106663570d168","trace":"4896d28e6ed4aee84f8861a0d144112a"}
+{"@timestamp":"2024-04-20T16:43:02.629+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54131 - PostmanRuntime/7.37.3 - slowcall(9009.7ms)","duration":"9009.7ms","level":"slow","span":"97e686079048374f","trace":"b7d39466bcf5743c1abc866743ce1392"}
+{"@timestamp":"2024-04-20T16:46:58.173+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54281 - PostmanRuntime/7.37.3 - slowcall(9005.4ms)","duration":"9005.4ms","level":"slow","span":"7662394332ffa162","trace":"4e4506048182ee5cfeec7818d49380ee"}
+{"@timestamp":"2024-04-20T16:49:30.036+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54342 - PostmanRuntime/7.37.3 - slowcall(9007.0ms)","duration":"9007.0ms","level":"slow","span":"488b40d93de93c59","trace":"814ede86df6a8da3e0f1aa0f24eb78ac"}
+{"@timestamp":"2024-04-20T16:50:34.581+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:54366 - PostmanRuntime/7.37.3 - slowcall(9012.3ms)","duration":"9012.3ms","level":"slow","span":"4de78596462a4c66","trace":"8205893c70b0c11537d3e237ba211fa1"}
+{"@timestamp":"2024-04-22T09:19:16.858+08:00","caller":"handler/loghandler.go:132","content":"[HTTP] 200 - POST /crmApplication/pr/pname/ass - 127.0.0.1:59248 - PostmanRuntime/7.37.3 - slowcall(2348.5ms)","duration":"2348.5ms","level":"slow","span":"6509359ada07ebaf","trace":"3239429b5336223141bdfbbb7a160a97"}