JAV-438 fix docker config

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>
apache · Nov 6, 2017 · 429b45b · 429b45b
1 parent 4537ef7
commit 429b45b
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 111 deletions.
diff --git a/saga-demo/dependency-free-transaction-demo/docker-compose.yaml b/saga-demo/dependency-free-transaction-demo/docker-compose.yaml
@@ -74,12 +74,12 @@ services:
         condition: service_healthy
 
   web:
-      image: "saga-web:0.0.3-SNAPSHOT"
-      hostname: web
-      links:
-        - "service-center:sc.servicecomb.io"
-        - "saga:saga.servicecomb.io"
-      environment:
-        - JAVA_OPTS=-Dspring.profiles.active=prd,servicecomb -Dcse.service.registry.address=http://sc.servicecomb.io:30100
-      ports:
-        - "8888:8888"
+    image: "saga-web:0.0.3-SNAPSHOT"
+    hostname: web
+    links:
+      - "service-center:sc.servicecomb.io"
+      - "saga:saga.servicecomb.io"
+    environment:
+      - JAVA_OPTS=-Dspring.profiles.active=prd,servicecomb -Dcse.service.registry.address=http://sc.servicecomb.io:30100
+    ports:
+      - "8888:8888"
diff --git a/saga-spring/src/main/java/io/servicecomb/saga/spring/SagaController.java b/saga-spring/src/main/java/io/servicecomb/saga/spring/SagaController.java
@@ -27,6 +27,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -133,7 +134,8 @@ private boolean isRequestParamValid(String pageIndex, String pageSize, String st
     try {
       if (Integer.parseInt(pageIndex) >= 0 && Integer.parseInt(pageSize) > 0) {
         Date start = "NaN-NaN-NaN NaN:NaN:NaN".equals(startTime) ? new Date(0) : this.dateFormat.parse(startTime);
-        Date end = "NaN-NaN-NaN NaN:NaN:NaN".equals(endTime) ? new Date(Long.MAX_VALUE) : this.dateFormat.parse(endTime);
+        Date end =
+            "NaN-NaN-NaN NaN:NaN:NaN".equals(endTime) ? new Date(Long.MAX_VALUE) : this.dateFormat.parse(endTime);
         return start.getTime() <= end.getTime();
       }
     } catch (NumberFormatException | ParseException ignored) {
@@ -201,14 +203,14 @@ public SagaExecution(long id, String sagaId, long startTime, long completedTime,
 
   @JsonAutoDetect(fieldVisibility = ANY, getterVisibility = NONE, setterVisibility = NONE)
   static class SagaExecutionDetail {
-    public Map<String, List<String>> router;
+    public Map<String, HashSet<String>> router;
     public Map<String, String> status;
     public Map<String, String> error;
 
     public SagaExecutionDetail() {
     }
 
-    public SagaExecutionDetail(Map<String, List<String>> router, Map<String, String> status,
+    public SagaExecutionDetail(Map<String, HashSet<String>> router, Map<String, String> status,
         Map<String, String> error) {
       this();
       this.router = router;

diff --git a/saga-spring/src/main/java/io/servicecomb/saga/spring/SagaExecutionQueryService.java b/saga-spring/src/main/java/io/servicecomb/saga/spring/SagaExecutionQueryService.java
@@ -26,6 +26,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -45,8 +46,8 @@
 import io.servicecomb.saga.core.SagaStartedEvent;
 import io.servicecomb.saga.core.TransactionAbortedEvent;
 import io.servicecomb.saga.core.TransactionEndedEvent;
-import io.servicecomb.saga.core.dag.GraphBuilder;
 import io.servicecomb.saga.core.application.interpreter.FromJsonFormat;
+import io.servicecomb.saga.core.dag.GraphBuilder;
 import io.servicecomb.saga.core.dag.GraphCycleDetectorImpl;
 import io.servicecomb.saga.core.dag.Node;
 import io.servicecomb.saga.core.dag.SingleLeafDirectedAcyclicGraph;
@@ -75,7 +76,7 @@ public SagaExecutionQueryResult querySagaExecution(String pageIndex, String page
       String startTime, String endTime) throws ParseException {
 
     Date start = "NaN-NaN-NaN NaN:NaN:NaN".equals(startTime) ? new Date(0) : this.dateFormat.parse(startTime);
-    Date end = "NaN-NaN-NaN NaN:NaN:NaN".equals(endTime) ? new Date(Long.MAX_VALUE) : this.dateFormat.parse(endTime);
+    Date end = "NaN-NaN-NaN NaN:NaN:NaN".equals(endTime) ? new Date() : this.dateFormat.parse(endTime);
 
     List<SagaExecution> requests = new ArrayList<>();
     Page<SagaEventEntity> startEvents = repo.findByTypeAndCreationTimeBetweenOrderByIdDesc(
@@ -103,7 +104,7 @@ public SagaExecutionDetail querySagaExecutionDetail(String sagaId) {
     SagaEventEntity[] entities = repo.findBySagaId(sagaId).toArray(new SagaEventEntity[0]);
     Optional<SagaEventEntity> sagaStartEvent = Arrays.stream(entities)
         .filter(entity -> SagaStartedEvent.class.getSimpleName().equals(entity.type())).findFirst();
-    Map<String, List<String>> router = new HashMap<>();
+    Map<String, HashSet<String>> router = new HashMap<>();
     Map<String, String> status = new HashMap<>();
     Map<String, String> error = new HashMap<>();
     if (sagaStartEvent.isPresent()) {
@@ -141,9 +142,9 @@ public SagaExecutionDetail querySagaExecutionDetail(String sagaId) {
     return new SagaExecutionDetail(router, status, error);
   }
 
-  private void loopLoadGraphNodes(Map<String, List<String>> router, Node<SagaRequest> node) {
+  private void loopLoadGraphNodes(Map<String, HashSet<String>> router, Node<SagaRequest> node) {
     if (isNodeValid(node)) {
-      List<String> point = router.computeIfAbsent(node.value().id(), key -> new ArrayList<>());
+      HashSet<String> point = router.computeIfAbsent(node.value().id(), key -> new HashSet<>());
       for (Node<SagaRequest> child : node.children()) {
         point.add(child.value().id());
         loopLoadGraphNodes(router, child);

diff --git a/saga-web/src/main/resources/application.yaml b/saga-web/src/main/resources/application.yaml
@@ -16,7 +16,7 @@
 
 zuul:
   routes:
-    calculator:
+    saga-service:
       serviceId: saga-service
 
 # disable netflix eurkea since it's not used for service discovery

diff --git a/saga-web/src/main/resources/static/js/table.js b/saga-web/src/main/resources/static/js/table.js
@@ -15,114 +15,113 @@
  */
 
 $("#content").bootstrapTable({
-    method: 'get',
-    dataType: 'json',
-    url: '/saga-service/requests/',
-    queryParams: function queryParams(params) {
-        var start = document.getElementById("startTime").value;
-        var end = document.getElementById("endTime").value;
-        return {
-            startTime: changeDateFormat(start),
-            endTime: changeDateFormat(end),
-            pageIndex: params.pageNumber,
-            pageSize: params.limit
-        };
+  method: 'get',
+  dataType: 'json',
+  url: '/saga-service/requests/',
+  queryParams: function queryParams(params) {
+    var start = document.getElementById("startTime").value;
+    var end = document.getElementById("endTime").value;
+    return {
+      startTime: changeDateFormat(start),
+      endTime: changeDateFormat(end),
+      pageIndex: params.pageNumber,
+      pageSize: params.limit
+    };
 
+  }
+  ,
+  cache: false,
+  totalField: 'totalCount',
+  dataField: 'requests',
+  striped: true,
+  pageNumber: 0,
+  pageSize: 50,
+  pagination: true,
+  sidePagination: "server",
+  queryParamsType: 'limit',
+  columns: [
+    {checkbox: true},
+    {
+      field: 'id',
+      title: 'Id',
+      align: 'center',
+      width: '10%'
+    },
+    {
+      field: 'sagaId',
+      title: 'SagaId',
+      align: 'center',
+      width: '35%'
+    },
+    {
+      field: 'startTime',
+      title: 'StartTime',
+      align: 'center',
+      width: '20%',
+      //——修改——获取日期列的值进行转换
+      formatter: function (value, row, index) {
+        return changeDateFormat(value);
+      }
+    },
+    {
+      field: 'completedTime',
+      title: 'CompletedTime',
+      align: 'center',
+      width: '20%',
+      //——修改——获取日期列的值进行转换
+      formatter: function (value, row, index) {
+        return changeDateFormat(value);
+      }
+    },
+    {
+      field: 'status',
+      title: 'Status',
+      align: 'center',
+      width: '15%',
+      //查看状态详情
+      formatter: function (value, row, index) {
+        return statusDetails(value, row);
+      }
     }
-    ,
-    cache: false,
-    totalField: 'totalCount',
-    dataField: 'requests',
-    striped: true,
-    pageNumber: 1,
-    pageSize: 2,
-    pagination: true,
-    sidePagination: "server",
-    queryParamsType: 'limit',
-    columns: [
-        {checkbox: true},
-        {
-            field: 'id',
-            title: 'Id',
-            align: 'center',
-            width: '10%'
-        },
-        {
-            field: 'sagaId',
-            title: 'SagaId',
-            align: 'center',
-            width: '35%'
-        },
-        {
-            field: 'startTime',
-            title: 'StartTime',
-            align: 'center',
-            width: '20%',
-            //——修改——获取日期列的值进行转换
-            formatter: function (value, row, index) {
-                return changeDateFormat(value);
-            }
-        },
-        {
-            field: 'completedTime',
-            title: 'CompletedTime',
-            align: 'center',
-            width: '20%',
-            //——修改——获取日期列的值进行转换
-            formatter: function (value, row, index) {
-                return changeDateFormat(value);
-            }
-        },
-        {
-            field: 'status',
-            title: 'Status',
-            align: 'center',
-            width: '15%',
-            //查看状态详情
-            formatter: function (value, row, index) {
-                return statusDetails(value,row);
-            }
-        }
 
-    ]
+  ]
 
 });
 
-
 function refresh(params) {
 
-    var start = document.getElementById("startTime").value;
-    var end = document.getElementById("endTime").value;
+  var start = document.getElementById("startTime").value;
+  var end = document.getElementById("endTime").value;
 
-    var params = {
-        startTime: changeDateFormat(start),
-        endTime: changeDateFormat(end),
-        pageIndex: 0,
-        pageSize: params.limit
-    }
-    $('#content').bootstrapTable('refresh', params);
+  var params = {
+    startTime: changeDateFormat(start),
+    endTime: changeDateFormat(end),
+    pageIndex: 0,
+    pageSize: 50
+  }
+  $('#content').bootstrapTable('refresh', params);
 }
 
 //时间转换
 function changeDateFormat(value) {
-    var date = new Date(value);
-    var y = date.getFullYear();
-    var m = date.getMonth() + 1;
-    m = m < 10 ? ('0' + m) : m;
-    var d = date.getDate();
-    d = d < 10 ? ('0' + d) : d;
-    var h = date.getHours();
-    var minute = date.getMinutes();
-    minute = minute < 10 ? ('0' + minute) : minute;
-    var second = date.getSeconds();
-    second = second < 10 ? ('0' + second) : second;
-    return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+  var date = new Date(value);
+  var y = date.getFullYear();
+  var m = date.getMonth() + 1;
+  m = m < 10 ? ('0' + m) : m;
+  var d = date.getDate();
+  d = d < 10 ? ('0' + d) : d;
+  var h = date.getHours();
+  var minute = date.getMinutes();
+  minute = minute < 10 ? ('0' + minute) : minute;
+  var second = date.getSeconds();
+  second = second < 10 ? ('0' + second) : second;
+  return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
 }
 
 //查看状态详情
-function statusDetails(value,row) {
-    var sagaId = row.sagaId;
-    var url = "<a href='detail.html?sagaId="+sagaId+"'>"+value+"</a>";
-    return url;
+function statusDetails(value, row) {
+  var sagaId = row.sagaId;
+  var url = "<a href='detail.html?sagaId=" + sagaId + "'>" + value + "</a>";
+  return url;
 }