Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
eaf14c6a
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
eaf14c6a
编写于
8月 10, 2016
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复页面描述不符的问题 修复授权文件下载
上级
d3e9b3cc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
13 deletion
+8
-13
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/AuthFileController.java
...i/cloud/skywalking/web/controller/AuthFileController.java
+2
-5
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java
.../java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java
+3
-5
skywalking-webui/src/main/webapp/pages/usr/applications/applicationMaintain.ftl
...ain/webapp/pages/usr/applications/applicationMaintain.ftl
+3
-3
未找到文件。
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/AuthFileController.java
浏览文件 @
eaf14c6a
...
...
@@ -50,7 +50,7 @@ public class AuthFileController extends BaseController {
return
;
}
LoginUserInfo
loginUserInfo
=
fetchLoginUserInfoFromSession
(
request
);
String
filepath
=
loginUserInfo
.
getUserName
()
+
"-"
+
applicationCode
+
".jar
"
;
String
filepath
=
"sky-walking.auth
"
;
response
.
reset
();
response
.
setContentType
(
"application/octet-stream"
);
String
fileName
=
URLDecoder
.
decode
(
filepath
,
"utf-8"
);
...
...
@@ -79,10 +79,7 @@ public class AuthFileController extends BaseController {
File
file
=
new
File
(
request
.
getServletContext
().
getRealPath
(
"/"
)
+
File
.
separator
+
"download"
+
File
.
separator
+
fileName
);
file
.
delete
();
// 生成JarFile
JarOutputStream
stream
=
new
JarOutputStream
(
new
FileOutputStream
(
file
));
JarEntry
entry
=
new
JarEntry
(
"sky-walking.auth"
);
stream
.
putNextEntry
(
entry
);
FileOutputStream
stream
=
new
FileOutputStream
(
file
);
properties
.
store
(
stream
,
""
);
stream
.
flush
();
stream
.
close
();
...
...
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java
浏览文件 @
eaf14c6a
...
...
@@ -6,22 +6,20 @@ import org.apache.logging.log4j.Logger;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Repository
;
import
javax.annotation.PostConstruct
;
import
java.sql.Connection
;
import
java.sql.SQLException
;
@Repository
public
class
DBConnectUtil
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
DBConnectUtil
.
class
);
@Autowired
private
static
HikariDataSource
hikariD
ataSource
;
private
HikariDataSource
d
ataSource
;
public
Connection
getConnection
()
{
try
{
return
hikariD
ataSource
.
getConnection
();
return
d
ataSource
.
getConnection
();
}
catch
(
SQLException
e
)
{
logger
.
error
(
"Failed to get connection"
,
e
);
throw
new
RuntimeException
(
"Cannot get connection."
);
...
...
skywalking-webui/src/main/webapp/pages/usr/applications/applicationMaintain.ftl
浏览文件 @
eaf14c6a
...
...
@@ -214,14 +214,14 @@
<label for="inputPassword3" class="col-sm-3 control-label">收件人地址:</label>
<div class="col-sm-9">
<input type="text-are" class="form-control" id="mailTo" name="mailTo"
placeholder="
Application Description
">
placeholder="
test@test.com,test@test.com
">
</div>
</div>
<div class="form-group">
<label for="inputPassword3" class="col-sm-3 control-label">抄送人地址:</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="mailCc" name="mailCc"
placeholder="
Application Description
">
placeholder="
test@test.com,test@test.com
">
</div>
</div>
</div>
...
...
@@ -349,4 +349,4 @@
</div>
</div>
</script>
</#macro>
\ No newline at end of file
</#macro>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录