From 64998cf6e14059e2a7d05772bba1e40c0e86e403 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 15 十月 2024 15:15:26 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/resources/application-druid.yml | 8 ++++----
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 15 ---------------
ruoyi-admin/src/main/resources/application.yml | 2 +-
3 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 6f262ae..039eb45 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.110.34:3306/cashier?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://127.0.0.1:10633/cashier?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: root
+# password: ShouYin@2024!
+ url: jdbc:mysql://127.0.0.1:3306/cashier?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: 123456
-# url: jdbc:mysql://8.137.10.192:3306/sys_config?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-# username: root
-# password: shms#123~
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 640b8cc..a27bdda 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -36,7 +36,7 @@
# 日志配置
logging:
level:
- com.ruoyi: debug
+ com.ruoyi: error
org.springframework: warn
# 用户配置
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 431bbaf..9d59c1f 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -215,21 +215,6 @@
return AjaxResult.success(map);
}
- /**
- * 移除黑名单
- */
- @GetMapping("/removeBlackList")
- public AjaxResult removeBlackList(@RequestParam String ids)
- {
- String[] split = ids.split(",");
- List<Long> id = new ArrayList<>();
- for (String s : split) {
- id.add(Long.valueOf(s));
- }
- userService.updateUserIfBlack(id);
- return AjaxResult.success();
- }
-
// @Log(title = "用户管理", businessType = BusinessType.EXPORT)
//// // @PreAuthorize("@ss.hasPermi('system:user:export')")
--
Gitblit v1.7.1