From ff9019e43ba8b80d2337cfc00468987c4642b494 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Sun, 07 Feb 2021 09:30:55 +0800
Subject: [PATCH] 健康码，警单
---
blade-service/blade-desk/src/main/resources/application-dev.yml | 9 +++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java | 6 ++----
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 4 ++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java | 5 +----
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-desk/src/main/resources/application-dev.yml b/blade-service/blade-desk/src/main/resources/application-dev.yml
index 2a4cb8c..77036f2 100644
--- a/blade-service/blade-desk/src/main/resources/application-dev.yml
+++ b/blade-service/blade-desk/src/main/resources/application-dev.yml
@@ -9,3 +9,12 @@
username: ${blade.datasource.dev.username}
password: ${blade.datasource.dev.password}
+ oss:
+ enabled: true
+ name: minio
+ tenant-mode: false
+ endpoint: http://s16s652780.51mypc.cn:21403
+ access-key: minioadmin
+ secret-key: minioadmin
+ bucket-name: jfpt
+
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
index 745ce17..72f2fdf 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
@@ -46,6 +46,7 @@
*/
@RestController
@AllArgsConstructor
+@CrossOrigin
@RequestMapping("healthcode/healthcode")
@Api(value = "", tags = "接口")
public class healthcodeController extends BladeController {
@@ -132,10 +133,7 @@
* 统计接口
*/
@PostMapping("/selectCount")
- public R selectCount(@RequestBody String type, HttpServletResponse response) {
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ public R selectCount(@RequestBody String type) {
List<Map<String, Object>> list = new ArrayList<>();
Date now = new Date();
Date time = new Date(now.getYear(), now.getMonth(), now.getDate());
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
index 89e4b28..d2e08e4 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -233,10 +233,7 @@
}
@PostMapping("/updateInfo")
- public R updateInfo(String id, String handleP, String handName, String handletype, String type, HttpServletResponse response) {
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ public R updateInfo(String id, String handleP, String handName, String handletype, String type) {
jingdanService.updateInfo(id, handleP, handName,handletype,type);
return R.success("修改成功");
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 34b14e1..7a9f515 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -131,7 +131,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
return R.status(userService.submit(user));
@@ -176,7 +176,7 @@
@PostMapping("/reset-password")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "初始化密码", notes = "传入userId集合")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
boolean temp = userService.resetPassword(userIds);
return R.status(temp);
--
Gitblit v1.9.3