From 18d229499781e51d4c82906e62755725475d3f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E5=AE=9D=E5=B1=B1?= <1253070437@qq.com> Date: Thu, 28 Jan 2021 23:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?= =?UTF-8?q?=E6=96=B0sql=E6=96=87=E4=BB=B6=EF=BC=8C=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=85=B3=E9=97=AD=E6=89=93=E5=8D=B0=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _sql/xiaonuo-vue-pub-oracle.sql | 1 + _sql/xiaonuo-vue-pub.sql | 5 +++-- .../xiaonuo/generate/core/enums/TableFilteredFieldsEnum.java | 4 ++-- xiaonuo-main/src/main/resources/application.yml | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/_sql/xiaonuo-vue-pub-oracle.sql b/_sql/xiaonuo-vue-pub-oracle.sql index b8a3a81d..4bfaaab9 100644 --- a/_sql/xiaonuo-vue-pub-oracle.sql +++ b/_sql/xiaonuo-vue-pub-oracle.sql @@ -142,6 +142,7 @@ INSERT INTO "SYS_CONFIG" VALUES ('1270380786649972739', 'linux/mac本地上传 INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982740', 'XiaoNuo演示环境', 'XIAONUO_DEMO_ENV_FLAG', 'false', 'Y', 'XiaoNuo演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', TO_DATE('2020-09-03 14:38:17', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808'); INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982741', 'XiaoNuo放开XSS过滤的接口', 'XIAONUO_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982742', '单用户登陆的开关', 'XIAONUO_ENABLE_SINGLE_LOGIN', 'false', 'Y', '单用户登陆的开关，true-打开，false-关闭，如果一个人登录两次，就会将上一次登陆挤下去', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); +INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982743', '登录验证码的开关', 'XIAONUO_CAPTCHA_OPEN', 'true', 'Y', '登录验证码的开关，true-打开，false-关闭', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1280694183769792514', 'druid监控登录账号', 'XIAONUO_DRUID_USERNAME', 'superAdmin', 'Y', 'druid监控登录账号', '0', 'DEFAULT', TO_DATE('2020-07-08 10:44:22', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1280694281648070658', 'druid监控界面登录密码', 'XIAONUO_DRUID_PASSWORD', '123456', 'Y', 'druid监控登录密码', '0', 'DEFAULT', TO_DATE('2020-07-08 10:44:46', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1280694281648070659', '阿里云定位api接口地址', 'XIAONUO_IP_GEO_API', 'http://api01.aliyun.venuscn.com/ip?ip=%s', 'Y', '阿里云定位api接口地址', '0', 'DEFAULT', TO_DATE('2020-07-20 10:44:46', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); diff --git a/_sql/xiaonuo-vue-pub.sql b/_sql/xiaonuo-vue-pub.sql index fb390722..19cc7fa2 100644 --- a/_sql/xiaonuo-vue-pub.sql +++ b/_sql/xiaonuo-vue-pub.sql @@ -111,8 +111,9 @@ INSERT INTO `sys_config` VALUES ('1270380786649972739', 'linux/mac本地上传 INSERT INTO `sys_config` VALUES ('1270380786649982740', 'XiaoNuo演示环境', 'XIAONUO_DEMO_ENV_FLAG', 'false', 'Y', 'XiaoNuo演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', '0', 'DEFAULT', '2020-06-09 23:42:37', '1265476890672672808', '2020-09-03 14:38:17', '1265476890672672808'); INSERT INTO `sys_config` VALUES ('1270380786649982741', 'XiaoNuo放开XSS过滤的接口', 'XIAONUO_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', '0', 'DEFAULT', '2020-06-09 23:42:37', '1265476890672672808', null, null); INSERT INTO `sys_config` VALUES ('1270380786649982742', '单用户登陆的开关', 'XIAONUO_ENABLE_SINGLE_LOGIN', 'false', 'Y', '单用户登陆的开关，true-打开，false-关闭，如果一个人登录两次，就会将上一次登陆挤下去', '0', 'DEFAULT', '2020-06-09 23:42:37', '1265476890672672808', null, null); -INSERT INTO `sys_config` VALUES ('1280694183769792514', 'druid监控登录账号', 'XIAONUO_DRUID_USERNAME', '', 'Y', 'druid监控登录账号', '0', 'DEFAULT', '2020-07-08 10:44:22', '1265476890672672808', null, null); -INSERT INTO `sys_config` VALUES ('1280694281648070658', 'druid监控界面登录密码', 'XIAONUO_DRUID_PASSWORD', '', 'Y', 'druid监控登录密码', '0', 'DEFAULT', '2020-07-08 10:44:46', '1265476890672672808', null, null); +INSERT INTO `sys_config` VALUES ('1270380786649982743', '登录验证码的开关', 'XIAONUO_CAPTCHA_OPEN', 'true', 'Y', '登录验证码的开关，true-打开，false-关闭', '0', 'DEFAULT', '2020-06-09 23:42:37', '1265476890672672808', null, null); +INSERT INTO `sys_config` VALUES ('1280694183769792514', 'druid监控登录账号', 'XIAONUO_DRUID_USERNAME', 'superAdmin', 'Y', 'druid监控登录账号', '0', 'DEFAULT', '2020-07-08 10:44:22', '1265476890672672808', null, null); +INSERT INTO `sys_config` VALUES ('1280694281648070658', 'druid监控界面登录密码', 'XIAONUO_DRUID_PASSWORD', '123456', 'Y', 'druid监控登录密码', '0', 'DEFAULT', '2020-07-08 10:44:46', '1265476890672672808', null, null); INSERT INTO `sys_config` VALUES ('1280694281648070659', '阿里云定位api接口地址', 'XIAONUO_IP_GEO_API', 'http://api01.aliyun.venuscn.com/ip?ip=%s', 'Y', '阿里云定位api接口地址', '0', 'DEFAULT', '2020-07-20 10:44:46', '1265476890672672808', null, null); INSERT INTO `sys_config` VALUES ('1280694281648070660', '阿里云定位appCode', 'XIAONUO_IP_GEO_APP_CODE', '461535aabeae4f34861884d392f5d452', 'Y', '阿里云定位appCode', '0', 'DEFAULT', '2020-07-20 10:44:46', '1265476890672672808', null, null); INSERT INTO `sys_config` VALUES ('1288309751255412737', 'Oauth用户登录的开关', 'XIAONUO_ENABLE_OAUTH_LOGIN', 'true', 'Y', 'Oauth用户登录的开关', '0', 'OAUTH', '2020-07-29 11:05:55', '1265476890672672808', null, null); diff --git a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/enums/TableFilteredFieldsEnum.java b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/enums/TableFilteredFieldsEnum.java index a6c388be..7c5e307d 100644 --- a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/enums/TableFilteredFieldsEnum.java +++ b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/enums/TableFilteredFieldsEnum.java @@ -29,8 +29,8 @@ public enum TableFilteredFieldsEnum { * @date 2020年12月17日00:11:40 */ public static boolean contains(String propertyName) { - for (TableFilteredFieldsEnum gunsFilteredFieldsEnum : TableFilteredFieldsEnum.values()) { - if (gunsFilteredFieldsEnum.propertyName.equals(propertyName)) { + for (TableFilteredFieldsEnum xiaonuoFilteredFieldsEnum : TableFilteredFieldsEnum.values()) { + if (xiaonuoFilteredFieldsEnum.propertyName.equals(propertyName)) { return true; } } diff --git a/xiaonuo-main/src/main/resources/application.yml b/xiaonuo-main/src/main/resources/application.yml index 0623b856..23de96bc 100644 --- a/xiaonuo-main/src/main/resources/application.yml +++ b/xiaonuo-main/src/main/resources/application.yml @@ -56,6 +56,10 @@ jodconverter: #libreoffice进程重启前的最大进程数 max-tasks-per-process: 100 +#验证码相关配置 去除日志打印 +logging: + level: + com.anji: off #验证码相关配置 aj: captcha: