1、添加dubboAutoConfig功能，包括pom修改，相关配置文件，具体参看common-config工程中dubbo包下readme.txt文件

2、修改相关control_facade，配合dubboAutoConfig，主要是@Reference标注的用法 3、添加actuator功能，具体参看1的readme.txt文件

1、添加dubboAutoConfig功能，包括pom修改，相关配置文件，具体参看common-config工程中dubbo包下readme.txt文件
2、修改相关control_facade，配合dubboAutoConfig，主要是@Reference标注的用法 3、添加actuator功能，具体参看1的readme.txt文件
徐烜
1 parent 69222f2e
Showing 11 changed files with 87 additions and 33 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/schedule/BController_facade.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController_dubbo.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController_dubbo.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/service/schedule/dubbo/DubboConfig.java
src/main/resources/application-dev.properties
src/main/resources/dubbo/applicationContext_dubbo_consumer.xml
src/main/resources/dubbo/config-dev.properties
src/main/resources/dubbo/config-prod.properties
@@ -15,6 +15,11 @@
 	</parent>
 	<dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -308,6 +313,10 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
@@ -344,12 +353,35 @@
         <!--</dependency>-->
         <!-- dubbo 需要的jar end -->
-        <!-- common工程依赖 -->
+        <!-- plan common工程依赖 -->
         <dependency>
             <groupId>com.bsth.control_v2</groupId>
             <artifactId>plan_module-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <!-- plan common config 工程依赖 -->
+        <dependency>
+            <groupId>com.bsth.control_v2</groupId>
+            <artifactId>plan_module-common-config</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+
 	</dependencies>
 	<dependencyManagement>
