diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java index a49e7116..01ba2dc7 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java @@ -17,6 +17,8 @@ package top.charles7c.cnadmin.monitor.interceptor; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -44,6 +46,8 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HttpStatus; +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import top.charles7c.cnadmin.auth.model.request.LoginRequest; @@ -214,19 +218,31 @@ public class LogInterceptor implements HandlerInterceptor { logDO.setRequestMethod(request.getMethod()); logDO.setRequestHeaders(this.desensitize(ServletUtil.getHeaderMap(request))); String requestBody = this.getRequestBody(request); - if (StrUtil.isNotBlank(requestBody)) { - logDO.setRequestBody(this.desensitize( - JSONUtil.isTypeJSON(requestBody) ? JSONUtil.parseObj(requestBody) : ServletUtil.getParamMap(request))); - } - logDO.setClientIp(ServletUtil.getClientIP(request)); - logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp())); - logDO.setBrowser(ServletUtils.getBrowser(request)); logDO.setCreateUser(ObjectUtil.defaultIfNull(logDO.getCreateUser(), LoginHelper.getUserId())); if (null == logDO.getCreateUser() && SysConsts.LOGIN_URI.equals(request.getRequestURI())) { LoginRequest loginRequest = JSONUtil.toBean(requestBody, LoginRequest.class); logDO.setCreateUser( ExceptionUtils.exToNull(() -> userService.getByUsername(loginRequest.getUsername()).getId())); } + if (StrUtil.isNotBlank(requestBody)) { + if (JSONUtil.isTypeJSONObject(requestBody)) { + requestBody = this.desensitize(JSONUtil.parseObj(requestBody)); + } else if (JSONUtil.isTypeJSONArray(requestBody)) { + JSONArray requestBodyJsonArr = JSONUtil.parseArray(requestBody); + List requestBodyJsonObjList = new ArrayList<>(requestBodyJsonArr.size()); + for (Object requestBodyJsonObj : requestBodyJsonArr) { + requestBodyJsonObjList + .add(JSONUtil.parseObj(this.desensitize(JSONUtil.parseObj(requestBodyJsonObj)))); + } + requestBody = JSONUtil.toJsonStr(requestBodyJsonObjList); + } else { + requestBody = this.desensitize(ServletUtil.getParamMap(request)); + } + logDO.setRequestBody(requestBody); + } + logDO.setClientIp(ServletUtil.getClientIP(request)); + logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp())); + logDO.setBrowser(ServletUtils.getBrowser(request)); } /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/OptionRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/OptionRequest.java new file mode 100644 index 00000000..96b9ca91 --- /dev/null +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/OptionRequest.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package top.charles7c.cnadmin.system.model.request; + +import javax.validation.constraints.NotBlank; + +import lombok.Data; + +import io.swagger.v3.oas.annotations.media.Schema; + +import org.hibernate.validator.constraints.Length; + +import top.charles7c.cnadmin.common.base.BaseRequest; + +/** + * 修改系统参数信息 + * + * @author Bull-BCLS + * @since 2023/8/26 19:38 + */ +@Data +@Schema(description = "修改系统参数信息") +public class OptionRequest extends BaseRequest { + + private static final long serialVersionUID = 1L; + + /** + * 参数键 + */ + @Schema(description = "参数键", example = "site_title") + @NotBlank(message = "参数键不能为空") + @Length(max = 100, message = "参数键长度不能超过 {max} 个字符") + private String code; + + /** + * 参数值 + */ + @Schema(description = "参数值", example = "ContiNew Admin") + @NotBlank(message = "参数值不能为空") + private String value; +} \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/ResetOptionValueRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/ResetOptionValueRequest.java new file mode 100644 index 00000000..eab7586e --- /dev/null +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/ResetOptionValueRequest.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package top.charles7c.cnadmin.system.model.request; + +import java.io.Serializable; +import java.util.List; + +import javax.validation.constraints.NotEmpty; + +import lombok.Data; + +import io.swagger.v3.oas.annotations.media.Schema; + +/** + * 重置系统参数信息 + * + * @author Bull-BCLS + * @since 2023/9/21 23:10 + */ +@Data +@Schema(description = "重置系统参数信息") +public class ResetOptionValueRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 参数键列表 + */ + @Schema(description = "参数键列表", example = "site_title,site_copyright") + @NotEmpty(message = "参数键不能为空") + private List code; +} diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/OptionService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/OptionService.java index e9cd1b07..bac2012c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/OptionService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/OptionService.java @@ -19,6 +19,8 @@ package top.charles7c.cnadmin.system.service; import java.util.List; import top.charles7c.cnadmin.system.model.query.OptionQuery; +import top.charles7c.cnadmin.system.model.request.OptionRequest; +import top.charles7c.cnadmin.system.model.request.ResetOptionValueRequest; import top.charles7c.cnadmin.system.model.vo.OptionVO; /** @@ -37,4 +39,20 @@ public interface OptionService { * @return 列表信息 */ List list(OptionQuery query); + + /** + * 修改系统参数 + * + * @param request + * 参数信息 + */ + void update(List request); + + /** + * 重置系统参数 + * + * @param request + * 重置参数信息 + */ + void resetValue(ResetOptionValueRequest request); } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/OptionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/OptionServiceImpl.java index 22cafb82..e482ac92 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/OptionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/OptionServiceImpl.java @@ -26,7 +26,10 @@ import cn.hutool.core.bean.BeanUtil; import top.charles7c.cnadmin.common.util.helper.QueryHelper; import top.charles7c.cnadmin.system.mapper.OptionMapper; +import top.charles7c.cnadmin.system.model.entity.OptionDO; import top.charles7c.cnadmin.system.model.query.OptionQuery; +import top.charles7c.cnadmin.system.model.request.OptionRequest; +import top.charles7c.cnadmin.system.model.request.ResetOptionValueRequest; import top.charles7c.cnadmin.system.model.vo.OptionVO; import top.charles7c.cnadmin.system.service.OptionService; @@ -46,4 +49,14 @@ public class OptionServiceImpl implements OptionService { public List list(OptionQuery query) { return BeanUtil.copyToList(baseMapper.selectList(QueryHelper.build(query)), OptionVO.class); } + + @Override + public void update(List request) { + baseMapper.updateBatchById(BeanUtil.copyToList(request, OptionDO.class)); + } + + @Override + public void resetValue(ResetOptionValueRequest request) { + baseMapper.lambdaUpdate().set(OptionDO::getValue, null).in(OptionDO::getCode, request.getCode()).update(); + } } \ No newline at end of file diff --git a/continew-admin-ui/src/api/system/config.ts b/continew-admin-ui/src/api/system/config.ts index ae2df164..704b8ea7 100644 --- a/continew-admin-ui/src/api/system/config.ts +++ b/continew-admin-ui/src/api/system/config.ts @@ -11,7 +11,7 @@ export interface BasicConfigRecord { } export interface DataRecord { - name: string; + name?: string; code: string; value: string; description?: string; @@ -30,6 +30,10 @@ export function list(params: ListParam) { }); } +export function save(req: DataRecord[]) { + return axios.patch(`${BASE_URL}`, req); +} + export function resetValue(params: ListParam) { return axios.patch(`${BASE_URL}/value`, params); } diff --git a/continew-admin-ui/src/views/system/config/components/basic-setting.vue b/continew-admin-ui/src/views/system/config/components/basic-setting.vue index 85b6c7e0..4f54476b 100644 --- a/continew-admin-ui/src/views/system/config/components/basic-setting.vue +++ b/continew-admin-ui/src/views/system/config/components/basic-setting.vue @@ -164,6 +164,7 @@ DataRecord, ListParam, list, + save, resetValue, } from '@/api/system/config'; @@ -207,18 +208,49 @@ siteFavicon.value = dataList.value.find( (option) => option.code === 'site_favicon' ); - form.value.site_title = siteTitle.value?.value; - form.value.site_copyright = siteCopyright.value?.value; + form.value = { + site_title: siteTitle.value?.value, + site_copyright: siteCopyright.value?.value, + site_logo: { + url: siteLogo.value?.value, + }, + site_favicon: { + url: siteFavicon.value?.value, + }, + }; logoFile.value.url = siteLogo.value?.value; faviconFile.value.url = siteFavicon.value?.value; }; getConfig(); + /** + * 取消 + */ + const handleCancel = () => { + isEdit.value = false; + }; + /** * 保存 */ - const handleSave = async () => { - isEdit.value = false; + const handleSave = () => { + proxy.$refs.formRef.validate((valid: any) => { + if (!valid) { + const optionList: DataRecord[] = Object.entries(form.value).map( + (item) => { + return { + code: item[0], + value: item[1]?.url || item[1], + }; + } + ); + save(optionList).then((res) => { + // siteConfigStore().save(data.form); + handleCancel(); + proxy.$message.success(res.msg); + }); + } + }); }; /** @@ -315,14 +347,6 @@ const reset = () => { proxy.$refs.formRef?.resetFields(); }; - - /** - * 取消 - */ - const handleCancel = () => { - isEdit.value = false; - reset(); - };