Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
4b2fb51f
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 大约 1 年
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
4b2fb51f
编写于
5月 17, 2016
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复没有登录也可以搜索viewpoint的bug,以及在重启机器情况下,再次点击搜索页面没有跳转到登录页面
上级
76d5baab
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
40 addition
and
13 deletion
+40
-13
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/common/BaseController.java
...va/com/ai/cloud/skywalking/web/common/BaseController.java
+4
-2
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/SearchController.java
.../ai/cloud/skywalking/web/controller/SearchController.java
+6
-1
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/entity/BreviaryChainNode.java
...com/ai/cloud/skywalking/web/entity/BreviaryChainNode.java
+3
-4
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/exception/UserInvalidateException.java
...oud/skywalking/web/exception/UserInvalidateException.java
+8
-0
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/exception/UserNotLoginException.java
...cloud/skywalking/web/exception/UserNotLoginException.java
+8
-0
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/filter/AccessControllerFilter.java
...i/cloud/skywalking/web/filter/AccessControllerFilter.java
+2
-1
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/ViewPointBeautiUtil.java
...com/ai/cloud/skywalking/web/util/ViewPointBeautiUtil.java
+7
-5
skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisSearchResult.js
...pp/bower_components/skywalking/js/analysisSearchResult.js
+2
-0
未找到文件。
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/common/BaseController.java
浏览文件 @
4b2fb51f
package
com.ai.cloud.skywalking.web.common
;
import
com.ai.cloud.skywalking.web.exception.UserInvalidateException
;
import
com.ai.cloud.skywalking.web.exception.UserNotLoginException
;
import
com.ai.cloud.skywalking.web.util.Constants
;
import
com.ai.cloud.skywalking.web.dto.LoginUserInfo
;
import
org.springframework.ui.ModelMap
;
...
...
@@ -29,11 +31,11 @@ public class BaseController {
LoginUserInfo
loginUserInfo
=
(
LoginUserInfo
)
request
.
getSession
().
getAttribute
(
Constants
.
SESSION_LOGIN_INFO_KEY
);
if
(
loginUserInfo
==
null
)
{
throw
new
Runtime
Exception
(
"Failed to find login user info"
);
throw
new
UserNotLogin
Exception
(
"Failed to find login user info"
);
}
if
(
loginUserInfo
.
getUid
()
==
null
)
{
throw
new
Runtim
eException
(
"Login user Id is null"
);
throw
new
UserInvalidat
eException
(
"Login user Id is null"
);
}
return
loginUserInfo
;
...
...
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/SearchController.java
浏览文件 @
4b2fb51f
...
...
@@ -6,6 +6,7 @@ import com.ai.cloud.skywalking.web.entity.BreviaryChainNode;
import
com.ai.cloud.skywalking.web.dto.LoginUserInfo
;
import
com.ai.cloud.skywalking.web.dto.TraceTreeInfo
;
import
com.ai.cloud.skywalking.web.entity.BreviaryChainTree
;
import
com.ai.cloud.skywalking.web.exception.UserNotLoginException
;
import
com.ai.cloud.skywalking.web.service.inter.ICallChainTreeService
;
import
com.ai.cloud.skywalking.web.service.inter.ITraceTreeService
;
import
com.ai.cloud.skywalking.web.util.Constants
;
...
...
@@ -115,7 +116,11 @@ public class SearchController extends BaseController {
result
.
add
(
"children"
,
jsonElements
);
jsonObject
.
put
(
"code"
,
"200"
);
jsonObject
.
put
(
"result"
,
result
.
toString
());
}
catch
(
Exception
e
)
{
}
catch
(
UserNotLoginException
e
){
logger
.
error
(
"Failed to search chain tree:{}"
,
key
,
e
);
jsonObject
.
put
(
"code"
,
"505"
);
jsonObject
.
put
(
"result"
,
"User is not login."
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"Failed to search chain tree:{}"
,
key
,
e
);
jsonObject
.
put
(
"code"
,
"500"
);
jsonObject
.
put
(
"result"
,
"Fatal error"
);
...
...
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/entity/BreviaryChainNode.java
浏览文件 @
4b2fb51f
...
...
@@ -6,9 +6,10 @@ import com.ai.cloud.skywalking.web.util.ViewPointBeautiUtil;
* Created by xin on 16-4-14.
*/
public
class
BreviaryChainNode
{
private
String
traceLevelId
=
""
;
private
String
traceLevelId
=
""
;
private
String
viewPoint
;
private
boolean
isGuess
;
public
BreviaryChainNode
(
String
traceLevelId
,
String
viewPoint
,
boolean
isGuess
)
{
this
.
traceLevelId
=
traceLevelId
;
this
.
viewPoint
=
viewPoint
;
...
...
@@ -32,9 +33,7 @@ public class BreviaryChainNode {
}
public
void
beautiViewPointString
(
String
searchKey
)
{
if
(
viewPoint
.
length
()
>
100
)
{
viewPoint
=
ViewPointBeautiUtil
.
beautifulViewPoint
(
viewPoint
,
searchKey
);
}
viewPoint
=
ViewPointBeautiUtil
.
beautifulViewPoint
(
viewPoint
,
searchKey
);
}
@Override
...
...
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/exception/UserInvalidateException.java
0 → 100644
浏览文件 @
4b2fb51f
package
com.ai.cloud.skywalking.web.exception
;
public
class
UserInvalidateException
extends
RuntimeException
{
public
UserInvalidateException
(
String
message
)
{
super
(
message
);
}
}
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/exception/UserNotLoginException.java
0 → 100644
浏览文件 @
4b2fb51f
package
com.ai.cloud.skywalking.web.exception
;
public
class
UserNotLoginException
extends
RuntimeException
{
public
UserNotLoginException
(
String
message
)
{
super
(
message
);
}
}
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/filter/AccessControllerFilter.java
浏览文件 @
4b2fb51f
...
...
@@ -24,7 +24,8 @@ public class AccessControllerFilter implements Filter {
contained
.
add
(
"addApplication"
);
contained
.
add
(
"createGlobalApplication"
);
contained
.
add
(
"modifyApplication"
);
contained
.
add
(
"showAnlyResult"
);
contained
.
add
(
"showAnlySearchResult"
);
contained
.
add
(
"showAnalysisResult"
);
}
@Override
...
...
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/ViewPointBeautiUtil.java
浏览文件 @
4b2fb51f
package
com.ai.cloud.skywalking.web.util
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* Created by xin on 16-4-19.
*/
...
...
@@ -10,7 +7,10 @@ public class ViewPointBeautiUtil {
public
static
String
beautifulViewPoint
(
String
viewPoint
,
String
searchKey
)
{
String
highLightViewPoint
=
ViewPointBeautiUtil
.
addViewPoint
(
viewPoint
,
searchKey
);
String
highLightViewPoint
=
viewPoint
;
if
(
viewPoint
.
length
()
>
100
)
{
highLightViewPoint
=
ViewPointBeautiUtil
.
addViewPoint
(
viewPoint
,
searchKey
);
}
return
ViewPointBeautiUtil
.
highLightViewPoint
(
highLightViewPoint
,
searchKey
);
}
...
...
@@ -27,7 +27,9 @@ public class ViewPointBeautiUtil {
result
.
append
(
"<span class='highlight-viewpoint'>"
);
result
.
append
(
searchKey
);
result
.
append
(
"</span>"
);
result
.
append
(
viewPoint
.
substring
(
index
+
searchKey
.
length
()
+
1
));
if
(
viewPoint
.
length
()
>
index
+
searchKey
.
length
()
+
1
)
{
result
.
append
(
viewPoint
.
substring
(
index
+
searchKey
.
length
()
+
1
));
}
return
result
.
toString
();
}
...
...
skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisSearchResult.js
浏览文件 @
4b2fb51f
...
...
@@ -89,6 +89,8 @@ function loadAnalyResult(searchKey, pageSize) {
$
(
"
#anlyResultmPanel
"
).
append
(
htmlOutput
);
bindPagerBtn
();
}
}
else
if
(
data
.
code
==
'
505
'
){
window
.
location
.
href
=
baseUrl
+
"
/usr/login
"
;
}
},
error
:
function
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录