feat:修改用户同步的配置项

src/config.json

@@ -322,5 +322,6 @@
     "smsServiceRpc":"127.0.0.1:932",
     "searchTypeSwitch": true,
     "fileSignBool":true,
-    "baseUserFilterFlag":false
+    "baseUserFilterFlag":false,
+    "userCenterApi":"https://web-zxl.jydev.jianyu360.com"
 }

src/jfw/front/login.go

@@ -142,7 +142,7 @@ func (l *Login) Login() error {
 								formdata["company"] = s_company
 							}
 							ck, _ := l.GetCookie("SESSIONID")
-							usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, formdata, ck)
+							usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, formdata, ck)
 							//用户中台存储  结束
 						}(phone, _id)
 						jy.ClearPhoneIdentSession(l.Session())
@@ -265,7 +265,7 @@ func (l *Login) ForgetPwd() error {
 				userid := BsonIdToSId(user["_id"])
 				//用户中台存储  开始
 				ck, _ := l.GetCookie("SESSIONID")
-				usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, ck)
+				usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, ck)
 
 				//用户中台存储  结束
 				l.DelSession("forgetPwdStep")

src/jfw/front/pchelper.go

@@ -141,7 +141,7 @@ func (l *PcHelper) Login() error {
 									"phone": phone,
 								}
 								ck, _ := l.GetCookie("SESSIONID")
-								usercenter.AddBaseUser(mongodb, util.ObjToString(config.Sysconfig["webdomain"]), userId, formdata, ck)
+								usercenter.AddBaseUser(mongodb, util.ObjToString(config.Sysconfig["userCenterApi"]), userId, formdata, ck)
 							}(phone, _id)
 							//用户中台存储  结束
 							jy.ClearPhoneIdentSession(l.Session())

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

@@ -210,7 +210,7 @@ func (l *Login) Login() error {
 								"phone": phone,
 							}
 							ck, _ := l.GetCookie("SESSIONID")
-							usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, formdata, ck)
+							usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, formdata, ck)
 						}(_id)
 						jy.ClearPhoneIdentSession(l.Session())
 						returnSign = afterLogin(data, l.Session(), rid, oid, phoneType, channel, deviceId, true, l.ResponseWriter)
@@ -455,7 +455,7 @@ func (l *Login) Register() error {
 					//用户中台同步
 					func(userid string) {
 						ck, _ := l.GetCookie("SESSIONID")
-						usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, ck)
+						usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, ck)
 					}(qutil.ObjToString(wxuid))
 				} else {
 					data["i_appid"] = 2
@@ -481,7 +481,7 @@ func (l *Login) Register() error {
 							"company":  s_entname,
 						}
 						ck, _ := l.GetCookie("SESSIONID")
-						usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, formdata, ck)
+						usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, formdata, ck)
 					}(saveid)
 					addr := config.Sysconfig["nsq"].(string)
 					topic := config.Sysconfig["nsq_topic"].(string)
@@ -601,7 +601,7 @@ func (l *Login) WxLogin() {
 					"$set": upSet,
 				})
 				ck, _ := l.GetCookie("SESSIONID")
-				usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, ck)
+				usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, ck)
 			}(BsonIdToSId((*user)["_id"]))
 
 			returnSign = afterLogin(*user, l.Session(), rid, oid, phoneType, channel, deviceId, false, l.ResponseWriter)
@@ -645,7 +645,7 @@ func (l *Login) WxLogin() {
 						"unionid":  u.UnionId,
 					}
 					ck, _ := l.GetCookie("SESSIONID")
-					usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, formdata, ck)
+					usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, formdata, ck)
 				}(_id)
 				returnSign = afterLogin(newUser, l.Session(), rid, oid, phoneType, channel, deviceId, true, l.ResponseWriter)
 				if disWord != "" {
@@ -750,7 +750,7 @@ func (l *Login) ForgetPwd() error {
 				jy.ClearPhoneIdentSession(l.Session())
 				func(userid string) {
 					ck, _ := l.GetCookie("SESSIONID")
-					usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, ck)
+					usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, ck)
 				}(BsonIdToSId(user["_id"]))
 				return "y"
 			}

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

@@ -198,7 +198,7 @@ func (l *Me) Updatepwd() error {
 		}) {
 			//调用用户中台
 			ck, _ := l.GetCookie("SESSIONID")
-			usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["webdomain"]), userid, ck)
+			usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, ck)
 			return "y"
 		} else {
 			return "saveError"

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

@@ -165,5 +165,6 @@
     "namePrefix":"JY_%s",
     "smsServiceRpc":"127.0.0.1:932",
     "searchTypeSwitch": true,
-    "baseUserFilterFlag":true
+    "baseUserFilterFlag":true,
+    "userCenterApi":"https://web-zxl.jydev.jianyu360.com"
 }

src/jfw/modules/subscribepay/src/config.json

@@ -109,5 +109,6 @@
 	},
 	"smsServiceRpc":"127.0.0.1:932",
 	"nsq":"192.168.3.240:4260",
-  "nsq_topic": "jy_event"
+  "nsq_topic": "jy_event",
+  "userCenterApi":"https://web-zxl.jydev.jianyu360.com"
 }

src/jfw/modules/subscribepay/src/config/config.go

