Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
ipgallery
/
location-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Registry
Issues
0
Merge Requests
0
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f1c04ef3
authored
Apr 20, 2016
by
amir
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix no redis connection and complete docker test
parent
4df8d985
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
7 deletions
Dockerfile
build.gradle
cfg/config.properties
run-docker.sh
src/main/java/handlers/LocationServiceHandler.java
Dockerfile
View file @
f1c04ef3
FROM
172.16.1.132:5000/ipgallery/base-microservice-java
FROM
172.16.1.132:5000/ipgallery/base-microservice-java
RUN
mkdir
-p
/opt/mcx/config/LocationService
#RUN mkdir -p /opt/mcx/config
#RUN mkdir -p /logs/conf
#RUN mkdir -p /logs/conf
COPY
build/libs/LocationService-*.jar /usr/
COPY
build/libs/LocationService-*.jar /usr/
...
...
build.gradle
View file @
f1c04ef3
...
@@ -11,15 +11,12 @@ repositories {
...
@@ -11,15 +11,12 @@ repositories {
maven
{
url
"http://mandubian-mvn.googlecode.com/svn/trunk/mandubian-mvn/repository"
}
maven
{
url
"http://mandubian-mvn.googlecode.com/svn/trunk/mandubian-mvn/repository"
}
maven
{
url
"http://172.16.1.132:8081/repository/internal"
}
maven
{
url
"http://172.16.1.132:8081/repository/internal"
}
}
}
configurations
.
all
{
// Check for updates every build
resolutionStrategy
.
cacheChangingModulesFor
0
,
'seconds'
}
dependencies
{
dependencies
{
// compile 'com.ipgallery:jinfra-utils:1.1.1'
// compile 'com.ipgallery:jinfra-utils:1.1.1'
// compile 'com.ipgallery:jinfra-rabbitmq:1.0.0'
// compile 'com.ipgallery:jinfra-rabbitmq:1.0.0'
// compile 'com.ipgallery:jinfra-grs:1.0.0'
// compile 'com.ipgallery:jinfra-grs:1.0.0'
compile
group:
'com.ipgallery'
,
name:
'jinfra-microservice'
,
version:
'1.3.
0'
,
changing:
true
compile
group:
'com.ipgallery'
,
name:
'jinfra-microservice'
,
version:
'1.3.
1'
compile
'com.ipgallery:jinfra-itc:1.0.0'
compile
'com.ipgallery:jinfra-itc:1.0.0'
compile
'io.swagger:swagger-annotations:1.5.7'
compile
'io.swagger:swagger-annotations:1.5.7'
...
...
cfg/config.properties
View file @
f1c04ef3
#ds.IpAddress=172.16.1.97:8080
#ds.IpAddress=172.16.1.97:8080
log4j.prop.file.path
=
/logs/conf/log4j.xml
log4j.prop.file.path
=
/logs/conf/log4j.xml
#mcz.files.location=/opt/mcx/config
#mcz.files.location=/opt/mcx/config
...
...
run-docker.sh
0 → 100755
View file @
f1c04ef3
#!/bin/sh
docker run
-e
IPG_ENV_PARAMS
=
-Dds
.IpAddress
=
172.16.1.97:8080#-Dredis.host
=
172.16.1.244
-e
USE_DEBUG
=
yes
-p
8000:8000
-p
32015:32015 172.16.1.132:5000/ipgallery/location-service
src/main/java/handlers/LocationServiceHandler.java
View file @
f1c04ef3
...
@@ -31,13 +31,14 @@ public class LocationServiceHandler extends BaseHandler {
...
@@ -31,13 +31,14 @@ public class LocationServiceHandler extends BaseHandler {
// public static final Pattern regExCsvParamSeperatorPattern = Pattern.compile(",");
// public static final Pattern regExCsvParamSeperatorPattern = Pattern.compile(",");
public
LocationServiceHandler
(
ILogger
logger
)
{
public
LocationServiceHandler
(
ILogger
logger
)
{
this
.
rcc
=
new
RedisCacheClient
();
}
}
@Override
@Override
public
void
init
()
{
public
void
init
()
{
this
.
locationServiceManager
=
new
LocationServiceManager
(
logger
);
this
.
locationServiceManager
=
new
LocationServiceManager
(
logger
);
this
.
rcc
=
new
RedisCacheClient
(
this
.
getConfigValueAsString
(
"redis.host"
,
"localhost"
));
}
}
@Override
@Override
...
...
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