adjust ops flow & upgrade tower

ihaolin · Oct 10, 2016 · 54dd781 · 54dd781
1 parent b773d64
commit 54dd781
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@
 
 [English wiki](README_EN.md)。
 
+<a href="http://diablo.hao0.me" target="_blank">在线Demo</a>。
+
 ## 一些特性
 
 + **轻量级**: 没有复杂的技术和第三方依赖;
@@ -19,6 +21,7 @@
 
 + ...
 
+
 ## Quick start
 
 ### 安装

diff --git a/README_EN.md b/README_EN.md
@@ -5,6 +5,8 @@ A Lightweight Persistent Configuration Service
 
 [中文wiki](README.md).
 
+<a href="http://diablo.hao0.me" target="_blank">Online Demo</a>。
+
 ## Features
 
 + **Lightweight**: these aren't complex techs and third dependencies;

diff --git a/diablo-client-spring/pom.xml b/diablo-client-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>diablo</artifactId>
         <groupId>me.hao0</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>me.hao0</groupId>
             <artifactId>diablo-client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
 
         <dependency>

diff --git a/diablo-client/pom.xml b/diablo-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>diablo</artifactId>
         <groupId>me.hao0</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>me.hao0</groupId>
             <artifactId>diablo-common</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
 
         <!-- use slf4j-api for logging -->

diff --git a/diablo-client/src/main/java/me/hao0/diablo/client/DiabloAgent.java b/diablo-client/src/main/java/me/hao0/diablo/client/DiabloAgent.java
@@ -32,7 +32,7 @@ class DiabloAgent {
     /**
      * The client version
      */
-    private static final String CLIENT_VERSION = "1.0.0";
+    private static final String CLIENT_VERSION = "1.0.2";
 
     private AbstractDiabloClient client;
 

diff --git a/diablo-common/pom.xml b/diablo-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>diablo</artifactId>
         <groupId>me.hao0</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/diablo-server/pom.xml b/diablo-server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>diablo</artifactId>
         <groupId>me.hao0</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>me.hao0</groupId>
             <artifactId>diablo-common</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
 
         <dependency>

diff --git a/diablo-server/src/assembly/assemble.xml b/diablo-server/src/assembly/assemble.xml
@@ -4,7 +4,7 @@
     <id>${project.artifactId}-assembly-${project.version}</id>
 
     <!-- basedir -->
-    <baseDirectory>diablo</baseDirectory>
+    <baseDirectory>diablo-server-${project.version}</baseDirectory>
 
     <!-- don't need the file's base dirs -->
     <!--<includeBaseDirectory>false</includeBaseDirectory>-->

diff --git a/diablo-server/src/main/java/me/hao0/diablo/server/dao/mgr/AppManager.java b/diablo-server/src/main/java/me/hao0/diablo/server/dao/mgr/AppManager.java
@@ -28,6 +28,12 @@ public class AppManager {
      */
     public void delete(App app){
 
+        // delete the app index
+        appDao.unIndex(app);
+
+        // delete the app
+        appDao.delete(app.getId());
+
         // delete all configs of the app
         configManager.deleteByAppId(app.getId());
 
@@ -36,12 +42,6 @@ public void delete(App app){
 
         // unbind app's all config ids
         configDao.deleteBindOfApp(app.getId());
-
-        // delete the app index
-        appDao.unIndex(app);
-
-        // delete the app
-        appDao.delete(app.getId());
     }
 
     public void save(App app) {

diff --git a/diablo-server/src/main/java/me/hao0/diablo/server/dao/mgr/ConfigManager.java b/diablo-server/src/main/java/me/hao0/diablo/server/dao/mgr/ConfigManager.java
@@ -23,12 +23,12 @@ public class ConfigManager {
      */
     public void delete(Config config){
 
-        // delete the config index
-        configDao.unIndex(config);
-
         // unbind app's config id
         configDao.unBindApp(config);
 
+        // delete the config index
+        configDao.unIndex(config);
+
         // delete the config
         configDao.delete(config.getId());
     }

diff --git a/diablo-server/src/main/resources/public/app.css b/diablo-server/src/main/resources/public/app.css
diff --git a/diablo-server/src/main/resources/public/app.js b/diablo-server/src/main/resources/public/app.js
diff --git a/diablo-server/src/main/resources/public/common.js b/diablo-server/src/main/resources/public/common.js
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>me.hao0</groupId>
     <artifactId>diablo</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <modules>
         <module>diablo-common</module>
         <module>diablo-server</module>