Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
2b636a92
Commit
2b636a92
authored
Jul 29, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查看word 返回类型修改
parent
71b16cc5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+5
-5
ControllerAop.java
...m/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @
2b636a92
...
...
@@ -605,8 +605,8 @@ public class CommandController extends BaseController {
*
* @return
*/
@TycloudOperation
(
needAuth
=
tru
e
,
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/lookHtmlText"
,
produces
=
"application/json;charset=UTF-8"
)
@TycloudOperation
(
needAuth
=
fals
e
,
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/lookHtmlText"
)
@ApiOperation
(
value
=
"查看文件内容"
,
notes
=
"查看文件内容"
)
public
ResponseModel
<
Object
>
lookHtmlText
(
HttpServletResponse
response
,
@RequestParam
(
value
=
"fileUrl"
)
String
fileUrl
,
@RequestParam
(
value
=
"product"
)
String
product
,
@RequestParam
(
value
=
"appKey"
)
String
appKey
,
@RequestParam
(
value
=
"token"
)
String
token
/* @PathVariable String fileName */
)
throws
Exception
{
...
...
@@ -627,9 +627,9 @@ public class CommandController extends BaseController {
File
htmlFile
=
new
File
(
htmlFileName
);
WordConverterUtils
.
wordToHtml
(
fileName
,
htmlFileName
,
imagePathStr
,
readUrl
,
remoteSecurityService
,
product
,
appKey
,
token
);
FileInputStream
fis
=
new
FileInputStream
(
htmlFile
);
response
.
setContentType
(
"multipart/form-data"
);
response
.
setCharacterEncoding
(
"UTF-8"
);
response
.
setContentType
(
"text/html"
);
//
response.setContentType("multipart/form-data");
//
response.setCharacterEncoding("UTF-8");
//
response.setContentType("text/html");
ServletOutputStream
out
;
out
=
response
.
getOutputStream
();
int
b
=
0
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java
View file @
2b636a92
...
...
@@ -71,7 +71,7 @@ public class ControllerAop {
throw
new
RuntimeException
(
e
.
getMessage
());
}
// 不需要添加请求头的接口
String
[]
url
=
new
String
[]{
"/api/user/selectInfo"
,
"/api/user/save/curCompany"
};
String
[]
url
=
new
String
[]{
"/api/user/selectInfo"
,
"/api/user/save/curCompany"
,
"/jcs/command/lookHtmlText"
};
// 获取请求路径
if
(
Arrays
.
asList
(
url
).
contains
(
request
.
getRequestURI
()))
{
// 暂无需要
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment