From 54c0125835e850b97793601ac45ee62fa1c4b12e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 09:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 6b5b362..9215b71 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -256,9 +256,9 @@
if (ObjectUtils.isEmpty(map)){
return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
}
-// test(map,response);
+ test(map,response);
// return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
- return ResultMessage.ok(map);
+ return ResultMessage.ok();
}
@@ -365,6 +365,12 @@
// map.put("data",params.get("data").toString());
compile.render(map);
// response.addHeader("Access-Contro1-Allow-Origin", "*");
+
+ response.setHeader("Access-Control-Allow-Origin","*");//������������������������
+ response.setHeader("Access-Control-Allow-Methods", "*");//���������������������������GET, POST, HEAD ���
+ response.setHeader("Access-Control-Allow-Headers", "*");//������������������������
+ response.setHeader("Access-Control-Allow-Credentials", "true");//������������cooki
+
compile.write(response.getOutputStream());
compile.close();
} catch (IOException e) {
--
Gitblit v1.8.0