Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
portal-backend
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HBP Medical Informatics Platform
portal-backend
Commits
464ae0d7
Commit
464ae0d7
authored
5 years ago
by
JerryPan44
Browse files
Options
Downloads
Plain Diff
getting ready for merge with master
parents
1229570b
bb960cdb
No related branches found
No related tags found
1 merge request
!7
Features/keycloak integration
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.sh
+2
-1
2 additions, 1 deletion
build.sh
src/main/java/eu/hbp/mip/controllers/MiningApi.java
+3
-2
3 additions, 2 deletions
src/main/java/eu/hbp/mip/controllers/MiningApi.java
with
5 additions
and
3 deletions
build.sh
+
2
−
1
View file @
464ae0d7
...
...
@@ -34,8 +34,9 @@ docker build --build-arg BUILD_DATE=$(date -Iseconds) \
--build-arg
VCS_REF
=
$VCS_REF
\
--build-arg
VERSION
=
$VERSION
\
--tag
"
$IMAGE
:latest"
\
--tag
"
$IMAGE
:
$VERSION
"
\
--tag
"
jerrypan44/portal-backend:latest
"
\
.
docker push
"jerrypan44/portal-backend:latest"
BUGSNAG_KEY
=
""
eval
$(
grep
-e
"^
\\
s*BUGSNAG_KEY"
Dockerfile |
tr
'\\'
' '
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/eu/hbp/mip/controllers/MiningApi.java
+
3
−
2
View file @
464ae0d7
...
...
@@ -21,10 +21,11 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
eu.hbp.mip.utils.UserActionLogging
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.*
;
import
java.io.IOException
;
...
...
@@ -89,7 +90,7 @@ public class MiningApi {
@RequestBody
List
<
HashMap
<
String
,
String
>>
queryList
,
@ApiParam
(
value
=
"algorithmName"
,
required
=
true
)
@PathVariable
(
"algorithmName"
)
String
algorithmName
)
{
LOGGER
.
info
(
"Run algo"
);
UserActionLogging
.
LogAction
(
"Run algo"
,
""
);
String
query
=
gson
.
toJson
(
queryList
);
String
url
=
miningExaremeQueryUrl
+
"/"
+
algorithmName
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment