Skip to content

S
saasio
Commit 08b12045 by songweifeng
Options

Merge remote-tracking branch 'origin/master'

parents 5d01429b 48def014
Showing with 873 additions and 440 deletions
pom.xml
......@@ -189,7 +189,7 @@
<hive.url>jdbc:hive2://ec2-54-223-146-236.cn-north-1.compute.amazonaws.com.cn:10000/tkio_bigtable</hive.url>
<hive.username>root</hive.username>
<account.check.url>http://localhost:8091</account.check.url>
<account.check.url>http://52.80.113.103:8006</account.check.url>
</properties>
</profile>
......
src/main/java/com/reyun/model/IONotice.java
......@@ -40,7 +40,7 @@ public class IONotice {
private Boolean release;
private boolean isRead;
private Boolean isRead = false;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
......@@ -224,11 +224,11 @@ public class IONotice {
}
@Transient
public boolean getIsRead() {
public Boolean getIsRead() {
return isRead;
}
public void setIsRead(boolean isRead) {
public void setIsRead(Boolean isRead) {
this.isRead = isRead;
}
}
src/main/java/com/reyun/repository/AccountRepository.java
......@@ -92,7 +92,7 @@ public interface AccountRepository extends JpaRepository<Account, Long> {
@Transactional
@Modifying
@Query(value = "update Account set status = 1, modify_account = ?1,modify_time = ?2 where id = ?3")
@Query(value = "update Account set status = 1, modify_account = ?1,modify_time = ?2,is_special_account=0 where id = ?3")
int enableSubAccount(Long modifyAccount, Date modifyTime, Long subAccount);
List<Account> findByParent(Long account);
......
src/main/java/com/reyun/repository/NoticeRepository.java
......@@ -16,7 +16,7 @@ public interface NoticeRepository extends JpaRepository<IONotice, Long> {
// @Query(value = "select * from ionotice n where n.isdeploy is true and (io_account like %?1% or io_account = '-1') order by deploy_date desc", nativeQuery = true)
// List<IONotice> listRecentDeployNotice(String email);
@Query(value = "select * from ionotice n where n.isdeploy is true and n.modify_date>= ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) union select * from ionotice where is_top=1 and isdeploy is true and modify_date< ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) order by modify_date desc"
@Query(value = "select * from ionotice n where n.isdeploy is true and n.deploy_date>= ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) union select * from ionotice where is_top=1 and isdeploy is true and deploy_date< ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) order by deploy_date desc"
, nativeQuery = true)
List<IONotice> listRecentDeployNotice(String currentDate, Long rootParent);
......
src/main/java/com/reyun/service/impl/NoticeServiceImpl.java
......@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -38,6 +39,7 @@ public class NoticeServiceImpl implements NoticeService {
Account account = accountRepository.findOne(accountId);
List<IONotice> recentDeployNoticeList = noticeRepository.listRecentDeployNotice(DateUtil.getBeforeDays(7), account.getRootParent());
List<IONotice> result = new ArrayList<>();
if (!CollectionUtils.isEmpty(recentDeployNoticeList)) {
......@@ -58,9 +60,29 @@ public class NoticeServiceImpl implements NoticeService {
}
}
}
List<IONotice> unreadTopList = new ArrayList<>();
List<IONotice> unreadNotTopList = new ArrayList<>();
List<IONotice> readTopList = new ArrayList<>();
List<IONotice> readNotTopList = new ArrayList<>();
for (IONotice notice : recentDeployNoticeList) {
boolean isread = notice.getIsRead()==null?false:notice.getIsRead();
if (!isread && notice.getIs_top()) {
unreadTopList.add(notice);
} else if (!isread && !notice.getIs_top()) {
unreadNotTopList.add(notice);
} else if (isread && notice.getIs_top()) {
readTopList.add(notice);
} else {
readNotTopList.add(notice);
}
}
result.addAll(unreadTopList);
result.addAll(unreadNotTopList);
result.addAll(readTopList);
result.addAll(readNotTopList);
}
return recentDeployNoticeList;
return result;
}
@Override
......
src/main/websrc/activation.html
......@@ -67,7 +67,7 @@
</div>
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
......
src/main/websrc/data/channel.json 0 → 100644
{
"companys": [
"果合",
"安沃",
"adsage",
"万普",
"畅思",
"mex",
"点入",
"土壳移动",
"mobvista",
"glispa",
"磨盘时代",
"趣米",
"力美积分墙",
"拓畅",
"筷子",
"优友",
"新游互联",
"豆盟",
"力美dsp",
"指盟",
"点乐",
"avazu",
"mdsp",
"搞趣",
"追书神器",
"adview",
"限时免费大全",
"宜搜",
"百思不得姐",
"笑得合不拢嘴",
"久邦数码",
"试客",
"yeahmobi",
"非凡dsp",
"钱咖",
"大树dsp",
"易连飞宇",
"优数",
"fyber",
"兔玩网",
"仁盈软件",
"oneway",
"18183",
"掌通",
"睿晟",
"applovin",
"新数dsp",
"盆友",
"mobcastle",
"指尖互动",
"蜂巢",
"玩吧",
"图友dsp",
"钱鹿",
"tad",
"掌阅",
"西洋镜",
"biddingx",
"7日坐标",
"x-mob",
"软猎",
"掌上互动",
"灵境",
"巨掌",
"仙果dsp",
"tapjoy",
"everyads",
"果合视频",
"syhs",
"mobupps",
"聚鹏",
"adoceans",
"掌游宝",
"astra",
"时趣互动",
"vidoads",
"海数互联",
"多点广告",
"adcolony",
"inmobi",
"麦萌漫画",
"亿玛",
"aduu",
"dmmobi",
"玩转互联",
"众橙",
"银橙",
"spotad",
"掌握",
"adpotato",
"mobcastlead",
"麒点",
"易动手盟",
"adtopping",
"rocket10",
"1图1",
"unity",
"云聚",
"ipromo",
"idvert",
"慧推",
"麦田",
"hina",
"纷熙移动",
"thinklean",
"易杨dsp",
"上榜科技",
"极光",
"快手",
"echovalue",
"taptica",
"mobhuge",
"applift",
"灼见",
"巨鲨wap",
"dotinapp",
"氪金",
"比邻弘科",
"adwan",
"miercn",
"surikate",
"gamebeats",
"云数",
"wead",
"乐樽",
"pocketmedia",
"17ads",
"appnext",
"hotmobi",
"quadas",
"一木",
"shuqi",
"vidoplus",
"象威hypers",
"joyplus",
"adpotato-af",
"聚点",
"曼拓dsp",
"点锐",
"ktplay",
"soloads",
"xbaos",
"superads",
"涌玉",
"道有道",
"mobwalker",
"boommob",
"cliiky",
"etoron",
"xy助手",
"aso100",
"倍业dsp",
"快友",
"ironsource",
"汇聚畅想",
"龙珠直播",
"游戏多",
"cauly",
"芝麻互娱",
"clicktech",
"greenkoo",
"锐艺",
"快看",
"adlight",
"pptv",
"kukukk",
"爱思助手",
"咪兔广告",
"vision",
"moboway",
"玉米dsp",
"兔兔助手",
"parbattech",
"efreemob",
"mobgi",
"mobisummer",
"gdmedia",
"龙涵",
"vlion",
"zxrtb",
"惠员助手",
"youappi",
"华院分析",
"1plusads",
"zoncheer",
"leadbolt",
"今日赚",
"adsgard1",
"mobilda",
"爱秀",
"墨迹天气",
"九苑",
"汽车之家",
"infimob",
"今日头条",
"zplayads",
"智投广告",
"madhouse",
"promoadx",
"veda",
"知乎",
"trafficred",
"adcost",
"话语科技",
"chartboost",
"广州娱玩",
"upltv",
"一点资讯",
"taptap",
"15mob",
"zhimob",
"闯奇",
"果盟",
"多盟",
"有米",
"appcoachs",
"vungle",
"璧合",
"helium",
"matomy",
"mediamob",
"centrixlink",
"斗鱼",
"creativeclicks",
"coinads",
"懂球帝",
"智龙",
"novad",
"adrich",
"拓美dsp",
"高能平台",
"新效",
"imoney",
"蝉大师",
"htad",
"奥菲传媒",
"gotzha",
"cloudmobi",
"骏伯网络",
"聚告",
"玖玖网络",
"新澜",
"核桃林",
"摩邑诚",
"信淼",
"云锐",
"厦门微众",
"轩辕",
"乐思",
"舜飞",
"齐欣互动",
"点锐",
"掌优",
"点摩",
"智云众",
"侠客行",
"厚拓",
"德绚",
"派瑞",
"猎鹰",
"微思敦",
"天擎",
"九点",
"共和盛世",
"千手网络",
"行云",
"新启成",
"旺翔",
"点摩",
"爱德康赛",
"火速",
"酷亿",
"东方现代",
"龙数",
"灵云",
"华晋",
"微传播",
"狗仔",
"游思",
"畅效",
"欢趣",
"勤诚",
"心景",
"龙域",
"真龙",
"移瑞"
],
"emails": [
"guohead",
"adwo",
"adsage",
"wapx",
"chukong",
"mobiexchanger",
"dianru",
"tukmob",
"mobvista",
"glispa",
"imopan",
"qumi",
"limei",
"chance-ad",
"kuaizi",
"youyou",
"xinyou",
"doumeng",
"limeidsp",
"zhimeng",
"dianle",
"avazu",
"gao7",
"zhuishu",
"adview",
"xianmian",
"easou",
"budejie",
"xdhblz",
"jiubang",
"shike",
"yeahmobi",
"feifan",
"qianka",
"dashu",
"yilianfy",
"youshu",
"fyber",
"tuwan",
"renying",
"oneway",
"18183",
"zhangtong",
"listen-ad",
"applovin",
"wisemedia",
"penyou",
"mobcastle",
"fingermob",
"fengchao",
"wanba",
"adtuyou",
"qianlu",
"tad",
"zhangyue",
"xiyangjing",
"biddingx",
"7ri",
"xmob",
"ruanlie",
"adzshd",
"lingjing",
"adjuz",
"3gu",
"tapjoy",
"everyads",
"guohevideo",
"syhs",
"mobupps",
"jupeng",
"adoceans",
"zhangyoubao",
"fuseclick",
"shiquhudong",
"vidoads",
"haishu",
"duodianad",
"adcolony",
"inmobi",
"maimengmanhua",
"yima",
"aduu",
"dmmobi",
"wanzhuan",
"zhongcheng",
"ycmedia",
"spotad",
"zhangwo",
"adpotato",
"mobcastlead",
"keydot",
"yidong",
"topdang",
"rocket10",
"1tu1",
"unity",
"yunju",
"ipromo",
"idvert",
"htmob",
"maitian",
"hina",
"fenxiyidong",
"thinklean",
"eyangmedia",
"shangbangkeji",
"jiguang",
"kuaishou",
"echovalue",
"taptica",
"mobhuge",
"applift",
"zhuojian",
"jusha",
"dotinapp",
"codrim",
"lbadvisor",
"adwan",
"miercn",
"surikate",
"gamebeats",
"yunshu",
"wead",
"lezun",
"pocketmedia",
"costations",
"appnext",
"hotmobi",
"quadas",
"yimu",
"shuqi",
"vidoplus",
"hypers",
"joyplus",
"adpotatoaf",
"jd61",
"mantoinfo",
"dianrui",
"ktplay",
"solo-ads",
"xbaos",
"superads",
"adyoyu",
"daoyoudao",
"mobwalker",
"boommob",
"cliiky",
"etoron",
"xyzs",
"aso100",
"bayescom",
"kuaiyou",
"ironsrc",
"hjcx",
"longzhu",
"youxiduo",
"fsn",
"zhimahuyu",
"clicktech",
"greenkoo",
"rui-yi",
"kuaikan",
"adlight",
"pptv",
"kukukk",
"i4",
"mitu",
"vision",
"moboway",
"yumidsp",
"tutuzhushou",
"parbattech",
"efreemob",
"kyle",
"mobisummer",
"gdmedia",
"longhan",
"vlion",
"zxrtb",
"huiyuanzhushou",
"youappi",
"huayuanfenxi",
"1plusads",
"zongchi",
"leadbolt",
"jinrizhuan",
"adsgard1",
"mobilda",
"aixiu",
"moji",
"jiuyuan",
"qichezhijia",
"infimob",
"toutiao",
"zplayads",
"zhitou",
"madhouse",
"promoadx",
"veda",
"zhihu",
"traffic",
"adcost",
"huayukeji",
"chartboost",
"yuwan",
"upltv",
"yidianzixun",
"taptap",
"15mob",
"zhimob",
"chuangqi",
"guomob",
"domob",
"youmi",
"appcoachs",
"vungle",
"behe",
"helium",
"matomy",
"mediamob",
"centrixlink",
"douyu",
"creativeclicks",
"coinads",
"dongqiudi",
"zhilong",
"novad",
"adrich",
"toomeead",
"gaoneng",
"xinxiao",
"imoney",
"chandashi",
"htad",
"aofeichuanmei",
"gotzha",
"cloudmobi",
"junbowangluo",
"adinall",
"jiujiuwangluo",
"xinlanad",
"hetaolinmedia",
"mobiexchanger",
"shxinmiao",
"bjyunrui",
"xm-ls",
"hsuanyuen",
"lscx",
"usingde",
"sunteng",
"qxhd",
"zhangyoukeji",
"imygbs",
"optaim",
"bccv",
"szhometop",
"deshell",
"aspiration-cn",
"lieying",
"wesdom",
"skytech",
"9ads",
"ghssad",
"5iqianshou",
"wifiwalker",
"xinqicheng",
"adunite",
"imygbs",
"adks",
"hotsales",
"coolyi",
"adseast",
"loosho",
"yunmedia",
"huajinmedia",
"weichuanbo",
"sogou-inc",
"yousiad",
"ad-cx",
"hzhuanqu",
"ihmedia",
"wish-media",
"starmobs",
"zhenlong",
"infimob",
"eduancm"
]
}
src/main/websrc/demo.html
......@@ -19,16 +19,13 @@
$.get("/api/demo",function(data) {
data = JSON.parse(data);
var account = data.content.account,token = data.content.token;
var isSuper = account.isSuperUser == true && account.isChannelPerson!=true;
$.cookie("ryioUid",account.id);
$.cookie("ryioUname",account.email);
// $.cookie("ryioUauth",account.authStr);
window.localStorage.setItem("ryioUauth",account.authStr);
$.cookie("ryioToken",token);
$.cookie("ryioPastDate",account.pastDate);
window.localStorage.setItem("io_ryioUauth",account.authStr);
window.localStorage.setItem("io_ry_user",JSON.stringify(account));
$.cookie("io_ryioToken",token);
var isSuper = account.isSuperUser == true && account.isChannelPerson!=true;
$.cookie("ryioIsSuper",isSuper);
$.cookie("io_ryioIsSuper",isSuper);
window.location.href="index.html";
});
</script>
......
src/main/websrc/failure.html
......@@ -41,7 +41,7 @@
</div>
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
......
src/main/websrc/forget.html
......@@ -67,7 +67,7 @@
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
......
src/main/websrc/home1.html deleted 100644 → 0
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>灵犀</title>
<meta name="keywords" content="热云数据 灵犀" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<!-- build:css styles/home.css -->
<link rel="stylesheet" type="text/css" href="styles/home.css">
<!-- endbuild -->
<!-- build:js scripts/change.js -->
<script src="js/app/page.js"></script>
<!-- endbuild -->
<!-- build:js scripts/home.js -->
<script src="js/common/angular.min.js"></script>
<script src="js/common/angular-ui-router.min.js"></script>
<script src="js/common/jquery.min.js"></script>
<script src="js/common/jquery.cookie.min.js"></script>
<script src="js/common/judge.js"></script>
<!-- endbuild -->
<!-- build:js scripts/homectrl.js -->
<script src="js/home/module.js"></script>
<script src="js/home/route.js"></script>
<script src="js/app/HttpService.js"></script>
<script src="js/app/UtilService.js"></script>
<script src="js/app/OptionService.js"></script>
<script src="js/app/ToolService.js"></script>
<script src="js/home/home.js"></script>
<script src="js/home/demolist.js"></script>
<script src="js/home/main.js"></script>
<!-- endbuild -->
<script>
var _hmt = _hmt || [];
(function() {
var uid = $.cookie("ryioUid");
if(!uid){return false;}
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?3c5292cf6a78c16bc4f8127ca28f6ad5";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body ng-app="app" ng-controller="homeCtrl">
<div class="homeWrap">
<div class="menuWrap">
<div class="content">
<a href="/home.html"><div class="logoimg">热云旗下产品</div></a>
<div class="menuList">
<a target="_blank" href="http://blog.trackingio.com/">博客</a>
<a target="_blank" href="http://doc.trackingio.com/">文档中心</a>
<a href="/home.html#/home/main">申请演示</a>
<a href="/home.html#/home/demolist">体验DEMO</a>
</div>
<div ng-show="HomeId != ''" class="userinfo" ng-mouseenter="showinfo=true;" ng-mouseleave="showinfo=false" ng-cloak>
<span class="userIconN"></span>
<div class="userInfoWrap" ng-show="showinfo">
<div class="userInfoDetail">
<div class="itemInfo">
<span class="userIcon"></span>{{Homename}}
</div>
</div>
<div class="userInfoBottom" ng-class="{'third':isSuper || isManage}">
<div class="itemInfo light" ng-mouseenter="us = true;" ng-mouseleave="us = false;" ng-click="goSet()">
<span class="usetIcon" ng-class="{'active':us}" style=""></span>账号管理
</div>
<div class="itemInfo light" ng-mouseenter="ap = true;" ng-mouseleave="ap = false;" ng-click="goApp()" ng-show="isSuper || isManage">
<span class="appLIcon" ng-class="{'active':ap}"></span>应用管理
</div>
<div class="itemInfo light" ng-mouseenter="lgo = true;" ng-mouseleave="lgo = false;" ng-click="Logout()">
<span class="logoutIcon" ng-class="{'active':lgo}" style=""></span>注销
</div>
</div>
</div>
</div>
<a href="register.html"><div ng-show="HomeId == ''" class="menuIcon">注册</div></a>
<a href="login.html"><div ng-show="HomeId == ''" class="menuIcon">登录</div></a>
</div>
</div>
<div class="bodyWrap" ui-view="home">
<div class="tkioWrap">
<div class="trackingiobg">
<div class="trackingioview">
<p class="tkiotilte">TrackingIO</p>
<p class="tkiotext">数据驱动2.0时代产品，打通市场投放和产品用户行为数据<br>帮市场省钱，助产品赚钱</p>
<div class="tkiobutton">
<a ng-show="HomeId == ''" href="login.html"><div class="btn1 button">登录使用</div></a>
<a ng-show="HomeId != '' && Homename !='demo@reyun.com'" ng-click="userNow()"><div class="btn1 button" ng-cloak>立即使用</div></a>
<a ng-show="HomeId != '' && Homename =='demo@reyun.com'" ng-click="HomeDemo()"><div class="btn1 button" ng-cloak>立即使用</div></a>
<a href="/home.html#/home/demolist"><div class="btn2 button">体验DEMO</div></a>
</div>
</div>
</div>
<div class="trackingiobgColor">
<div class="left"></div>
<div class="right"></div>
<div class="clear"></div>
</div>
</div>
<div class="mainTitle">TrackingIO优势</div>
<div class="content" style="padding: 0 15px">
<div class="trackText">
<img src="images/ys1.png">
<p class="trackTextTitle">全网防作弊</p>
<div class="trackTextText">
完善的反作弊体系助您过滤无效的广告数据，精准的广告数据统计为您提供中立的广告效果监测。
</div>
</div>
<div class="trackText">
<img src="images/ys2.png">
<p class="trackTextTitle">推广渠道归因</p>
<div class="trackTextText">
科学的分析方法帮您计算推广或渠道带来的价值，深入的数据研究助您探索优质渠道。
</div>
</div>
<div class="trackText">
<img src="images/ys3.png">
<p class="trackTextTitle">用户行为分析</p>
<div class="trackTextText">
事件、留存、漏斗等多维分析工具帮您分析不同渠道、不同特征用户的行为及用户质量，助您深入了解您的用户，并寻找产品改进的突破点。
</div>
</div>
<div class="trackText">
<img src="images/ys4.png">
<p class="trackTextTitle">大数据引擎</p>
<div class="trackTextText">
整套系统建立在Hadoop生态之上，使用自有研发的ETL执行引擎来对任务进行调度，为您提供优质的技术保障。
</div>
</div>
<div class="clear"></div>
</div>
<div class="gruybg">
<div class="mainTitle">产品功能</div>
<div class="proWrap pro1">
<div class="proLeft">
<p class="proTitle">广告效果监测</p>
<p class="proText">监测，实时数据监测，帮您实时监控推广数据，及时调整广告策略；<br>效果，渠道价值分析，帮您深入分析渠道数据，筛选优质的推广渠道。</p>
</div>
</div>
<div class="proWrap pro2">
<div class="proRight">
<p class="proTitle">用户行为分析</p>
<p class="proText">看单，行业概览查看，帮您整理行业数据报表，快速了解产品用户情况；<br>工具，事件分析工具，分析app的事件，留存，漏斗，用户画像等数据，详细了解用户行为。</p>
</div>
</div>
</div>
<div class="mainTitle">有哪些企业正在使用</div>
<div class="content">
<div class="userWrap">
<img ng-repeat="idx in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23]" src="images/logo/u{{idx}}.png">
<div ng-if="companyMoreType" class="channelMore" ng-click="companyMore()">MORE>></div>
<img ng-if="!companyMoreType" ng-repeat="idx in [24,25,26,27,28,29,30,31,32]" src="images/logo/u{{idx}}.png">
<div class="clear"></div>
</div>
<div class="clear"></div>
</div>
<div class="gruybg">
<div class="mainTitle gruybg">我们已经合作了300余家渠道</div>
<div class="content channelWrap">
<img ng-repeat="imgs in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23]" ng-src="images/coop/h{{imgs}}.png">
<div ng-if="channelMoreType" class="channelMore" ng-click="clickMore()">MORE>></div>
<img ng-if="!channelMoreType" ng-repeat="imgs in [24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101]" ng-src="images/coop/h{{imgs}}.png">
<div class="clear"></div>
</div>
<div class="clear"></div>
</div>
</div>
<footer>
<div class="footermenu">
<div class="fmenu">
<p class="ftitle">首页</p>
<p class="flink"><a target="_blank" href="http://www.reyun.com/index.html">首页</a></p>
</div>
<div class="fmenu">
<p class="ftitle">产品</p>
<p class="flink"><a target="_blank" href="http://www.reyun.com/trackingio.html">广告与行为分析平台</a></p>
<p class="flink"><a target="_blank" href="http://www.reyun.com/game.html">游戏运营支撑平台</a></p>
<p id="track" class="flink"><a href="http://track.reyun.com/login.html" target="_blank">移动广告效果检测平台</a></p>
</div>
<div class="fmenu">
<p class="ftitle">关于我们</p>
<p class="flink"><a target="_blank" href="http://www.reyun.com/aboutus.html">公司介绍</a></p>
<p class="flink"><a target="_blank" href="http://www.reyun.com/aboutus.html#joinus">职位招聘</a></p>
</div>
<div class="erweima">
微信关注<br>
公众号：<br>
reyunshuju
</div>
</div>
<div class="footertext">
<p class="frinedText">友情链接：</p>
<div class="frinedLink">
<a href="http://www.sfw.cn/" target="_blank"><img class="link1" src="images/link/1.png"></a>
<a href="http://www.huodonghezi.com/" target="_blank"><img class="link2" src="images/link/2.png"></a>
<a href="http://www.gupowang.com/" target="_blank"><img class="link3" src="images/link/3.png"></a>
<a href="http://www.appganhuo.com/" target="_blank"><img class="link4" src="images/link/4.png"></a>
<a href="http://app.asm.liangjianghu.com/asm-search/#/index" target="_blank"><img class="link5" src="images/link/5.png"></a>
<a href="http://www.zishu010.com/" target="_blank"><img class="link6" src="images/link/6.png"></a>
<a href="http://www.ctoutiao.com/" target="_blank"><img class="link7" src="images/link/7.png"></a>
<a href="http://www.27sem.com/" target="_blank"><img class="link8" src="images/link/8.png"></a>
<a href="http://www.galaxyspace.com/" target="_blank"><img class="link9" src="images/link/9.png"></a>
<a href="http://www.bianxianmao.com" target="_blank"><img class="link10" src="images/link/10.png"></a>
<a href="https://www.appgrowing.cn" target="_blank"><img class="link11" src="images/link/11.png"></a>
</div>
<p>总部：北京市朝阳区望京SOHO T1 A座 1511室 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;华南区：广州市天河区天河路490号壬丰大厦3209室</p>
<p>Copyright&copy;2013-2017 reyun.com All Rights Reserved　京ICP备14021832号-4</p>
<div style="width:200px;margin:0 auto; padding:0 0 20px 0;text-align: center;">
<a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010502032980" style="text-align:center;text-decoration:none;height:20px;line-height:20px;"><img src="images/police.png" style="float:left;"/><p style="float:left;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:#939393;">京公网安备 11010502032980号</p></a>
</div>
</div>
</footer>
<div class="talkWarp" ng-mouseenter="showQQ=true;" ng-mouseleave="showQQ=false">
<img src="images/talk.png"><br>咨询
<div class="PhoneTalk" ng-show="showQQ">
<div class="PhoneTalkDiv">
<div class="phone"><img src="images/phone400.png">热线电话: 400-001-5680</div>
<div class="QQtalk">
<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=1870174944&site=qq&menu=yes"><img src="images/qq.png">商务咨询</a>
<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=314806858&site=qq&menu=yes"><img src="images/qq.png">商务咨询</a>
</div>
</div>
<div class="arrowRight">
</div>
</div>
</div>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
<div class="rect3"></div>
<div class="rect4"></div>
<div class="rect5"></div>
</div>
</div>
<div class="infoTips toggle" ng-if="operShow" ng-cloak>{{operMsg}}</div>
</body>
</html>
src/main/websrc/index.html
......@@ -166,7 +166,7 @@
<div class="rightContent slide-top" ui-view="content" ng-style="resizeStyle()"></div>
<div class="copyright">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
</div>
......
src/main/websrc/js/active/product.js
......@@ -3,11 +3,13 @@
.controller("productCtrl",["$scope","HttpService","ToolService","UtilService","$state","$rootScope","$interval",productCtrl])
function productCtrl($scope,HttpService,ToolService,UtilService,$state,$rootScope,$interval){
$scope.Prostatus = UtilService.getCookie("ryioStatus");
$scope.UserId = UtilService.getCookie("ryioUid");
var UUser = ToolService.getUser();
$scope.Prostatus = UUser.status;
$scope.UserId = UUser.id;
//判断状态
$scope.UserEmail= $.cookie("ryioUname");
$scope.UserEmail= UUser.email;
$scope.findStatus = function(){
var statusPM = HttpService.getInfo("reged/findbyemail?email="+$scope.UserEmail);
ToolService.showLoading();
......@@ -24,30 +26,24 @@
}
},1000);
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
$scope.initpage();
// if(data.isSuperUser == true){
// window.location.href = "index.html#/manage/app";
// }else{
window.location.href = "index.html";
// }
window.location.href = "index.html#/manage/app";
}
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
}
});
}
$scope.findStatus();
/*if($scope.Prostatus == 1){
$scope.initpage();
if($rootScope.isSuper){
$scope.goPage("collect.app");
}
}*/
$scope.postApply = function(){
var savePM = HttpService.getInfo("reged/verify/"+$scope.UserId);
ToolService.showLoading();
......@@ -55,7 +51,8 @@
ToolService.hideLoading();
if(data.status == -1){
$scope.Prostatus = -1;
UtilService.setCookie("ryioStatus",data.status,7);
UUser.status = data.status;
ToolService.setUser(UUser);
}
});
}
......
src/main/websrc/js/app/HttpService.js
......@@ -11,16 +11,15 @@
};
service.noLogin = function(url){
if(angular.isUndefined(url) || url.indexOf('login')==-1){
var loginuserId = UtilService.getCookie("ryioUid");
var loginuserId = UtilService.getUser().id;
if(UtilService.isNullStr(loginuserId)){
service.logOutCookie();
}
}
};
service.logOutCookie = function(){
UtilService.setCookie("ryioUid","");
// UtilService.setCookie("ryioUname",'');
window.localStorage.setItem("ryioUauth","");
UtilService.setUser({});
window.localStorage.setItem("ryioUauth","");
UtilService.setCookie("ryioToken","");
UtilService.setCookie("ryioIsSuper","");
window.location.href="/login.html";
......
src/main/websrc/js/app/ToolService.js
......@@ -17,7 +17,7 @@
return that.name;
}
service.isDemoUser = function(){
return (UtilService.getCookie("ryioUname") == 'demo@reyun.com');
return (UtilService.getUser().email == 'demo@reyun.com');
}
service.getChannelCampaignList = function(){
var list = [
......@@ -387,8 +387,11 @@
return "子应用管理员";
}
}
service.setUser = function(user){
window.localStorage.setItem("io_ry_user",JSON.stringify(user));
}
service.getUser = function(){
var u = localStorage.getItem("ry_user");
var u = localStorage.getItem("io_ry_user");
if(UtilService.isNullStr(u)){
return {};
......@@ -416,9 +419,11 @@
appname = $rootScope.appInstance.name;
}
if(!submenu || submenu==''){submenu = menu[$rootScope.pagePath];}
var Uuser = UtilService.getUser();
var params = {
appid: UtilService.getTKAppkey(),
who:UtilService.getCookie("ryioUname"),
who:Uuser.email,
what:"pageview",
context:{
rootmenu:rootmenu[$rootScope.mainMenu], //菜单分类
......@@ -436,7 +441,7 @@
"_campaignid":cmids.campaignid,
"_apptype":"wap",
email:UtilService.getCookie("ryioUname"),
email:Uuser.email,
_deviceid:UtilService.randDeviceId(), //设备ID
operatesystem: UtilService.operatorSystem(),//操作系统 _ryos
browser: UtilService.getBrowser() //浏览器类型
......@@ -459,15 +464,16 @@
company = "";
}
var Uuser = UtilService.getUser();
var params = {
appid:UtilService.getTKAppkey(),
who:UtilService.getCookie("ryioUname"),
who:Uuser.email,
what:"operation",
context:{
menu:menu[$rootScope.pagePath], //菜单分类
opername:opername, //操作名字
email:UtilService.getCookie("ryioUname"),
email:Uuser.email,
user_appkey:appkey, //所选APP的id,
appcategory:appcategory,//应用类型 中文名
appname:appname, //应用名称
......@@ -486,6 +492,51 @@
$.post(UtilService.getLogRoot()+"/receive/tkio/event",JSON.stringify(params));
}
//自定义报送
service.sendWhatEvtData = function(what,jsonparams){
var appkey = "",appcategory = "",appname = "";
if($rootScope.appInstance){
appkey = $rootScope.appInstance.appkey;
appcategory = $rootScope.appInstance.appGenreName;
appname = $rootScope.appInstance.name;
}
var cmids = service.getCMidInfo();
var company = service.getUser().company;
if(UtilService.isNullStr(company)){
company = "";
}
var Uuser = UtilService.getUser();
var params = {
appid:UtilService.getTKAppkey(),
who:Uuser.email,
what:what,
context:{
email:Uuser.email,
user_appkey:appkey, //所选APP的id,
appcategory:appcategory,//应用类型 中文名
appname:appname, //应用名称
rolename:service.getRoleName(),
company:company,
"_cid":cmids.cid,
"_campaignid":cmids.campaignid,
"_apptype":"wap",
_deviceid:UtilService.randDeviceId(), //设备ID
operatesystem: UtilService.operatorSystem(),//操作系统 _ryos
browser: UtilService.getBrowser() //浏览器类型
}
};
if(jsonparams){
for(var k in jsonparams){
params.context[k] = jsonparams[k];
}
}
$.post(UtilService.getLogRoot()+"/receive/tkio/event",JSON.stringify(params));
}
return service;
}
})();
src/main/websrc/js/app/UtilService.js
......@@ -221,10 +221,10 @@
}
service.setCookie = function(n,_value,d){
$.cookie(n,_value,{expires:d,path:'/',secure:false,raw:false});
$.cookie("io_"+n,_value,{expires:d,path:'/',secure:false,raw:false});
}
service.getCookie = function(n){
return $.cookie(n);
return $.cookie("io_"+n);
}
service.setItem = function(n,_value){
......@@ -266,6 +266,19 @@
return randNumber;
}
}
service.setUser = function(user){
window.localStorage.setItem("io_ry_user",JSON.stringify(user));
}
service.getUser = function(){
var u = localStorage.getItem("io_ry_user");
if(service.isNullStr(u)){
return {};
}
else{
return JSON.parse(u);
}
}
service.getTKAppkey = function(){
return "f0f251af10e66a0c94d2e923d8863105";
}
......
src/main/websrc/js/app/app.js
......@@ -133,15 +133,16 @@
}
});
$scope.loginuserName = UtilService.getCookie("ryioUname");
$scope.currentAccountId = UtilService.getCookie("ryioUid");
$scope.userPastDate = UtilService.getCookie("ryioPastDate");
var uuser = ToolService.getUser();
$scope.loginuserName = uuser.email;
$scope.currentAccountId = uuser.id;
$scope.userPastDate = uuser.pastDate;
$scope.errorBack = function(msg){
ToolService.showTips(msg);
};
var rmdId = UtilService.randRangeId(),auid = UtilService.getCookie("ryioUid");
var rmdId = UtilService.randRangeId(),auid = ToolService.getUser().id;
$scope.goPage = function(ui){
$rootScope.channeluniqueName = 'normal';
......@@ -164,7 +165,7 @@
}
}
$rootScope.noLeftMenus = ["userinfo","nopower","auth","app"];
$rootScope.noLeftMenus = ["userinfo","nopower","auth","app","product"];
$scope.resizeStyle = function(){
var mleft = '0px';
if($rootScope.noLeftMenus.indexOf($rootScope.pagePath) == -1){
......
src/main/websrc/js/app/config.js
......@@ -8,20 +8,22 @@
$rootScope.$stateParams = $stateParams;
$rootScope.isSuper = UtilService.getCookie("ryioIsSuper")=='true' || UtilService.getCookie("ryioIsSuper")==true;
var ryioRole = UtilService.getCookie("ryioRole");
if(ryioRole && ryioRole == '1'){ //管理员
var UUUser = ToolService.getUser();
var userID = UUUser.id,ryioRole = UUUser.roleCategory;
if(ryioRole && ryioRole == 1){ //管理员
$rootScope.isManage = true;
}
else if(ryioRole && ryioRole == '2'){//子应用管理员
else if(ryioRole && ryioRole == 2){//子应用管理员
$rootScope.isAppManage = true;
}
$rootScope.isall = $rootScope.isSuper || $rootScope.isManage || $rootScope.isAppManage;
$rootScope.firstMeau = '/collect/custommenu';
var userID = UtilService.getCookie("ryioUid");
var flowPM = HttpService.getInfo("mng/accountRestrict/find/"+userID);
var queryFlow = function(){
flowPM.then(function(data){
if(!data){return false;}
$rootScope.flowName = data.packageName; //套餐名称
$rootScope.flowLevel = data.priceLevel; //套餐级别
if(data.flowRestrict == true){ //是否是受限用户 true是
......@@ -183,7 +185,7 @@
.factory('httpInterceptor', [function() {
var timestampMarker = {
request: function(config) {
var token = $.cookie("ryioToken");
var token = $.cookie("io_ryioToken");
config.headers.Authorization = token;
config.requestTimestamp = new Date().getTime();
config.timeout = 3000 * 10;
......
src/main/websrc/js/app/directive.js
......@@ -30,7 +30,7 @@
.directive("searchGroup",[searchGroup])
.directive("bigTable",["$timeout","$compile",bigTable])
.directive("dragOrder",[dragOrder])
.directive("notice",["HttpService","$timeout",notice]);
.directive("notice",["HttpService","ToolService","$timeout",notice]);
function delTip(){
return{
......@@ -2032,7 +2032,7 @@
}
//消息
function notice(HttpService,$timeout){
function notice(HttpService,ToolService,$timeout){
return {
restrict: 'E',
replace:true,
......@@ -2047,11 +2047,11 @@
var noticePM = HttpService.getInfo("notice/findDeploy", {});
noticePM.then(function(data){
$scope.list = data;
$scope.noreadList = $scope.list.filter(function(item){
return item.isRead === false;
})
if(data){
$scope.noreadList = $scope.list.filter(function(item){
return item.isRead != true;
})
}
});
$timeout($scope.queryNotice,1000*60*3);
}
......@@ -2067,12 +2067,14 @@
if(!news.isRead){
HttpService.postInfo("notice/saveReadLog/"+news.id, {});
}
ToolService.sendWhatEvtData("readnotice",{noticeid:news.id,noticetitle:news.title});
news.isRead = true;
$scope.curNoticeInfo = news;
$scope.isDetail = true;
$scope.noreadList = $scope.list.filter(function(item){
return item.isRead === false;
return item.isRead != true;
})
}
......
src/main/websrc/js/collect/report.js
......@@ -3,7 +3,7 @@
.controller("reportCtrl",["$rootScope","$scope","HttpService","ToolService","UtilService",exportCtrl]);
function exportCtrl($rootScope,$scope,HttpService,ToolService,UtilService){
$scope.UserId = $.cookie("ryioUid");
$scope.UserId = ToolService.getUser().id;
$scope.query = function(){
ToolService.showLoading()
......
src/main/websrc/js/home/home.js
......@@ -11,11 +11,12 @@
document.getElementById("sysLoad").style.display = "none";
}
$scope.Homename = UtilService.getCookie("ryioUname");
var Uuser = UtilService.getUser();
$scope.Homename = Uuser.email;
if($scope.Homename == undefined || $scope.Homename == null){
$scope.Homename = "";
}
$scope.HomeId = UtilService.getCookie("ryioUid");
$scope.HomeId = UtilService.getUser().id;
if($scope.HomeId == undefined || $scope.HomeId == null){
$scope.HomeId = "";
}
......@@ -39,8 +40,8 @@
}
$scope.isSuper = UtilService.getCookie("ryioIsSuper")=='true' || UtilService.getCookie("ryioIsSuper")==true;
var ryioRole = UtilService.getCookie("ryioRole");
if(ryioRole && ryioRole == '1'){ //管理员
var ryioRole = Uuser.roleCategory;
if(ryioRole && ryioRole == 1){ //管理员
$scope.isManage = true;
}
......@@ -48,9 +49,9 @@
$scope.companyMore = function(){
$scope.companyMoreType = false;
}
$scope.UserEmail= $.cookie("ryioUname");
$scope.UserEmail= Uuser.email;
$scope.userNow = function(){
var status = UtilService.getCookie("ryioStatus");
var status = Uuser.status;
var statusPM = HttpService.getInfo("reged/findbyemail?email="+$scope.UserEmail);
ToolService.showLoading();
statusPM.then(function(data){
......@@ -66,17 +67,15 @@
}
},1000);
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
if(data.isSuperUser == true){
window.location.href = "index.html#/manage/app";
}else{
window.location.href = "index.html";
}
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
window.location.href = "index.html#/manage/app";
}
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
window.location.href = "index.html#/active/product";
}
});
......
src/main/websrc/js/login/acvitation.js
......@@ -11,11 +11,13 @@
$scope.hideLoading = function(){
document.getElementById("sysLoad").style.display = "none";
}
$scope.registerId = $.cookie("regId");
$scope.registerEmail= $.cookie("regEmail");
$scope.flag = $.cookie("regFlag");
$scope.activeStatus = $.cookie("ryioActiveStatus");
$scope.acvitation = $.cookie("ryioAcvitation"); //0 success 1 failure
$scope.registerId = UtilService.getCookie("regId");
$scope.registerEmail= UtilService.getCookie("regEmail");
$scope.flag = UtilService.getCookie("regFlag");
var Uuser = UtilService.getUser();
$scope.activeStatus = Uuser.activeStatus;
$scope.acvitation = UtilService.getCookie("ryioAcvitation"); //0 success 1 failure
//判断状态
$scope.findStatus = function(){
......@@ -23,7 +25,10 @@
$http.get("/api/reged/findbyemail?email="+$scope.registerEmail).success(function(data){
$scope.hideLoading();
$scope.activeStatus = data.content.activeStatus;
UtilService.setCookie("ryioActiveStatus",data.content.activeStatus,7);
Uuser.activeStatus = $scope.activeStatus;
UtilService.setUser(Uuser);
if(data.content.status > -3 && $scope.flag != 1){
window.location.href = "success.html";
}
......@@ -60,9 +65,9 @@
}else{
$scope.acvitation = 1;
}
});
});
}
$scope.changeEmail = function(){
$scope.winFlag = 1;
$scope.oldemail = $scope.registerEmail;
......@@ -118,7 +123,7 @@
txt:"请输入正确的邮箱格式"
}
}
if ($scope.tip.succ != true) {
if ($scope.tip.succ != true) {
return false;
}
$scope.errorMessage = "";
......@@ -159,4 +164,4 @@
}
}
}
})();
\ No newline at end of file
})();
src/main/websrc/js/login/login.js
......@@ -9,17 +9,11 @@
$scope.reportDate = DateService.getYesDay().startDate;
$scope.isrember = false;
$scope.isonline = true;
/*var chartInstance = echarts.init(document.getElementById('mapInfo'));
var options = OptionService.getLoginMapOption({name:[],val:[],key:[]},"map",{});
chartInstance.setOption(options);*/
var uname = UtilService.getCookie("ryioUname"),upass = UtilService.getCookie("ryioUpass");
var uname = UtilService.getCookie("ryioUname");
if(!UtilService.isNullStr(uname)){
$scope.name = uname;
}
if(!UtilService.isNullStr(upass)){
$scope.password = upass;
}
var code = "";
$scope.getImgInfo = function(){
......@@ -85,19 +79,13 @@
else{
TrackingIO.loggedin(account.email);
UtilService.setCookie("ryioUid",account.id,7);
UtilService.setCookie("ryioUname",account.email,7);
window.localStorage.setItem("ry_user",JSON.stringify(account));
UtilService.setCookie("ryioToken",token,7);
UtilService.setCookie("ryioPastDate",account.pastDate,7);
UtilService.setCookie("ryioStatus",account.status,7);
UtilService.setCookie("ryioActiveStatus",account.activeStatus,7);
UtilService.setCookie("ryioIcon",0,7);
window.localStorage.setItem("io_ry_user",JSON.stringify(account));
UtilService.setCookie("ryioUname",account.email);
UtilService.setCookie("ryioToken",token,7);////
var isSuper = account.isSuperUser == true && account.isChannelPerson!=true;
UtilService.setCookie("ryioIsSuper",isSuper,7);
UtilService.setCookie("ryioRole",account.roleCategory,7);
UtilService.setCookie("ryioIsSuper",isSuper,7);///////
if( data.account.activeStatus != true && data.account.status == 1 && isSuper==true){
UtilService.setCookie("regId",account.id,7);
UtilService.setCookie("regEmail",$scope.name,7);
......
src/main/websrc/js/login/olduser.js
......@@ -12,9 +12,9 @@
}
//$scope.registerId = $location.search().id;
//$scope.registerEmail= $location.search().email;
$scope.registerId = $.cookie("regId");
$scope.registerEmail= $.cookie("regEmail");
$scope.flag = $.cookie("regFlag");
$scope.registerId = UtilService.getCookie("regId");
$scope.registerEmail= UtilService.getCookie("regEmail");
$scope.flag = UtilService.getCookie("regFlag");
$scope.hasReged = true;
$scope.oldEmail = function(){
......@@ -28,7 +28,7 @@
}
window.location.href = "activation.html";
});
}
}
})();
\ No newline at end of file
})();
src/main/websrc/js/manage/app.js
......@@ -315,7 +315,7 @@
return false;
}
var appTagList = [], isnull = false, tag = "00";
console.log($scope.tagType,$scope.typeIds,$scope.themeIds,$scope.styleIds)
if($scope.tagType == 'game'){
$scope.typenull = !$scope.typeIds;
$scope.themenull = !$scope.themeIds;
......
src/main/websrc/js/manage/auth.js
......@@ -5,7 +5,7 @@
function authCtrl($rootScope,$scope,HttpService,ToolService,UtilService,$state){
$scope.demoUSuper = UtilService.getCookie("ryioUname") == 'demoadmin@reyun.com';
$scope.demoUSuper = UtilService.getUser().email == 'demoadmin@reyun.com';
$scope.deviceList = [
{id:1,name:"已启用"},
{id:2,name:"已停用"}
......@@ -45,8 +45,21 @@
$scope.$on('flipinfo',function(e,msg){
$scope.flipPage = msg;
});
$scope.wantOn = false;
$scope.doOpen = function(info){
$scope.curOnId = info.id;
if(info.isSpecialAccount=="1"){
$scope.wantOn = true;
ToolService.showAlp();
}
else{
$scope.onUser($scope.curOnId);
}
}
$scope.onUser = function(id){
if($scope.wantOn){
$scope.closeOn();
}
ToolService.showLoading();
var userPM = HttpService.putInfo("mng/auth"+$scope.getSuburl()+"/"+id+"/enable");
userPM.then(function(data){
......@@ -56,6 +69,10 @@
$scope.query();
});
}
$scope.closeOn = function(){
$scope.wantOn = false;
ToolService.hideAlp();
}
$scope.offUser = function(id){
var userPM = HttpService.putInfo("mng/auth"+$scope.getSuburl()+"/"+id+"/disable");
ToolService.showLoading();
......@@ -76,9 +93,14 @@
ToolService.showLoading();
var deletePM = HttpService.deleteInfo("mng/auth/"+$scope.delInfo.id+"/delete");
deletePM.then(function(){
ToolService.showTips("删除成功");
ToolService.hideLoading();
$scope.query();
if(data){
ToolService.showTips("删除成功");
$scope.query();
}
else{
ToolService.showTips("该账号已激活，不支持删除，您可以在右侧操作区对账号进行停用。");
}
});
}
$scope.sendEmailAgain = function(send){
......
src/main/websrc/login.html
......@@ -96,7 +96,7 @@
<div class="copyright">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<script>
var date = new Date();
......
src/main/websrc/olduser.html
......@@ -35,11 +35,11 @@
<div class="registerActivation">注册激活</div>
<div class="activationText oldUser">我们当前正在为开发者做更多的权限和安全设计，为了您的账户安全，请激活您的邮箱。</div>
<div class="activationButton" ng-click="oldEmail()">发送激活邮件</div>
<div class="activationText"><a href="index.html">跳过，下次再显示</a></div>
<div class="activationText"><a href="index.html#/manage/app">跳过，下次再显示</a></div>
</div>
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
......
src/main/websrc/register.html
......@@ -135,7 +135,7 @@
</div>
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
......
src/main/websrc/resetpwd.html
......@@ -62,7 +62,7 @@
</div>
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
......
src/main/websrc/styles/style.scss
......@@ -896,14 +896,14 @@ textarea.iptform{
}
.btn.active,.btn.active:hover,.btnactive{
background-color:$activebgcolor;
border-color:$activebgcolor;
background-color:$logobg;
border-color:$logobg;
color:$activeftcolor;
}
.btn3{
height:$btnheight;
line-height:$btnheight;
border-color:$activebgcolor;
border-color:$logobg;
color:$activeftcolor;
padding:0px 10px;
float:left;
......@@ -911,7 +911,7 @@ textarea.iptform{
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background-color:$activebgcolor;
background-color:$logobg;
cursor:pointer;
}
.btn3.lh30{
......@@ -950,11 +950,11 @@ textarea.iptform{
cursor: default;
}
.btn:hover,.btn2.active{
border-color:$activebgcolor;
color:$activebgcolor;
border-color:$logobg;
color:$logobg;
}
.btn4{
border:1px solid $activebgcolor;
border:1px solid $logobg;
color:$activeftcolor;
padding:6px 6px;
float:left;
......@@ -962,7 +962,7 @@ textarea.iptform{
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background-color:$activebgcolor;
background-color:$logobg;
cursor:pointer;
font-size:12px;
margin-right: 5px;
......@@ -970,7 +970,7 @@ textarea.iptform{
}
.btn5{
border:1px solid $activebgcolor;
border:1px solid $logobg;
color:$activeftcolor;
height:$btnheight;
line-height:$btnheight;
......@@ -979,7 +979,7 @@ textarea.iptform{
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background-color:$btnformcolor;
background-color:$logobg;
cursor:pointer;
font-size:12px;
}
......@@ -1003,7 +1003,7 @@ textarea.iptform{
background-color:$btngraybg;
}
.btn7:hover{
background-color:$activebgcolor;
background-color:$logobg;
}
.btn8{
......@@ -2137,6 +2137,10 @@ textarea.iptform{
color:$labeldisft;
cursor:not-allowed;
}
.formOper.leftAlg{
text-align:left;
padding-left:20px;
}
.formOper .btn2,.formOper .btn4{
display:inline-block;
float:none;
......@@ -4195,7 +4199,7 @@ pre{
height:30px;
line-height: 30px;
font-size:12px;
background-color:$activebgcolor;
background-color:$logobg;
color:#fff;
display:inline-block;
border-radius:$comradius;
......@@ -4233,7 +4237,7 @@ pre{
vertical-align:middle;
}
.btnMoreGroup .primaryBtn{
background-color:$activebgcolor;
background-color:$logobg;
color:#fff;
border-top-left-radius:$comradius;
border-bottom-left-radius:$comradius;
......@@ -4253,7 +4257,7 @@ pre{
}
.btnMoreGroup .primarySelBtn.dis{border-left:none;}
.btnMoreGroup .primarySelBtn{
background-color:$activebgcolor;
background-color:$logobg;
border-top-right-radius:$comradius;
border-bottom-right-radius:$comradius;
float:left;
......
src/main/websrc/success.html
......@@ -37,7 +37,7 @@
</div>
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
2017 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
2018 TrackingIO.com All Rights Reserved <a href="http://www.miitbeian.gov.cn/" target="_blank">京ICP备14021832号</a>
</div>
<div class="alphaDiv" id="sysLoad" style="display: none;z-index: 99;">
<div class="spinner">
......
src/main/websrc/template/collect/logdump.html
......@@ -17,8 +17,8 @@
<tr ng-repeat="info in addrList.val track by $index">
<td ng-repeat="col in addrList.columnkey track by $index" data-clipboard-text="{{info[col]}}" ng-class="{'ckhand':$index>0,'copyBtn':$index==1}">{{info[col]}}</td>
<td class="formOper">
<a class="formBtn" ng-click="downFile(info.type)" ng-if="appInstance.regedbutton==true"><span class="downloadIcon active"></span>下载</a>
<a class="formBtn" ng-click="downTips()" ng-if="appInstance.regedbutton!=true"><span class="downloadIcon active"></span>下载</a>
<a class="formBtn" ng-click="downFile(info.type)" ng-if="appInstance.regedbutton==true">下载</a>
<a class="formBtn" ng-click="downTips()" ng-if="appInstance.regedbutton!=true">下载</a>
</td>
</tr>
</table>
......@@ -33,4 +33,4 @@
<li>目前仅支持导出昨日数据。</li>
</ol>
</dl>
</div>
\ No newline at end of file
</div>
src/main/websrc/template/manage/activityevent.html
<div class="clearfix longTip rightTip tip0">
<ul class="customNav custleft">
<li ng-click="goPage('collect.event')">APP事件管理</li>
<li ng-click="goPage('collect.event')">APP事件管理</li>
<li class="active" ng-click="goPage('collect.activityevent')">虚拟事件管理</li>
</ul>
</div>
<div class="chartWrap clearfix" style="margin-top: 20px;">
<div class="chartWrapItem grayhm titleChart nothborder">
<div class="chartWrapItem grayhm titleChart nothborder">
<div class="chartModule">
<span>虚拟事件管理</span>
<div class="searchWrap">
......@@ -32,15 +32,15 @@
<td>{{info.eventListName}}</td>
<td class="formOper" ng-if="hasEditPower()">
<div class="formBtn" ng-click="gopage(info)">
<span class="editIcon"></span>编辑
编辑
</div>
<div class="btn4" ng-if="info.enable==false && info.type=='userdefine'" ng-click="onUser(info.id)">启用</div>
<div class="btn2" ng-if="info.enable==true && info.type=='userdefine'" ng-click="offUser(info.id)">停用</div>
<div class="onOffBtn on" ng-if="info.enable==true && info.type=='userdefine'" ng-click="offUser(info.id)" title="已启用"></div>
<div class="onOffBtn" ng-if="info.enable==false && info.type=='userdefine'" ng-click="onUser(info.id)" title="已停用"></div>
</td>
</tr>
</table>
<flip-info list-info="eventList" search-txt="searchTxt" search-name="eventList"></flip-info>
</div>
</div>
</div>
\ No newline at end of file
</div>
src/main/websrc/template/manage/auth.html
......@@ -22,33 +22,38 @@
<th>姓名</th>
<th>角色</th>
<th>状态</th>
<th>操作</th>
<th colspan="2" ng-if="findName=='enable'">操作</th>
<th ng-if="findName=='disable'">操作</th>
<th>操作记录</th>
</tr>
<tr ng-repeat="info in authList | filterList:searchTxt:'name,email' track by $index" ng-if="$index>flipPage.start && $index < flipPage.end">
<td>{{$index+1}}</td>
<td>{{info.email}}</td>
<td>{{info.name}}</td>
<td ng-if="accountFlag!='channel'">{{info.roleName}}</td>
<td>{{info.roleName}}</td>
<td>
<span ng-if="info.status==-3">未激活</span>
<span ng-if="info.status!=-3 && info.valid">激活</span>
<span ng-if="info.status!=-3 && !info.valid">已过期</span>
</td>
<td class="formOper">
<td class="formOper leftAlg" ng-show="findName=='enable'">
<div ng-hide="(info.roleCategory == 1 && !isSuper) || info.email == 'demo@reyun.com' || (info.roleCategory==2 && isAppManage)">
<div class="formBtn" ng-class="{'dis':!info.valid}" ng-click="gopage(info)" ng-show="info.status==1 && findName=='enable'"><span class="editIcon"></span>编辑</div>
<div class="btn4" ng-if="info.status!=-3 && findName=='disable' && info.valid" ng-click="onUser(info.id)">启用</div>
<div class="btn2" ng-if="info.status!=-3 && findName=='enable' && info.valid" ng-click="offUser(info.id)">停用</div>
<div class="formBtn" ng-class="{'dis':!info.valid}" ng-click="gopage(info)" ng-show="findName=='enable'">编辑</div>
<div class="formBtn" ng-if="info.status==-3 && !info.send" ng-click="sendEmailAgain(info)">重新发送激活邮件</div>
<div class="formBtn dis" ng-if="info.status==-3 && info.send == 1">发送成功</div>
<div class="formBtn" ng-click="deleteAuth(info)" ng-if="info.status==-3"><span class="removeIcon"></span>删除</div>
</div>
<div class="nopower" ng-if="info.roleCategory==2 && isAppManage" title="您已无此授权权限，请联系管理员">
<div class="formBtn" ng-click="deleteAuth(info)" ng-if="info.status==-3">删除</div>
</div>
</td>
<td>
<div class="formBtn" ng-click="showDetails(info)" stop-event><span class="lookIcon"></span></div>
<div ng-if="info.status!=-3 && findName=='enable' && info.valid">
已启用<div class="onOffBtn on" ng-click="offUser(info.id)"></div>
</div>
<div ng-if="info.status!=-3 && findName=='disable' && info.valid">
已停用<div class="onOffBtn" ng-click="doOpen(info)"></div>
</div>
</td>
<td>
<div class="formBtn" ng-click="showDetails(info)" stop-event>查看</div>
</td>
</tr>
</table>
......@@ -67,6 +72,16 @@
<div class="btn8" ng-click="doDelete()">确定</div>
</div>
</div>
<div class="openTipWin" ng-show="wantOn">
<div class="closeGray" ng-click="closeOn()"></div>
<div class="tipCont">
由于系统权限升级，不支持自定义账号权限，该账号启用后将会拥有对应产品的子应用管理员权限，请谨慎操作。是否确定启用？
</div>
<div class="openBtnGroup clearfix">
<div class="btn8 mr20" ng-click="closeOn()">取消</div>
<div class="btn8" ng-click="onUser(curOnId)">确定</div>
</div>
</div>
<div class="leftTipsSlider" ng-class="{'sliderSw':isdetail}" stop-event>
<div class="slideHeader">
操作记录
......
src/main/websrc/template/manage/authDetail.html
......@@ -82,7 +82,7 @@
<div class="formsaveBtnWrap clearfix">
<div class="btn6" ng-click="cancel()">取消</div>
<div class="btn5" ng-click="save()">
<span ng-if="!id">完成</span>
<span ng-if="!id">添加</span>
<span ng-if="id">保存</span>
</div>
</div>
......
src/main/websrc/template/manage/event.html
<div class="clearfix longTip rightTip tip0">
<ul class="customNav custleft">
<li class="active" ng-click="goPage('collect.event')">APP事件管理</li>
<li class="active" ng-click="goPage('collect.event')">APP事件管理</li>
<li ng-click="goPage('collect.activityevent')">虚拟事件管理</li>
</ul>
</div>
<div class="chartWrap clearfix" style="margin-top: 20px;">
<div class="chartWrapItem grayhm titleChart nothborder">
<div class="chartWrapItem grayhm titleChart nothborder">
<div ng-show="isevent">
<div class="chartModule">
<span>APP事件管理</span>
......@@ -36,10 +36,10 @@
</td>
<td class="formOper">
<div class="formBtn" ng-click="clickEvent(info)">
<span class="viewIcon"></span>详情
详情
</div>
<div class="btn4" ng-if="info.status==false && info.common!=true && hasEditPower()" ng-click="onOff(info.eventName)">启用</div>
<div class="btn2" ng-if="info.status==true && info.common!=true && hasEditPower()" ng-click="onOff(info.eventName,1)">停用</div>
<div class="onOffBtn on" ng-if="info.status==true && info.common!=true && hasEditPower()" ng-click="onOff(info.eventName,1)" title="已启用"></div>
<div class="onOffBtn" ng-if="info.status==false && info.common!=true && hasEditPower()" ng-click="onOff(info.eventName)" title="已停用"></div>
</td>
</tr>
</table>
......@@ -97,4 +97,4 @@
</div>
</div>
</div>
\ No newline at end of file
</div>
src/main/websrc/template/manage/usergroup.html
......@@ -35,14 +35,14 @@
<span class="f5Icon"></span>更新
</div> -->
<div class="formBtn" ng-click="gopage(info)">
<span class="editIcon"></span>编辑
编辑
</div>
<div class="formBtn" ng-click="doRemove(info.id)">
<span class="removeIcon"></span>删除
删除
</div>
</td>
</tr>
</table>
<flip-info list-info="usergroupList" search-txt="searchTxt" search-name="name"></flip-info>
<del-tip status="delstatus" delfn="removeInfo()">确定删除该数据？</del-tip>
</div>
\ No newline at end of file
<flip-info list-info="usergroupList" search-txt="searchTxt" search-name="name"></flip-info>
<del-tip status="delstatus" delfn="removeInfo()">确定删除该数据？</del-tip>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment