Merge remote-tracking branch 'origin/dev' into dev

guodalin8 · Mar 8, 2017 · 7e9eb4b · 7e9eb4b
2 parents 2b6deab + 86aaa3b
commit 7e9eb4b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/com/tale/controller/InstallController.java b/src/main/java/com/tale/controller/InstallController.java
@@ -56,7 +56,10 @@ public String index(Request request) {
     public RestResponse doInstall(@QueryParam String site_title, @QueryParam String site_url,
                                   @QueryParam String admin_user, @QueryParam String admin_email,
                                   @QueryParam String admin_pwd) {
-
+        if(FileKit.exist(AttachController.CLASSPATH + "install.lock")
+                && TaleConst.OPTIONS.getInt("allow_install", 0)!=1){
+            return RestResponse.fail("请勿重复安装");
+        }
         try {
             if (StringKit.isBlank(site_title) ||
                     StringKit.isBlank(site_url) ||