Browse Source

1. 升级底层

liukx 4 years ago
parent
commit
89ca96af7e

+ 1 - 1
elab-annotation/pom.xml

@@ -31,7 +31,7 @@
         <snapshotRepository>
             <id>snapshots</id>
             <name>User Project SNAPSHOTS</name>
-            <url>http://192.168.0.11:8081/nexus/content/repositories/snapshots/</url>
+            <url>http://192.168.0.11:8081/repository/maven-snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 

+ 1 - 1
elab-cache/pom.xml

@@ -203,7 +203,7 @@
         <repository>
             <id>releases</id>
             <name>Nexus Release Repository</name>
-            <url>http://192.168.0.11:8081/nexus/content/repositories/elab/</url>
+            <url>http://192.168.0.11:8081/content/repositories/elab/</url>
         </repository>
     </distributionManagement>
 </project>

+ 4 - 0
elab-mongodb/pom.xml

@@ -19,6 +19,10 @@
             <artifactId>elab-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
         <!--<dependency>-->
             <!--<groupId>com.elab.core</groupId>-->
             <!--<artifactId>elab-spring</artifactId>-->

+ 6 - 4
elab-mongodb/src/main/java/com/elab/mongodb/BaseMongodb.java

@@ -1,5 +1,6 @@
 package com.elab.mongodb;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.mongodb.WriteResult;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -133,16 +134,17 @@ public abstract class BaseMongodb<T> {
 
         Query query = new Query(Criteria.where("id").is(id));
         Update update = new Update();
-        Map<String, String> describe = BeanUtils.describe(entity);
-
+        //Map<String, String> describe = BeanUtils.describe(entity);
+        Map<String, Object> describe = BeanUtil.beanToMap(entity);
         // 遍历map集合
-        for (Map.Entry<String, String> entry : describe.entrySet()) {
+        for (Map.Entry<String, Object> entry : describe.entrySet()) {
             String key = entry.getKey();
-            String value = entry.getValue();
+            Object value = entry.getValue();
 
             if ("class".equals(key) || value == null) {
                 continue;
             }
+
             update.set(key, value);
         }
         //更新查询返回结果集的第一条

+ 46 - 34
elab-mongodb/src/test/java/com/elab/test/mongodb/MongodbTest.java

@@ -13,6 +13,7 @@ import org.springframework.data.mongodb.core.query.Query;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -29,30 +30,42 @@ import java.util.Map;
 public class MongodbTest {
 
     @Test
-    public void insert() throws UnknownHostException {
+    public void insert() throws Exception {
         UserMongoDB mongoDB = new UserMongoDB();
-        MongoTemplate mongoTemplate = new MongoTemplate(new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")),
-                "test"));
+        MongoTemplate mongoTemplate = new MongoTemplate(
+            new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")), "test"));
         mongoDB.setMongoTemplate(mongoTemplate);
-        User user = new User("uuu", "123", "7");
-        User user1 = new User("jjj", "123", "8");
-        User user2 = new User("kkkk", "123", "9");
-        List<User> list = new ArrayList<>();
-        list.add(user);
-        list.add(user1);
-        list.add(user2);
-        mongoDB.batchSave(list);
-//        mongoDB.save(user);
-//        mongoDB.save(user1);
-//        mongoDB.save(user2);
+
+        List<String> strings = Arrays.asList("sss", "fff", "ddd");
+
+        User user = new User("uuu", "123", "7", strings);
+        User user1 = new User("jjj", "123", "8", strings);
+        User user2 = new User("kkkk", "123", "9", strings);
+        Query query = new Query();
+        Criteria criteria = Criteria.where("arrayData").in("A", "sss");
+        query.addCriteria(criteria);
+        List<User> user3 = mongoTemplate.find(query, User.class, "user");
+        System.out.println(user3);
+        //        List<User> list = new ArrayList<>();
+        //        list.add(user);
+        //        list.add(user1);
+        //        list.add(user2);
+        //        mongoDB.batchSave(list);
+        //        mongoDB.deleteById(user1.getId());
+        //        mongoDB.batchSave(list);
+        //        mongoDB.updateById(user1.getId(),user1);
+        //        mongoDB.updateById(user.getId(),user2);
+        //        mongoDB.save(user);
+        //        mongoDB.save(user1);
+        //        mongoDB.save(user2);
         System.out.println("成功~");
     }
 
     @Test
     public void insertJSON() throws UnknownHostException {
         JsonObjectDb mongoDB = new JsonObjectDb();
-        MongoTemplate mongoTemplate = new MongoTemplate(new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")),
-                "test"));
+        MongoTemplate mongoTemplate = new MongoTemplate(
+            new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")), "test"));
 
         mongoDB.setMongoTemplate(mongoTemplate);
 
@@ -62,18 +75,17 @@ public class MongodbTest {
 
         mongoTemplate.insert(jsonObject);
 
-
-//        mongoDB.batchSave(list);
-//        mongoDB.save(user);
-//        mongoDB.save(user1);
-//        mongoDB.save(user2);
+        //        mongoDB.batchSave(list);
+        //        mongoDB.save(user);
+        //        mongoDB.save(user1);
+        //        mongoDB.save(user2);
         System.out.println("成功~");
     }
 
     @Test
     public void update() throws Exception {
-        MongoTemplate mongoTemplate = new MongoTemplate(new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")),
-                "test"));
+        MongoTemplate mongoTemplate = new MongoTemplate(
+            new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")), "test"));
         UserMongoDB mongoDB = new UserMongoDB();
         User user = new User("lkx", "4444", "1");
         mongoDB.updateById("1", user);
@@ -82,8 +94,8 @@ public class MongodbTest {
 
     @Test
     public void delete() throws Exception {
-        MongoTemplate mongoTemplate = new MongoTemplate(new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")),
-                "test"));
+        MongoTemplate mongoTemplate = new MongoTemplate(
+            new SimpleMongoDbFactory(new MongoClient("127.0.0.1", Integer.parseInt("27017")), "test"));
         UserMongoDB mongoDB = new UserMongoDB();
         mongoDB.deleteById("1");
         System.out.println("成功~");
@@ -91,19 +103,19 @@ public class MongodbTest {
 
     @Test
     public void query() throws Exception {
-        MongoTemplate mongoTemplate = new MongoTemplate(new SimpleMongoDbFactory(new MongoClient("139.196.5.59", Integer.parseInt("27017")),
-                "logdb"));
-//        UserMongoDB mongoDB = new UserMongoDB();
-//        User user = new User("xxx", null, null);
-//        List<User> byList = mongoDB.findByList(user);
-//        System.out.println(JSON.toJSONString(byList));
-//        mongoDB.
+        MongoTemplate mongoTemplate = new MongoTemplate(
+            new SimpleMongoDbFactory(new MongoClient("139.196.5.59", Integer.parseInt("27017")), "logdb"));
+        //        UserMongoDB mongoDB = new UserMongoDB();
+        //        User user = new User("xxx", null, null);
+        //        List<User> byList = mongoDB.findByList(user);
+        //        System.out.println(JSON.toJSONString(byList));
+        //        mongoDB.
         Criteria area = Criteria.where("area").is("bbbb");
-//        Criteria price = Criteria.where("price").lt("100").gt("200").in("aaaaa");
+        //        Criteria price = Criteria.where("price").lt("100").gt("200").in("aaaaa");
 
         Query query = new Query();
         query.addCriteria(area);
-//        query.addCriteria(price);
+        //        query.addCriteria(price);
         List<Map> copy_of_rental_house = mongoTemplate.find(query, Map.class, "Copy_of_rental_house");
         System.out.println(copy_of_rental_house.size());
     }

+ 21 - 0
elab-mongodb/src/test/java/com/elab/test/mongodb/entity/User.java

@@ -1,5 +1,7 @@
 package com.elab.test.mongodb.entity;
 
+import java.util.List;
+
 /**
  * @author Liukx
  * @create 2018-05-03 11:16
@@ -10,6 +12,7 @@ public class User {
     private String username;
     private String password;
     private String id;
+    private List<String> arrayData;
 
     public User(String username, String password, String id) {
         this.username = username;
@@ -17,6 +20,24 @@ public class User {
         this.id = id;
     }
 
+    public User() {
+    }
+
+    public User(String username, String password, String id, List<String> arrayData) {
+        this.username = username;
+        this.password = password;
+        this.id = id;
+        this.arrayData = arrayData;
+    }
+
+    public List<String> getArrayData() {
+        return arrayData;
+    }
+
+    public void setArrayData(List<String> arrayData) {
+        this.arrayData = arrayData;
+    }
+
     public String getUsername() {
         return username;
     }

+ 9 - 3
elab-redis/src/test/java/com/elab/redis/spring/SpringDataTest.java

@@ -6,6 +6,7 @@ import com.elab.redis.CacheTemplate;
 import com.elab.redis.RedisSpringBoot;
 import com.elab.redis.serializers.CompatibilityJsonRedisSerializer;
 import com.google.common.base.Splitter;
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.*;
@@ -130,10 +131,15 @@ public class SpringDataTest extends RedisSpringBoot {
     @Test
     public void del() {
 
-        String prefKey = "gateway:LOGIN:TOKEN:token:ecrm*";
+        String prefKey = "user:userId:mobile:*";
         Set<String> keys = redisTemplate.keys(prefKey);
-        redisTemplate.delete(keys);
-        System.out.println(keys);
+        // redisTemplate.delete(keys);
+        Set<String> mobiles = new HashSet<>();
+        List<Object> objects = redisTemplate.opsForValue().multiGet(keys);
+        objects.forEach((V)->{
+            mobiles.add(V.toString());
+        });
+        System.out.println(objects);
         //        List<String> delKey = new ArrayList<>();
         //
         //        redisTemplate.delete(Arrays.asList(""));

+ 2 - 2
elab-redis/src/test/resources/application.yml

@@ -1,10 +1,10 @@
 spring:
   redis:
-    database: 0
+    database: 10
     host: r-uf6e60u5cmlj0sx563pd.redis.rds.aliyuncs.com
     password: xcGm4kTks6
     port: 6379
-    timeout: 2s
+    timeout: 10s
     elab:
       ttl: 30
       prefix-with: user_

+ 1 - 1
elab-spring/pom.xml

@@ -206,7 +206,7 @@
         <snapshotRepository>
             <id>snapshots</id>
             <name>User Project SNAPSHOTS</name>
-            <url>http://192.168.0.11:8081/nexus/content/repositories/snapshots/</url>
+            <url>http://192.168.0.11:8081/repository/maven-snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 

+ 6 - 6
pom.xml

@@ -394,15 +394,15 @@
     <!--mvn -DnewVersion=1.0.0-RELEASE -DgenerateBackupPoms=false versions:set-->
     <!--mvn -DnewVersion=2.0.5.3-SNAPSHOT -DgenerateBackupPoms=false versions:set-->
     <distributionManagement>
-        <!--<repository>-->
-        <!--<id>releases</id>-->
-        <!--<name>Nexus Release Repository</name>-->
-        <!--<url>http://192.168.0.11:8081/nexus/content/repositories/elab/</url>-->
-        <!--</repository>-->
+        <repository>
+            <id>releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.0.11:8081/repository/maven-releases/</url>
+        </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>User Project SNAPSHOTS</name>
-            <url>http://192.168.0.11:8081/nexus/content/repositories/snapshots/</url>
+            <url>http://192.168.0.11:8081/repository/maven-snapshots/</url>
         </snapshotRepository>
     </distributionManagement>