misofng-provider now uses 8080 by default, also reporting resource set to /v1/reports
This commit is contained in:
+1
-1
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
|
|||||||
public class InMemoryApplicationConfigurationService implements
|
public class InMemoryApplicationConfigurationService implements
|
||||||
ApplicationConfigurationService {
|
ApplicationConfigurationService {
|
||||||
|
|
||||||
private String oauthProviderUrl = "http://localhost:8085/mifosng-provider/";
|
private String oauthProviderUrl = "http://localhost:8080/mifosng-provider/";
|
||||||
private String requestTokenURL = "oauth/request_token";
|
private String requestTokenURL = "oauth/request_token";
|
||||||
private String userAuthorizationURL = "oauth/confirm_access";
|
private String userAuthorizationURL = "oauth/confirm_access";
|
||||||
private String accessTokenURL = "oauth/access_token";
|
private String accessTokenURL = "oauth/access_token";
|
||||||
|
|||||||
+1
-1
@@ -42,7 +42,7 @@ public class ReportingRestOperationsImpl implements ReportingRestOperations {
|
|||||||
public void hackToForceAuthentication() {
|
public void hackToForceAuthentication() {
|
||||||
try {
|
try {
|
||||||
URI restUri = URI
|
URI restUri = URI
|
||||||
.create(getBaseServerUrl().concat("api/v1/flexiblereporting/forceauth"));
|
.create(getBaseServerUrl().concat("api/v1/reports/forceauth"));
|
||||||
|
|
||||||
this.oauthRestServiceTemplate.exchange(restUri, HttpMethod.GET, emptyRequest(), null);
|
this.oauthRestServiceTemplate.exchange(restUri, HttpMethod.GET, emptyRequest(), null);
|
||||||
} catch (HttpStatusCodeException e) {
|
} catch (HttpStatusCodeException e) {
|
||||||
|
|||||||
+1
-2
@@ -91,8 +91,7 @@ function selectNewThousandsSep(selectedVal) {
|
|||||||
|
|
||||||
var reportingParams = {
|
var reportingParams = {
|
||||||
rptDB: "mifosngprovider",
|
rptDB: "mifosngprovider",
|
||||||
//old link RESTUrl: "${baseUrl}api/protected/reporting/flexireport",
|
RESTUrl: "${baseUrl}api/v1/reports",
|
||||||
RESTUrl: "${baseUrl}api/v1/flexiblereporting",
|
|
||||||
pentahoUrl: "${baseUrl}pentahoreport",
|
pentahoUrl: "${baseUrl}pentahoreport",
|
||||||
//old link exportUrl: "${rootContext}exportcsv",
|
//old link exportUrl: "${rootContext}exportcsv",
|
||||||
exportUrl: "${baseUrl}exportcsv",
|
exportUrl: "${baseUrl}exportcsv",
|
||||||
|
|||||||
+3
-3
@@ -37,12 +37,12 @@ import org.springframework.context.annotation.Scope;
|
|||||||
import org.springframework.security.access.AccessDeniedException;
|
import org.springframework.security.access.AccessDeniedException;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@Path("/v1/flexiblereporting")
|
@Path("/v1/reports")
|
||||||
@Component
|
@Component
|
||||||
@Scope("singleton")
|
@Scope("singleton")
|
||||||
public class FlexibleReportingApiResource {
|
public class ReportingApiResource {
|
||||||
|
|
||||||
private final static Logger logger = LoggerFactory.getLogger(FlexibleReportingApiResource.class);
|
private final static Logger logger = LoggerFactory.getLogger(ReportingApiResource.class);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ReadExtraDataAndReportingService ReadExtraDataAndReportingService;
|
private ReadExtraDataAndReportingService ReadExtraDataAndReportingService;
|
||||||
Reference in New Issue
Block a user