fenzhihebing

src/go.mod

@@ -6,7 +6,11 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20240412015757-6d8429bb4dae
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
+<<<<<<< HEAD
 	app.yhyue.com/moapp/jypkg v1.21.9
+=======
+	app.yhyue.com/moapp/jypkg v1.21.10
+>>>>>>> master
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0

src/go.sum

@@ -20,8 +20,13 @@ app.yhyue.com/moapp/jybase v0.0.0-20240412015757-6d8429bb4dae/go.mod h1:XHNATN6t
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 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=
+<<<<<<< HEAD
 app.yhyue.com/moapp/jypkg v1.21.9 h1:puRB1/7nJyEk3dUEnEz3V3ZPLABVwDfLYGuOw+BIJP0=
 app.yhyue.com/moapp/jypkg v1.21.9/go.mod h1:FylaC4MJ4G36WndktgeZfc8jTq3uvBGWIwbk02xfdQI=
+=======
+app.yhyue.com/moapp/jypkg v1.21.10 h1:mzn1BB95aNc+xb7+6DGLTCdZNbBCSKvDvkYm6H1abrk=
+app.yhyue.com/moapp/jypkg v1.21.10/go.mod h1:FylaC4MJ4G36WndktgeZfc8jTq3uvBGWIwbk02xfdQI=
+>>>>>>> master
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

src/jfw/front/dataExport.go

