Merge branch 'master' into feature/v4.9.43

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

@@ -22,6 +22,8 @@ app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloO
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
 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/jypkg v1.22.2 h1:JGACT09PXN/DEjDgBSwC7veHiNrSRZH73mAc9MUV5w8=
+app.yhyue.com/moapp/jypkg v1.22.2/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/publicapply/src/userbase/entity/entity.go

@@ -4,7 +4,6 @@ import (
 	"app.yhyue.com/moapp/jybase/date"
 	"encoding/json"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
 	"jy/src/jfw/modules/publicapply/src/config"
 	"jy/src/jfw/modules/publicapply/src/db"
 	"jy/src/jfw/modules/publicapply/src/userbase/initjson"
@@ -594,16 +593,14 @@ func (o *OriginalPower) CNode() (leadOk bool) {
 // GetOriginalTextUrl 获取原文地址
 func GetOriginalTextUrl(biddingId string) (href string) {
 	obj := map[string]interface{}{}
-	brobj, ok := db.Mgo.Find("bidding_rec", bson.M{"s_id": biddingId}, `{"l_recoverydate":-1}`, nil, false, 0, 1)
-	if ok && (*brobj) != nil && len(*brobj) == 1 && (*brobj)[0] != nil {
-		obj = (*brobj)[0]
-	} else {
-		aobj, ok := db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection, biddingId, nil)
-		if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
-			aobj, ok = db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection_change, biddingId, nil)
-		}
-		obj = *aobj
+	aobj, ok := db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection, biddingId, nil)
+	if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
+		aobj, ok = db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection_change, biddingId, nil)
 	}
+	if aobj == nil {
+		return
+	}
+	obj = *aobj
 	if obj != nil && len(obj) > 0 {
 		infoformat := util.IntAllDef(obj["infoformat"], 1)
 		obj["infoformat"] = infoformat
@@ -622,6 +619,7 @@ func GetOriginalTextUrl(biddingId string) (href string) {
 			}
 		}
 	}
+	href = Convert2https(href)
 	return
 }
 
@@ -731,3 +729,16 @@ func GetMonthStart() string {
 	timeStart := date.FormatDate(&monthStart, date.Date_Full_Layout)
 	return timeStart
 }
+
+func Convert2https(url string) string {
+	if strings.HasPrefix(url, "https") {
+		return url
+	}
+	for i := 0; i < len(initjson.OriginalC.ConvertSite); i++ {
+		if strings.HasPrefix(url, initjson.OriginalC.ConvertSite[i]) {
+			url = strings.Replace(url, "http://", "https://", 1)
+			break
+		}
+	}
+	return url
+}

src/jfw/modules/publicapply/src/userbase/initjson/ub.go

@@ -40,6 +40,7 @@ type MenuInfo struct {
 type OriginalConfig struct {
 	Stype              []StypeInfo `json:"stype"`
 	UseUserAccountTime string      `json:"use_user_account_time"` // 此时间之后使用新表original_user_account统计数量
+	ConvertSite        []string    `json:"convert_site"`          // 需要http换成https网站
 }
 type StypeInfo struct {
 	Name  string `json:"name"`  // stype

src/jfw/modules/publicapply/src/userbase/original_power.json

@@ -36,5 +36,6 @@
       "check": true
     }
   ],
-  "use_user_account_time": "2023-11-30 23:59:59"
+  "use_user_account_time": "2023-11-30 23:59:59",
+  "convert_site": ["http://www.ggzy.gov.cn"]
 }

src/jfw/modules/publicapply/src/userbase/service/service.go

@@ -247,7 +247,7 @@ func (this *ServiceStruct) GetOriginalText() {
 		// 存记录
 		op.SavePowerRecord(textData)
 		this.ServeJson(Result{Data: map[string]interface{}{
-			"url": textData,
+			"url": entity.Convert2https(textData),
 		}})
 		return
 	}