Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
6c72f69e
Commit
6c72f69e
authored
Aug 29, 2018
by
frank.xa.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed hard code url to config file
parent
2a864c5f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
UserServiceImpl.java
...n/java/pwc/taxtech/atms/service/impl/UserServiceImpl.java
+5
-1
conf.properties
atms-api/src/main/resources/conf/conf.properties
+4
-2
conf_profile_dev.properties
atms-api/src/main/resources/conf/conf_profile_dev.properties
+4
-2
No files found.
atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserServiceImpl.java
View file @
6c72f69e
...
...
@@ -5,6 +5,7 @@ import org.apache.commons.lang3.BooleanUtils;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.Assert
;
import
org.springframework.util.StringUtils
;
...
...
@@ -74,6 +75,9 @@ public class UserServiceImpl extends AbstractService implements UserService {
@Autowired
private
UserRoleService
userRoleService
;
@Value
(
"${api.url}"
)
private
String
apiUrl
;
@Override
public
UserPermissionDto
getUserPermission
(
String
userName
)
{
User
user
=
userMapper
.
selectByUserNameIgnoreCase
(
userName
);
...
...
@@ -410,7 +414,7 @@ public class UserServiceImpl extends AbstractService implements UserService {
token
.
setExpires_in
(
86400000L
);
// api_host可以由atms-web端来赋值
token
.
setApi_host
(
"NA"
);
token
.
setVat_api_host
(
"http://localhost:8180"
);
token
.
setVat_api_host
(
apiUrl
);
token
.
setTp_url
(
"https://cnshaappuwv023:35001"
);
token
.
setVersion
(
"1.0"
+
".0.0"
);
token
.
setUser_name
(
inputLoginName
);
...
...
atms-api/src/main/resources/conf/conf.properties
View file @
6c72f69e
...
...
@@ -27,4 +27,6 @@ max_file_length=${max_file_length}
#Distributed ID Generate
distributed_id_datacenter
=
${distributed_id_datacenter}
distributed_id_machine
=
${distributed_id_machine}
\ No newline at end of file
distributed_id_machine
=
${distributed_id_machine}
api.url
=
${api.url}
\ No newline at end of file
atms-api/src/main/resources/conf/conf_profile_dev.properties
View file @
6c72f69e
...
...
@@ -27,4 +27,6 @@ max_file_length=104857600
#Distributed ID Generate
distributed_id_datacenter
=
1
distributed_id_machine
=
1
\ No newline at end of file
distributed_id_machine
=
1
api.url
=
http://localhost:8180
\ No newline at end of file
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