@@ -279,6 +279,9 @@ func (d *DataExport) SieveData() {
 	if sessVal["userId"] != nil {
 		sieveCondition["s_userid"] = util.ObjToString(sessVal["userId"])
 	}
+	if sessVal["mgoUserId"] != nil {
+		sieveCondition["mgoUserId"] = util.ObjToString(sessVal["mgoUserId"])
+	}
 	_id := mongodb.Save(dataexport.ExportTable, sieveCondition)
 	_res := map[string]interface{}{
 		"error_code": 0,
@@ -620,6 +623,7 @@ func (d *DataExport) SuperSearchExport() error {
 		saveData["selectType"] = selectType
 		saveData["s_openid"] = openid
 		saveData["s_userid"] = userId
+		saveData["mgoUserId"] = util.ObjToString(sessVal["mgoUserId"])
 		saveData["comeinfrom"] = "supersearchPage"
 		//是否开启 正文 标题同时搜索只搜正文的开关
 		saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)

src/jfw/front/ws_dataExport.go

@@ -354,6 +354,7 @@ func (w *WsDataExport) SubmitOrder() error {
 func (wd *WsDataExport) SearchExport() error {
 	openid := util.ObjToString(wd.GetSession("s_m_openid"))
 	userId := util.ObjToString(wd.GetSession("userId"))
+	mgoUserId := util.ObjToString(wd.GetSession("mgoUserId"))
 	if userId == "" {
 		return errors.New("未登录")
 	}
@@ -400,6 +401,7 @@ func (wd *WsDataExport) SearchExport() error {
 	saveData["selectType"] = strings.Join(jy.GetVipState(wd.Session(), *config.Middleground, userId).GetQueryItems(wd.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
+	saveData["mgoUserId"] = mgoUserId
 	saveData["comeinfrom"] = "supersearchPage"
 	region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
 	if region != "" && reqData.City != "" {

src/jfw/front/wx_dataExport.go

@@ -297,6 +297,7 @@ func (w *WxDataExport) SaveData() error {
 	if w.GetSession("userId") != nil {
 		saveData["s_userid"] = w.GetSession("userId").(string)
 	}
+	saveData["mgoUserId"] = w.GetSession("mgoUserId").(string)
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
 	msgCount := dataexport.GetDataExportSearchCountByScdId(public.MQFW, public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, _id)
 	if msgCount > 20000 {

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

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240412015757-6d8429bb4dae
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.21.5
+	app.yhyue.com/moapp/jypkg v1.21.10
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.7.0

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -370,6 +370,7 @@ func (this *Portrait) SaveExportRecord(pwp *PortraitProjectScreen, ids []string,
 		saveMap["buyer"] = []string{ent}
 	}
 
+	saveMap["mgoUserId"] = this.Session.Get("mgoUserId").(string)
 	if _id := db.Mgo.Save("export_search", saveMap); _id != "" {
 		return encrypt.SE.Encode2Hex(_id), nil
 	}

src/jfw/modules/bigmember/src/go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.21.1
+	app.yhyue.com/moapp/jypkg v1.21.10
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16
 	github.com/donnie4w/go-logger v0.0.0-20230316073421-36a48f87a69a

src/jfw/modules/publicapply/src/dataexport/service/action.go

@@ -175,6 +175,7 @@ func (des *DataExportStruct) ByCollection() {
 			"selectIds":  ids,
 		}
 
+		saveData["mgoUserId"] = des.GetSession("mgoUserId").(string)
 		_id := db.Mgo.Save(dataexport.ExportTable, saveData)
 		if _id == "" {
 			return nil, fmt.Errorf("选择导出异常")
@@ -259,7 +260,6 @@ func (des *DataExportStruct) ByPushHistory() {
 				}
 			}
 		}
-
 		saveData := map[string]interface{}{
 			"s_userid":     userId,
 			"comeinfrom":   "pushHistory",
@@ -267,6 +267,7 @@ func (des *DataExportStruct) ByPushHistory() {
 			"selectIds":    ids,
 			"pushKeyWords": keyWords,
 		}
+		saveData["mgoUserId"] = des.GetSession("mgoUserId").(string)
 		_id := db.Mgo.Save(dataexport.ExportTable, saveData)
 		if _id == "" {
 			return nil, fmt.Errorf("创建导出异常")

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

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.21.8
+	app.yhyue.com/moapp/jypkg v1.21.11
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240607062231-ae1d02891843
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67

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

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6t
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 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.21.8 h1:J5CS2DJRKVsiKhEQ4wGRdtUEbLrVDyi70zmusm+8uaM=
-app.yhyue.com/moapp/jypkg v1.21.8/go.mod h1:FylaC4MJ4G36WndktgeZfc8jTq3uvBGWIwbk02xfdQI=
+app.yhyue.com/moapp/jypkg v1.21.11 h1:DcBNvSXKvoTNbjGu2ZgVcJowVz2Ls+iveCBekYD7UO0=
+app.yhyue.com/moapp/jypkg v1.21.11/go.mod h1:FylaC4MJ4G36WndktgeZfc8jTq3uvBGWIwbk02xfdQI=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

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

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240626030750-115a3c0929fb
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.21.4
+	app.yhyue.com/moapp/jypkg v1.21.10
 	bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2
 	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230911091604-2faa31032743
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16

src/web/staticres/micro/js/qiankun-common-functions.js

@@ -41,27 +41,15 @@ function addNotFindPage(router) {
           href: location.href
         },
         extra: {
-          router: router,
-          to: to,
-          from: from
+          to: {
+            fullPath: to.fullPath
+          },
+          from: {
+            fullPath: from && from.fullPath
+          }
         }
       })
 
-      if (window.jQuery) {
-        $.ajax({
-          url: '/data-export/help-report',
-          method: 'post',
-          data: {
-            type: 'Error getHasRouteMatched beforeEach',
-            extra: JSON.stringify({
-              router: router,
-              to: to,
-              from: from
-            })
-          }
-        })
-      }
-
       window.top.location.replace(notFindPage);
     } else {
       next();
@@ -73,23 +61,9 @@ function addNotFindPage(router) {
       level: 'error',
       tags: {
         href: location.href
-      },
-      extra: {
-        router: router
       }
     })
-    if (window.jQuery) {
-      $.ajax({
-        url: '/data-export/help-report',
-        method: 'post',
-        data: {
-          type: 'Error getHasRouteMatched',
-          extra: JSON.stringify({
-            router: router,
-          })
-        }
-      })
-    }
+
     window.top.location.replace(notFindPage);
   }
 }

src/web/staticres/public-pc/js/detection.js

@@ -3,11 +3,24 @@
     try {
       Sentry.init({
         dsn: "https://ea0521e5b3584ca1879b940c165916e4@jysentry.jydev.jianyu360.cn/3",
-        release: "v4.9.555",
+        release: "v4.719",
         environment: "produce",
         sampleRate: 1,
         beforeSend: (event) => {
-          event.user.email = localStorage.getItem('BIGMEMBER_PC')
+          let isTest = false
+          try {
+            isTest = window.navigator.userAgent.lastIndexOf('jy-test') !== -1
+          } catch (e) {
+            console.warn(e)
+          }
+          if (isTest) {
+            return null
+          }
+          try {
+            event.user.email = localStorage.getItem('BIGMEMBER_PC')
+          } catch (e) {
+            console.warn(e)
+          }
           return event
         }
       });

src/web/templates/frontRouter/pc/page_big_pc/sess/index.html

@@ -105,12 +105,6 @@
 <script src='{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
 <script src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
 <script>
-    // 临时处理-返回筛选
-    $('.page--docs--index').on('click', '.fr.goback', function() {
-      if (history.length === 1) {
-        window.close();
-      }
-    });
     $(function () {
         haslogin({{.T.logid}});
         // 采购单位画像TDK设置（也可在page_bigmember_pc子应用里通过MetaInfo插件设置）