Commit ad30ebb4 by shenjunjie

Merge branch 'release' into 'master'

Release

See merge request !290
parents c6d041d2 e3e668f2
...@@ -3,9 +3,11 @@ package com.zhiwei.brandkbs2.controller.app; ...@@ -3,9 +3,11 @@ package com.zhiwei.brandkbs2.controller.app;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zhiwei.brandkbs2.auth.Auth;
import com.zhiwei.brandkbs2.auth.UserThreadLocal; import com.zhiwei.brandkbs2.auth.UserThreadLocal;
import com.zhiwei.brandkbs2.common.GenericAttribute; import com.zhiwei.brandkbs2.common.GenericAttribute;
import com.zhiwei.brandkbs2.controller.BaseController; import com.zhiwei.brandkbs2.controller.BaseController;
import com.zhiwei.brandkbs2.enmus.RoleEnum;
import com.zhiwei.brandkbs2.model.ResponseResult; import com.zhiwei.brandkbs2.model.ResponseResult;
import com.zhiwei.brandkbs2.service.ProjectService; import com.zhiwei.brandkbs2.service.ProjectService;
import com.zhiwei.brandkbs2.service.ProjectWarnService; import com.zhiwei.brandkbs2.service.ProjectWarnService;
...@@ -39,6 +41,7 @@ import java.util.Map; ...@@ -39,6 +41,7 @@ import java.util.Map;
@RestController @RestController
@Api(tags = "情报预警接口", description = "情报预警") @Api(tags = "情报预警接口", description = "情报预警")
@RequestMapping("/app/warn") @RequestMapping("/app/warn")
@Auth(role = RoleEnum.CUSTOMER)
public class AppWarnController extends BaseController { public class AppWarnController extends BaseController {
private static final Logger log = LogManager.getLogger(AppWarnController.class); private static final Logger log = LogManager.getLogger(AppWarnController.class);
......
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