Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gk
Project
Project
Details
Activity
Releases
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
micro_app
gk
Commits
66f0b141
Commit
66f0b141
authored
Nov 25, 2024
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉无用日志
parent
c9f6d8c2
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
55 additions
and
56 deletions
+55
-56
SecurityInterceptor.java
...dlbridge/jadp/common/interceptor/SecurityInterceptor.java
+2
-2
CmptService.java
...a/com/dlbridge/jadp/plugins/cmpt/service/CmptService.java
+5
-5
RemoteService.java
...com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
+1
-1
RoadService.java
...a/com/dlbridge/jadp/plugins/cmpt/service/RoadService.java
+24
-24
WeixinInfoService.java
...dlbridge/jadp/plugins/cmpt/service/WeixinInfoService.java
+1
-1
AesUtil.java
...in/java/com/dlbridge/jadp/plugins/cmpt/utils/AesUtil.java
+4
-4
MicroApiController.java
...om/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
+8
-9
RoadController.java
...va/com/dlbridge/jadp/plugins/cmpt/web/RoadController.java
+5
-5
YfbViewController.java
...com/dlbridge/jadp/plugins/cmpt/web/YfbViewController.java
+5
-5
No files found.
src/main/java/com/dlbridge/jadp/common/interceptor/SecurityInterceptor.java
View file @
66f0b141
...
...
@@ -48,7 +48,7 @@ public class SecurityInterceptor extends JService implements HandlerInterceptor
Object
handler
)
throws
Exception
{
Map
<
String
,
Object
>
queryParams
=
getQueryParams
(
request
);
logger
.
info
(
"请求URL:"
+
request
.
getRequestURI
()+
queryParams
);
//
logger.info("请求URL:"+request.getRequestURI()+queryParams);
if
(
handler
instanceof
HandlerMethod
)
{
HandlerMethod
handlerMethod
=
(
HandlerMethod
)
handler
;
...
...
@@ -75,7 +75,7 @@ public class SecurityInterceptor extends JService implements HandlerInterceptor
String
cId
=
request
.
getParameter
(
"cId"
);
String
uId
=
request
.
getParameter
(
"uId"
);
String
str
=
"cId="
+
cId
+
"×tamp="
+
timestamp
+
"&uId="
+
uId
;
log
.
info
(
"请求路径:"
+
str
+
",sign:"
+
DigestUtils
.
md5DigestAsHex
(
str
.
getBytes
())
+
",psign:"
+
sign
);
//
log.info("请求路径:" + str + ",sign:" + DigestUtils.md5DigestAsHex(str.getBytes()) + ",psign:" + sign);
if
(
NumberUtils
.
toInt
(
uId
,
-
1
)
==
-
1
||
NumberUtils
.
toInt
(
uId
,
-
1
)
==
0
)
{
log
.
info
(
"无用户信息登录"
);
response
.
sendRedirect
(
"http://timer.geexek.com"
);
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptService.java
View file @
66f0b141
...
...
@@ -42,19 +42,19 @@ public class CmptService {
try
{
long
start
=
System
.
currentTimeMillis
();
Cmpt
cmpt
=
remoteService
.
getCmptByCmptId
(
cmptId
);
log
.
info
(
"耗时cmpt1:"
+(
System
.
currentTimeMillis
()-
start
));
//
log.info("耗时cmpt1:"+(System.currentTimeMillis()-start));
if
(
cmpt
==
null
)
{
log
.
error
(
"not find related cmpt id : "
+
cmptId
);
return
new
Cmpt
().
setCmptId
(
cmptId
);
}
cmpt
.
setCmptId
(
cmptId
);
log
.
info
(
cmpt
);
//
log.info(cmpt);
Cmpt
localCmpt
=
cmptMapper
.
queryCmptBycmptId
(
cmptId
);
log
.
info
(
"耗时cmpt2:"
+(
System
.
currentTimeMillis
()-
start
));
//
log.info("耗时cmpt2:"+(System.currentTimeMillis()-start));
if
(
localCmpt
==
null
)
{
save
(
cmpt
);
log
.
info
(
"耗时cmpt3:"
+(
System
.
currentTimeMillis
()-
start
));
//
log.info("耗时cmpt3:"+(System.currentTimeMillis()-start));
return
cmptMapper
.
queryCmptBycmptId
(
cmptId
);
}
else
{
localCmpt
.
setCmptName
(
cmpt
.
getCmptName
());
...
...
@@ -62,7 +62,7 @@ public class CmptService {
localCmpt
.
setEndTime
(
cmpt
.
getEndTime
());
localCmpt
.
setCmptType
(
cmpt
.
getCmptType
());
update
(
localCmpt
);
log
.
info
(
"耗时cmpt4:"
+(
System
.
currentTimeMillis
()-
start
));
//
log.info("耗时cmpt4:"+(System.currentTimeMillis()-start));
return
localCmpt
;
}
}
catch
(
Exception
ex
){
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
View file @
66f0b141
...
...
@@ -76,7 +76,7 @@ public class RemoteService {
String
resultString
=
forEntity
.
getBody
();
log
.
info
(
"resultString:"
+
resultString
);
JSONObject
object
=
JSONObject
.
parseObject
(
resultString
);
log
.
info
(
object
.
toJSONString
());
//
log.info(object.toJSONString());
if
(
object
.
isEmpty
())
{
return
null
;
}
else
{
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RoadService.java
View file @
66f0b141
...
...
@@ -57,18 +57,18 @@ public class RoadService {
return
roadMapper
.
queryPaths
(
cmptId
,
roadId
);
}
public
List
<
Road
>
queryRoads
(
Integer
cmptId
)
{
log
.
info
(
"=====queryRoads -> RoadService enter"
);
//
log.info("=====queryRoads -> RoadService enter");
List
<
Road
>
roads
=
remoteService
.
getRoads
(
cmptId
);
if
(
roads
==
null
)
{
return
null
;
}
for
(
Road
road
:
roads
)
{
log
.
info
(
"RoadService api接口 getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
()
+
" getFileUrl:"
+
road
.
getFileUrl
());
}
//
for (Road road : roads) {
//
log.info("RoadService api接口 getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
//
}
List
<
Road
>
localRoads
=
roadMapper
.
queryRoadsMultiPath
(
cmptId
);
for
(
Road
road
:
localRoads
)
{
log
.
info
(
"RoadService 数据库接口 getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
()
+
" getFileUrl:"
+
road
.
getFileUrl
());
}
//
for (Road road : localRoads) {
//
log.info("RoadService 数据库接口 getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
//
}
for
(
Road
road
:
roads
)
{
// 更新 插入操作
if
(
localRoads
.
contains
(
road
))
{
Road
rd
=
localRoads
.
get
(
localRoads
.
indexOf
(
road
));
...
...
@@ -76,10 +76,10 @@ public class RoadService {
rd
.
setName
(
road
.
getName
());
roadMapper
.
update
(
road
);
}
log
.
info
(
"RoadService contains getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
//
log.info("RoadService contains getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName());
}
else
{
roadMapper
.
save
(
road
);
log
.
info
(
"RoadService not contains getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
//
log.info("RoadService not contains getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName());
}
}
for
(
Road
road
:
localRoads
)
{
// 删除操作
...
...
@@ -88,9 +88,9 @@ public class RoadService {
}
}
for
(
Road
road
:
localRoads
)
{
log
.
info
(
"RoadService 接口和api更新后数据 getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
()
+
" getFileUrl:"
+
road
.
getFileUrl
());
}
//
for (Road road : localRoads) {
//
log.info("RoadService 接口和api更新后数据 getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
//
}
return
roadMapper
.
queryRoadsMultiPath
(
cmptId
);
}
...
...
@@ -100,18 +100,18 @@ public class RoadService {
* @return
*/
public
List
<
Road
>
queryRoadsMultiPath
(
Integer
cmptId
)
{
log
.
info
(
"===== queryRoadsMultiPath -> RoadService enter"
);
//
log.info("===== queryRoadsMultiPath -> RoadService enter");
List
<
Road
>
roads
=
remoteService
.
getRoads
(
cmptId
);
if
(
roads
==
null
)
{
return
null
;
}
for
(
Road
road
:
roads
)
{
log
.
info
(
"RoadService api接口 getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
()
+
" getFileUrl:"
+
road
.
getFileUrl
());
}
//
for (Road road : roads) {
//
log.info("RoadService api接口 getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
//
}
List
<
Road
>
localRoads
=
roadMapper
.
queryRoadsMultiPath
(
cmptId
);
for
(
Road
road
:
localRoads
)
{
log
.
info
(
"RoadService 数据库接口 getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
()
+
" getFileUrl:"
+
road
.
getFileUrl
());
}
//
for (Road road : localRoads) {
//
log.info("RoadService 数据库接口 getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
//
}
for
(
Road
road
:
roads
)
{
// 更新 插入操作
if
(
localRoads
.
contains
(
road
))
{
Road
rd
=
localRoads
.
get
(
localRoads
.
indexOf
(
road
));
...
...
@@ -119,10 +119,10 @@ public class RoadService {
rd
.
setName
(
road
.
getName
());
roadMapper
.
update
(
road
);
}
log
.
info
(
"RoadService contains getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
//
log.info("RoadService contains getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName());
}
else
{
roadMapper
.
save
(
road
);
log
.
info
(
"RoadService not contains getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
//
log.info("RoadService not contains getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName());
}
}
for
(
Road
road
:
localRoads
)
{
// 删除操作
...
...
@@ -131,9 +131,9 @@ public class RoadService {
}
}
for
(
Road
road
:
localRoads
)
{
log
.
info
(
"RoadService 接口和api更新后数据 getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
()
+
" getFileUrl:"
+
road
.
getFileUrl
());
}
//
for (Road road : localRoads) {
//
log.info("RoadService 接口和api更新后数据 getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName() + " getFileUrl:" + road.getFileUrl());
//
}
return
roadMapper
.
queryRoadsMultiPath
(
cmptId
);
}
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/WeixinInfoService.java
View file @
66f0b141
...
...
@@ -45,7 +45,7 @@ public class WeixinInfoService {
HttpEntity
entity
=
response
.
getEntity
();
String
content
=
EntityUtils
.
toString
(
entity
,
"utf-8"
);
JSONObject
json
=
JSON
.
parseObject
(
content
);
log
.
info
(
"=====getOpenIdAndSessionKey请求路径:"
+
url
+
",返回数据:"
+
content
);
//
log.info("=====getOpenIdAndSessionKey请求路径:"+url+",返回数据:"+content);
hp
.
close
();
return
json
;
}
catch
(
Exception
e
)
{
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/utils/AesUtil.java
View file @
66f0b141
...
...
@@ -36,9 +36,9 @@ public class AesUtil {
* @throws Exception
*/
public
static
String
decrypt
(
String
data
,
String
key
,
String
iv
,
String
encodingFormat
)
throws
Exception
{
log
.
info
(
"data:"
+
data
);
log
.
info
(
"key:"
+
key
);
log
.
info
(
"iv:"
+
iv
);
//
log.info("data:" + data);
//
log.info("key:" + key);
//
log.info("iv:" + iv);
//被加密的数据
byte
[]
dataByte
=
Base64
.
decodeBase64
(
data
);
//加密秘钥
...
...
@@ -55,7 +55,7 @@ public class AesUtil {
byte
[]
resultByte
=
cipher
.
doFinal
(
dataByte
);
if
(
null
!=
resultByte
&&
resultByte
.
length
>
0
)
{
String
result
=
new
String
(
resultByte
,
encodingFormat
);
log
.
info
(
result
);
//
log.info(result);
return
result
;
}
else
{
log
.
info
(
"解析失败----"
);
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @
66f0b141
...
...
@@ -146,7 +146,7 @@ public class MicroApiController {
if
(
userId
==
-
1
){
return
Result
.
fail
().
setMsg
(
"入参错误"
);
}
log
.
info
(
"userId:"
+
userId
+
",userMapId:"
+
userMapId
+
",cmptId:"
+
cmptId
);
log
.
info
(
"
===== /api/bindCmpt方法,
userId:"
+
userId
+
",userMapId:"
+
userMapId
+
",cmptId:"
+
cmptId
);
EnrollInfo
info
=
cmptService
.
bind
(
userId
,
phone
,
cmptId
,
userMapId
);
// // 根据手机号+姓名,没有查到计时系统的名单
...
...
@@ -428,7 +428,7 @@ public class MicroApiController {
String
partnerId
=
request
.
getParameter
(
"partnerId"
);
String
creator
=
request
.
getParameter
(
"userId"
);
Partner
partner
=
cmptService
.
getPartnerById
(
partnerId
);
log
.
info
(
"partner:"
+
partner
);
//
log.info("partner:"+partner);
Map
<
String
,
String
>
param
=
new
HashMap
<>();
param
.
put
(
"userId"
,
partner
.
getUserId
()+
""
);
param
.
put
(
"creator"
,
creator
);
...
...
@@ -583,10 +583,9 @@ public class MicroApiController {
@ApiOperation
(
value
=
"微信登录/注册"
,
notes
=
"微信登录/注册"
,
tags
=
"用户信息"
)
public
Result
<
User
>
bindWx
(
HttpServletRequest
request
,
String
encryptedData
,
String
iv
,
String
code
)
{
//////////////// 1、向微信服务器 使用登录凭证 code 获取 session_key 和 openid ////////////////
log
.
info
(
"=====bindWx方法,code:"
+
code
+
",encryptedData:"
+
encryptedData
+
",code:"
+
code
);
log
.
info
(
"=====请求方法:"
+
request
.
getMethod
());
// log.info("=====bindWx方法,code:" + code + ",encryptedData:" + encryptedData + ",code:" + code);
String
partnerId
=
request
.
getParameter
(
"partnerId"
);
log
.
info
(
"=====
请求参数:"
+
request
.
getQueryString
());
// log.info("=====/bindWx
请求参数:"+request.getQueryString());
JSONObject
json
=
weixinInfoService
.
getOpenIdAndSessionKey
(
code
,
partnerId
);
String
openid
=
null
;
String
session_key
;
...
...
@@ -599,7 +598,7 @@ public class MicroApiController {
openid
=
json
.
getString
(
"openid"
);
//获取会话密钥(session_key)
session_key
=
json
.
getString
(
"session_key"
);
log
.
info
(
"=====openId:"
+
openid
+
", session_key:"
+
session_key
);
//
log.info("=====openId:" + openid + ", session_key:" + session_key);
}
}
else
{
log
.
info
(
"=====获取授权失败"
);
...
...
@@ -608,7 +607,7 @@ public class MicroApiController {
//////////////// 2、对encryptedData加密数据进行AES解密 ////////////////
try
{
String
result
=
AesUtil
.
decrypt
(
encryptedData
,
session_key
,
iv
,
"UTF-8"
);
log
.
info
(
"=====解密结果:"
+
result
);
//
log.info("=====解密结果:"+result);
if
(
null
!=
result
&&
result
.
length
()
>
0
)
{
JSONObject
jsoninfo
=
JSONObject
.
parseObject
(
result
);
String
name
=
jsoninfo
.
getString
(
"nickName"
);
...
...
@@ -636,11 +635,11 @@ public class MicroApiController {
"&userName="
+
name
+
"&nickName="
+
name
+
"&userFrom=3"
;
}
log
.
info
(
"=====请求的URL:"
+
url
);
//
log.info("=====请求的URL:" + url);
ResponseEntity
<
String
>
forEntity
=
restTemplate
.
getForEntity
(
url
,
String
.
class
);
if
(
forEntity
.
getStatusCode
()
==
HttpStatus
.
OK
)
{
JSONObject
object
=
JSONObject
.
parseObject
(
forEntity
.
getBody
());
log
.
info
(
"=====返回的JSON:"
+
forEntity
.
getBody
());
//
log.info("=====返回的JSON:" + forEntity.getBody());
int
userId
=
object
.
getJSONObject
(
"result"
).
getIntValue
(
"userId"
);
User
user
=
new
User
().
setUserId
(
userId
).
setHeadImgUrl
(
imgUrl
).
setOpenId
(
openid
)
.
setUnionId
(
jsoninfo
.
getString
(
"unionId"
))
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/RoadController.java
View file @
66f0b141
...
...
@@ -51,11 +51,11 @@ public class RoadController {
Cmpt
cmpt
=
cmptService
.
queryCmptBycmptId
(
cmptId
);
mv
.
addObject
(
"cmpt"
,
cmpt
);
List
<
Road
>
list
=
roadService
.
queryRoadsMultiPath
(
cmptId
);
if
(
list
!=
null
){
for
(
Road
road
:
list
)
{
log
.
info
(
"RoadController getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
}
}
//
if(list != null){
//
for (Road road : list) {
//
log.info("RoadController getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName());
//
}
//
}
Map
<
String
,
String
>
multiMap
=
roadService
.
getMultiRouteInfo
(
cmptId
);
for
(
Road
road
:
list
){
road
.
setIsMultiRoute
(
multiMap
.
get
(
"isMultiRoute"
));
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/YfbViewController.java
View file @
66f0b141
...
...
@@ -41,11 +41,11 @@ public class YfbViewController {
Cmpt
cmpt
=
cmptService
.
queryCmptBycmptId
(
cmptId
);
mv
.
addObject
(
"cmpt"
,
cmpt
);
List
<
Road
>
list
=
roadService
.
queryRoads
(
cmptId
);
if
(
list
!=
null
){
for
(
Road
road
:
list
)
{
log
.
info
(
"RoadController getName:"
+
road
.
getName
()
+
" getRoadId:"
+
road
.
getRoadId
()
+
" getFileName:"
+
road
.
getFileName
());
}
}
//
if(list != null){
//
for (Road road : list) {
//
log.info("RoadController getName:" + road.getName() + " getRoadId:" + road.getRoadId() + " getFileName:" + road.getFileName());
//
}
//
}
mv
.
addObject
(
"list"
,
list
);
mv
.
setViewName
(
"cmpt/road"
);
...
...
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