Commit ea51d68e authored by liugaoling's avatar liugaoling

workspace use url

parent d5ebc1a0
......@@ -25,7 +25,7 @@ public class CloudamClient {
public CloudamClient(String env, String accessToken) {
this.workSpace = env;
this.accessToken = accessToken;
auth();
// auth();
}
private void auth() {
......@@ -42,12 +42,11 @@ public class CloudamClient {
}
public <T extends CloudamResponse> T doAction(CloudamRequest<T> cloudamRequest) {
String baseUrl = WorkSpaceFactory.getBaseUrl(this.workSpace);
CloudamResponse cloudamResponse = null;
Response response = null;
try {
Request.Builder request = cloudamRequest.getBuilder(HttpUtil.getBuilder(this.accessToken), baseUrl, cloudamRequest);
Request.Builder request = cloudamRequest.getBuilder(HttpUtil.getBuilder(this.accessToken), this.workSpace, cloudamRequest);
response = HttpUtil.execNormalHttpRequest(request, 3);
if (response != null && response.code() == 200 && response.body() != null) {
Job job = JSON.parseObject(response.body().bytes(), Job.class);
......
......@@ -76,6 +76,7 @@ public class CreateJobRequest extends CloudamRequest<CreateJobResponse> {
};
stringValidAppend.accept(jobDescription.getName(), "-J");
stringValidAppend.accept(jobDescription.getAutoCluster().getPartition(), "-p");
stringValidAppend.accept("workflowJobId=" + jobDescription.getWorkflowJobId(), "--export");
intValidAppend.accept(jobDescription.getCpus(), "-c");
intValidAppend.accept(jobDescription.getGpus(), "-g");
......
......@@ -17,8 +17,8 @@ public class HttpUtil {
public static Request.Builder getBuilder(String accessToken) {
return new Request.Builder()
.addHeader("Content-Type", "application/json")
.addHeader("authorization", "Bearer " + accessToken);
.addHeader("Content-Type", "application/json");
// .addHeader("authorization", "Bearer " + accessToken);
}
public static Response execNormalHttpRequest(Request.Builder builder, int MAX_RETRIES) {
......
Markdown is supported
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