Merge branch 'feature/v4.8.70' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.8.70_wmh

src/config.json

@@ -448,5 +448,8 @@
   "hotSubjectMatter": "A4纸,安全标志,安全挡板,安全隔离网,安全网,办公耗材,办公家具,办公设备,办公椅,办公用房,办公用品,办公桌,保护装置,保密柜,笔记本,笔记本电脑,变压器,仓库,插线板,充电桩,触控一体机,传感器,打印机,打印机耗材,打印设备,档案袋,档案盒,道路工程,地铁,电池,电缆,电流互感器,电梯,电线,订书机,订书针,对讲机,多功能一体机,多媒体设备,发电机,防冻液,防护栏杆,防护门,防护棚,防雷设施,防水工程,服务器,服装,复印机,复印纸,钢板,钢结构,钢筋,工作服,工作站,公路,公用工程,固体胶,光伏,光盘,航标灯,回形针,机房空调,机柜,机油,鸡蛋,计算机,记号笔,记事本,继电器,家具,监测仪,监视器,检测报告,检测仪器,剪刀,建筑工程,交换机,交通设施,胶带,胶水,脚手架,井架,警示灯,救护车,救生设施,刻录机,空调,空气调节器,垃圾袋,垃圾桶,冷却塔,冷水机组,楼层呼唤器,路灯,绿化工程,毛巾,美工刀,门禁,密集架,灭火器,抹布,墨盒,逆变器,牛皮纸,配电箱,喷壶,起重机,汽油,桥梁,热泵机组,热水器,弱电系统,扫描仪,摄像头,生活用房,食堂,市政工程,双面胶,水电站,水桶,宿舍,碎纸机,台式机,太阳能,碳粉,天然气,投影仪,图书,土石方,拖把,挖掘机,网线,文件袋,文件柜,无人机,无线电,硒鼓,洗洁精,洗手液,洗衣粉,显示屏,橡皮,消防立管,消防器材,消防水泵,消防箱,新能源,蓄电池,液晶显示器,医疗器械,医疗设备,移动工作站,移动硬盘,预埋钢板,园林工程,纸杯,中性笔,桩基,装修工程",
   "biddingRelatesLevel": 0,
   "ipInitAuthentication": "qwertyuiopzxcvbnm1234567890asdfghjkl",
-  "node": 1
+  "node": 1,
+  "keywordRestrict": 100,
+  "buyerRestrict": 100,
+  "winnerRestrict": 100
 }

src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.0.6
+	app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e
 	github.com/ClickHouse/clickhouse-go v1.5.4
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67

src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6 h1:uyaBp5Iuc/Il4+O
 app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.0.6 h1:96kLs49jrUsdeFtuGf24UdqFjpnlR6G03j0AUvUPuGI=
-app.yhyue.com/moapp/jypkg v1.0.6/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed h1:K3k/mrSS3ptA5lNQijE6onaCS6oyjLstnvMnMYaqyFk=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

src/jfw/front/dataExport.go

@@ -190,6 +190,15 @@ func (d *DataExport) SieveData() {
 			selectType = strings.Replace(strings.Join(detail, ","), "detail", "title,detail", -1)
 		}
 	}
