Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
Overview
Overview
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
曹鹏
bigdatainterservice
Commits
2759b4e2
Commit
2759b4e2
authored
Apr 23, 2019
by
zhulinying
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/master' into zhuly_bate
parents
3a3903a2
5d0c51a0
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
src/main/java/com/founder/interservice/config/filter/LogFilter.java
+4
-1
src/main/java/com/founder/interservice/protogenesis/controller/ProtoController.java
+1
-0
src/main/java/com/founder/interservice/protogenesis/service/impl/ProtoServiceImpl.java
+0
-1
src/main/java/com/founder/interservice/util/HttpClient.java
+1
-5
src/main/resources/templates/公司代码.properties
+2
-1
src/main/resources/token.properties
+1
-1
No files found.
src/main/java/com/founder/interservice/config/filter/LogFilter.java
View file @
2759b4e2
...
...
@@ -69,7 +69,7 @@ public class LogFilter implements Filter {
filterChain
.
doFilter
(
httpServletRequest
,
servletResponse
);
}
else
{
if
(
StringUtil
.
ckeckEmpty
(
yhCateCode
)
||
StringUtil
.
ckeckEmpty
(
projectName
))
{
ResultVO
resultVO
=
ResultVOUtil
.
error
(
ResultEnum
.
PARAM_NOTNULL
.
getCode
(),
ResultEnum
.
PARAM_NOTNULL
.
getMessage
());
ResultVO
resultVO
=
ResultVOUtil
.
error
(
ResultEnum
.
PARAM_NOTNULL
.
getCode
(),
ResultEnum
.
PARAM_NOTNULL
.
getMessage
()
,
"请检查yhCate和projectName参数是否正确"
);
OutputStream
outputStream
=
servletResponse
.
getOutputStream
();
outputStream
.
write
(
resultVO
.
toString
().
getBytes
());
}
else
{
...
...
@@ -94,6 +94,9 @@ public class LogFilter implements Filter {
case
"05"
:
yhCateName
=
"讯之美"
;
break
;
case
"06"
:
yhCateName
=
"德拓"
;
break
;
default
:
yhCateName
=
"方正"
;
break
;
...
...
src/main/java/com/founder/interservice/protogenesis/controller/ProtoController.java
View file @
2759b4e2
...
...
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.servlet.ModelAndView
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
src/main/java/com/founder/interservice/protogenesis/service/impl/ProtoServiceImpl.java
View file @
2759b4e2
...
...
@@ -273,7 +273,6 @@ public class ProtoServiceImpl implements ProtoService {
String
result
=
HttpClient
.
doPostWaData
(
url
,
param
);
return
result
;
}
catch
(
InterServiceException
e
){
e
.
printStackTrace
();
throw
new
InterServiceException
(
ResultEnum
.
REQUEST_URL_ERROR
.
getCode
(),
ResultEnum
.
REQUEST_URL_ERROR
.
getMessage
());
}
}
...
...
src/main/java/com/founder/interservice/util/HttpClient.java
View file @
2759b4e2
...
...
@@ -203,15 +203,11 @@ public class HttpClient {
CloseableHttpResponse
result
=
httpClient
.
execute
(
httpPost
);
if
(
result
.
getStatusLine
().
getStatusCode
()
==
HttpStatus
.
SC_OK
){
String
str
=
""
;
try
{
// 读取服务器返回的json数据(然后解析)
jsonResult
=
EntityUtils
.
toString
(
result
.
getEntity
(),
"utf-8"
);
// 把json字符串转换成json对象
}
catch
(
Exception
e
){
throw
new
InterServiceException
(
ResultEnum
.
REQUEST_URL_ERROR
.
getCode
(),
ResultEnum
.
REQUEST_URL_ERROR
.
getMessage
(),
e
);
}
}
}
catch
(
IOException
e
){
e
.
printStackTrace
();
throw
new
InterServiceException
(
ResultEnum
.
REQUEST_URL_ERROR
.
getCode
(),
ResultEnum
.
REQUEST_URL_ERROR
.
getMessage
(),
e
);
}
finally
{
httpPost
.
releaseConnection
();
...
...
src/main/resources/templates/公司代码.properties
View file @
2759b4e2
\u65B
9\
u6B63
=
00
\u65B
9\
u6B63
=
00
...
...
@@ -4,3 +4,4 @@
\u5929\
u5F66
=
03
\u6D77\
u946B
=
04
\u8BAF\u4E4B\
u7F8E
=
05
\u5FB7\
u62D3
=
06
src/main/resources/token.properties
View file @
2759b4e2
api
k
ey
=
fb5aaf49482721d6c495d3ae26796216
api
K
ey
=
fb5aaf49482721d6c495d3ae26796216
username
=
xjzd-fangzheng
token_url
=
http://www.adu.cq:8071/doc/token/token
token
=
...
...
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