diff --git a/src/main/java/com/telpo/dipperposition/annotation/MongoSwitch.java b/src/main/java/com/telpo/dipperposition/annotation/MongoSwitch.java new file mode 100644 index 0000000..6153006 --- /dev/null +++ b/src/main/java/com/telpo/dipperposition/annotation/MongoSwitch.java @@ -0,0 +1,22 @@ +package com.telpo.dipperposition.annotation; + +import java.lang.annotation.*; + +/** + * @program: DataPushServer + * @description: mongo数据源切换注解 + * @author: linwl + * @create: 2020-07-11 15:06 + */ +@Target({ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface MongoSwitch { + + /** + * mongo数据库名称 + * + * @return + */ + String value() default ""; +} diff --git a/src/main/java/com/telpo/dipperposition/config/db/MongoDbContext.java b/src/main/java/com/telpo/dipperposition/config/db/MongoDbContext.java index f27c529..14fbcd8 100644 --- a/src/main/java/com/telpo/dipperposition/config/db/MongoDbContext.java +++ b/src/main/java/com/telpo/dipperposition/config/db/MongoDbContext.java @@ -22,8 +22,7 @@ import java.util.Map; public class MongoDbContext { private static final Map MONGO_CLIENT_DB_FACTORY_MAP = new HashMap<>(); - private static final ThreadLocal MONGO_DB_FACTORY_THREAD_LOCAL = - new ThreadLocal<>(); + private static final ThreadLocal MONGO_DB_FACTORY_THREAD_LOCAL = new ThreadLocal<>(); @Autowired MongoListProperties mongoListProperties; diff --git a/src/main/java/com/telpo/dipperposition/mapper/IPProvinceMapper.java b/src/main/java/com/telpo/dipperposition/mapper/IPProvinceMapper.java index b42acc0..b050e1d 100644 --- a/src/main/java/com/telpo/dipperposition/mapper/IPProvinceMapper.java +++ b/src/main/java/com/telpo/dipperposition/mapper/IPProvinceMapper.java @@ -1,5 +1,6 @@ package com.telpo.dipperposition.mapper; +import com.telpo.dipperposition.annotation.MongoSwitch; import com.telpo.dipperposition.entity.mongo.IPProvinceEntity; import db.BaseMongoDbDao; import org.springframework.stereotype.Repository; @@ -21,11 +22,13 @@ public class IPProvinceMapper extends BaseMongoDbDao { } @Override + @MongoSwitch("common") public void save(IPProvinceEntity entity, String collectionName) { super.save(entity, collectionName); } @Override + @MongoSwitch("common") public void updateFirst(IPProvinceEntity srcObj, IPProvinceEntity targetObj) { super.updateFirst(srcObj, targetObj); } @@ -36,16 +39,19 @@ public class IPProvinceMapper extends BaseMongoDbDao { } @Override + @MongoSwitch("common") public List queryList(IPProvinceEntity object) { return super.queryList(object); } @Override + @MongoSwitch("common") public List queryList(IPProvinceEntity object, String collectionName) { return super.queryList(object, collectionName); } @Override + @MongoSwitch("common") public void deleteById(String id) { super.deleteById(id); } diff --git a/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java b/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java index 6afdc44..9b4066d 100644 --- a/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java +++ b/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java @@ -24,7 +24,7 @@ import java.net.InetSocketAddress; @Slf4j public class DipperPositionServer { - @Value(value = "${position.serverAddr}") + @Value(value = "${position.server.serverAddr}") private String serverAddr; @Value(value = "${position.server.timeAsycPort}") diff --git a/src/main/resources/bootstrap.yaml b/src/main/resources/bootstrap.yaml index 707693d..57e192e 100644 --- a/src/main/resources/bootstrap.yaml +++ b/src/main/resources/bootstrap.yaml @@ -29,6 +29,7 @@ pos: position: server: - timeAsycPort: - posAsycPort: - starsAsycPort: \ No newline at end of file + serverAddr: 172.16.192.26 + timeAsycPort: 9011 + posAsycPort: 9013 + starsAsycPort: 9012 \ No newline at end of file