fix:特别行政区添加

rpc/consumer/etc/consumer.yaml

@@ -29,4 +29,13 @@ Oss:
   ossAccessKeyId: LTAI4G5x9aoZx8dDamQ7vfZi
   ossAccessKeySecret: Bk98FsbPYXcJe72n1bG3Ssf73acuNh
   ossBucketName: jytest2022
-  ossUrl: https://jytest2022.oss-cn-beijing.aliyuncs.com
+  ossUrl: https://jytest2022.oss-cn-beijing.aliyuncs.com
+PublishCity:  {
+  北京: 北京市,
+  上海: 上海市,
+  天津: 天津市,
+  重庆: 重庆市,
+  香港: 香港市,
+  澳门: 澳门市,
+  台湾: 台湾市,
+}

rpc/consumer/init/init.go

@@ -31,6 +31,11 @@ func init() {
 	//初始SupplyTotal
 	sm := C.SupplyTotal
 	model.SupplyTotalConfig(sm)
+
+	//初始特别行政地区
+	pc := C.PublishCity
+	model.PublishCityInfo(pc)
+
 	//初始es
 	es := C.Es
 	model.InitEs(&es)

rpc/consumer/internal/config/config.go

@@ -15,4 +15,5 @@ type Config struct {
 	SupplyTotal int
 	Es          entity.EsStruct
 	Oss         entity.OssStruct
+	PublishCity map[string]string
 }

rpc/consumer/internal/logic/publishinfologic.go

@@ -33,13 +33,6 @@ func NewPublishInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Publi
 	}
 }
 
-var PublishCity = map[string]string{
-	"北京": "北京市",
-	"上海": "上海市",
-	"天津": "天津市",
-	"重庆": "重庆市",
-}
-
 // 发布信息
 func (l *PublishInfoLogic) PublishInfo(in *consumerinfo.PublishInfoReq) (*consumerinfo.PublishInfoResp, error) {
 	res := consumerinfo.PublishInfoResp{}
@@ -51,7 +44,7 @@ func (l *PublishInfoLogic) PublishInfo(in *consumerinfo.PublishInfoReq) (*consum
 	publishData["phone"] = in.Phone       //注册手机号
 	publishData["title"] = in.Title       //信息标题
 	publishData["province"] = in.Province //项目省份
-	if v, ok := PublishCity[in.Province]; ok && v != "" {
+	if v, ok := (*model.PublishCity)[in.Province]; ok && v != "" {
 		publishData["city"] = v
 	} else {
 		publishData["city"] = in.City

rpc/model/db.go

@@ -14,15 +14,23 @@ import (
 	"app.yhyue.com/moapp/jybase/redis"
 )
 
-var Mysql *mysql.Mysql
-var NsqConfig *entity.NsqStruct
-var SupplyTotal int
-var Sensitive *entity.Sensitive
+var (
+	Mysql       *mysql.Mysql
+	NsqConfig   *entity.NsqStruct
+	SupplyTotal int
+	Sensitive   *entity.Sensitive
+	PublishCity *map[string]string
+)
 
 func SupplyTotalConfig(mm int) {
 	SupplyTotal = mm
 }
 
+func PublishCityInfo(pb map[string]string) {
+	log.Println("--初始化 特别行政地区--")
+	PublishCity = &pb
+}
+
 func InitNsqConfig(mm *entity.NsqStruct) {
 	if mm.Ip != "" {
 		log.Println("--初始化 nsq--")