修改

README.md

@@ -3,3 +3,6 @@
 weixin sdk https://github.com/wizjin/weixin
 web用xweb框架
 
+v2.7.1
+1.新版落地页
+2.app渠道统计，灰度发布

doc/发版程序/app/config.json

@@ -0,0 +1,113 @@
+{
+    "mongodbServers": "10.172.242.243:27080,10.30.94.175:27081,10.81.232.246:27082",
+    "mongodbPoolSize": "120",
+    "mongodbName": "qfw",
+    "influxaddr": "http://192.168.3.207:8086",
+    "influxdb": "jy_logs",
+    "elasticsearch": "http://172.17.145.170:9800",
+    "elasticPoolSize": 80,
+    "redisaddrs": "other=10.172.228.50:1713,push=10.172.228.50:1713,sso=10.172.228.50:1711,session=10.172.228.50:1715,pushcache_1=10.66.39.130:5000,pushcache_2_a=172.17.145.169:5000,pushcache_2_b=10.162.193.49:5000",
+    "webport": "8402",
+    "weixinrpc": "10.170.187.34:8202",
+    "cacheflag":false,
+    "cassandra":{
+		"log":{
+			"host":["172.17.145.178"],
+			"size":10
+		},
+		"push":{
+			"host":["172.17.145.176"],
+			"size":10
+		}
+	},
+    "agreement": "https",
+    "webdomain": "https://res.jianyu360.com",
+	"redirect": {
+        "wxpushlist": "/jyapp/wxpush/bidinfo/%s",
+	"newInfoFollow": "/jyapp/followent/newInfo/%s",
+        "wxpushfollowlist": "/jyapp/follow/notice/%s/%s",
+        "followset": "/jyapp/follow/set/%s/%s",
+	"myfeedbacks": "/jyapp/swordfish/myFeedbacks",
+        "historypush": "/jyapp/swordfish/historypush?f=push",
+        "followEntDetail": "/jyapp/followent/detail/%s"
+    },
+    "followProject": 10,
+	"followentlimit":"10",
+    "followLimitDay": 30,
+    "followTipMsg": {
+        "title": "您关注的项目《%s》将于%s开标！",
+        "remark": "您收到这条信息是因为您之前设置了项目开标提醒，如果您不再需要此类提醒，可点击下方“详情”修改提醒设置。"
+    },
+	"followPushRpc": "10.170.187.34:8700",
+    "recommendThreshold": 0.5,
+    "rewardText": [
+        "憋说话！赏我！",
+        "“赏”就一个字 我只说一次",
+        "厉害了word鱼！",
+        "看官赏点银子偶会更卖力噢！",
+        "各位客官，快来赏点吧！",
+        "夸我还是含蓄点的好，赏一个吧~",
+        "爱，就供养；喜欢，就打赏！",
+        "请简单粗暴地爱我！",
+        "最喜欢你一言不合就打赏的样子了~~~么么！"
+    ],
+    "advertText": [
+        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼标讯社区",
+        "加入剑鱼标讯社区  和投标大神做朋友",
+        "来剑鱼标讯社区  找最合拍的伙伴",
+        "剑鱼标讯社区，让沟通连接你我。",
+        "剑鱼标讯社区，分享你的知识、解决问题、行业资源交换",
+        "勇敢发声，和老司机一起畅聊招投标。",
+        "春风十里，不如来剑鱼标讯社区！",
+        "只要心相通，相隔千里也能畅快交流。",
+        "弹指一挥间，剑鱼标讯因你而不同！",
+        "携手同行，认真对待每一次招投标"
+    ],
+    "advertImg": "/jyapp/images/advert.png",
+    "advertName": "广告",
+    "advertUrl": "/jyapp/free/swordfish/about",
+    "industry":"行业分类",
+    "recommendEntLimit":"50",
+	"update":{
+		"version": "2.7.1",
+		"mustupdate": false,
+		"tipspace": 86400,
+		"ios_version": "2.5.8",
+		"ios_mustupdate": false,
+		"apkurl": "https://res.jianyu360.com/jyapp/res/%s/jianyu360.apk",
+		"channelDir":{
+			"baidu":"baiduSem",
+			"shenma":"shenmaSem",
+			"huawei":"huawei",
+			"xiaomi":"xiaomi",
+			"yingyongbao":"yingyongbao",
+			"douyin":"douyin",
+			"weixin":"jywx",
+			"topnet":"topnet",
+			"duanxin":"duanxin",
+			"default":"topnet"
+		}
+	},
+	"limitSearchText": {
+		"flag": true,
+		"count": 3,
+		"timeout": 60,
+		"totalPage": 4,
+		"userIds": ["5b988c2cc9ebc2082f28fae6","581858dbc9ebc2132200002e","5a806144c9ebc21b9cdd5944"],
+		"msg": "f 开关状态：%s //-2 从配置文件重置，-1 关闭，1 打开<br><br>c 并发数：%d //-2 不限制并发数，-1 无条件直接限制，>0 限制并发数<br><br>t 个人查询限制时间：%ds //-1 不限制<br><br>p 限制页数：%d"
+	},
+	"share": {
+        "forceShareEnabled" : false,
+        "onlineDate": "2018-09-17 17:00:00",
+        "regDaysForNewUser": 5,
+        "shareIntervalDays": 7,
+        "startHour": 8,
+        "endHour": 20,
+        "shareTimesUpperLimitR": 4000,
+        "shareTimesUpperLimitIrr": 1000
+    },
+    "appPushServiceRpc":"127.0.0.1:5566",
+    "appPower": {
+        "grayflag": true
+    }
+}

