From 181166f4c06311447dc3e8aec39ef61f1ce4b2e1 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 30 三月 2023 18:59:07 +0800 Subject: [PATCH] update 优化 !pr324 代码结构 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java | 1 - ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java | 1 - script/sql/ry_vue_5.X.sql | 2 +- script/sql/oracle/oracle_ry_vue_5.X.sql | 8 ++++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java index 7dd5998..d5b906c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java @@ -156,7 +156,6 @@ * * @return ture锛氭墦寮� false锛氬叧闂� */ - @SaIgnore @GetMapping("/registerEnabled") public R<Boolean> registerEnabled() { return R.ok(Convert.toBool(configService.selectConfigByKey("sys.account.registerUser"))); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java index 6d83484..f51db1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java @@ -57,7 +57,6 @@ private final CaptchaProperties captchaProperties; private final ISysPermissionService permissionService; private final ISysTenantService tenantService; - private final ISysConfigService configService; /** diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql index 9d57d30..4c7c56a 100644 --- a/script/sql/oracle/oracle_ry_vue_5.X.sql +++ b/script/sql/oracle/oracle_ry_vue_5.X.sql @@ -828,10 +828,10 @@ insert into sys_config values(2, '000000', '鐢ㄦ埛绠$悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate, null, null, '鍒濆鍖栧瘑鐮� 123456' ); insert into sys_config values(3, '000000', '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate, null, null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' ); insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�'); -insert into sys_config values(6, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜鏈�澶ч敊璇鏁�', 'sys.user.maxRetryCount', '5', 'Y', 103, 1, sysdate, null, null, '瀵嗙爜鏈�澶ч敊璇鏁�'); -insert into sys_config values(7, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜閿佸畾鏃堕棿', 'sys.user.lockTime', '10', 'Y', 103, 1, sysdate, null, null, '瀵嗙爜閿佸畾鏃堕棿锛堝垎閽燂級'); -insert into sys_config values(8, '000000', '璐﹀彿鑷姪-鐭俊寮�鍏�', 'sys.account.smsEnabled', 'false', 'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚煭淇″姛鑳斤紙true寮�鍚紝false鍏抽棴锛�'); -insert into sys_config values(9, '000000', '璐﹀彿鑷姪-楠岃瘉鐮佹ā鏉縤d', 'sys.account.templateId', '', 'Y', 103, 1, sysdate, null, null, '楠岃瘉鐮佹ā鏉縤d'); +insert into sys_config values(6, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜鏈�澶ч敊璇鏁�', 'sys.user.maxRetryCount', '5', 'Y', 103, 1, sysdate, null, null, '瀵嗙爜鏈�澶ч敊璇鏁�'); +insert into sys_config values(7, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜閿佸畾鏃堕棿', 'sys.user.lockTime', '10', 'Y', 103, 1, sysdate, null, null, '瀵嗙爜閿佸畾鏃堕棿锛堝垎閽燂級'); +insert into sys_config values(8, '000000', '璐﹀彿鑷姪-鐭俊寮�鍏�', 'sys.account.smsEnabled', 'false', 'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚煭淇″姛鑳斤紙true寮�鍚紝false鍏抽棴锛�'); +insert into sys_config values(9, '000000', '璐﹀彿鑷姪-楠岃瘉鐮佹ā鏉縤d', 'sys.account.templateId', '', 'Y', 103, 1, sysdate, null, null, '楠岃瘉鐮佹ā鏉縤d'); insert into sys_config values(11, '000000', 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate, null, null, 'true:寮�鍚�, false:鍏抽棴'); diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql index b163e9e..41290d2 100644 --- a/script/sql/ry_vue_5.X.sql +++ b/script/sql/ry_vue_5.X.sql @@ -629,7 +629,7 @@ insert into sys_config values(2, '000000', '鐢ㄦ埛绠$悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, NULL, '鍒濆鍖栧瘑鐮� 123456'); insert into sys_config values(3, '000000', '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, NULL, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light'); insert into sys_config values(4, '000000', '璐﹀彿鑷姪-楠岃瘉鐮佸紑鍏�', 'sys.account.captchaEnabled', 'true', 'Y', 103, 1, sysdate(), null, NULL, '鏄惁寮�鍚獙璇佺爜鍔熻兘锛坱rue寮�鍚紝false鍏抽棴锛�'); -insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'true', 'Y', 103, 1, sysdate(), null, NULL, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�'); +insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, NULL, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�'); insert into sys_config values(6, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜鏈�澶ч敊璇鏁�', 'sys.user.maxRetryCount', '5', 'Y', 103, 1, sysdate(), null, NULL, '瀵嗙爜鏈�澶ч敊璇鏁�'); insert into sys_config values(7, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜閿佸畾鏃堕棿', 'sys.user.lockTime', '10', 'Y', 103, 1, sysdate(), null, NULL, '瀵嗙爜閿佸畾鏃堕棿锛堝垎閽燂級'); insert into sys_config values(8, '000000', '璐﹀彿鑷姪-鐭俊寮�鍏�', 'sys.account.smsEnabled', 'false', 'Y', 103, 1, sysdate(), null, NULL, '鏄惁寮�鍚煭淇″姛鑳斤紙true寮�鍚紝false鍏抽棴锛�'); -- Gitblit v1.9.3