冲突合并

src/config.json

@@ -282,27 +282,16 @@
     "脑洞倍儿大": "10000",
     "靠实力说话": "10000"
   },
-<<<<<<< HEAD
   "makepicurl": "http://39.105.183.186:11120",
   "intranetip": {
     "jy": "http://webxzh.qmx.top"
-=======
+  },
   "searchMosaic":{
     "buyer":true,
     "budget":true,
     "winner":true,
     "bidamount": true,
     "bidopentime": true
-},
-  "keywordsLimitNologin":25,
-  "messageCenter": {
-    "appid": "10000",
-    "dbName": "messagetest",
-    "interval": 300,
-    "createtime": "2023-01-04 00:00:00",
-    "limitDay": 7,
-    "limitCount": 3
->>>>>>> master
   },
   "getpicurl": "https://res.jianyu360.com/",
   "sealSendTime": 14400,
@@ -398,13 +387,13 @@
     "winnerMap": true
   },
   "keywordsLimitNologin": 25,
-    "messageCenter": {
-      "appid": "10000",
-      "dbName": "messagetest",
-      "interval": 300,
-      "createtime": "2023-01-04 00:00:00",
-      "limitDay": 7,
-      "limitCount": 3
-    },
-    "workDesktopUrl":"/page_workDesktop/work-bench/page?aside=0&link="
+  "messageCenter": {
+    "appid": "10000",
+    "dbName": "messagetest",
+    "interval": 300,
+    "createtime": "2023-01-04 00:00:00",
+    "limitDay": 7,
+    "limitCount": 3
+  },
+  "workDesktopUrl":"/page_workDesktop/work-bench/page?aside=0&link="
 }

src/jfw/front/swordfish.go

@@ -5,48 +5,28 @@ import (
 	"encoding/json"
 	"fmt"
 	"html/template"
-<<<<<<< HEAD
 	"jy/src/jfw/config"
-
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
-
+	"jy/src/jfw/jyutil"
 	"jy/src/jfw/wx"
-=======
-	"jfw/config"
-	"jfw/jyutil"
-	"jfw/public"
-	"jfw/wx"
->>>>>>> master
 	"log"
 	"math/rand"
 	"net/url"
-<<<<<<< HEAD
-=======
-	"qfw/util"
-	"qfw/util/bidsearch"
-	"qfw/util/elastic"
-	"qfw/util/redis"
->>>>>>> master
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
 
-	"jy/src/jfw/jyutil"
-
-	. "app.yhyue.com/moapp/jybase/date"
-	. "app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jypkg/public"
-
 	util "app.yhyue.com/moapp/jybase/common"
-
+	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/esv1"
-	"app.yhyue.com/moapp/jybase/redis"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"app.yhyue.com/moapp/jypkg/public"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )

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

@@ -1187,13 +1187,8 @@ func afterLogin(user map[string]interface{}, session *httpsession.Session, rid,
 				}
 			}
 			//同一账号在不同设备登录，极光id不一样，给之前的设备推送自定义的下线消息，离线消息保持10天
-<<<<<<< HEAD
-			if old_rid != "" && old_rid != rid && off {
-				utils.Compatible.Update(userid, map[string]interface{}{
-=======
 			if old_rid != "" && old_rid != rid && off && rid != "" {
 				mongodb.UpdateById("user", userid, map[string]interface{}{
->>>>>>> master
 					"$addToSet": map[string]interface{}{"a_jpushid": old_rid},
 				})
 				//
@@ -1245,24 +1240,6 @@ func afterLogin(user map[string]interface{}, session *httpsession.Session, rid,
 					"s_opushid": "",
 				},
 			}, false, true)
-<<<<<<< HEAD
-		}
-		set := map[string]interface{}{
-			"s_jpushid":     rid,
-			"s_opushid":     oid,
-			"s_appponetype": phoneType,
-		}
-		if o_jy, ok := user["o_jy"].(map[string]interface{}); ok && o_jy != nil && o_jy["i_apppush"] == nil {
-			set["o_jy.i_apppush"] = 1
-		}
-		utils.Compatible.Update(userid, map[string]interface{}{
-			"$set":  set,
-			"$pull": map[string]interface{}{"a_jpushid": rid},
-		})
-		//删除未登录的pushid
-		if rid != "" {
-=======
-
 			set := map[string]interface{}{
 				"s_jpushid":     rid,
 				"s_opushid":     oid,
@@ -1276,7 +1253,6 @@ func afterLogin(user map[string]interface{}, session *httpsession.Session, rid,
 				"$pull": map[string]interface{}{"a_jpushid": rid},
 			})
 			//删除未登录的pushid
->>>>>>> master
 			jyutil.UnLoginPush.DeleteBuff(rid)
 		}
 	}()

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