+	if len(keywordList) > util.IntAllDef(config.Sysconfig["keywordRestrict"], 100) {
+		keywordList = keywordList[:util.IntAllDef(config.Sysconfig["keywordRestrict"], 100)]
+	}
+	if len(buyerArr) > util.IntAllDef(config.Sysconfig["buyerRestrict"], 100) {
+		buyerArr = buyerArr[:util.IntAllDef(config.Sysconfig["buyerRestrict"], 100)]
+	}
+	if len(winnerArr) > util.IntAllDef(config.Sysconfig["winnerRestrict"], 100) {
+		winnerArr = winnerArr[:util.IntAllDef(config.Sysconfig["winnerRestrict"], 100)]
+	}
 	sieveCondition := map[string]interface{}{
 		"publishtime": publishtime,
 		"area":        areaArr,
@@ -847,7 +856,7 @@ func (d *DataExport) ValuationList(order_code string) error {
 
 func (d *DataExport) SetDontPromptAgain() {
 	status := d.GetString("status") //0 提示  1 不再提示
-	userId := d.GetSession("userId").(string)
+	userId := d.GetSession("mgoUserId").(string)
 	boo := public.MQFW.UpdateById("user", userId, map[string]interface{}{
 		"$set": map[string]interface{}{
 			"i_export_promptAgain": status,
@@ -863,10 +872,11 @@ func (d *DataExport) SetDontPromptAgain() {
 
 func (d *DataExport) GetDontPromptAgain() {
 	isPrompt := true
-	userId := d.GetSession("userId").(string)
-	user, ok := public.MQFW.FindById("user", userId, `"i_export_promptAgain":1`)
-	if ok && user != nil {
-		if (*user)["_id"] == nil || util.IntAll((*user)["i_export_promptAgain"]) == 1 {
+	userId := d.GetSession("mgoUserId").(string)
+	fmt.Println("userId", userId)
+	user, ok := public.MQFW.FindById("user", userId, `{"i_export_promptAgain":1}`)
+	if ok && user != nil && len(*user) > 0 {
+		if util.IntAll((*user)["i_export_promptAgain"]) == 1 {
 			isPrompt = false
 		}
 	}

src/jfw/front/wx_dataExport.go

@@ -3,6 +3,7 @@ package front
 import (
 	"encoding/json"
 	"errors"
+	"jy/src/jfw/config"
 	"jy/src/jfw/wx"
 	"log"
 	"strings"
@@ -206,6 +207,15 @@ func (w *WxDataExport) SaveData() error {
 			selectType = strings.Replace(strings.Join(detail, ","), "detail", "title,detail", -1)
 		}
 	}
+	if len(keyWordArr) > util.IntAllDef(config.Sysconfig["keywordRestrict"], 100) {
+		keyWordArr = keyWordArr[:util.IntAllDef(config.Sysconfig["keywordRestrict"], 100)]
+	}
+	if len(buyerArr) > util.IntAllDef(config.Sysconfig["buyerRestrict"], 100) {
+		buyerArr = buyerArr[:util.IntAllDef(config.Sysconfig["buyerRestrict"], 100)]
+	}
+	if len(winnerArr) > util.IntAllDef(config.Sysconfig["winnerRestrict"], 100) {
+		winnerArr = winnerArr[:util.IntAllDef(config.Sysconfig["winnerRestrict"], 100)]
+	}
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
 		"area":        areaArr,

src/jfw/modules/app/src/app/front/dataExport.go

@@ -3,6 +3,8 @@ package front
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
+	"jy/src/jfw/modules/app/src/jfw/config"
 	"log"
 	"strings"
 	"time"
@@ -18,23 +20,26 @@ import (
 
 type WxDataExport struct {
 	*xweb.Action
-	toSieve       xweb.Mapper `xweb:"/jyapp/front/dataExport/toSieve"`       //微信数据导出
-	saveData      xweb.Mapper `xweb:"/jyapp/front/dataExport/saveData"`      //保存筛选数据
-	area          xweb.Mapper `xweb:"/jyapp/front/dataExport/area"`          //区域
-	industry      xweb.Mapper `xweb:"/jyapp/front/dataExport/industry"`      //行业
-	buyerclass    xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerclass"`    //采购单位类型
-	keyWord       xweb.Mapper `xweb:"/jyapp/front/dataExport/keyWord"`       //关键词
-	keyWordInput  xweb.Mapper `xweb:"/jyapp/front/dataExport/keyWordInput"`  //关键词输入
-	appended      xweb.Mapper `xweb:"/jyapp/front/dataExport/appended"`      //附加词
-	appendedInput xweb.Mapper `xweb:"/jyapp/front/dataExport/appendedInput"` //附加词输入
-	exclude       xweb.Mapper `xweb:"/jyapp/front/dataExport/exclude"`       //排除词
-	excludeInput  xweb.Mapper `xweb:"/jyapp/front/dataExport/excludeInput"`  //排除词输入
-	price         xweb.Mapper `xweb:"/jyapp/front/dataExport/price"`         //金额
-	subType       xweb.Mapper `xweb:"/jyapp/front/dataExport/subType"`       //信息类型
-	buyerEdit     xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerEdit"`     //采购单位编辑
-	buyerInput    xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerInput"`    //采购单位输入
-	winnerEdit    xweb.Mapper `xweb:"/jyapp/front/dataExport/winnerEdit"`    //中标单位编辑
-	winnerInput   xweb.Mapper `xweb:"/jyapp/front/dataExport/winnerInput"`   //中标单位输入
+	toSieve            xweb.Mapper `xweb:"/jyapp/front/dataExport/toSieve"`            //微信数据导出
+	saveData           xweb.Mapper `xweb:"/jyapp/front/dataExport/saveData"`           //保存筛选数据
+	area               xweb.Mapper `xweb:"/jyapp/front/dataExport/area"`               //区域
+	industry           xweb.Mapper `xweb:"/jyapp/front/dataExport/industry"`           //行业
+	buyerclass         xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerclass"`         //采购单位类型
+	keyWord            xweb.Mapper `xweb:"/jyapp/front/dataExport/keyWord"`            //关键词
+	keyWordInput       xweb.Mapper `xweb:"/jyapp/front/dataExport/keyWordInput"`       //关键词输入
+	appended           xweb.Mapper `xweb:"/jyapp/front/dataExport/appended"`           //附加词
+	appendedInput      xweb.Mapper `xweb:"/jyapp/front/dataExport/appendedInput"`      //附加词输入
+	exclude            xweb.Mapper `xweb:"/jyapp/front/dataExport/exclude"`            //排除词
+	excludeInput       xweb.Mapper `xweb:"/jyapp/front/dataExport/excludeInput"`       //排除词输入
+	price              xweb.Mapper `xweb:"/jyapp/front/dataExport/price"`              //金额
+	subType            xweb.Mapper `xweb:"/jyapp/front/dataExport/subType"`            //信息类型
+	buyerEdit          xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerEdit"`          //采购单位编辑
+	buyerInput         xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerInput"`         //采购单位输入
+	winnerEdit         xweb.Mapper `xweb:"/jyapp/front/dataExport/winnerEdit"`         //中标单位编辑
+	winnerInput        xweb.Mapper `xweb:"/jyapp/front/dataExport/winnerInput"`        //中标单位输入
+	setDontPromptAgain xweb.Mapper `xweb:"/jyapp/front/dataExport/setDontPromptAgain"` //数据导出-超出2w条，不再提示
+	getDontPromptAgain xweb.Mapper `xweb:"/jyapp/front/dataExport/getDontPromptAgain"` //数据导出-超出2w条，不再提示
+
 }
 
 func init() {
@@ -208,6 +213,15 @@ func (w *WxDataExport) SaveData() error {
 			selectType = strings.Replace(strings.Join(detail, ","), "detail", "title,detail", -1)
 		}
 	}
+	if len(keyWordArr) > util.IntAllDef(config.Seoconfig["keywordRestrict"], 100) {
+		keyWordArr = keyWordArr[:util.IntAllDef(config.Sysconfig["keywordRestrict"], 100)]
+	}
+	if len(buyerArr) > util.IntAllDef(config.Sysconfig["buyerRestrict"], 100) {
+		buyerArr = buyerArr[:util.IntAllDef(config.Sysconfig["buyerRestrict"], 100)]
+	}
+	if len(winnerArr) > util.IntAllDef(config.Sysconfig["winnerRestrict"], 100) {
+		winnerArr = winnerArr[:util.IntAllDef(config.Sysconfig["winnerRestrict"], 100)]
+	}
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
 		"area":        areaArr,
@@ -243,6 +257,40 @@ func (w *WxDataExport) SaveData() error {
 	return nil
 }
 
+func (w *WxDataExport) SetDontPromptAgain() {
+	status := w.GetString("status") //0 提示  1 不再提示
+	userId := w.GetSession("mgoUserId").(string)
+	boo := public.MQFW.UpdateById("user", userId, map[string]interface{}{
+		"$set": map[string]interface{}{
+			"i_export_promptAgain": status,
+		},
+	})
+	w.ServeJson(map[string]interface{}{
+		"error_code": 0,
+		"error_msg":  "",
+		"success":    boo,
+	})
+	return
+}
+
+func (w *WxDataExport) GetDontPromptAgain() {
+	isPrompt := true
+	userId := w.GetSession("mgoUserId").(string)
+	fmt.Println("userId", userId)
+	user, ok := public.MQFW.FindById("user", userId, `{"i_export_promptAgain":1}`)
+	if ok && user != nil && len(*user) > 0 {
+		if util.IntAll((*user)["i_export_promptAgain"]) == 1 {
+			isPrompt = false
+		}
+	}
+	w.ServeJson(map[string]interface{}{
+		"error_code": 0,
+		"error_msg":  "",
+		"isPrompt":   isPrompt,
+	})
+	return
+}
+
 // Area 区域
 func (w *WxDataExport) Area() error {
 	w.Render("/dataExport/dataExport_area.html")

src/jfw/modules/app/src/config.json

@@ -252,5 +252,8 @@
     "projecttype": true,
     "approvecity": true
   },
-  "ipInitAuthentication": "qwertyuiopzxcvbnm1234567890asdfghjkl"
+  "ipInitAuthentication": "qwertyuiopzxcvbnm1234567890asdfghjkl",
+  "keywordRestrict": 100,
+  "buyerRestrict": 100,
+  "winnerRestrict": 100
 }

src/jfw/modules/app/src/go.mod

@@ -5,8 +5,8 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.0.4-0.20231109032304-2da6db20132a
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
+	app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1
 	github.com/pkg/errors v0.9.1
@@ -19,7 +19,7 @@ require (
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a // indirect
-	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
+	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/RoaringBitmap/roaring v1.5.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect

src/jfw/modules/app/src/go.sum

@@ -9,18 +9,18 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.0.4-0.20231109032304-2da6db20132a h1:mUqyzXj24uoi9gE9P+EVoiMi/deUHH2+0jbTnwLhOZ0=
-app.yhyue.com/moapp/jypkg v1.0.4-0.20231109032304-2da6db20132a/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed h1:K3k/mrSS3ptA5lNQijE6onaCS6oyjLstnvMnMYaqyFk=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 h1:14Yxzutsej7LQe3jnN61wuRX9qjAZ4FtdWMA27ewQ3w=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e h1:bncHHkJLqiDW1ZN6MVe+3bj3i0LxWgFkfqge6Gk7lB4=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e/go.mod h1:+6ZjaqpCr+ih1GYOh6ZhoDri9ZjiuxxSHvR7ovvhLx0=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -37,7 +37,7 @@ const (
 	searchMaxLimit    = 100 //最大查询数量限制
 	freeSearchNum     = 4   //免费查询数量限制
 	entSearchCacheDB  = "other"
-	entSearchCacheKey = "entSearchIndexCache"
+	entSearchCacheKey = "entSearchIndexCache_%v"
 
 	index, itype  = "qyxy", "qyxy"
 	entQuery      = `{"query":{"bool":{"must":[%s],"must_not":[%s]}},"_source":["_id","company_name","company_status","legal_person","capital","company_address","company_shortname","company_phone","establish_date"],"sort":[{"capital":{"order":"desc"}}]}`
@@ -341,7 +341,7 @@ type entIds struct {
 }
 
 func GetEntIndexShow(isFree bool) (list *[]map[string]interface{}) {
-	bytes, err := redis.GetBytes(entSearchCacheDB, entSearchCacheKey)
+	bytes, err := redis.GetBytes(entSearchCacheDB, fmt.Sprintf(entSearchCacheKey, isFree))
 	if err == nil {
 		if err = json.Unmarshal(*bytes, &list); err == nil && list != nil && len(*list) > 0 {
 			return

src/jfw/modules/publicapply/src/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.0.4
+	app.yhyue.com/moapp/jypkg v1.0.7-0.20231114011545-acf570b01ea7
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.4

src/jfw/modules/publicapply/src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6 h1:uyaBp5Iuc/Il4+O
 app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.0.4 h1:qczPgO9uURDMFTIG7wlyx9oQKf2kY7QS0uwbfBvEIac=
-app.yhyue.com/moapp/jypkg v1.0.4/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114011545-acf570b01ea7 h1:i7sFy+e/zjqhTQci+0x4E1qEXZOEYCIe6EDug+8LyFk=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114011545-acf570b01ea7/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

src/jfw/modules/subscribepay/src/go.mod

@@ -5,9 +5,9 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.0.3-0.20231031031244-d8df2b391b72
+	app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed
 	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230225061813-384daf716c9d
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.3
 	github.com/shopspring/decimal v1.3.1
@@ -23,7 +23,7 @@ require (
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a // indirect
-	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
+	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect

src/jfw/modules/subscribepay/src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b h1:Wtytm2QqQWtBV+s
 app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.0.3-0.20231031031244-d8df2b391b72 h1:irUuaH36GK/6tz4UWDjxSseKX8GJnfy5J6F+e9fFAZY=
-app.yhyue.com/moapp/jypkg v1.0.3-0.20231031031244-d8df2b391b72/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed h1:K3k/mrSS3ptA5lNQijE6onaCS6oyjLstnvMnMYaqyFk=
+app.yhyue.com/moapp/jypkg v1.0.7-0.20231114053038-e14f2bdd66ed/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -19,10 +19,10 @@ bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f7
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
 bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230225061813-384daf716c9d h1:mqOFpjEX8eNNskmu0cejgA8fqmbDjFG/ggeNrUO3shw=
 bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230225061813-384daf716c9d/go.mod h1:UKLwPLx9be595yaiIwqqdKSloKK/Kdf/wTLr4XUClV0=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 h1:14Yxzutsej7LQe3jnN61wuRX9qjAZ4FtdWMA27ewQ3w=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e h1:bncHHkJLqiDW1ZN6MVe+3bj3i0LxWgFkfqge6Gk7lB4=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e/go.mod h1:+6ZjaqpCr+ih1GYOh6ZhoDri9ZjiuxxSHvR7ovvhLx0=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=