Merge branch 'dev_v1.1.46_wh' of BaseService/jyMicroservices into feature/v1.1.46

jyBXCore/api/etc/bxcore-api.yaml

@@ -1,6 +1,6 @@
 Name: bxcore-api
 Host: 0.0.0.0
-Port: 8004
+Port: 8008
 Verbose: true
 Timeout: 12000
 Webrpcport: 8014

jyBXCore/api/internal/logic/searchCriteriaLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"github.com/gogf/gf/v2/util/gconv"
 	"jyBXCore/rpc/type/bxcore"
 
 	"jyBXCore/api/internal/svc"
@@ -30,6 +31,6 @@ func (l *SearchCriteriaLogic) SearchCriteria() (resp *types.CommonResp, err erro
 	return &types.CommonResp{
 		Err_code: res.ErrCode,
 		Err_msg:  res.ErrMsg,
-		Data:     res.Data,
+		Data:     gconv.Map(res.Data),
 	}, nil
 }

jyBXCore/rpc/etc/property.json

@@ -0,0 +1,40 @@
+{
+  "业务类型": {
+    "物业管理": "物业管理",
+    "保安服务": "保安服务",
+    "保洁服务": "保洁服务",
+    "绿化养护": "绿化养护",
+    "运营维护": "运营维护",
+    "食堂承包": "食堂承包",
+    "食材配送": "食材配送",
+    "环卫服务": "环卫服务",
+    "劳资派遣": "劳资派遣",
+    "布草洗涤": "布草洗涤"
+  },
+  "物业业态": {
+    "住宅": "住宅",
+    "政府": "政府",
+    "办公楼": "办公楼",
+    "学校": "学校",
+    "医院": "医院",
+    "产业园区": "产业园区",
+    "商务办公楼": "商务办公楼",
+    "酒店": "酒店",
+    "旅游景区交通枢纽": "旅游景区交通枢纽"
+  },
+  "合同周期": {
+    "1年以下": 11,
+    "1年": 12,
+    "2年": 13,
+    "3年": 14,
+    "5年": 15,
+    "其他": 16
+  },
+  "价格区间": {
+    "50万以下": 1,
+    "50-100万": 2,
+    "100-200万": 3,
+    "200-500万": 4,
+    "500万以上": 5
+  }
+}

jyBXCore/rpc/init/init.go

@@ -1,6 +1,7 @@
 package init
 
 import (
+	util "app.yhyue.com/moapp/jybase/common"
 	"context"
 	"flag"
 	"fmt"
@@ -61,7 +62,7 @@ func (r *ReqLimit) Release() {
 func init() {
 	//基本配置
 	conf.MustLoad(*configFile, &C)
-	conf.MustLoad(*propertyFile, &Property)
+	util.ReadConfig("etc/property.json", &Property)
 	//数据库配置
 	conf.MustLoad(*dbFile, &DB)
 	//初始mongodb

jyBXCore/rpc/internal/logic/propertysearchcriterialogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	IC "jyBXCore/rpc/init"
 
@@ -27,6 +28,7 @@ func NewPropertySearchCriteriaLogic(ctx context.Context, svcCtx *svc.ServiceCont
 
 func (l *PropertySearchCriteriaLogic) PropertySearchCriteria(in *bxcore.SearchReq) (*bxcore.SearchCriteriaRes, error) {
 	// todo: add your logic here and delete this line
+	fmt.Println(IC.Property)
 	return &bxcore.SearchCriteriaRes{
 		ErrCode: 0,
 		ErrMsg:  "",