@@ -4,31 +4,26 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-<<<<<<< HEAD
+	utils "jy/src/jfw/modules/app/src/app/jyutil"
 	"jy/src/jfw/modules/app/src/jfw/config"
-=======
-	"jfw/config"
-	"qfw/util/fsw"
->>>>>>> master
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
 
 	"app.yhyue.com/moapp/jybase/encrypt"
-    utils "jy/src/jfw/modules/app/src/app/jyutil"
-	//"math/rand"
-	"log"
+	"app.yhyue.com/moapp/jybase/fsw"
 
+	//"math/rand"
 	. "jy/src/jfw/modules/app/src/app/jyutil"
+	"log"
 
 	util "app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/esv1"
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"app.yhyue.com/moapp/jypkg/public"
-
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 )
 
 type Short struct {
@@ -52,21 +47,12 @@ func (s *Short) Article(stype, id string) error {
 	//	return s.Redirect("/jyapp/free/swordfish/about", 302)
 	//}
 	disWord := s.GetString("disWord")
-<<<<<<< HEAD
-	belongUserId := GetbelongUserId(disWord, userId)
-	b, _ := redis.Exists("sso", "req_"+userId)
-	if b {
-		return s.Redirect("/jyapp/free/mob/err")
-	}
-	userPower := jy.GetBigVipUserBaseMsg( s.Session(),  *config.Middleground)
-=======
->>>>>>> master
+	userPower := jy.GetBigVipUserBaseMsg(s.Session(), *config.Middleground)
 	var (
 		belongUserId, email string
 
 		isEntnicheNew, isOldVip, isVip, isMember, isEntniche, isEntService bool
 	)
-	userPower := new(jy.BigVipBaseMsg)
 	//userId = "637dcf3ff143ed326e9e1589"
 	//登录用户 权限
 	if userId != "" {
@@ -75,8 +61,6 @@ func (s *Short) Article(stype, id string) error {
 		if b {
 			return s.Redirect("/jyapp/free/mob/err")
 		}
-		userPower = jy.GetBigVipUserBaseMsg(userId, public.Mysql, public.MQFW)
-
 		isEntnicheNew = userPower.EntIsNew        //新版超级订阅
 		isOldVip = false                          //新购超级订阅不能查看拟建项目详情页
 		isVip = userPower.VipStatus > 0           //超级订阅
@@ -183,13 +167,8 @@ func (s *Short) Article(stype, id string) error {
 			s.T["canRead"] = canRead
 		}
 		if canRead {
-<<<<<<< HEAD
-			if belongUserId != "" && belongUserId != userId && util.ObjToString(obj["subtype"]) != "拟建" { //分享开打的
-				article_id := encrypt.CommonDecodeArticle(stype, id)[0]
-=======
 			if belongUserId != "" && belongUserId != userId && util.ObjToString(obj["subtype"]) != "拟建" && userId != "" { //分享开打的
-				article_id := util.CommonDecodeArticle(stype, id)[0]
->>>>>>> master
+				article_id := encrypt.CommonDecodeArticle(stype, id)[0]
 				key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, belongUserId, userId)
 				if redis.Incr("other", key) == 1 {
 					redis.SetExpire("other", key, 60*60*24)
@@ -277,19 +256,13 @@ func (s *Short) Article(stype, id string) error {
 		if userId != "" {
 			s.T["userId"] = se.Encode2Hex(userId) //加密用户userid
 		}
-		s.T["forceShareFlag"] = public.CheckUserNeedForceShare(userId, public.ShareType_detail)
+		s.T["forceShareFlag"] = public.CheckUserNeedForceShare(userId, public.ShareType_detail, config.Sysconfig)
 		s.T["rewardText"], s.T["advertText"] = getRewardText()
 		s.T["advertImg"] = config.Sysconfig["advertImg"]
 		s.T["advertName"] = config.Sysconfig["advertName"]
 		s.T["advertUrl"] = config.Sysconfig["advertUrl"]
 		obj["industry"] = industry
-<<<<<<< HEAD
-		obj["ucbsId"] = encrypt.EncodeArticleId2ByCheck("ucbs#" + userId + "#" + id)
-		s.T["obj"] = obj
-		s.T["forceShareFlag"] = public.CheckUserNeedForceShare(userId, public.ShareType_detail, config.Sysconfig)
-=======
 		s.T["obj"] = obj
->>>>>>> master
 		s.T["isIosExam"], s.T["isIosExamPhone"], _, _ = IosExamInfo(s.Action, false, false)
 		content, err := s.Render4Cache("/weixin/wxinfocontent.html", &s.T)
 		if err != nil {
@@ -326,8 +299,8 @@ func NoLoginArticle(stype, sid string) map[string]interface{} {
 					rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":"%s"}},{"term":{"hname":"%s"}}],"minimum_should_match":1}},"_source":["name","_id","capital","company_phone"],"size":1}`, v, v))
 					if rData != nil && len(*rData) == 1 {
 						if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
-							entIdArr = append(entIdArr, util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
-							winnerMap[v] = util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
+							entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
+							winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
 						}
 					}
 				}
@@ -337,7 +310,7 @@ func NoLoginArticle(stype, sid string) map[string]interface{} {
 					if vstr == "-" {
 						continue
 					}
-					winnerMap[swinnerArr[k]] = util.EncodeArticleId2ByCheck(vstr)
+					winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
 				}
 			}
 			obj["entId"] = entIdArr
@@ -446,7 +419,7 @@ func CNode(userId string) bool {
 		delete(rM, "createtime")
 		delete(rM, "client")
 	}
-	if userinfo := utils.Compatible.Select( userId, `{"s_phone":1,"s_m_phone":1,"s_myemail":1,"s_company":1,"o_jy":1,"o_vipjy":1}`); userinfo != nil && ok && len(*userinfo) > 0 {
+	if userinfo := utils.Compatible.Select(userId, `{"s_phone":1,"s_m_phone":1,"s_myemail":1,"s_company":1,"o_jy":1,"o_vipjy":1}`); userinfo != nil && ok && len(*userinfo) > 0 {
 		s_phone := util.ObjToString((*userinfo)["s_phone"])
 		phone := util.If(s_phone == "", util.ObjToString((*userinfo)["s_m_phone"]), s_phone)
 		if rM["phone"] == nil || rM["phone"] == "" {
@@ -547,8 +520,8 @@ func getwinnertel(company interface{}) string {
 
 func UserPermission(userId string) (isVip, isOldVip, isEntniche bool, i_member_status int, email string) {
 	var phone string
-	data :=utils.Compatible.Select( userId, `{"i_vip_status":1,"i_member_status":1,"s_myemail":1,"s_phone":1,"s_m_phone":1,"l_vip_starttime":1}`)
-	if  data != nil && len(*data) > 0 {
+	data := utils.Compatible.Select(userId, `{"i_vip_status":1,"i_member_status":1,"s_myemail":1,"s_phone":1,"s_m_phone":1,"l_vip_starttime":1}`)
+	if data != nil && len(*data) > 0 {
 		i_vip_status := util.IntAll((*data)["i_vip_status"])
 		if i_vip_status > 0 {
 			isVip = true

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

@@ -127,93 +127,48 @@
       "user": "public03@topnet.net.cn"
     }
   ],
-<<<<<<< HEAD
-  "policy": {
-    "title": "使用许可协议和隐私政策",
-    "content": "欢迎使用剑鱼标讯！\n我们依据最新法规及监管政策要求，更新了《剑鱼标讯用户使用许可协议》和《剑鱼标讯隐私政策》，在您使用剑鱼标讯前，请仔细阅读并充分了解。\n如你同意《剑鱼标讯用户使用许可协议》和《剑鱼标讯隐私政策》，请点击“同意”并开始使用我们的产品和服务，我们会全力保护你的个人信息安全。",
-    "href": [
-      "jyapp/free/staticPage/privacy_rules_client.html",
-      "jyapp/free/staticPage/permission_rules_client.html"
-    ],
-    "name": [
-      "《剑鱼标讯隐私政策》",
-      "《剑鱼标讯用户使用许可协议》"
-    ]
-  },
-  "tencentcloud": {
-    "appid": "TIDAXUV9",
-    "secretKey": "c7KJhtLMF805EeImBcOsoygu8KkdOrAfIaSU9SqAh8a2aiCgc69EfsaLM5EQcadF",
-    "version": "1.0.0"
-  },
-  "termValidity": 3600,
-  "uploadPath": "./web/staticres/jyapp/res/",
-  "appConfig": {
-    "pushGrpcServer": "192.168.20.114:5565",
-    "pushGrpcHeartBeat": 3
-  },
-  "redisSessionLockSize": 20,
-  "nsq": "192.168.3.240:4260",
+"policy": {
+"title": "使用许可协议和隐私政策",
+"content": "欢迎使用剑鱼标讯！\n我们依据最新法规及监管政策要求，更新了《剑鱼标讯用户使用许可协议》和《剑鱼标讯隐私政策》，在您使用剑鱼标讯前，请仔细阅读并充分了解。\n如你同意《剑鱼标讯用户使用许可协议》和《剑鱼标讯隐私政策》，请点击“同意”并开始使用我们的产品和服务，我们会全力保护你的个人信息安全。",
+"href": [
+	"jyapp/free/staticPage/privacy_rules_client.html",
+	"jyapp/free/staticPage/permission_rules_client.html"
+],
+"name": [
+	"《剑鱼标讯隐私政策》",
+	"《剑鱼标讯用户使用许可协议》"
+]
+},
+"tencentcloud": {
+"appid": "TIDAXUV9",
+"secretKey": "c7KJhtLMF805EeImBcOsoygu8KkdOrAfIaSU9SqAh8a2aiCgc69EfsaLM5EQcadF",
+"version": "1.0.0"
+},
+"termValidity": 3600,
+"uploadPath": "./web/staticres/jyapp/res/",
+"appConfig":{
+"pushGrpcServer":"192.168.20.114:5565",
+"pushGrpcHeartBeat":3
+},
+  "redisSessionLockSize":20,
+  "nsq":"192.168.3.240:4260",
   "nsq_topic": "jy_event",
-  "accountMergeOnline": "3333-03-30 00:00:00",
+  "accountMergeOnline":"3333-03-30 00:00:00",
   "bidSearchOldUserLimit": 1626105600,
   "contextOldVipLimit": 1664553600,
-  "firstBindPop": 3,
-  "maxBindPop": 8,
-  "bindPopRedis": "merge",
-  "phoneFilterFlag": true,
-  "optimalTime": "2021-08-03 12:00:00",
-  "criticality": 2,
+  "firstBindPop":3,
+  "maxBindPop":8,
+  "bindPopRedis":"merge",
+  "phoneFilterFlag":true,
+  "optimalTime":"2021-08-03 12:00:00",
+  "criticality":2,
   "canReadNotice": 3,
-  "namePrefix": "JY_%s",
-  "smsServiceRpc": "127.0.0.1:932",
+  "namePrefix":"JY_%s",
+  "smsServiceRpc":"127.0.0.1:932",
   "searchTypeSwitch": true,
-  "baseUserFilterFlag": true,
-  "userCenterApi": "https://web-zxl.jydev.jianyu360.com",
-  "freeProjectFocus": 10
-=======
-	"policy": {
-		"title": "使用许可协议和隐私政策",
-		"content": "欢迎使用剑鱼标讯！\n我们依据最新法规及监管政策要求，更新了《剑鱼标讯用户使用许可协议》和《剑鱼标讯隐私政策》，在您使用剑鱼标讯前，请仔细阅读并充分了解。\n如你同意《剑鱼标讯用户使用许可协议》和《剑鱼标讯隐私政策》，请点击“同意”并开始使用我们的产品和服务，我们会全力保护你的个人信息安全。",
-		"href": [
-			"jyapp/free/staticPage/privacy_rules_client.html",
-			"jyapp/free/staticPage/permission_rules_client.html"
-		],
-		"name": [
-			"《剑鱼标讯隐私政策》",
-			"《剑鱼标讯用户使用许可协议》"
-		]
-	},
-	"tencentcloud": {
-		"appid": "TIDAXUV9",
-		"secretKey": "c7KJhtLMF805EeImBcOsoygu8KkdOrAfIaSU9SqAh8a2aiCgc69EfsaLM5EQcadF",
-		"version": "1.0.0"
-	},
-	"termValidity": 3600,
-	"uploadPath": "./web/staticres/jyapp/res/",
-	"appConfig":{
-		"pushGrpcServer":"192.168.20.114:5565",
-		"pushGrpcHeartBeat":3
-	},
-    "redisSessionLockSize":20,
-    "nsq":"192.168.3.240:4260",
-    "nsq_topic": "jy_event",
-    "accountMergeOnline":"3333-03-30 00:00:00",
-    "bidSearchOldUserLimit": 1626105600,
-    "contextOldVipLimit": 1664553600,
-    "firstBindPop":3,
-    "maxBindPop":8,
-    "bindPopRedis":"merge",
-    "phoneFilterFlag":true,
-    "optimalTime":"2021-08-03 12:00:00",
-    "criticality":2,
-    "canReadNotice": 3,
-    "namePrefix":"JY_%s",
-    "smsServiceRpc":"127.0.0.1:932",
-    "searchTypeSwitch": true,
-    "baseUserFilterFlag":true,
-    "userCenterApi":"https://web-zxl.jydev.jianyu360.com",
-    "freeProjectFocus": 10,
-
+  "baseUserFilterFlag":true,
+  "userCenterApi":"https://web-zxl.jydev.jianyu360.com",
+  "freeProjectFocus": 10,
   "detailMosaicTxt":"略",
   "needMosaic":{
     "projectname":true,
@@ -261,5 +216,4 @@
     "expurasingtime":true,
     "winnerMap":true
   }
->>>>>>> master
 }

src/jfw/modules/app/src/main.go

@@ -9,25 +9,17 @@ import (
 	_ "jy/src/jfw/modules/app/src/app/front"
 	"jy/src/jfw/modules/app/src/app/tag"
 	. "jy/src/jfw/modules/app/src/jfw/config"
+	_ "jy/src/jfw/modules/app/src/public"
 	"net/http"
-<<<<<<< HEAD
-=======
-	"qfw/util"
-	"qfw/util/fsw"
->>>>>>> master
-
-	util "app.yhyue.com/moapp/jybase/common"
-
-	"app.yhyue.com/moapp/jypkg/public"
-
 	"strings"
 	"time"
 
-	_ "jy/src/jfw/modules/app/src/public"
-
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/fsw"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	_ "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jylog" //日志文件
+	"app.yhyue.com/moapp/jypkg/public"
 )
 
 func init() {
@@ -37,13 +29,9 @@ func init() {
 func main() {
 	//开启web
 	//限制全文检索查询
-<<<<<<< HEAD
 	go public.InitLimitSearchText(true, Sysconfig)
-=======
-	go public.InitLimitSearchText(true)
 	//敏感词初始化
 	fsw.ReadFswDict()
->>>>>>> master
 	active.Init()
 	//
 	mux1 := http.NewServeMux()

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

@@ -32,10 +32,23 @@ func decode(v string) *IdentityInfo {
 //
 func (f *Identity) List() {
 	identitys := []map[string]interface{}{}
-	if base_user_id := util.Int64All(f.GetSession("base_user_id")); base_user_id > 0 {
-		for _, v := range Middleground.UserCenter.IdentityList(base_user_id) {
+	sessVal := f.Session().GetMultiple()
+	if base_user_id := util.Int64All(sessVal["base_user_id"]); base_user_id > 0 {
+		list := Middleground.UserCenter.IdentityList(base_user_id)
+		index := -1
+		for k, v := range list {
+			if (util.Int64All(sessVal["positionType"]) == 0 && v.PositionType == 0) || util.Int64All(sessVal["positionId"]) == v.PositionId {
+				index = k
+				break
+			}
+		}
+		if index == -1 {
+			SwitchToBest(base_user_id, f.Session(), Middleground)
+			sessVal = f.Session().GetMultiple()
+		}
+		for _, v := range list {
 			checked := 0
-			if (util.Int64All(f.GetSession("positionType")) == 0 && v.PositionType == 0) || util.Int64All(f.GetSession("positionId")) == v.PositionId {
+			if (util.Int64All(sessVal["positionType"]) == 0 && v.PositionType == 0) || util.Int64All(sessVal["positionId"]) == v.PositionId {
 				checked = 1
 				NewIdentityInfo(v).Switch(f.Session())
 			}