Merge branch 'dev_v2.9.44.1_wh' of jianyu/ent_new into hotfix/v2.9.44.1

entniche_new/src/db.json

@@ -1,35 +1,25 @@
 {
 	"mongodb": {
 		"main": {
-			"address": "192.168.3.206:27080",
-	 		"size": 5,
-	 		"dbName": "qfw",
+			"address": "192.168.3.149:27180",
+			"size": 5,
+			"dbName": "qfw",
 			"replSet": ""
 		},
 		"bidding": {
-			"address": "192.168.3.206:27002",
-	 		"size": 5,
-	 		"dbName": "qfw_data",
+			"address": "192.168.3.149:27102",
+			"size": 5,
+			"dbName": "qfw_data",
 			"replSet": "",
 			"collection": "bidding",
 			"collection_back": "bidding_back",
 			"userName": "jyDevGroup",
 			"password": "jy@DevGroup"
 		},
-		"ent": {
-			"address": "192.168.3.206:27002",
-			"size": 5,
-			"dbName": "mixdata",
-			"replSet": "",
-			"collection": "qyxy",
-			"collection_change": "qyxy_change",
-			"userName": "jyDevGroup",
-			"password": "jy@DevGroup"
-		},
 		"log":{
-			"address": "192.168.3.206:27090",
-	 		"size": 5,
-	 		"dbName": "qfw",
+			"address": "192.168.3.149:27190",
+			"size": 5,
+			"dbName": "qfw",
 			"replSet": "",
 			"userName": "admin",
 			"password": "123456"
@@ -37,27 +27,27 @@
 	},
 	"elasticsearch": {
 		"main": {
-			"address": "http://192.168.3.206:9800",
-	    	"size": 5,
+			"address": "http://192.168.3.241:9205,http://192.168.3.149:9200",
+			"size": 5,
 			"version": "v7",
 			"userName":"",
 			"password":""
 		}
-    },
-    "redis": {
-    	"main":{
-			"address": "pushcache_1=192.168.3.206:1712,pushcache_2_a=192.168.3.206:1712,pushcache_2_b=192.168.3.206:1712,other=192.168.3.206:1712,session=192.168.3.11:1713,open=192.168.3.206:1712"
+	},
+	"redis": {
+		"main":{
+			"address": "other=192.168.3.149:1712,session=192.168.3.149:1713,open=192.168.3.149:1712,newother=192.168.3.149:1712"
 		}
-    },
-    "mysql": {
-	    "main": {
-	        "dbName": "jianyu",
-	        "address": "192.168.3.11:3366",
-	        "userName": "root",
-	        "passWord": "Topnet123",
+	},
+	"mysql": {
+		"main": {
+			"dbName": "jianyu",
+			"address": "jymysql.jydev.jy360.cn:33066",
+			"userName": "jianyu",
+			"passWord": "Topnet123",
 			"maxOpenConns": 5,
 			"maxIdleConns": 5
-	    },
+		},
 		"base": {
 			"dBName": "base_service",
 			"address": "192.168.3.217:4000",
@@ -65,14 +55,6 @@
 			"passWord": "=PDT49#80Z!RVv52_z",
 			"maxOpenConns": 5,
 			"maxIdleConns": 5
-		},
-		"push": {
-	        "dbName": "jianyu",
-	        "address": "192.168.3.11:3366",
-	        "userName": "root",
-	        "passWord": "Topnet123",
-			"maxOpenConns": 5,
-			"maxIdleConns": 5
-	    }
-    }
+		}
+	}
 }

entniche_new/src/go.mod

@@ -1,6 +1,6 @@
 module entniche_new/src
 
-go 1.18
+go 1.20
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b

entniche_new/src/service/subscribe/subscribe.go

@@ -2,6 +2,7 @@
 package subscribe
 
 import (
+	"app.yhyue.com/moapp/message/db"
 	"encoding/json"
 	"entniche_new/src/config"
 	"fmt"
@@ -1676,7 +1677,7 @@ func deleteRepeat(slice []string) []string {
 	for _, v := range slice {
 		m[v]++
 	}
-	for x, _ := range m {
+	for x := range m {
 		slice_repeat = append(slice_repeat, qutil.ObjToString(x))
 	}
 	return slice_repeat
@@ -1760,6 +1761,38 @@ func (ac *Action) updateEntnicheRule(parameter_name string, parameter interface{
 		"l_updatetime":                 time.Now().Unix(),
 		"o_entniche." + parameter_name: parameter,
 	}}, true, false)
+	//企业订阅修改记录
+	if bl {
+		dataList, _ := util.MQFW.Find("entniche_rule", query, `{"o_vipjy":1,"o_member_jy":1,"o_jy":1}`, nil, true, -1, -1)
+		util.MQFW.Update("entniche_rule", query, bson.M{"$set": bson.M{
+			"l_updatetime":                 time.Now().Unix(),
+			"o_entniche." + parameter_name: parameter,
+		}}, true, false)
+		if dataList != nil && len(*dataList) > 0 {
+			data := (*dataList)[0]
+			switch identity {
+			case "ent":
+				if entInfo.Role_admin_department && entInfo.Ent.Dept_subscribe == 1 { //部门管理员且有权力
+					data["i_deptid"] = entInfo.Dept.Id
+					data["i_entid"] = entId
+
+				} else if entInfo.Role_admin_system { //企业管理员
+					data["i_entid"] = entId
+					data["i_deptid"] = map[string]interface{}{
+						"$exists": false,
+					}
+					data["i_userid"] = map[string]interface{}{
+						"$exists": false,
+					}
+				}
+			case "pers":
+				data["i_userid"] = entUserId
+				data["i_entid"] = entId
+				data["i_type"] = i_type
+			}
+			go db.Mgo_Log.Save("entjy_log", data)
+		}
+	}
 	return bl
 }