Merge remote-tracking branch 'origin/master'

Author: zfvipgit

tx-manager/src/main/java/com/codingapi/tm/api/service/impl/ApiAdminServiceImpl.java

@@ -3,7 +3,7 @@
 import com.codingapi.tm.api.service.ApiAdminService;
 import com.codingapi.tm.compensate.model.TxModel;
 import com.codingapi.tm.compensate.service.CompensateService;
-import com.codingapi.tm.manager.service.EurekaService;
+import com.codingapi.tm.manager.service.MicroService;
 import com.codingapi.tm.model.ModelName;
 import com.codingapi.tm.model.TxState;
 import com.codingapi.tm.redis.service.RedisServerService;
@@ -21,7 +21,7 @@ public class ApiAdminServiceImpl implements ApiAdminService {
 
 
     @Autowired
-    private EurekaService eurekaService;
+    private MicroService eurekaService;
 
     @Autowired
     private RedisServerService redisServerService;

tx-manager/src/main/java/com/codingapi/tm/api/service/impl/ApiTxManagerServiceImpl.java

@@ -5,7 +5,7 @@
 import com.codingapi.tm.compensate.model.TransactionCompensateMsg;
 import com.codingapi.tm.compensate.service.CompensateService;
 import com.codingapi.tm.config.ConfigReader;
-import com.codingapi.tm.manager.service.EurekaService;
+import com.codingapi.tm.manager.service.MicroService;
 import com.codingapi.tm.manager.service.TxManagerSenderService;
 import com.codingapi.tm.manager.service.TxManagerService;
 import com.codingapi.tm.model.TxServer;
@@ -24,7 +24,7 @@ public class ApiTxManagerServiceImpl implements ApiTxManagerService {
     private TxManagerService managerService;
 
     @Autowired
-    private EurekaService eurekaService;
+    private MicroService eurekaService;
 
     @Autowired
     private CompensateService compensateService;

…pi/tm/manager/service/EurekaService.java …api/tm/manager/service/MicroService.javatx-manager/src/main/java/com/codingapi/tm/manager/service/EurekaService.java renamed to tx-manager/src/main/java/com/codingapi/tm/manager/service/MicroService.java tx-manager/src/main/java/com/codingapi/tm/manager/service/EurekaService.java renamed to tx-manager/src/main/java/com/codingapi/tm/manager/service/MicroService.java

@@ -2,18 +2,15 @@
 
 import com.codingapi.tm.model.TxServer;
 import com.codingapi.tm.model.TxState;
-import com.netflix.appinfo.InstanceInfo;
-
-import java.util.List;
 
 /**
  * create by lorne on 2017/11/11
  */
-public interface EurekaService {
+public interface MicroService {
+
+    String  tmKey = "tx-manager";
 
     TxServer getServer();
 
     TxState getState();
-
-    List<InstanceInfo> getConfigServiceInstances();
 }

…ager/service/impl/EurekaServiceImpl.java …nager/service/impl/MicroServiceImpl.javatx-manager/src/main/java/com/codingapi/tm/manager/service/impl/EurekaServiceImpl.java renamed to tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/EurekaServiceImpl.java renamed to tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java

@@ -3,7 +3,7 @@
 import com.codingapi.tm.Constants;
 import com.codingapi.tm.config.ConfigReader;
 import com.codingapi.tm.framework.utils.SocketManager;
-import com.codingapi.tm.manager.service.EurekaService;
+import com.codingapi.tm.manager.service.MicroService;
 import com.codingapi.tm.model.TxServer;
 import com.codingapi.tm.model.TxState;
 import com.netflix.appinfo.InstanceInfo;
@@ -25,7 +25,7 @@
  * create by lorne on 2017/11/11
  */
 @Service
-public class EurekaServiceImpl implements EurekaService{
+public class MicroServiceImpl implements MicroService {
 
 
     @Autowired
@@ -39,11 +39,14 @@ public class EurekaServiceImpl implements EurekaService{
     private DiscoveryClient discoveryClient;
 
 
+    @Autowired
+    private EurekaClient eurekaClient;
+
+
 
-    private final static String  tmKey = "tx-manager";
 
     /** logger */
-    private static final Logger logger = LoggerFactory.getLogger(EurekaServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(MicroServiceImpl.class);
 
 
     private boolean isIp(String ipAddress) {
@@ -54,9 +57,6 @@ private boolean isIp(String ipAddress) {
     }
 
 
-    @Autowired
-    private EurekaClient eurekaClient;
-
     public List<InstanceInfo> getConfigServiceInstances() {
         Application application = eurekaClient.getApplication(tmKey);
         if (application == null) {