Merge branch 'develop' of git.ailuowan.com:zzw/lone-services into develop

.gitea/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Detect changes
         id: filter
         run: |
-          SERVICES="bff product admin user ad chore order express sale wecom task equipment record payment factory message support percutaneous water"
+          SERVICES="bff product admin user ad chore order express sale wecom task equipment record payment factory message support percutaneous water store"
 
           pattern_for() {
             case "$1" in
@@ -100,6 +100,7 @@ jobs:
           - support
           - percutaneous
           - water
+          - store
     env:
       BUILD_LIST: ${{ needs.changes.outputs.build_list }}
       NAME: lone/${{ matrix.name }}

services/analysis/.gitignore

@@ -0,0 +1,3 @@
+run.toml
+tmp
+etc/analysis.yaml

services/analysis/internal/callback/process.go

@@ -56,7 +56,7 @@ func ProcessUpload(ctx context.Context, payload analysisoss.CallbackPayload) err
 	}
 
 	if utils.GetConfigInt("switch.facepp") == utils.NumberOne {
-		logx.WithContext(ctx).Infof("facepp switch on but not migrated yet, skip task_id=%s", payload.TaskId)
+		logx.WithContext(ctx).Infof("facepp skip task_id=%s", payload.TaskId)
 	}
 
 	if utils.GetConfigInt("switch.analysis") == utils.NumberOne {

services/analysis/run.toml

@@ -69,12 +69,33 @@
     expireSeconds = 3600
     callbackUrl = "https://services-test.ailuowan.com/api/v1/oss/callback"
 
+[milvus]
+    milvus_host = 'milvus'
+    milvus_grpc_port = 19530
+    milvus_http_port = 9091
+    etcd_port = 2379
+    minio_port = 9000
+
 [services]
     user = "user-service"
     chore = "chore-service"
     store = "store-service"
     equipment = "equipment-service"
 
+    skin_py_analysis_host = "http://172.19.74.222:8000"
+    skin_py_analysis_path = "/api/v1/analysis/submit"
+
+    skin_py_face_host = "http://skin-py-insightface:8072"
+    skin_py_face_path = "/api/v1/face/extract"
+
+[facepp]
+    api_key = "OeM6mTOMz1syfybKB2YyGCG0g2yk8r5L"
+    api_secret = "1Ab4N5H4659n_d50-UP9LbJquRnT0cUx"
+
+    train_image_path = "/data/facepp/train/images"
+    train_json_path = "/data/facepp/train/json"
+    train_label_path = "/data/facepp/train/labels"
+
 [switch]
     wechat = 1
     facepp = 1

services/store/internal/logic/createLogic.go

@@ -124,7 +124,7 @@ func (l *CreateLogic) Create(in *store.CreateRequest) (*store.Response, error) {
 func (l *CreateLogic) getSaleInfo(id int64) (int64, utils.Status) {
 	cli, err := svc.GetRpcClient(l.svcCtx.SaleName)
 	if err != nil {
-		logx.Errorf("get order err: %v", err)
+		logx.Errorf("get sale service err: %v", err)
 		return utils.NumberZero, utils.ErrorInternalServer
 	}
 
@@ -132,7 +132,7 @@ func (l *CreateLogic) getSaleInfo(id int64) (int64, utils.Status) {
 	w := sale.InfoReq{Id: id}
 	info, err := client.InfoInternal(context.Background(), &w)
 	if err != nil {
-		logx.Errorf("get order err: %v", err)
+		logx.Errorf("get sale info err: %v", err)
 		return utils.NumberZero, utils.ErrorInternalServer
 	}
 	return info.GroupId, utils.Ok

services/user/internal/logic/authHelper.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"context"
 	"errors"
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -281,6 +282,11 @@ func fillSessionBizIds(ctx context.Context, session *dao.UserLoginSession, userI
 		if bizId < utils.NumberOne {
 			return nil
 		}
+
+		fmt.Println("client Code ______________________", client.Code)
+		fmt.Println("userId______________________", userId)
+		fmt.Println("bizId______________________", bizId)
+		session.BizId = bizId
 		storeInfo, err := fetchStoreById(ctx, utils.GetConfigString("services.store"), bizId)
 		if err != nil {
 			return err

services/ws/.gitignore

@@ -0,0 +1,3 @@
+run.toml
+tmp
+etc/ws.yaml