推送服务完善

admin

2021-06-16 4403f34670d2aef9da4abd1dd8e9363d3b7b2b27

推送服务完善

 facade-goldcorn/pom.xml

@@ -18,7 +18,7 @@
        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <version>0.0.1</version>
            <scope>compile</scope>
        </dependency>

@@ -51,7 +51,7 @@
                    <dependency>
                        <groupId>com.ks</groupId>
                        <artifactId>lib-common</artifactId>
                        <version>0.0.1-SNAPSHOT</version>
                        <version>0.0.1</version>
                        <scope>compile</scope>
                    </dependency>
                </dependencies>

 facade-push/pom.xml

@@ -18,7 +18,7 @@
        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <version>0.0.1</version>
            <scope>compile</scope>
        </dependency>

@@ -51,7 +51,7 @@
                    <dependency>
                        <groupId>com.ks</groupId>
                        <artifactId>lib-common</artifactId>
                        <version>0.0.1-SNAPSHOT</version>
                        <version>0.0.1</version>
                        <scope>compile</scope>
                    </dependency>
                </dependencies>

 lib-common/libs/utils-0.0.2.jar

Binary files differ

 lib-common/pom.xml

@@ -9,17 +9,14 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>

    <version>0.0.1</version>
    <artifactId>lib-common</artifactId>
    <dependencies>
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
            <systemPath>${basedir}/libs/utils-0.0.2.jar</systemPath>
            <scope>system</scope>
            <version>0.0.4</version>
        </dependency>

    </dependencies>

    <build>

 lib-common/src/main/java/com/ks/lib/common/util/RedisUtil.java

@@ -411,7 +411,7 @@
     */
    public boolean sSet(String key, Object... values) {
        try {
            return redisTemplate.opsForSet().add(key, values);
            return redisTemplate.opsForSet().add(key, values) != null;
        } catch (Exception e) {
            e.printStackTrace();
            return false;
@@ -428,10 +428,11 @@
     */
    public boolean sSetAndTime(String key, long time, Object... values) {
        try {
          boolean count = redisTemplate.opsForSet().add(key, values);
            if (time > 0)
            long count = redisTemplate.opsForSet().add(key, values);
            if (time > 0) {
                expire(key, time);
            return count;
            }
            return count > 0;
        } catch (Exception e) {
            e.printStackTrace();
            return false;
@@ -463,7 +464,7 @@

    public boolean setRemove(String key, Object... values) {
        try {
          return redisTemplate.opsForSet().remove(key, values);
            return redisTemplate.opsForSet().remove(key, values) > 0;
        } catch (Exception e) {
            e.printStackTrace();
            return false;

 pom.xml

@@ -45,6 +45,15 @@
        <mongo.driver.version>3.12.0</mongo.driver.version>
    </properties>

    <repositories>
        <repository>
            <id>nexus</id>
            <name>nexus</name>
            <url>http://193.112.35.168:8889/nexus/content/groups/public/</url>
        </repository>
    </repositories>


    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>

 service-goldcorn/pom.xml

@@ -155,8 +155,8 @@
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
            <scope>compile</scope>
            <version>0.0.4</version>
            <!--<scope>compile</scope>-->
        </dependency>



 service-goldcorn/src/main/resources/application-pro.yml

@@ -77,7 +77,7 @@
    name: goldcorn-service
  registry:
    protocol: zookeeper
    address: zookeeper://172.16.16.29:2181 # 134.175.68.214   134.175.68.214:2181
    address: zookeeper://172.16.16.46:2181 # 134.175.68.214   134.175.68.214:2181
    client: curator
  protocol:
    name: dubbo

 service-push/pom.xml

@@ -154,7 +154,7 @@
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
            <version>0.0.4</version>
            <scope>compile</scope>
        </dependency>


 service-push/src/main/java/com/ks/push/dao/BPushDeviceTokenDao.java

@@ -10,6 +10,7 @@
import org.springframework.stereotype.Repository;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

@@ -124,7 +125,9 @@
        Query query = getQuery(daoQuery);
        query.skip(start);
        query.limit(count);
        query.with(new Sort(new Sort.Order(Sort.Direction.ASC, "updateTime")));
        List<Sort.Order> orderList = new ArrayList<>();
        orderList.add(new Sort.Order(Sort.Direction.ASC, "updateTime"));
        query.with(Sort.by(orderList));
        return findList(query);
    }

@@ -145,6 +148,5 @@
        public Date maxUpdateTime;
        public Date minCreateTime;
        public Date maxCreateTime;

    }
}