Merge pull request #66 from lepdou/v2

portal can load data

apollo-core/src/main/java/com/ctrip/apollo/core/dto/ItemDTO.java

 package com.ctrip.apollo.core.dto;
 
+import java.util.Date;
+
 public class ItemDTO {
 
   private long id;
@@ -12,6 +14,10 @@ public class ItemDTO {
 
   private String comment;
 
+  private String dataChangeLastModifiedBy;
+
+  private Date dataChangeLastModifiedTime;
+
   public ItemDTO() {
 
   }
@@ -60,4 +66,20 @@ public class ItemDTO {
   public void setValue(String value) {
     this.value = value;
   }
+
+  public String getDataChangeLastModifiedBy() {
+    return dataChangeLastModifiedBy;
+  }
+
+  public void setDataChangeLastModifiedBy(String dataChangeLastModifiedBy) {
+    this.dataChangeLastModifiedBy = dataChangeLastModifiedBy;
+  }
+
+  public Date getDataChangeLastModifiedTime() {
+    return dataChangeLastModifiedTime;
+  }
+
+  public void setDataChangeLastModifiedTime(Date dataChangeLastModifiedTime) {
+    this.dataChangeLastModifiedTime = dataChangeLastModifiedTime;
+  }
 }

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/ConfigService.java

@@ -97,12 +97,12 @@ public class ConfigService {
     NamespaceVO.ItemVO itemVO = new NamespaceVO.ItemVO();
     itemVO.setItem(itemDTO);
     String key = itemDTO.getKey();
-    String value = itemDTO.getValue();
+    String newValue = itemDTO.getValue();
     String oldValue = releaseItems.get(key);
-    if (value.equals(oldValue)) {
+    if (oldValue == null || !newValue.equals(oldValue)) {
       itemVO.setModified(true);
-      itemVO.setOldValue(oldValue);
-      itemVO.setNewValue(value);
+      itemVO.setOldValue(oldValue == null ? "" : oldValue);
+      itemVO.setNewValue(newValue);
     }
     return itemVO;
   }

apollo-portal/src/main/resources/static/scripts/app.js

@@ -3,7 +3,7 @@ var appService = angular.module('app.service', ['ngResource']);
 
 /** page module 定义*/
 //项目主页
-var application_module = angular.module('application', ['ngResource','ui.router', 'app.service', 'toastr', 'angular-loading-bar', 'ngTable']);
+var application_module = angular.module('application', ['ngResource','ui.router', 'app.service', 'toastr', 'angular-loading-bar']);
 //创建项目页面
 var create_app_module = angular.module('create_app', ['ngResource', 'toastr', 'app.service', 'angular-loading-bar']);
 

apollo-portal/src/main/resources/static/styles/common-style.css

@@ -19,6 +19,9 @@ a{
 }
 
 /*panel*/
+.panel{
+    border: 1px solid #ddd;
+}
 .panel-heading {
     height: 45px;
     font-size: 14px;