Skip to content
Snippets Groups Projects
Commit 464ae0d7 authored by JerryPan44's avatar JerryPan44
Browse files

getting ready for merge with master

parents 1229570b bb960cdb
No related branches found
No related tags found
1 merge request!7Features/keycloak integration
......@@ -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 '\\' ' ')
......
......@@ -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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment