Merge branch 'feature' into 'dev'

Feature

See merge request !50

src/main/java/com/zhiwei/brandkbs2/pojo/vo/BehaviorVO.java

@@ -5,8 +5,6 @@ import com.zhiwei.brandkbs2.util.Tools;
 import lombok.Data;
 import lombok.ToString;
 
-import java.util.Date;
-
 /**
  * @author sjj
  * @version 1.0
@@ -23,7 +21,7 @@ public class BehaviorVO {
     /**
      * 用户ID
      */
-    private String nickName;
+    private String nickname;
     /**
      * IP地址
      */
@@ -31,7 +29,7 @@ public class BehaviorVO {
     /**
      * 创建时间
      */
-    private Date cTime;
+    private long cTime;
     /**
      * 访问页面
      */

src/main/java/com/zhiwei/brandkbs2/service/impl/BehaviorServiceImpl.java

@@ -75,8 +75,9 @@ public class BehaviorServiceImpl implements BehaviorService {
         String[] collectionNames = behaviorDao.generateCollectionNames(start, end);
         Query query = new Query();
         query.addCriteria(Criteria.where("cTime").gte(startTime).lt(endTime).and("backstage").is(backstage));
+        behaviorDao.addSort(query, "{\"cTime\":\"ascend\"}");
         if (StringUtils.isNotEmpty(nickname)) {
-            userDao.addKeywordFuzz(query,nickname,"nickname");
+            userDao.addKeywordFuzz(query, nickname, "nickname");
             List<User> userList = userDao.findList(query);
             // 根据nickname未查询
             if (CollectionUtils.isEmpty(userList)) {

src/main/resources/pushlog.properties

-local.robot.push.address=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=e2218c6e-af6a-4296-9d75-7178b941a3b5
+local.robot.push.address=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=759b600c-d47a-4c6b-9a9b-90b6c80d343c
 local.robot.push.enable=false
 local.robot.push.filterclass=org.apache.dubbo.common.Version,com.alibaba.dubbo.common.Version,org.apache.dubbo.monitor.dubbo.DubboMonitor,com.alibaba.dubbo.monitor.dubbo.DubboMonitor
 local.robot.push.level=error
-local.robot.push.app.name=brandkbs2
+local.robot.push.app.name=brandkbs2-local
 
-dev.robot.push.address=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=e2218c6e-af6a-4296-9d75-7178b941a3b5
-dev.robot.push.enable=false
+dev.robot.push.address=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=759b600c-d47a-4c6b-9a9b-90b6c80d343c
+dev.robot.push.enable=true
 dev.robot.push.filterclass=org.apache.dubbo.common.Version,com.alibaba.dubbo.common.Version,org.apache.dubbo.monitor.dubbo.DubboMonitor,com.alibaba.dubbo.monitor.dubbo.DubboMonitor
 dev.robot.push.level=error
-dev.robot.push.app.name=brandkbs2
+dev.robot.push.app.name=brandkbs2-dev
 
-prod.robot.push.address=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=e2218c6e-af6a-4296-9d75-7178b941a3b5
-prod.robot.push.enable=false
+prod.robot.push.address=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=759b600c-d47a-4c6b-9a9b-90b6c80d343c
+prod.robot.push.enable=true
 prod.robot.push.filterclass=org.apache.dubbo.common.Version,com.alibaba.dubbo.common.Version,org.apache.dubbo.monitor.dubbo.DubboMonitor,com.alibaba.dubbo\.monitor.dubbo.DubboMonitor
 prod.robot.push.level=error
-prod.robot.push.app.name=brandkbs2
\ No newline at end of file
+prod.robot.push.app.name=brandkbs2-prod
\ No newline at end of file