@@ -21,6 +21,9 @@ public class Constants {
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
 	public static final String CAPTCHA = "/captcha.jpg";
+	// springboot manage health的检测url
+    public static final String ACTUATOR_MANAGEMENT_HEALTH = "/manage/health";
+
 	//对外的营运数据接口
 	public static final String SERVICE_INTERFACE = "/companyService/**";
@@ -17,9 +17,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-public class BController_facade<Id extends Serializable, DTO> {
-    @Autowired
-    private BServiceFacade<Id, DTO> bServiceFacade;
+public abstract class BController_facade<Id extends Serializable, DTO> {
+    protected abstract BServiceFacade<Id, DTO> getBServiceFacade();
     @Autowired
     private SysUserService sysUserService;
@@ -43,7 +42,7 @@ public class BController_facade&lt;Id extends Serializable, DTO&gt; {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            DTO dto_saved = bServiceFacade.save(dto);
+            DTO dto_saved = getBServiceFacade().save(dto);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", dto_saved);
         } catch (Exception exp) {
@@ -63,7 +62,7 @@ public class BController_facade&lt;Id extends Serializable, DTO&gt; {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            DTO dto_updated = bServiceFacade.save(dto);
+            DTO dto_updated = getBServiceFacade().save(dto);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", dto_updated);
         } catch (Exception exp) {
@@ -79,7 +78,7 @@ public class BController_facade&lt;Id extends Serializable, DTO&gt; {
     public Map<String, Object> findById(@PathVariable("id") Id id) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            DTO dto = bServiceFacade.findById(id);
+            DTO dto = getBServiceFacade().findById(id);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", dto);
         } catch (Exception exp) {
@@ -95,7 +94,7 @@ public class BController_facade&lt;Id extends Serializable, DTO&gt; {
     public Map<String, Object> list(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            List<DTO> tList = bServiceFacade.list(param);
+            List<DTO> tList = getBServiceFacade().list(param);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", tList);
         } catch (Exception exp) {
@@ -121,7 +120,7 @@ public class BController_facade&lt;Id extends Serializable, DTO&gt; {
                 .build();
         Map<String, Object> rtn = new HashMap<>();
         try {
-            rtn.put("data", bServiceFacade.list(map, pageRequestDto));
+            rtn.put("data", getBServiceFacade().list(map, pageRequestDto));
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -136,7 +135,7 @@ public class BController_facade&lt;Id extends Serializable, DTO&gt; {
         Map<String, Object> rtn = new HashMap<>();
         try {
             // 由于种种原因，这里不保存用户和操作时间了
-            bServiceFacade.delete(id);
+            getBServiceFacade().delete(id);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
 package com.bsth.controller.schedule.core;
+import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
 import com.bsth.control_v2.plan_module.common.dto.schedule.PlanDto;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade;
 import com.bsth.control_v2.plan_module.common.service.schedule.validate.PlanPreValidateFacade;
 import com.bsth.controller.schedule.BController_facade;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,8 +19,15 @@ import java.util.Map;
 @RestController
 @RequestMapping("spc")
 public class SchedulePlanController_dubbo extends BController_facade<Long, PlanDto> {
-    @Autowired
+//    @Reference
     private PlanPreValidateFacade planPreValidateFacade;
+    @Reference
+    private PlanServiceFacade planInfoServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, PlanDto> getBServiceFacade() {
+        return planInfoServiceFacade;
+    }
     // TODO：save方法独立出来
 package com.bsth.controller.schedule.core;
+import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
 import com.bsth.control_v2.plan_module.common.dto.schedule.PlanInfoDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
 import com.bsth.control_v2.plan_module.common.service.schedule.PlanInfoServiceFacade;
-import com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade;
 import com.bsth.controller.schedule.BController_facade;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,10 +19,15 @@ import java.util.Map;
 @RestController
 @RequestMapping("spic")
 public class SchedulePlanInfoController_dubbo extends BController_facade<Long, PlanInfoDto> {
-    @Autowired
+    @Reference
     private PlanInfoServiceFacade planInfoServiceFacade;
     @Override
+    protected BServiceFacade<Long, PlanInfoDto> getBServiceFacade() {
+        return planInfoServiceFacade;
+    }
+
+    @Override
     public void setCreateUserInfo(PlanInfoDto planInfoDto, Integer userId, Date createDate) {
         UserDto userDto = UserDto.getBuilder()
                 .setId(userId)
@@ -16,8 +16,12 @@ public abstract class BaseFilter implements Filter {
 	/**
 	 * 白名单
 	 */
-	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT };
+	private String[] whiteListURLs = {
+	        Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL,
+            Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL,
+            Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
+            Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH };
 	@Override
 	public void destroy() {
-package com.bsth.service.schedule.dubbo;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-
-/**
- * Dubbo消费者配置。
- */
-@Configuration
-@ImportResource({"classpath:dubbo/applicationContext_dubbo_consumer.xml"})
-public class DubboConfig {
-
-}
 server.port=9088
-management.port= 9001
-management.address= 127.0.0.1
+#management.port= 9001
+#management.address= 127.0.0.1
+management.security.enabled=false
+management.context-path=/manage
+dubbo.use=false
 spring.jpa.hibernate.ddl-auto= none
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
@@ -10,7 +10,7 @@
     <!-- 使用zookeeper注册中心暴露服务地址 -->
     <!-- 注册中心地址 -->
-    <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181" />
+    <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181" check="false" />
     <!-- 计划排班服务接口 -->
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade" id="planServiceFacadeImpl" check="false" />
+# application名字
+spring.dubbo.application.name=bsth_control_v2
+# zookeeper注册中心地址
+spring.dubbo.registry=zookeeper://127.0.0.1:2181
+
+#----------- dubbo:consumer 性能调优选项 -------------#
+# 远程服务调用超时时间，单位毫秒，这里设置30分钟
+spring.dubbo.consumer.timeout=1800000
+# 远程服务调用重试次数，0表示不需要重试
+spring.dubbo.consumer.retries=0
+#----------- dubbo:consumer 服务治理选项 -------------#
+# 启动不检查提供者是否存在
+spring.dubbo.consumer.check=false
 \ No newline at end of file