Merge branch 'developer' into 'master'

分享有礼补数据

See merge request !118

haoban-manage3-operation-web/pom.xml

@@ -220,6 +220,12 @@
 			<artifactId>haoban-task-manage-api</artifactId>
 			<version>${haoban-task-manage-api}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>sharing-core-api</artifactId>
+			<version>${sharing-core-api}</version>
+		</dependency>
 	</dependencies>
 
 	<build>

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

@@ -14,6 +14,8 @@ import com.gic.haoban.manage.web.controller.WebBaseController;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.TestQo;
 import com.gic.haoban.manage.web.vo.TestVo;
+import com.gic.sharing.core.service.api.service.MqApiService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,6 +37,9 @@ public class TestController extends WebBaseController {
 
     @Autowired
     private TestApiService testApiService;
+
+    @Autowired
+    private MqApiService mqApiService;
 //
 //    @RequestMapping("/testList")
 //    @ResponseBody
@@ -89,4 +94,19 @@ public class TestController extends WebBaseController {
 
         return resultResponse(HaoBanErrCode.ERR_1);
     }
+
+    /**
+     * 创建定时器
+     *
+     * @return
+     */
+    @RequestMapping("/sharing-import")
+    @ResponseBody
+    public HaobanResponse sharingImport(String key) {
+        if (StringUtils.isBlank(key)) {
+            return resultResponse(HaoBanErrCode.ERR_0);
+        }
+        mqApiService.run(key);
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
 }

haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml

@@ -50,4 +50,8 @@
 
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.HandoverOperationApiService"
 					 id="handoverOperationApiService"/>
+
+	<dubbo:reference interface="com.gic.sharing.core.service.api.service.MqApiService"
+					 id="mqApiService"/>
+
 </beans>