Merge branch 'feature/v4.8.74_ws' of qmx/jy into feature/v4.8.74

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

@@ -108,7 +108,7 @@ func (l *Login) Login() error {
 	var (
 		returnSign  = ""
 		userInfo    = map[string]interface{}{}
-		channelCode = "jy_app_phone"
+		channelCode = qutil.If(strings.Contains(l.Request.Host, "h5"), "jy_h5_phone", "jy_app_phone").(string)
 	)
 	cc, ckErr := l.Request.Cookie(jy.ChannelCookieName)
 	if ckErr == nil {
@@ -513,7 +513,7 @@ func (l *Login) Register() error {
 		returnSign   string
 		nsqPath, _   = config.Sysconfig["nsq"].(string)
 		nsq_topic, _ = config.Sysconfig["nsq_topic"].(string)
-		channelCode  = "jy_app_phone"
+		channelCode  = qutil.If(strings.Contains(l.Request.Host, "h5"), "jy_h5_phone", "jy_app_phone").(string)
 		cc, ckErr    = l.Request.Cookie(jy.ChannelCookieName)
 	)
 	if ckErr == nil {

src/jfw/qrmanager/qrmanager.go

@@ -28,7 +28,7 @@ func RedisInfo(oid, action, sione, sitwo string, i int, hsn *httpsession.Session
 	}
 	userData := make(map[string]interface{})
 	//P414
-	channelCode := "jy_pc_wx_er"
+	channelCode := "jy_pc_wx"
 	ccVal, ckErr := hrt.Cookie(jy.ChannelCookieName)
 	if ckErr == nil {
 		channelCode = ccVal.Value