doc/发版程序/web/config.json

@@ -0,0 +1,302 @@
+{
+    "mongodbServers": "10.172.242.243:27080,10.30.94.175:27081,10.81.232.246:27082",
+    "mongodbPoolSize": "120",
+    "mongodbName": "qfw",
+    "influxaddr": "http://192.168.3.207:8086",
+    "influxdb": "jy_logs",
+    "qrModelID":"2",
+    "numTimeNumber":15,
+    "strTimeNumber":30,
+    "redisaddrs": "other=10.172.228.50:1713,push=10.172.228.50:1713,sso=10.172.228.50:1711,session=10.172.228.50:1715,recovery=10.31.25.49:3380,pushcache_1=10.66.39.130:5000,pushcache_2_a=172.17.145.169:5000,pushcache_2_b=10.162.193.49:5000",
+    "elasticsearch": "http://172.17.145.170:9800",
+    "elasticPoolSize": 100,
+    "webport":"8300",
+    "webrpcport": "84",
+    "weixinrpc":"10.170.187.34:8202",
+    "cacheflag":false,
+    "cassandra": {
+		"log":{
+			"host":["172.17.145.178"],
+			"size":10
+		},
+		"push":{
+			"host":["172.17.145.176"],
+			"size":10
+		}
+	},
+    "agreement": "https",
+    "webdomain": "https://www.jianyu360.com",
+    "redirect": {
+        "searchinfo": "/jylab/mainSearch",
+        "rssset": "/swordfish/historypush",
+        "viewdemo": "/front/viewdemo",
+        "wxpushlist": "/wxpush/bidinfo/%s",
+        "share": "/swordfish/guide/share",
+        "myfollow": "/follow/list",
+	"newInfoFollow": "/jylab/followent/newInfo/%s",
+	"entListFollow": "/jylab/followent/entList",
+	"pcmyfollow": "/follow/set/list/%s",
+        "feedback": "/swordfish/feedback",
+        "wxpushfollowlist": "/follow/notice/%s/%s",
+	"community": "http://www.myfans.cc/30a78e9b78",
+        "quickly": "http://mp.weixin.qq.com/s?__biz=MzIyNTM1NDUyNw==&mid=100000001&idx=1&sn=58e6008f0577d529a56c9ed78724decf&scene=0#wechat_redirect",
+        "useskill": "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect",
+        "about": "/swordfish/about?flag=1",
+        "followset": "/follow/set/%s/%s",
+	"myfeedbacks": "/swordfish/myFeedbacks",
+	"zqluckdraw":"/active/zqLuckdraw",
+	"followent":"/jylab/followent/entList",
+	"labindex":"/jylab/index",
+	"qrToLab":"/jylab/qrToLab/%s",
+	"searchKeyword":"/jylab/searchKeyword/%s",
+	"yimiao": "/front/yimiao/search",
+        "sealRep": "/active/sealfriends/%s",
+        "sealIndex": "/active/seal/index",
+	"sealSend": "/active/seal/sealMsg",
+	"futureIndex": "/active/future/index",
+	"keysetIndex":"/wxkeyset/keyset/index?tiptext=%s",
+        "followEntDetail": "/jylab/followent/detail/%s"
+    },
+    "jy_activeset":{
+		"activitystartcode":"3201000000",
+		"activityendcode":"3201999999",
+		"code":"promation",
+		"jy_extend":{			
+			"activitystartcode":"3202100000",
+			"activityendcode":"3202199999"
+		},
+		"jy_leaflets":{			
+			"activitystartcode":"3202200000",
+			"activityendcode":"3202299999"
+		}
+	},
+    "followProject": 10,
+    "pushRpc": "10.170.187.34:8204",
+    "followLimitDay": 30,
+    "followTipMsg": {
+        "title": "您关注的项目《%s》将于%s开标！",
+        "remark": "您收到这条信息是因为您之前设置了项目开标提醒，如果您不再需要此类提醒，可点击下方“详情”修改提醒设置。"
+    },
+   "followPushRpc": "10.170.187.34:8700",
+    "userPoolSize": 1000,
+    "recommendThreshold":0.5,
+    "msg_server":"10.171.112.160:7070",
+    "rewardText": [
+        "憋说话！赏我！",
+        "“赏”就一个字 我只说一次",
+        "厉害了word鱼！",
+        "看官赏点银子偶会更卖力噢！",
+        "各位客官，快来赏点吧！",
+        "夸我还是含蓄点的好，赏一个吧~",
+        "爱，就供养；喜欢，就打赏！",
+        "请简单粗暴地爱我！",
+        "最喜欢你一言不合就打赏的样子了~~~么么！"
+    ],
+    "advertText": [
+        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼标讯社区",
+        "加入剑鱼标讯社区  和投标大神做朋友",
+        "来剑鱼标讯社区  找最合拍的伙伴",
+        "剑鱼标讯社区，让沟通连接你我。",
+        "剑鱼标讯社区，分享你的知识、解决问题、行业资源交换",
+        "勇敢发声，和老司机一起畅聊招投标。",
+        "春风十里，不如来剑鱼标讯社区！",
+        "只要心相通，相隔千里也能畅快交流。",
+        "弹指一挥间，剑鱼标讯因你而不同！",
+        "携手同行，认真对待每一次招投标"
+    ],"recoveryText": [
+        "火眼金睛的你，已超越99%的同行！",
+        "感谢你及时纠正了我的胡说八道！",
+        "剑鱼标讯已收到指示，并给你手动点赞。",
+        "感谢纠错，剑鱼标讯正在火速补救。",
+        "听说帮剑鱼标讯纠错的人最后都中了标！",
+        "你帮助了众多投标人，很棒棒哟！",
+        "不嫌千辛万苦来纠错，剑鱼标讯给你小心心！",
+        "感谢你的火眼金睛，剑鱼标讯光速更新中...",
+        "老铁，我已收到，欢迎将纠错进行到底。"
+    ],
+    "recoveryRight": [
+        "火眼金睛的你，已超越99%的同行！",
+        "剑鱼标讯已收到指示，并给你手动点赞。",
+        "你帮助了众多投标人，很棒棒哟！"
+    ],
+    "recoveryField": {
+        "招标": [
+            {
+                "proportion": 15,
+                "field": "projectname"
+            },
+            {
+                "proportion": 5,
+                "field": "budget"
+            },
+            {
+                "proportion": 15,
+                "field": "buyer"
+            },
+            {
+                "proportion": 5,
+                "field": "agency"
+            },
+            {
+                "proportion": 15,
+                "field": "winner"
+            },
+            {
+                "proportion": 15,
+                "field": "bidopentime"
+            },
+            {
+                "proportion": 15,
+                "field": "buyerperson"
+            },
+            {
+                "proportion": 15,
+                "field": "buyertel"
+            }
+        ],
+        "其他": [
+            {
+                "proportion": 8,
+                "field": "projectname"
+            },
+            {
+                "proportion": 12,
+                "field": "budget"
+            },
+            {
+                "proportion": 8,
+                "field": "buyer"
+            },
+            {
+                "proportion": 12,
+                "field": "agency"
+            },
+            {
+                "proportion": 12,
+                "field": "winner"
+            },
+            {
+                "proportion": 12,
+                "field": "bidamount"
+            },
+            {
+                "proportion": 12,
+                "field": "bidopentime"
+            },
+            {
+                "proportion": 12,
+                "field": "buyerperson"
+            },
+            {
+                "proportion": 12,
+                "field": "buyertel"
+            }
+        ]
+    },
+    "advertImg": "/images/advert.png",
+    "advertName": "广告",
+    "advertUrl": "https://www.myfans.cc/30a78e9b78",
+    "wxJianyu": {
+		"appid": "wxd66e9589c9fecff6",
+		"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
+		"pay":{
+			"mchid": "1418321102",
+			"key": "topnet2016topnet2016topnet2016ab",
+			"attachmsg": "剑鱼标讯打赏",
+			"bodymsg": "剑鱼标讯-招标信息打赏",
+			"detailmsg": "招标推送信息[%s] 打赏%s元钱",
+			"sjdc_attachmsg": "剑鱼标讯-历史数据",
+			"sjdc_bodymsg": "剑鱼标讯-历史数据",
+			"sjdc_detailmsg": "剑鱼标讯-历史数据"
+		}
+	},
+	"industry":"行业分类",
+	"recommendEntLimit":"50",
+	"jyapp": {
+		"domain":"https://www.jianyu360.com",
+		"apkurl": "/jyapp/res/%s/jianyu360.apk",
+		"appstoreurl": "https://itunes.apple.com/cn/app/id1354897149",
+		"channelDir":{
+			"s001":"baiduSem",
+			"s003":"shenmaSem",
+			"huawei":"huawei",
+			"xiaomi":"xiaomi",
+			"yingyongbao":"yingyongbao",
+			"douyin":"douyin",
+			"wx01":"jywx",
+			"topnet":"topnet",
+			"duanxin":"duanxin",
+			"default":"topnet"
+		}
+	},
+	"limitSearchText": {
+		"flag": true,
+		"count": 3,
+		"timeout": 60,
+		"totalPage": 4,
+		"userIds": ["5b988c2cc9ebc2082f28fae6","581858dbc9ebc2132200002e"],
+		"msg": "f 开关状态：%s //-2 从配置文件重置，-1 关闭，1 打开<br><br>c 并发数：%d //-2 不限制并发数，-1 无条件直接限制，>0 限制并发数<br><br>t 个人查询限制时间：%ds //-1 不限制<br><br>p 限制页数：%d"
+	},
+	"share": {
+        "forceShareEnabled" : false,
+        "onlineDate": "2018-09-17 17:00:00",
+        "regDaysForNewUser": 5,
+        "shareIntervalDays": 7,
+        "startHour": 8,
+        "endHour": 20,
+        "shareTimesUpperLimitR": 4000,
+        "shareTimesUpperLimitIrr": 1000
+    },
+    "pcHelper":{
+        "subscribeTokenTimeout":15,
+        "version":"V2.5.8.1"
+    },
+    "cookiedomain": ".jianyu360.com",
+    "sealAmount": {
+        "销冠王": "30000",
+        "全才": "30000",
+        "社交红人": "30000",
+        "灵魂人物": "30000",
+        "有态度": "20000",
+        "钢铁意志": "20000",
+        "机敏过人": "20000",
+        "行动派": "20000",
+        "细节控": "20000",
+        "神队友": "20000",
+        "业务666": "20000",
+        "靠谱": "20000",
+        "情商贼高": "10000",
+        "嘴皮子溜": "10000",
+        "脑洞倍儿大": "10000",
+        "靠实力说话": "10000"
+    },
+	"makepicurl":"http://127.0.0.1:11120",
+	"intranetip":{
+		"jy":"http://10.170.187.34:8300"
+	},
+	"getpicurl":"https://res.jianyu360.com/",
+	"sealSendTime":14400,
+	"sealSendH":17,
+	"sealSendM":0,
+	"sealSendS":0,
+	"mysql":{
+		"dbName":   "jianyu",
+		"address":  "172.17.145.169:3306",
+		"userName": "root",
+		"passWord": "TopMysql@123"
+	},
+	"mail":[
+	{
+		"addr": "smtp.exmail.qq.com",
+		"port": 465,
+		"pwd": "ue9Rg9Sf4CVtdm5a",
+		"user": "public03@topnet.net.cn"
+	},{
+		"addr": "172.17.145.164",
+		"port": 465,
+		"pwd": "TopnetJy2018",
+		"user": "jy@jianyu360.cn"
+	}],
+	"appPushServiceRpc":"127.0.0.1:5566",
+	"openPlatformUrl":"https://open.jianyu360.com/"
+}

src/config.json

@@ -228,6 +228,7 @@
 			"douyin":"douyin",
 			"wx01":"jywx",
 			"topnet":"topnet",
+			"duanxin":"duanxin",
 			"default":"topnet"
 		}
 	},

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

@@ -77,14 +77,15 @@
         "ios_mustupdate": false,
         "apkurl": "http://web-jydev-wky.jianyu360.cn/jyapp/res/%s/jianyu360.apk",
         "channelDir":{
-			"s001":"baiduSem",
-			"s003":"shenmaSem",
+			"baidu":"baiduSem",
+			"shenma":"shenmaSem",
 			"huawei":"huawei",
 			"xiaomi":"xiaomi",
 			"yingyongbao":"yingyongbao",
 			"douyin":"douyin",
 			"weixin":"jywx",
 			"topnet":"topnet",
+			"duanxin":"duanxin",
 			"default":"topnet"
 		}
     },