Commit 488faa89 authored by 赵啸非's avatar 赵啸非

添加应用白名单接口

parent d054c42e
Pipeline #2486 canceled with stages
...@@ -38,6 +38,7 @@ import com.mortals.xhx.module.matter.model.*; ...@@ -38,6 +38,7 @@ import com.mortals.xhx.module.matter.model.*;
import com.mortals.xhx.module.matter.service.MatterDatumPrintService; import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
import com.mortals.xhx.module.matter.service.MatterDatumService; import com.mortals.xhx.module.matter.service.MatterDatumService;
import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.matter.service.MatterService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -46,6 +47,7 @@ import java.util.stream.Collectors; ...@@ -46,6 +47,7 @@ import java.util.stream.Collectors;
@RestController @RestController
@RequestMapping("home") @RequestMapping("home")
@Slf4j
public class HomeController extends BaseJsonBodyController { public class HomeController extends BaseJsonBodyController {
@Autowired @Autowired
...@@ -189,11 +191,11 @@ public class HomeController extends BaseJsonBodyController { ...@@ -189,11 +191,11 @@ public class HomeController extends BaseJsonBodyController {
int code = VALUE_RESULT_SUCCESS; int code = VALUE_RESULT_SUCCESS;
try { try {
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put("siteid", queryPdu.getSiteId()+""); params.put("siteid", queryPdu.getSiteId() + "");
params.put("title", queryPdu.getTitle()); params.put("title", queryPdu.getTitle());
params.put("type", queryPdu.getType()+""); params.put("type", queryPdu.getType() + "");
params.put("page", queryPdu.getPage()+""); params.put("page", queryPdu.getPage() + "");
params.put("size", queryPdu.getSize()+""); params.put("size", queryPdu.getSize() + "");
UrlBuilder urlBuilder = domain.addPath("news").addPath("newsList"); UrlBuilder urlBuilder = domain.addPath("news").addPath("newsList");
String response = HttpUtil.doGet(urlBuilder.toString(), params); String response = HttpUtil.doGet(urlBuilder.toString(), params);
this.recordSysLog(this.request, busiDesc + " 【成功】"); this.recordSysLog(this.request, busiDesc + " 【成功】");
...@@ -268,6 +270,7 @@ public class HomeController extends BaseJsonBodyController { ...@@ -268,6 +270,7 @@ public class HomeController extends BaseJsonBodyController {
@PostMapping({"info"}) @PostMapping({"info"})
@UnAuth @UnAuth
public Rest<Object> homePageInfo(@RequestBody HomeQueryPdu homeQueryPdu) { public Rest<Object> homePageInfo(@RequestBody HomeQueryPdu homeQueryPdu) {
log.info("homePageInfo:{}", JSON.toJSONString(homeQueryPdu));
Rest<Object> ret = new Rest(); Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap(); Map<String, Object> model = new HashMap();
...@@ -340,6 +343,7 @@ public class HomeController extends BaseJsonBodyController { ...@@ -340,6 +343,7 @@ public class HomeController extends BaseJsonBodyController {
ret.setData(model); ret.setData(model);
ret.setDict(model.get("dict")); ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString()); ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
log.info("home resp:{}", JSON.toJSONString(ret));
return ret; return ret;
} }
......
...@@ -45,3 +45,11 @@ cookie: ...@@ -45,3 +45,11 @@ cookie:
port: 111 port: 111
token: token:
head: mortal head: mortal
hystrix:
command:
default:
execution:
isolation:
thread:
timeoutInMilliseconds: 60000
...@@ -59,6 +59,12 @@ ...@@ -59,6 +59,12 @@
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-loadbalancer</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment