From 06a8bdec83a33454dc46e6663ad9454538f0a6e3 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Tue, 19 Mar 2024 15:23:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=99=A4=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E9=99=90=E5=88=B6=20/api/cms/form-record?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/FormRecordController.java | 15 ++++---- .../service/impl/FormRecordServiceImpl.java | 4 +-- .../common/core/security/SecurityConfig.java | 3 +- src/main/resources/application-diia.yml | 36 +++++++++++++++++++ 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/application-diia.yml diff --git a/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java index 15a9efb..b4fbc3b 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java @@ -3,8 +3,10 @@ package com.gxwebsoft.cms.controller; import com.gxwebsoft.cms.entity.FormRecord; import com.gxwebsoft.cms.param.FormRecordParam; import com.gxwebsoft.cms.service.FormRecordService; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -49,15 +51,10 @@ public class FormRecordController extends BaseController { @ApiOperation("添加表单数据记录表") @PostMapping() public ApiResult save(@RequestBody FormRecord formRecord) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - formRecord.setUserId(loginUser.getUserId()); - } if (formRecordService.save(formRecord)) { - return success("添加成功"); + return success("提交成功"); } - return fail("添加失败"); + return fail("提交失败"); } @ApiOperation("修改表单数据记录表") diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java index dde4489..87c9bd9 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java @@ -23,7 +23,7 @@ public class FormRecordServiceImpl extends ServiceImpl pageRel(FormRecordParam param) { PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +33,7 @@ public class FormRecordServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("create_time desc"); return page.sortRecords(list); } diff --git a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java index aa31f93..36f235e 100644 --- a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java @@ -63,7 +63,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/api/wxWorkQrConnect", "/WW_verify_QMv7HoblYU6z63bb.txt", "/5zbYEPkyV4.txt", - "/api/love/user-plan-log/wx-pay/**" + "/api/love/user-plan-log/wx-pay/**", + "/api/cms/form-record" ) .permitAll() .anyRequest() diff --git a/src/main/resources/application-diia.yml b/src/main/resources/application-diia.yml new file mode 100644 index 0000000..e4ee96d --- /dev/null +++ b/src/main/resources/application-diia.yml @@ -0,0 +1,36 @@ +# 生产环境配置 + +# 数据源配置 +spring: + datasource: + url: jdbc:mysql://127.0.0.1:3306/db_diia?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: db_diia + password: JKkkKjPjcmEZJfwa + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + +# 日志配置 +logging: + file: + name: websoft-modules.log + level: + root: WARN + com.gxwebsoft: ERROR + com.baomidou.mybatisplus: ERROR + +socketio: + host: 0.0.0.0 #IP地址 + +# 框架配置 +config: + # 生产环境接口 + server-url: https://server.gxwebsoft.com/api + upload-path: /www/wwwroot/file.ws/ + + # 阿里云OSS云存储 + endpoint: https://oss-cn-shenzhen.aliyuncs.com + accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP + accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM + bucketName: oss-gxwebsoft + bucketDomain: https://oss.wsdns.cn + aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com