gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v7.0.1-develop' into v7.0.1-develop

pull/64/head
陈立 2021-03-05 21:56:59 +08:00
parent 392179ed31 fc032eefbd
commit 2f31a40722
6 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/db/migration/V1.0_20210303_2229__add_email_config.sql Normal file
View File

@ -0,0 +1,9 @@
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367118984192843778, '邮件是否启用账号密码验证', 'SYS_EMAIL_ENABLE_AUTH', 'true', 'N', '', 1, 'java_mail_config', 'N', '2021-03-03 22:25:40', 1339550467939639299, '2021-03-03 22:25:43', 1339550467939639299);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119064924807169, '邮箱的账号', 'SYS_EMAIL_ACCOUNT', 'xxx@126.com', 'N', '', 1, 'java_mail_config', 'N', '2021-03-03 22:26:00', 1339550467939639299, NULL, NULL);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119226749444098, '邮箱的密码或者授权码', 'SYS_EMAIL_PASSWORD', 'xxx', 'N', '', 1, 'java_mail_config', 'N', '2021-03-03 22:26:38', 1339550467939639299, NULL, NULL);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119286195314689, '邮箱的发送方邮箱', 'SYS_EMAIL_SEND_FROM', 'xxx@126.com', 'Y', '', 1, 'java_mail_config', 'N', '2021-03-03 22:26:52', 1339550467939639299, NULL, NULL);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119399810621441, '是否开启tls', 'SYS_EMAIL_START_TLS_ENABLE', 'true', 'N', '使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。它将纯文本连接升级为加密连接（TLS或SSL）， 而不是使用一个单独的加密通信端口。', 1, 'java_mail_config', 'N', '2021-03-03 22:27:19', 1339550467939639299, NULL, NULL);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119457260003329, 'SSL安全连接', 'SYS_EMAIL_TLS_ENABLE', 'true', 'N', '', 1, 'java_mail_config', 'N', '2021-03-03 22:27:33', 1339550467939639299, '2021-03-03 22:28:33', 1339550467939639299);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119505888763905, '指定的端口连接到在使用指定的套接字工厂', 'SYS_EMAIL_SOCKET_FACTORY_PORT', '465', 'Y', '', 1, 'java_mail_config', 'N', '2021-03-03 22:27:45', 1339550467939639299, NULL, NULL);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119568455196674, 'SMTP超时时长，单位毫秒', 'SYS_EMAIL_SMTP_TIMEOUT', '10000', 'N', '', 1, 'java_mail_config', 'N', '2021-03-03 22:28:00', 1339550467939639299, NULL, NULL);
INSERT INTO `sys_config`(`config_id`, `config_name`, `config_code`, `config_value`, `sys_flag`, `remark`, `status_flag`, `group_code`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1367119662306942977, 'Socket连接超时值，单位毫秒，缺省值不超时', 'SYS_EMAIL_CONNECTION_TIMEOUT', '10000', 'N', 'Socket连接超时值，单位毫秒，缺省值不超时', 1, 'java_mail_config', 'N', '2021-03-03 22:28:22', 1339550467939639299, NULL, NULL);

1
src/main/resources/db/migration/V1.0_20210304_2231__update_xss_config.sql Normal file
View File

@ -0,0 +1 @@
UPDATE `sys_config` SET `config_name` = '获取XSS排除过滤的url范围', `config_code` = 'SYS_XSS_URL_EXCLUSIONS', `config_value` = '/sysNotice/add,/sysNotice/edit,/databaseInfo/add', `sys_flag` = 'Y', `remark` = '', `status_flag` = 1, `group_code` = 'sys_config', `del_flag` = 'N', `create_time` = '2021-01-17 12:47:46', `create_user` = 1339550467939639299, `update_time` = '2021-03-04 22:14:14', `update_user` = 1339550467939639299 WHERE `config_id` = 1350666094452482049;

8
src/main/webapp/assets/modular/system/config/sysConfig_add.js
View File

@ -4,9 +4,14 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
var admin = layui.admin;
var HttpRequest = layui.HttpRequest;
$("#groupCode").val(Feng.getUrlParam("groupCode"));
// 修改系统配置状态
var checked = 'Y';
form.on('switch(sysFlag)', function (obj) {
checked = obj.elem.checked ? 'Y' : 'N';
});
//表单提交事件
form.on('submit(btnSubmit)', function (data) {
var httpRequest = new HttpRequest(Feng.ctxPath + "/sysConfig/add", 'post', function (data) {
@ -17,6 +22,7 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
admin.closeThisDialog();
Feng.error("添加失败！" + data.message)
});
data.field.sysFlag = checked;
httpRequest.set(data.field);
httpRequest.start(true);
});

13
src/main/webapp/assets/modular/system/config/sysConfig_edit.js
View File

@ -7,8 +7,20 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
// 获取详情信息，填充表单
var httpRequest = new HttpRequest(Feng.ctxPath + "/sysConfig/detail?configId=" + Feng.getUrlParam("configId"), 'get');
var result = httpRequest.start();
// 获取checkbox值
var checkboxValue = result.data.sysFlag;
// checkbox特殊处理
result.data.sysFlag = checkboxValue === 'Y';
// 表单赋值
form.val('sysConfigForm', result.data);
// 修改系统配置状态
form.on('switch(sysFlag)', function (obj) {
checkboxValue = obj.elem.checked ? 'Y' : 'N';
});
//表单提交事件
form.on('submit(btnSubmit)', function (data) {
@ -21,6 +33,7 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
admin.closeThisDialog();
Feng.error("修改失败！" + data.message)
});
data.field.sysFlag = checkboxValue;
httpRequest.set(data.field);
httpRequest.start(true);
});

4
src/main/webapp/pages/modular/system/config/sysConfig_add.html
View File

@ -1,5 +1,5 @@
@layout("/layout/_form.html",{js:["/assets/modular/system/config/sysConfig_add.js"]}){
<form class="layui-form" id="sysConfigForm" lay-filter="sysConfigForm" >
<form class="layui-form" id="sysConfigForm" lay-filter="sysConfigForm">
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
@ -20,7 +20,7 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">系统参数</label>
<div class="layui-input-block">
<input type="checkbox" name="sysFlag" lay-skin="switch" lay-text="是|否" value="Y" checked>
<input type="checkbox" name="sysFlag" lay-filter="sysFlag" lay-skin="switch" lay-text="是|否" value="Y" checked>
</div>
</div>
<!-- 手动输入 -->

2
src/main/webapp/pages/modular/system/config/sysConfig_edit.html
View File

@ -24,7 +24,7 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">系统参数</label>
<div class="layui-input-block">
<input type="checkbox" name="sysFlag" lay-skin="switch" lay-text="是|否" value="Y" checked>
<input type="checkbox" name="sysFlag" lay-filter="sysFlag" lay-skin="switch" lay-text="是|否">
</div>
</div>
<!-- 手动输入 -->