From 80f9d76904c5d28c77a4d9bbaca9daa328e7806c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 07 五月 2019 00:26:57 +0800
Subject: [PATCH] web 服务 修改docker内容
---
CodeService/src/main/java/com/java110/code/CodeServiceApplicationStart.java | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/CodeService/src/main/java/com/java110/code/CodeServiceApplicationStart.java b/CodeService/src/main/java/com/java110/code/CodeServiceApplicationStart.java
index 57fa84f..2e22103 100644
--- a/CodeService/src/main/java/com/java110/code/CodeServiceApplicationStart.java
+++ b/CodeService/src/main/java/com/java110/code/CodeServiceApplicationStart.java
@@ -19,6 +19,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.context.ApplicationContext;
import java.net.InetAddress;
@@ -34,17 +35,18 @@
* @date 2016骞�8鏈�6鏃�
* @tag
*/
-@SpringBootApplication(scanBasePackages = {"com.java110.service","com.java110.code","com.java110.core","com.java110.cache",
-"com.java110.config.properties.code"})
+@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.code", "com.java110.core", "com.java110.cache",
+ "com.java110.config.properties.code"})
//@SpringBootApplication(scanBasePackages = {"com.java110.service","com.java110.code","com.java110.config.properties.code"})
@EnableDiscoveryClient
+@EnableFeignClients(basePackages = {"com.java110.core.smo"})
public class CodeServiceApplicationStart {
protected final static Logger logger = LoggerFactory.getLogger(CodeServiceApplicationStart.class);
public static void main(String[] args) throws Exception {
- ApplicationContext context = SpringApplication.run(CodeServiceApplicationStart.class, args);
+ ApplicationContext context = SpringApplication.run(CodeServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
@@ -57,24 +59,24 @@
/**
* 鍔犺浇 workId
*/
- public static void loadWorkId() throws StartException{
- ZookeeperProperties zookeeperProperties = ApplicationContextFactory.getBean("zookeeperProperties",ZookeeperProperties.class);
+ public static void loadWorkId() throws StartException {
+ ZookeeperProperties zookeeperProperties = ApplicationContextFactory.getBean("zookeeperProperties", ZookeeperProperties.class);
- if(zookeeperProperties == null){
- throw new StartException(ResponseConstant.RESULT_CODE_ERROR,"绯荤粺鍚姩澶辫触锛屾湭鍔犺浇zookeeper 閰嶇疆淇℃伅");
+ if (zookeeperProperties == null) {
+ throw new StartException(ResponseConstant.RESULT_CODE_ERROR, "绯荤粺鍚姩澶辫触锛屾湭鍔犺浇zookeeper 閰嶇疆淇℃伅");
}
String host = null;
try {
host = InetAddress.getLocalHost().getHostAddress();
} catch (UnknownHostException e) {
- throw new StartException(ResponseConstant.RESULT_CODE_ERROR,"绯荤粺鍚姩澶辫触锛岃幏鍙杊ost澶辫触"+e);
+ throw new StartException(ResponseConstant.RESULT_CODE_ERROR, "绯荤粺鍚姩澶辫触锛岃幏鍙杊ost澶辫触" + e);
}
- ServiceInfoListener serviceInfoListener = ApplicationContextFactory.getBean("serviceInfoListener",ServiceInfoListener.class);
+ ServiceInfoListener serviceInfoListener = ApplicationContextFactory.getBean("serviceInfoListener", ServiceInfoListener.class);
- if(serviceInfoListener == null){
- throw new StartException(ResponseConstant.RESULT_CODE_ERROR,"绯荤粺鍚姩澶辫触锛岃幏鍙栨湇鍔＄洃鍚鍙ｅけ璐�");
+ if (serviceInfoListener == null) {
+ throw new StartException(ResponseConstant.RESULT_CODE_ERROR, "绯荤粺鍚姩澶辫触锛岃幏鍙栨湇鍔＄洃鍚鍙ｅけ璐�");
}
serviceInfoListener.setServiceHost(host);
@@ -89,45 +91,41 @@
});
+ Stat stat = zooKeeper.exists(zookeeperProperties.getWorkDir(), true);
- Stat stat = zooKeeper.exists(zookeeperProperties.getWorkDir(),true);
-
- if(stat == null){
+ if (stat == null) {
zooKeeper.create(zookeeperProperties.getWorkDir(), "".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
}
String workDir = "";
- List<String> workDirs = zooKeeper.getChildren(zookeeperProperties.getWorkDir(),true);
+ List<String> workDirs = zooKeeper.getChildren(zookeeperProperties.getWorkDir(), true);
- if(workDirs != null && workDirs.size() > 0) {
- for(String workDirTemp : workDirs){
- if(workDirTemp.startsWith(serviceInfoListener.getHostPort())){
+ if (workDirs != null && workDirs.size() > 0) {
+ for (String workDirTemp : workDirs) {
+ if (workDirTemp.startsWith(serviceInfoListener.getHostPort())) {
workDir = workDirTemp;
break;
}
}
}
- if(StringUtil.isNullOrNone(workDir)) {
+ if (StringUtil.isNullOrNone(workDir)) {
workDir = zooKeeper.create(zookeeperProperties.getWorkDir() + "/" + serviceInfoListener.getHostPort(), "".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT_SEQUENTIAL);
}
String[] pathTokens = workDir.split("/");
- if ( pathTokens.length > 0
- && pathTokens[pathTokens.length -1].contains("-")
- && pathTokens[pathTokens.length -1].contains(":"))
- {
- String workId = pathTokens[pathTokens.length -1].substring(pathTokens[pathTokens.length -1].indexOf("-")+1);
+ if (pathTokens.length > 0
+ && pathTokens[pathTokens.length - 1].contains("-")
+ && pathTokens[pathTokens.length - 1].contains(":")) {
+ String workId = pathTokens[pathTokens.length - 1].substring(pathTokens[pathTokens.length - 1].indexOf("-") + 1);
serviceInfoListener.setWorkId(Long.parseLong(workId));
}
- Assert.hasLength(serviceInfoListener.getWorkId()+"","绯荤粺涓姞杞絯orkId 澶辫触");
- }catch (Exception e){
+ Assert.hasLength(serviceInfoListener.getWorkId() + "", "绯荤粺涓姞杞絯orkId 澶辫触");
+ } catch (Exception e) {
e.printStackTrace();
- throw new StartException(ResponseConstant.RESULT_CODE_ERROR,"绯荤粺鍚姩澶辫触锛岄摼鎺ookeeper澶辫触"+zookeeperProperties.getZookeeperConnectString());
+ throw new StartException(ResponseConstant.RESULT_CODE_ERROR, "绯荤粺鍚姩澶辫触锛岄摼鎺ookeeper澶辫触" + zookeeperProperties.getZookeeperConnectString());
}
-
-
}
--
Gitblit v1.8.0