\r\n
\r\n
\r\n");
$templateCache.put("plugins/developer/html/environments.html","\r\n
\r\n\r\n \r\n \r\n \r\n {{env.label}}\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n\r\n \r\n
\r\n\r\n\r\n \r\n
\r\n \r\n \r\n \r\n {{rc.$name}}\r\n : {{version}}\r\n \r\n \r\n \r\n {{rc.$name}}\r\n : {{version}}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {{rc.$podCounters.ready}}\r\n {{rc.$podCounters.valid}}\r\n {{rc.$podCounters.waiting}}\r\n {{rc.$podCounters.error}}\r\n \r\n \r\n
\r\n \r\n \r\n \r\n Build #{{rc.$buildId}}\r\n \r\n \r\n \r\n \r\n \r\n \r\n Commit {{rc.$gitCommit | limitTo:7}}\r\n \r\n \r\n \r\n Commit {{rc.$gitCommit | limitTo:7}}\r\n \r\n
\r\n \r\n\r\n \r\n \r\n\r\n \r\n\r\n
-
\r\n
\r\n\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n\r\n\r\n \r\n\r\n
\r\n");
-$templateCache.put("plugins/developer/html/fileMigrationTask.html","\r\n
\r\n\r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n Environments Overview
\r\n\r\n
\r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n No Environment Available
\r\nEnvironment is a logical place where deployments happen which maps to a kubernetes / openshift namespace. You will see environments here after you add a build.
\r\n New Build\r\n\r\n
\r\n \r\n
\r\n \r\n
\r\n\r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n Active Pipelines\r\n View All Pipelines >>\r\n
\r\n \r\n
\r\n \r\n
\r\n\r\n\r\n
\r\n \r\n
\r\n \r\n
\r\n Commits
\r\n View All Commits >>\r\n\r\n \r\n
\r\n \r\n
\r\n");
+$templateCache.put("plugins/developer/html/fileMigrationTask.html","\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n 当前没有可以查看的任务列表！
\r\n\r\n
\r\n
\r\n \r\n
\r\n");
$templateCache.put("plugins/developer/html/home.html","\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n 当前没有可以查看的任务列表！
\r\n\r\n \r\n
\r\n 0\" >\r\n
\r\n
\r\n \r\n
");
$templateCache.put("plugins/developer/html/jenkinsApproveModal.html","\r\n
\r\n Perspectives
\r\n\r\n\r\n Please choose the perspective you would like to use:\r\n
\r\n\r\n\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n Develop »\r\n \r\n
\r\n\r\n\r\n Work on projects and source code\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n Operate »\r\n \r\n
\r\n\r\n\r\n Manage and run Pods and Services\r\n
\r\n\r\n
\r\n{{operation}}?
\r\n\r\n Are you sure you wish to {{operation}}?\r\n
\r\n\r\n");
$templateCache.put("plugins/developer/html/jenkinsJob.html","\r\n \r\n \r\n \r\n \r\n\r\n\r\n
\r\n");
@@ -21461,10 +21509,6 @@ $templateCache.put("plugins/developer/html/projects.html","\r\n \r\n
\r\n\r\n \r\n \r\n
\r\n\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n There are no builds in this job.
\r\n\r\n
\r\n
\r\n \r\n
\r\n");
$templateCache.put("plugins/developer/html/workspace.html","\r\n \r\n
\r\n\r\n \r\n \r\n
\r\n\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n There are no tools currently available.
\r\n\r\n
\r\n \r\n
\r\n There are no tools currently available.
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n {{env.label}}\r\n
\r\n \r\n\r\n
\r\n");
$templateCache.put("plugins/developer/html/workspaces.html","\r\n \r\n
\r\n\r\n \r\n \r\n
\r\n\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n \r\n
\r\n");
-$templateCache.put("plugins/configs/html/configMenuItem.html","\r\n
\r\n \r\n
\r\n \r\n
\r\n - \r\n
- {{item.label}} \r\n
\r\n
\r\n 当前没有可以查看的数据.
\r\n\r\n
\r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n - \r\n
- 当前显示{{(model.paramOptions.currentPageNum-1)*20 + 1}}~{{(model.paramOptions.currentPageNum-1)*20 + model.data.length}}行，共{{model.paramOptions.totalSize}}行, \r\n \r\n
- 当前页码 \r\n
- \r\n \r\n \r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n
\r\n \r\n
\r\n \r\n- \r\n
- \r\n {{item.label}}\r\n \r\n
\r\n
\r\n");
-$templateCache.put("plugins/configs/html/kubeClusterSetting.html","\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n | 已启用 | \r\n已停止 | \r\n\r\n {{volume.name}}\r\n | \r\n\r\n 云路径：{{volume.path}}\r\n | \r\n\r\n 存储类型:\r\n 热区\r\n 冷区\r\n | \r\n\r\n 已用 {{volume.formatUsedSize}} / 共 {{volume.formatTotalSize}}\r\n | \r\n\r\n \r\n \r\n | \r\n
|---|---|---|---|---|---|---|
| \r\n \r\n \r\n | \r\n\r\n 服务器{{$index+1}}\r\n | \r\n\r\n {{row.ip}}\r\n | \r\n\r\n 存储路径:{{row.path}}\r\n | \r\n\r\n | \r\n\r\n |
\r\n
\r\n\r\n
\r\n \r\n 是否删除：{{showDeleteVolume.item.name}} 云盘?\r\n
\r\n\r\n
\r\n");
-$templateCache.put("plugins/configs/html/shareLayout.html","\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n 当前没有配置汇总库信息,请配置,否则汇总操作将不可用！
\r\n\r\n
\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n
\r\n 编辑汇总库连接信息:
\r\n添加汇总库信息:
\r\n\r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n");
$templateCache.put("plugins/kubernetes/html/appDeployedTemplate.html","\r\n {{row.entity.$creationDate ? (row.entity.$creationDate | relativeTime) : \'\'}}\r\n
\r\n");
$templateCache.put("plugins/kubernetes/html/appDetailTemplate.html","\r\n
\r\n");
$templateCache.put("plugins/kubernetes/html/appIconTemplate.html","\r\n
\r\n\r\n \r\n \r\n \r\n ![]()
\r\n \r\n \r\n \r\n \r\n {{view.appName}}\r\n \r\n \r\n
\r\n \r\n \r\n \r\n {{view.service.$host}}\r\n \r\n {{view.service.$host}}\r\n \r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n\r\n \r\n
\r\n \r\n deployed:\r\n {{view.createdDate | relativeTime}}\r\n
\r\n \r\n not deployed\r\n
\r\n \r\n
\r\n \r\n pod template:\r\n {{view.controllerId}} \r\n
\r\n \r\n no pod template\r\n
\r\n \r\n \r\n pods:\r\n \r\n {{view.podCount}}\r\n \r\n \r\n {{view.podCount}}\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n\r\n
\r\n \r\n \r\n
\r\n
\r\n | \r\n \r\n | \r\n\r\n \r\n \r\n \r\n | \r\n\r\n \r\n Pod {{pod.idAbbrev}}\r\n \r\n \r\n IP:\r\n {{pod.status.podIP}}\r\n \r\n | \r\n \r\n \r\n | \r\n
\r\n \r\n ![]()
\r\n \r\n \r\n \r\n {{row.entity.$info.name}}\r\n \r\n \r\n
\r\n");
diff --git a/plugins/configs/ts/ConfigsHelper.ts b/plugins/configs/ts/ConfigsHelper.ts
index 1b03fd3..3e1a38e 100644
--- a/plugins/configs/ts/ConfigsHelper.ts
+++ b/plugins/configs/ts/ConfigsHelper.ts
@@ -99,27 +99,47 @@ module Configs{
export function oracleInfoOperate($http, url:string, operate:string, resource, fn?: (data, status)=>void ){
if(resource === null)
- throw "不能操作空资源对象";
- var id = resource["id"] || resource["name"] || resource["_id"] || resource["_key"];
- var RESTfulUrl=url;
- if(id == "undefined"){
- RESTfulUrl = UrlHelpers.join(url, operate);
- }else{
- RESTfulUrl = UrlHelpers.join(url, id+"", operate);
- }
-
- $http({
- method: "POST",
- dataType: 'json',
- url: RESTfulUrl,
- data: JSON.stringify(resource),
- }).success((data,header,config,status) => {
- if(angular.isFunction(fn))
- fn(data, header);
- }).error((data,header,config,status) => {
- if(angular.isFunction(fn))
- fn(data, header);
- });
+ throw "不能操作空资源对象";
+ if(angular.isArray(resource)){
+ var ids = [];
+ angular.forEach(resource, (item) => {
+ var id = item["id"] || item["name"] || item["_id"] || item["_key"];
+ ids.push(id);
+ });
+ $http({
+ method: "POST",
+ dataType: 'json',
+ url: UrlHelpers.join(url, operate+"s"),
+ data: ids,
+ }).success((data,header,config,status) => {
+ if(angular.isFunction(fn))
+ fn(data, header);
+ }).error((data,header,config,status) => {
+ if(angular.isFunction(fn))
+ fn(data, header);
+ });
+ }else{
+ var id = resource["id"] || resource["name"] || resource["_id"] || resource["_key"];
+ var RESTfulUrl=url;
+ if(id == "undefined"){
+ RESTfulUrl = UrlHelpers.join(url, operate);
+ }else{
+ RESTfulUrl = UrlHelpers.join(url, id+"", operate);
+ }
+
+ $http({
+ method: "POST",
+ dataType: 'json',
+ url: RESTfulUrl,
+ data: JSON.stringify(resource),
+ }).success((data,header,config,status) => {
+ if(angular.isFunction(fn))
+ fn(data, header);
+ }).error((data,header,config,status) => {
+ if(angular.isFunction(fn))
+ fn(data, header);
+ });
+ }
}
export function createConfigHelperNavBar($scope, $location, $routeParams){
diff --git a/plugins/developer/html/fileMigrationTask.html b/plugins/developer/html/fileMigrationTask.html
index bc0f5e1..649024b 100644
--- a/plugins/developer/html/fileMigrationTask.html
+++ b/plugins/developer/html/fileMigrationTask.html
@@ -5,11 +5,19 @@
-
+
+
-
当前没有可以查看的任务列表！
+
diff --git a/plugins/developer/ts/dataManagerModel.ts b/plugins/developer/ts/dataManagerModel.ts
index d1493ea..e5767cf 100644
--- a/plugins/developer/ts/dataManagerModel.ts
+++ b/plugins/developer/ts/dataManagerModel.ts
@@ -235,7 +235,7 @@ module Developer{
//创建数据模型服务
_module.factory("DataModel", ['$rootScope', '$http', '$interval', '$location', '$resource', ($rootScope, $http, $interval, $location, $resource) => {
- var webSocket = new WebSocket('ws://192.168.0.101:9000/java/console/api/transferTask');
+
var $scope = new DataModelService();
$scope.startIntervalTask($interval, $http);
return $scope;
diff --git a/plugins/developer/ts/fileMigrationTask.ts b/plugins/developer/ts/fileMigrationTask.ts
index 8a500bf..93f430a 100644
--- a/plugins/developer/ts/fileMigrationTask.ts
+++ b/plugins/developer/ts/fileMigrationTask.ts
@@ -11,7 +11,7 @@ module Developer {
$scope.tableConfig = {
data: $scope.dataString,
- showSelectionCheckbox: false,
+ showSelectionCheckbox: $scope.typeFlag,
enableRowClickSelection: false,
multiSelect: true,
selectedItems: [],
@@ -51,7 +51,11 @@ module Developer {
displayName: '迁移状态',
cellTemplate: $templateCache.get("taskStatus.html")
},
-
+ {
+ field: "process",
+ displayName: '迁移进度',
+ cellTemplate: $templateCache.get("taskProcess.html")
+ },
{
field: "entity",
displayName: '操作',
@@ -66,34 +70,49 @@ module Developer {
});
});
+ $scope.deleteAll = (selected) => {
+ if (angular.isString(selected)) {
+ selected = [{
+ id: selected
+ }];
+ }
+ Configs.oracleInfoOperate($http, "/java/console/api/task/transfer", Configs.OperateType.DELETE, selected, (data, status) =>{
+ if(status === 200)
+ console.log("删除成功");
+ });
+ }
+
function init() {
- var path = $location.path().split("/");
- console.log(path[4]);
+ console.log(DataModel.doneTask);
+ var path = $location.path().split("/");
switch (path[4]) {
case "done":
- if($scope.model.doneTask.length > 0)
+ if(DataModel.doneTask.length > 0)
$scope.flag = true;
else
$scope.flag = false;
$scope.dataString = 'model.doneTask';
+ $scope.typeFlag = true
$scope.template = "taskRecordEdit.html";
break;
case "running":
- if($scope.model.runningTask.length > 0)
+ if(DataModel.runningTask.length > 0)
$scope.flag = true;
else
$scope.flag = false;
$scope.dataString = 'model.runningTask';
+ $scope.typeFlag = false
$scope.template = "taskEdit.html";
break;
default:
- if($scope.model.doneTask.length > 0)
+ if(DataModel.doneTask.length > 0)
$scope.flag = true;
else
$scope.flag = false;
$scope.dataString = 'model.doneTask';
+ $scope.typeFlag = false
$scope.template = "taskRecordEdit.html";
break;
}
diff --git a/plugins/developer/ts/workspaces.ts b/plugins/developer/ts/workspaces.ts
index 943845c..20b3be7 100644
--- a/plugins/developer/ts/workspaces.ts
+++ b/plugins/developer/ts/workspaces.ts
@@ -255,7 +255,7 @@ module Developer {
页面跳转
*/
$timeout(() =>{
- $location.path("/workspaces/Overview/task");
+ $location.path("/workspaces/Overview/task/running");
},250);
migrationClick.close();
},
diff --git a/plugins/kubernetes/ts/utilHelpers.ts b/plugins/kubernetes/ts/utilHelpers.ts
index a476ac3..3dd556e 100644
--- a/plugins/kubernetes/ts/utilHelpers.ts
+++ b/plugins/kubernetes/ts/utilHelpers.ts
@@ -125,9 +125,13 @@ module Kubernetes {
{
"containerPort": 1521,
"hostPort": Obj.port || ramdomPort()
- }],
+ }],
+ "resources": {
+ "cpu": "100m",
+ "memory": "3Gi"
+ },
"volumeMounts" : this.createVolumeMounts()
- });
+ });
return containers
}
+
+
+