xuhy
2024-10-15 64998cf6e14059e2a7d05772bba1e40c0e86e403
修改
3个文件已修改
25 ■■■■ 已修改文件
ruoyi-admin/src/main/resources/application-druid.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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:
                # 从数据源开关/默认关闭
ruoyi-admin/src/main/resources/application.yml
@@ -36,7 +36,7 @@
# 日志配置
logging:
  level:
    com.ruoyi: debug
    com.ruoyi: error
    org.springframework: warn
# 用户配置
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')")