From ea421cc9723cbc21675b7a64fe879ef079b4ab43 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Sat, 2 Mar 2019 10:19:23 +0800
Subject: [PATCH] .

---
 pom.xml                                   |  2 +-
 src/com/lxyer/bbs/base/ArangoService.java | 20 ++++++++++----------
 src/com/lxyer/bbs/base/TaskQueue.java     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c72c07..c503e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
     <groupId>com.lxyer</groupId>
     <artifactId>redbbs</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
     <build>
+        <finalName>redbbs</finalName>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
diff --git a/src/com/lxyer/bbs/base/ArangoService.java b/src/com/lxyer/bbs/base/ArangoService.java
index 572ad66..0cf4d48 100644
--- a/src/com/lxyer/bbs/base/ArangoService.java
+++ b/src/com/lxyer/bbs/base/ArangoService.java
@@ -40,7 +40,7 @@ public class ArangoService extends BaseService {
 
     //Arango
     protected static ArangoDB arangoDb;
-    protected static ArangoDatabase dbDev;
+    protected static ArangoDatabase db;
     protected static ArangoCollection colVisLog;
 
     @Override
@@ -48,11 +48,11 @@ public class ArangoService extends BaseService {
         System.out.println("isDev :" + isDev);
 
         arangoDb = new ArangoDB.Builder().host(arangoHost, port).user(user).password(password).build();
-        dbDev = arangoDb.db(chDev.apply(database));
-        colVisLog = dbDev.collection(chDev.apply(VIS_LOG));
+        db = arangoDb.db(chDev.apply(database));
+        colVisLog = db.collection(chDev.apply(VIS_LOG));
 
-        if (!dbDev.exists()) {
-            dbDev.create();
+        if (!db.exists()) {
+            db.create();
         }
         if (!colVisLog.exists()) {
             colVisLog.create();
@@ -63,7 +63,7 @@ public class ArangoService extends BaseService {
     public List<Map> hi() {
         System.out.println("colVisLog :" + colVisLog.exists());
         String aql = String.format("for d in %s limit 10 return d", chDev.apply(VIS_LOG));
-        List<Map> visLogs = dbDev.query(aql, Map.class).asListRemaining();
+        List<Map> visLogs = db.query(aql, Map.class).asListRemaining();
         return visLogs;
     }
 
@@ -77,19 +77,19 @@ public class ArangoService extends BaseService {
     }
 
     public static long findInt(String aql) {
-        return dbDev.query(aql, long.class).first();
+        return db.query(aql, long.class).first();
     }
     public static long findInt(String aql, Map para) {
-        return dbDev.query(aql, long.class).first();
+        return db.query(aql, long.class).first();
     }
 
     public static <T> List<T> find(String aql, Class<T> clazz) {
-        return dbDev.query(aql, clazz).asListRemaining();
+        return db.query(aql, clazz).asListRemaining();
     }
 
     public static <T> List<T> find(String aql, Map para, Class<T> clazz) {
 
-        return dbDev.query(aql, para, clazz).asListRemaining();
+        return db.query(aql, para, clazz).asListRemaining();
     }
 
 }
diff --git a/src/com/lxyer/bbs/base/TaskQueue.java b/src/com/lxyer/bbs/base/TaskQueue.java
index 434e68b..a51ead1 100644
--- a/src/com/lxyer/bbs/base/TaskQueue.java
+++ b/src/com/lxyer/bbs/base/TaskQueue.java
@@ -105,7 +105,7 @@ public class TaskQueue<T extends Object> extends BaseService implements Runnable
             para.put("time", cal.getTimeInMillis());
             //查询一周某热帖记录
             List<Count> hotArticle = ArangoService.find(
-                    "for d in vis_log_dev\n" +
+                    "for d in " + (isDev ? "vis_log_dev" : "vis_log") + "\n" +
                             "    filter d.uri =~ '^/jie/detail/[0-9]+$' and d.userid != 100001 and d.time > @time\n" +
                             "    COLLECT uri=d.uri WITH COUNT INTO total\n" +
                             "    sort total desc\n" +