Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
agent-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
agent-platform
Commits
021e82a8
Commit
021e82a8
authored
Apr 28, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加申报相关信息
parent
33c3a503
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
agent-manager/pom.xml
agent-manager/pom.xml
+1
-0
agent-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
...ls/xhx/base/system/user/service/impl/UserServiceImpl.java
+4
-5
agent-manager/src/main/resources/bootstrap.yml
agent-manager/src/main/resources/bootstrap.yml
+1
-1
No files found.
agent-manager/pom.xml
View file @
021e82a8
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.filepath>
/mortals/app/data
</profiles.filepath>
<profiles.filepath>
/mortals/app/data
</profiles.filepath>
<skipDeploy>
true
</skipDeploy>
<skipDeploy>
true
</skipDeploy>
<phpUrl>
http://127.0.0.1:8076/zwfw/inter/user/list
</phpUrl>
</properties>
</properties>
...
...
agent-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
View file @
021e82a8
...
@@ -43,6 +43,7 @@ import com.mortals.xhx.module.company.model.CompanyEntity;
...
@@ -43,6 +43,7 @@ import com.mortals.xhx.module.company.model.CompanyEntity;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
...
@@ -71,10 +72,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
...
@@ -71,10 +72,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
@Autowired
@Autowired
private
RoleUserService
roleUserService
;
private
RoleUserService
roleUserService
;
@Lazy
@Value
(
"${phpUrl:http://192.168.0.231:8076/zwfw_yx/inter/user/userlist}"
)
@Autowired
private
String
phpUrl
;
private
IUserFeign
userFeign
;
@Override
@Override
protected
String
getExtKey
(
UserEntity
data
)
{
protected
String
getExtKey
(
UserEntity
data
)
{
return
data
.
getLoginName
();
return
data
.
getLoginName
();
...
@@ -325,7 +324,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
...
@@ -325,7 +324,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
@Override
@Override
public
Rest
<
Void
>
refreshUser
()
{
public
Rest
<
Void
>
refreshUser
()
{
//todo 请求php获取用户
//todo 请求php获取用户
String
respJson
=
HttpUtil
.
get
(
"http://192.168.0.231:8076/zwfw_yx/inter/user/userlist"
);
String
respJson
=
HttpUtil
.
get
(
phpUrl
);
ApiResp
<
List
<
UserResp
>>
rest
=
JSON
.
parseObject
(
respJson
,
new
TypeReference
<
ApiResp
<
List
<
UserResp
>>>()
{
ApiResp
<
List
<
UserResp
>>
rest
=
JSON
.
parseObject
(
respJson
,
new
TypeReference
<
ApiResp
<
List
<
UserResp
>>>()
{
});
});
if
(
200
==
rest
.
getCode
())
{
if
(
200
==
rest
.
getCode
())
{
...
...
agent-manager/src/main/resources/bootstrap.yml
View file @
021e82a8
...
@@ -49,4 +49,4 @@ application:
...
@@ -49,4 +49,4 @@ application:
unloginUrl
:
/refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
unloginUrl
:
/refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
uncheckUrl
:
/refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
uncheckUrl
:
/refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
phpUrl
:
@
profiles.phpUrl@
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