更新

src/jfw/modules/app/src/app/filter/filter.go

@@ -15,7 +15,7 @@ func init() {
 		AskLoginUrls:  make([]*regexp.Regexp, 0),
 		Redirect:      "/jyapp/free/login?back=index&to=back",
 	}
-	sessionfiletr.AddAnonymousUrls("^/jyapp/(dataReport|dataExport)/(wxpay|alipay)/callback$", "^/jyapp/free/.*", "^/jyapp/jylab/mainSearch$", "^/jyapp/swordfish/searchlist/paging$", "^/jyapp/jylab/supsearch/getstatus$", "^/jyapp/followent/recList$", "/jyapp/errLogs/Receive")
+	sessionfiletr.AddAnonymousUrls("^/jyapp/(dataReport|dataExport)/(wxpay|alipay)/callback$", "^/jyapp/free/.*", "^/jyapp/jylab/mainSearch$", "^/jyapp/swordfish/searchlist/paging$", "^/jyapp/jylab/supsearch/getstatus$", "^/jyapp/followent/recList$", "/jyapp/errLogs/Receive", "/jyapp/distrib/redirectTo")
 	xweb.AddFilter(sessionfiletr)
 	xweb.AddFilter(&mergefilter{App: xweb.RootApp(), SessionName: "userId", Redirect: "/jyapp/free/login?back=index&to=back"})
 	go func() {

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

@@ -23,22 +23,22 @@ func init() {
 func (this *Distrib) RedirectTo() error {
 	defer util.Catch()
 	userId, _ := this.GetSession("userId").(string)
-	url := this.GetString("url")
-	if url != "" {
-		if strings.Contains(url, "disWord=") {
-			DAM := strings.Split(url, "disWord=")[1] //口令和产品名称
+	appUrl := this.GetString("appUrl")
+	if appUrl != "" {
+		if strings.Contains(appUrl, "disWord=") {
+			DAM := strings.Split(appUrl, "disWord=")[1] //口令和产品名称
 			if strings.Contains(DAM, "&&") {
-				modular := strings.Split(DAM, "&&")[1] //产品
-				disWord := strings.Split(DAM, "&&")[0] //口令
-				url = strings.Split(url, "&&")[0]      //格式化url
+				modular := strings.Split(DAM, "&&")[1]  //产品
+				disWord := strings.Split(DAM, "&&")[0]  //口令
+				appUrl = strings.Split(appUrl, "&&")[0] //格式化url
 				go this.ShareLogs(modular, disWord, userId)
 			}
 		}
 	}
-	if userId != "" && url != "" {
-		return this.Redirect(url)
+	if userId != "" && appUrl != "" {
+		return this.Redirect(appUrl)
 	}
-	return this.Redirect("/jyapp/free/login")
+	return this.Redirect("/jyapp/free/login?back=index&to=back&DisUrl=" + appUrl)
 }
 
 //type 1:超级订阅 2:数据导出 3:数据报告 4:线上课程

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

@@ -1,73 +0,0 @@
-package front
-
-/**
-日志文件自动切换，默认保留15天内日志
-**/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/robfig/cron"
-)
-
-//日志格式
-var fileReg = regexp.MustCompile("^(\\d{4}_[0-9_]{14})\\.log$")
-
-//当前日志文件句柄
-var LogFile *os.File
-
-//时间格式
-var FMT = "2006_01_02_15_04_05"
-
-//日志目录
-var LogPath = "./jylog"
-
-func init() {
-	os.Mkdir(LogPath, os.ModePerm)
-	//默认保留15天内的日志，-1为永久保留
-	initLog(15)
-}
-
-func initLog(saveDay int) {
-	go logfile()
-	task := cron.New()
-	task.Start()
-	task.AddFunc("0 0 0 * * ?", func() {
-		go logfile()
-		time.Sleep(50 * time.Second)
-		if saveDay > 0 {
-			filepath.Walk(LogPath, func(path string, info os.FileInfo, err error) error {
-				str := fileReg.FindStringSubmatch(info.Name())
-				if len(str) == 2 {
-					t, er := time.ParseInLocation(FMT, str[1], time.Local)
-					if er == nil {
-						if (time.Now().Unix()-t.Unix())/86400 > int64(saveDay) {
-							log.Println("delete log file:", path, os.Remove(path))
-						}
-					}
-				}
-				return nil
-			})
-		}
-	})
-}
-
-//创建并切换输出文件
-func logfile() {
-	now := time.Now().Format(FMT)
-	file, _ := os.Create(LogPath + "/" + now + ".log")
-	log.SetOutput(file)
-	xweb.RootApp().Logger.SetOutput(file)
-	go func(file *os.File) {
-		time.Sleep(5 * time.Second)
-		if LogFile != nil {
-			LogFile.Close()
-		}
-		LogFile = file
-	}(file)
-}

src/jfw/modules/app/src/seo.json

@@ -1,7 +1,7 @@
 {	
-	"cdn":"http://web-jydev-wcj.jianyu360.cn",
+	"cdn":"http://web-jydev-ws.jianyu360.cn",
 	"cdns":{
-	 	"web-jydev-wcj.jianyu360.cn":""
+	 	"web-jydev-ws.jianyu360.cn":""
 	},
     "qfw": {
         "swordfish": {

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -856,6 +856,12 @@ function loginSuccess(result){
 		sessionStorage.removeItem("alertKicked");
 	}
 	JyObj.saveUserToken(result.sign);
+	//分销跳转
+	if(getUrlParam("DisUrl")!=null){
+		afterLoginSuccess("",true);
+		location.replace(getUrlParam("DisUrl"));
+		return
+	}
 	//
 	if(getUrlParam("to") == "back"){
 //		sessionStorage.reloadHomePage=true;
@@ -869,11 +875,6 @@ function loginSuccess(result){
 		}
 		return
 	}
-	//分销跳转
-	if(getUrlParam("appUrl")!=null&&getUrlParam("appUrl").indexOf("distrib/redirectTo")>-1){
-		location.replace(getUrlParam("appUrl"));
-		return
-	}
 	//
 	var callBackUrl = getUrlParam("url",decodeURIComponent);
 	if(callBackUrl != null){
@@ -1254,14 +1255,14 @@ function getParam(name) {
 var tipFlag = true;
 function distribInfo(tt){
 	var myHref = window.location.href;
-//	alert(myHref+"--:"+tt)
-	if (myHref.indexOf("free/login")>-1&&(myHref.indexOf("appUrl=")>-1||myHref.indexOf("url=")>-1)){
-		//清除客户端粘贴板
-		try{
-			JyObj.clearRight();
-		}catch(e){}
-		return false
-	}
+	alert(myHref+"--:"+tt)
+//	if (myHref.indexOf("free/login")>-1&&(myHref.indexOf("appUrl=")>-1||myHref.indexOf("url=")>-1)){
+//		//清除客户端粘贴板
+//		try{
+//			JyObj.clearRight();
+//		}catch(e){}
+//		return false
+//	}
 	if (tt!=""&&tt.indexOf("复制")>-1&&tt.indexOf("剑鱼标讯")>-1){
 		var tt_last = tt.split("：")[1]//汉语：
 		var discored = tt_last.split("，")[0]//汉语，获取口令
@@ -1277,8 +1278,6 @@ function distribInfo(tt){
 					if(r.error_code==0){
 						//清除客户端粘贴板
 						try{
-							nowTime = new Date(formatDate(nowTime,true)+ " 00:00:00").getTime();
-							localStorage.setItem("Active_Vip_Invite",nowTime);
 							JyObj.clearRight();
 						}catch(e){}
 						tipFlag = false;
@@ -1288,21 +1287,13 @@ function distribInfo(tt){
 						var nickName = res["shareNickname"]=="undefined"?"":res["shareNickname"];//分销者昵称
 						var appUrl = res["appUrl"]=="undefined"?"":res["appUrl"];//跳转链接
 						//日志中转链接
-						appUrl = "/jyapp/distrib/redirectTo?url="+encodeURIComponent(appUrl+"&&"+modular)
 						if (!res["isLogin"]&&appUrl!=""){
-							if (myHref.indexOf("/free/login")>-1){
-								var fh = "?"
-								if (myHref.indexOf("?")>-1){
-									fh="&"
-								}
-								history.replaceState(null,null,myHref+fh+"appUrl="+encodeURIComponent(appUrl))
-							}else{
-								appUrl = "/jyapp/free/login?url="+encodeURIComponent(appUrl);
+							if (myHref.indexOf("?")>-1){
+								myHref = myHref.split("?")[0]
 							}
+							history.replaceState(null,null,myHref+"?DisUrl="+encodeURIComponent(appUrl))
 						}
-						setTimeout(function(){
-							DisWord_Tip_Invite(imgUrl,modular,nickName,appUrl);
-						},500)
+						alert(window.location.href)
 					}
 				},
 				error: function(){

src/jfw/modules/app/src/web/templates/common/js.html

@@ -1,2 +1,2 @@
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js" type="text/javascript" charset="utf-8"></script>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
+<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}2"></script>

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -557,7 +557,7 @@
         </div>
       </div>
       <!-- 优惠码弹窗 -->
-      <div class="j-picker adaption coupon-picker">
+      <div class="j-picker adaption coupon-picker" style="display:none;">
         <div class="weui-mask weui-animate-fade-in"></div>
         <div class="weui-half-screen-dialog weui-picker weui-animate-slide-up">
           <div class="weui-half-screen-dialog__hd">

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -36,7 +36,7 @@
     <div style="height: 100%">
         <div class="vip_purchase">
             {{if not .T.isTrial }}
-                <div class="hot-bought">
+                <div class="hot-bought" style="display:none;">
                     <span class="j-icon icon-cart"></span>
                     <span class="bought-text">已有<span class="bought-num">0</span>人购买</span>
                 </div>
@@ -110,7 +110,7 @@
                     {{end}}
                 </div> -->
                 {{if not .T.isTrial }}
-                    <div class="chooseList coupon-code-tx">
+                    <div class="chooseList coupon-code-tx" style="display:none;">
                         <div class="coupon-code-sel choose_item">
                             <a href="javascript:;">
                                 <span class="label">优惠码</span>
@@ -184,7 +184,7 @@
             </div>
             <div class="fixed-bottom-box p15">
                 {{if not .T.isTrial }}
-                    <div class="j-notice-bar bar-red vip-bar">限时6折，现在购买，帮您省<span class="reduce-price">0</span>元</div>
+                    <div class="j-notice-bar bar-red vip-bar" style="display:none;">限时6折，现在购买，帮您省<span class="reduce-price">0</span>元</div>
                 {{end}}
                 <div class="price">
                     <span class="billing-total">合计：</span>
@@ -195,7 +195,7 @@
                     </div>
                 </div>
                 {{if not .T.isTrial }}
-                    <div class="origin-price">
+                    <div class="origin-price" style="display:none;">
                         <span class="price-label">原价：</span>
                         <div class="price-container">
                             <span class="currency-type">&yen;</span>

src/jfw/modules/distribution/src/service/action/share.go

@@ -97,8 +97,8 @@ func analyseWord(discored string) (name, url, appUrl, shareNickname string) {
 	modular := util.ObjToMap(Sysconfig.Modular[encry])
 	if modular != nil {
 		name = (*modular)["name"].(string)
-		url = (*modular)["url"].(string) + "?disWord=" + discored[1:]                                                        //指令传输
-		appUrl = "/jyapp/distrib/redirectTo?url=" + (*modular)["appUrl"].(string) + "?disWord=" + discored[1:] + "&&" + name //日志中转页
+		url = (*modular)["url"].(string) + "?disWord=" + discored[1:]                                                           //指令传输
+		appUrl = "/jyapp/distrib/redirectTo?appUrl=" + (*modular)["appUrl"].(string) + "?disWord=" + discored[1:] + "&&" + name //日志中转页
 	}
 	//redis 获取分销者信息
 	redisDis := redis.GetStr("other", "DIS_"+discored[1:])