@@ -73,6 +73,7 @@ type config struct {
 	SmsServiceRpc      string
 	Nsq                string
 	Nsq_Topic          string
+	UserCenterApi      string
 }
 type mgoConf struct {
 	Address           string

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -393,7 +393,7 @@ func (this *UserAccount) PhoneBind() {
 				}
 				//用户中台存储  开始
 				ck, _ := this.GetCookie("SESSIONID")
-				usercenter.UpdateBaseUser(util.MQFW, config.Config.WebDomain, userId, ck)
+				usercenter.UpdateBaseUser(util.MQFW, config.Config.UserCenterApi, userId, ck)
 				//用户中台存储  结束
 				jy.CreateUserMerge(util.MQFW, util.Mysql, this.Session()).FlushSession(nil, userId) //刷新session
 			} else if mode == "mergeBind" { //跳转绑定-不合并绑定无效
@@ -417,10 +417,10 @@ func (this *UserAccount) PhoneBind() {
 					}) {
 						//用户中台存储  开始
 						ck, _ := this.GetCookie("SESSIONID")
-						usercenter.UpdateBaseUser(util.MQFW, config.Config.WebDomain, mongodb.BsonIdToSId(relationPhoneId), ck)
+						usercenter.UpdateBaseUser(util.MQFW, config.Config.UserCenterApi, mongodb.BsonIdToSId(relationPhoneId), ck)
 						//删除user
 						base_userid_del := usercenter.GetBaseUserId(util.MQFW, userId)
-						usercenter.PostUserCenter(config.Config.WebDomain+usercenter.UserCenterDelete, usercenter.ContentType_Json, userId, map[string]interface{}{
+						usercenter.PostUserCenter(config.Config.UserCenterApi+usercenter.UserCenterDelete, usercenter.ContentType_Json, userId, map[string]interface{}{
 							"appid": "10000",
 							"id":    base_userid_del,
 						}, ck)
@@ -566,7 +566,7 @@ func (this *UserAccount) PhoneChange() {
 			//用户中台存储  开始
 			func(phone, userId string) {
 				ck, _ := this.GetCookie("SESSIONID")
-				usercenter.UpdateBaseUser(util.MQFW, config.Config.WebDomain, userId, ck)
+				usercenter.UpdateBaseUser(util.MQFW, config.Config.UserCenterApi, userId, ck)
 			}(phoneVerify, userId)
 			//用户中台存储  结束
 			this.Session().Del(phoneAuthPassSessionKey)
@@ -663,8 +663,8 @@ func (this *UserAccount) WxBind() {
 
 		//关联用户中台base_user_id  双向关系
 		ck, _ := this.GetCookie("SESSIONID")
-		usercenter.UpdateBaseUser(util.MQFW, config.Config.WebDomain, userId, ck)
-		usercenter.UpdateBaseUser(util.MQFW, config.Config.WebDomain, relationWeixinId, ck)
+		usercenter.UpdateBaseUser(util.MQFW, config.Config.UserCenterApi, userId, ck)
+		usercenter.UpdateBaseUser(util.MQFW, config.Config.UserCenterApi, relationWeixinId, ck)
 		//刷新session
 		jy.CreateUserMerge(util.MQFW, util.Mysql, this.Session()).FlushSession(upDateMap, userId)
 		return map[string]interface{}{
@@ -734,7 +734,7 @@ func (this *UserAccount) WxUnBind() {
 					if qutil.ObjToString((*unsetMap)["a_m_openid"]) != "" {
 						formdata["a_openid"] = qutil.ObjToString((*unsetMap)["a_m_openid"])
 					}
-					usercenter.AddBaseUser(util.MQFW, config.Config.WebDomain, userid, formdata, ck)
+					usercenter.AddBaseUser(util.MQFW, config.Config.UserCenterApi, userid, formdata, ck)
 				}(phone, saveId)
 			}
 			flushWxsession = true

src/jfw/modules/weixin/src/config.json

@@ -16,11 +16,11 @@
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
-    "webdomain": "https://web-ws.jydev.jianyu360.com",
-    "appid":"wx5b1c6e7cc4dac0e4",
-    "appsecret":"b026103ffebd2291b3edb7a269612112",
+    "webdomain": "https://web-zxl.jydev.jianyu360.com",
+    "appid":"wxdedd73f450993685",
+    "appsecret":"d55898fde0b7887e5fe4660bd2494700",
     "apptoken": "top2022top2022",
-    "proxysess": "https://web-ws.jydev.jianyu360.com/front/sess/%s",
+    "proxysess": "https://web-zxl.jydev.jianyu360.com/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
     "tpl_subscribe_push_id": "IY_RWWzMlwDK6hcd6RAzTec6qre8n5r8PNOOUM_hgk0",
@@ -127,5 +127,6 @@
     "pcQrCode":{
     		"10":true,"11":true,"12":true,"13":true,"14":true,"17":true,"18":true,"19":true
     },
-    "namePrefix":"JY_%s"
+    "namePrefix":"JY_%s",
+    "userCenterApi":"https://web-zxl.jydev.jianyu360.com"
 }

src/jfw/modules/weixin/src/wx/wx.go

@@ -350,7 +350,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 				"s_openid": u.OpenId,
 				"unionid":  u.UnionId,
 			}
-			usercenter.AddBaseUser(tools.MQFW, util.ObjToString(config.Sysconfig["webdomain"]), _id, formdata, &http.Cookie{})
+			usercenter.AddBaseUser(tools.MQFW, util.ObjToString(config.Sysconfig["userCenterApi"]), _id, formdata, &http.Cookie{})
 
 		}
 		//逻辑转到用户完成绑定手机号时写入nsq队列