diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java index 2583c4f..3e4c52d 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java @@ -124,4 +124,6 @@ public interface NoticeDao extends BaseMapper { NoticeEntity queryById(@Param("noticeId")Long noticeId); + + NoticeEntity getOne(); } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java index bad6060..fd090cc 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.oa.notice.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum; @@ -27,6 +28,7 @@ import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerTypeEnum; import net.lab1024.sa.base.module.support.datatracer.service.DataTracerService; +import net.lab1024.sa.base.module.support.helpdoc.domain.entity.HelpDocEntity; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -241,4 +243,12 @@ public class NoticeService { public NoticeEntity queryById(Long noticeId) { return noticeDao.queryById(noticeId); } + + public NoticeEntity getOne() { + //获取第一条承诺书 + NoticeEntity noticeEntity = noticeDao.selectOne( + new LambdaQueryWrapper() + .last("limit 1")); + return noticeEntity; + } } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/controller/LetterController.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/controller/LetterController.java index 1fecc8f..6b84f76 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/controller/LetterController.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/controller/LetterController.java @@ -1,14 +1,14 @@ package net.lab1024.sa.admin.module.letter.controller; +import net.lab1024.sa.admin.module.letter.domain.form.LetterAddForm; import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryForm; +import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryFormNoPage; import net.lab1024.sa.admin.module.letter.domain.vo.LetterVO; import net.lab1024.sa.admin.module.letter.service.LetterService; import cn.dev33.satoken.annotation.SaCheckPermission; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -37,5 +37,15 @@ public class LetterController { return ResponseDTO.ok(letterService.queryPage(queryForm)); } + @Operation(summary = "是否签署承诺书 @author wzh") + @GetMapping("/letter/isLetter/{userId}") + public ResponseDTO isLetter(@PathVariable Long userId) { + return ResponseDTO.ok(letterService.isLetter(userId)); + } + @Operation(summary = "签署承诺书 @author wzh") + @PostMapping("/letter/add") + public ResponseDTO add() { + return ResponseDTO.ok(letterService.add()); + } } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/dao/LetterDao.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/dao/LetterDao.java index f440108..0fee20c 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/dao/LetterDao.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/dao/LetterDao.java @@ -30,4 +30,11 @@ public interface LetterDao extends BaseMapper { */ List queryPage(Page page, @Param("queryForm") LetterQueryForm queryForm); + /** + * 是否有承诺书 + * + * @param userId + * @return + */ + int isLetter(Long userId); } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.java index a7c6ab4..62a2b38 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.java @@ -24,8 +24,12 @@ public class LetterEntity { * 承诺书id */ @TableId(type = IdType.AUTO) - private Integer letterId; + private Long letterId; + /** + * 承诺书id + */ + private Long noticeId; /** * 排序 */ @@ -44,7 +48,7 @@ public class LetterEntity { /** * 用户id */ - private Integer userId; + private Long userId; /** * diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterAddForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterAddForm.java new file mode 100644 index 0000000..e90e40c --- /dev/null +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterAddForm.java @@ -0,0 +1,21 @@ +package net.lab1024.sa.admin.module.letter.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 承诺书签订表 + * + * @Author wzh + * @Date 2025-12-22 17:43:06 + * @Copyright 1 + */ + +@Data +@EqualsAndHashCode(callSuper = false) +public class LetterAddForm { + + @Schema(description = "用户id") + private Long userId; +} diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterQueryFormNoPage.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterQueryFormNoPage.java new file mode 100644 index 0000000..0363206 --- /dev/null +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterQueryFormNoPage.java @@ -0,0 +1,21 @@ +package net.lab1024.sa.admin.module.letter.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.lab1024.sa.base.common.domain.PageParam; + +/** + * 承诺书签订表 + * + * @Author wzh + * @Date 2025-12-22 17:43:06 + * @Copyright 1 + */ + +@Data +@EqualsAndHashCode(callSuper = false) +public class LetterQueryFormNoPage { + @Schema(description = "用户id") + private Long userId; +} diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.java index 880a47d..1ede6d3 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.java @@ -3,6 +3,8 @@ package net.lab1024.sa.admin.module.letter.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 承诺书签订表 列表VO * @@ -15,10 +17,15 @@ import lombok.Data; public class LetterVO { - @Schema(description = "承诺书id") + @Schema(description = "主鍵id") private Long letterId; + + @Schema(description = "承诺书id") + private Long noticeId; + @Schema(description = "承诺书名称") private String letterName; + @Schema(description = "排序") private Integer sort; @@ -30,6 +37,10 @@ public class LetterVO { @Schema(description = "用户id") private Long userId; + @Schema(description = "用户名称") private String userName; + + @Schema(description = "签约时间") + private LocalDateTime createTime; } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java index fae41db..7a5cf10 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java @@ -2,17 +2,26 @@ package net.lab1024.sa.admin.module.letter.service; import java.util.List; +import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity; import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeService; import net.lab1024.sa.admin.module.letter.dao.LetterDao; +import net.lab1024.sa.admin.module.letter.domain.entity.LetterEntity; +import net.lab1024.sa.admin.module.letter.domain.form.LetterAddForm; import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryForm; +import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryFormNoPage; import net.lab1024.sa.admin.module.letter.domain.vo.LetterVO; import net.lab1024.sa.admin.module.system.employee.service.EmployeeService; +import net.lab1024.sa.admin.util.AdminRequestUtil; +import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.module.support.helpdoc.domain.entity.HelpDocEntity; +import net.lab1024.sa.base.module.support.helpdoc.service.HelpDocService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.validation.Valid; /** * 承诺书签订表 Service @@ -31,7 +40,6 @@ public class LetterService { private EmployeeService employeeService; @Resource private NoticeService noticeService; - /** * 分页查询 */ @@ -41,10 +49,41 @@ public class LetterService { //查询用户名称 list.forEach(item -> { item.setUserName(employeeService.queryById(item.getUserId()).getActualName()); - item.setLetterName(noticeService.queryById(item.getLetterId()).getTitle()); + item.setLetterName(noticeService.queryById(item.getNoticeId()).getTitle()); }); return SmartPageUtil.convert2PageResult(page, list); } + /** + * 是否签署承诺书 + * @param userId + * @return + */ + public Boolean isLetter(Long userId) { + //查询当前用户是否签署了承诺书 + int letter = letterDao.isLetter(userId); + if (letter > 0){ + return true; + } + return false; + } + + /** + * 新增 + */ + public Boolean add() { + Long userId = AdminRequestUtil.getRequestUser().getUserId(); + LetterEntity letterEntity = new LetterEntity(); + letterEntity.setUserId(userId); + NoticeEntity one = noticeService.getOne(); + if (one != null) { + letterEntity.setNoticeId(one.getNoticeId()); + } + int insert = letterDao.insert(letterEntity); + if (insert <= 0) { + return false; + } + return true; + } } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java index 5710b0b..972fa4c 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java @@ -35,4 +35,6 @@ public class LoginResultVO extends RequestEmployee { @Schema(description = "上次登录时间") private LocalDateTime lastLoginTime; + @Schema(description = "协议书签订状态") + private Boolean agreementSignFlag; } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index 0b29bec..6ca079d 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.extra.servlet.ServletUtil; import lombok.extern.slf4j.Slf4j; +import net.lab1024.sa.admin.module.letter.service.LetterService; import net.lab1024.sa.admin.module.system.department.service.DepartmentService; import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity; import net.lab1024.sa.admin.module.system.employee.service.EmployeeService; @@ -108,6 +109,8 @@ public class LoginService implements StpInterface { @Resource private LoginManager loginManager; + @Resource + private LetterService letterService; /** * 获取验证码 @@ -216,7 +219,6 @@ public class LoginService implements StpInterface { // 更新用户权限 loginManager.loadUserPermission(employeeEntity.getEmployeeId()); - return ResponseDTO.ok(loginResultVO); } @@ -255,6 +257,8 @@ public class LoginService implements StpInterface { //查询执业证号 loginResultVO.setLicenseNumber(employeeService.getById(requestEmployee.getUserId()).getCertificateNumber()); + //承诺书签订状态 + loginResultVO.setAgreementSignFlag(letterService.isLetter(requestEmployee.getEmployeeId())); return loginResultVO; } diff --git a/yun-admin/src/main/resources/dev/application.yaml b/yun-admin/src/main/resources/dev/application.yaml index fa29f06..6ba9901 100644 --- a/yun-admin/src/main/resources/dev/application.yaml +++ b/yun-admin/src/main/resources/dev/application.yaml @@ -12,7 +12,7 @@ project: # 项目端口和url根路径 server: - port: 1024 + port: 8080 servlet: context-path: / diff --git a/yun-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml b/yun-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml index 7e47a59..2b71588 100644 --- a/yun-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml +++ b/yun-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml @@ -253,6 +253,11 @@ from t_notice where notice_id = #{noticeId} + insert into t_notice_view_record (notice_id, employee_id, first_ip, first_user_agent, page_view_count) values (#{noticeId}, #{employeeId}, #{ip}, #{userAgent}, #{pageViewCount}) diff --git a/yun-admin/src/main/resources/mapper/letter/LetterMapper.xml b/yun-admin/src/main/resources/mapper/letter/LetterMapper.xml index d5ecde8..9b140ee 100644 --- a/yun-admin/src/main/resources/mapper/letter/LetterMapper.xml +++ b/yun-admin/src/main/resources/mapper/letter/LetterMapper.xml @@ -5,6 +5,7 @@ t_letter.letter_id, + t_letter.notice_id, t_letter.sort, t_letter.disabled_flag, t_letter.deleted_flag, @@ -19,6 +20,14 @@ FROM t_letter + diff --git a/yun-admin/src/main/resources/pre/application.yaml b/yun-admin/src/main/resources/pre/application.yaml index 327888b..62588c0 100644 --- a/yun-admin/src/main/resources/pre/application.yaml +++ b/yun-admin/src/main/resources/pre/application.yaml @@ -8,7 +8,7 @@ # 项目配置: 名称、日志目录 project: name: yun-admin - log-directory: /home/logs/smart_admin_v3/${project.name}/${spring.profiles.active} + log-directory: /home/logs/${project.name}/${project.name}/${spring.profiles.active} # 项目端口和url根路径 server: diff --git a/yun-admin/src/main/resources/prod/application.yaml b/yun-admin/src/main/resources/prod/application.yaml index 327888b..423b847 100644 --- a/yun-admin/src/main/resources/prod/application.yaml +++ b/yun-admin/src/main/resources/prod/application.yaml @@ -8,11 +8,11 @@ # 项目配置: 名称、日志目录 project: name: yun-admin - log-directory: /home/logs/smart_admin_v3/${project.name}/${spring.profiles.active} + log-directory: /home/logs/${project.name}/${spring.profiles.active} # 项目端口和url根路径 server: - port: 1024 + port: 8080 servlet: context-path: / diff --git a/yun-admin/target/classes/application.yaml b/yun-admin/target/classes/application.yaml index 5583c1e..a796928 100644 --- a/yun-admin/target/classes/application.yaml +++ b/yun-admin/target/classes/application.yaml @@ -8,15 +8,15 @@ # 项目配置: 名称、日志目录 project: name: yun-admin - log-directory: ${localPath:/home}/logs/smart_admin_v3/yun-admin/${spring.profiles.active} + log-directory: /home/logs/yun-admin/${spring.profiles.active} # 项目端口和url根路径 server: - port: 1024 + port: 8080 servlet: context-path: / # 环境 spring: profiles: - active: 'dev' \ No newline at end of file + active: 'prod' \ No newline at end of file diff --git a/yun-admin/target/classes/log4j2-spring.xml b/yun-admin/target/classes/log4j2-spring.xml index cab3506..822d276 100644 --- a/yun-admin/target/classes/log4j2-spring.xml +++ b/yun-admin/target/classes/log4j2-spring.xml @@ -10,8 +10,7 @@ - + @@ -102,10 +101,12 @@ + - + + diff --git a/yun-admin/target/classes/mapper/business/oa/notice/NoticeMapper.xml b/yun-admin/target/classes/mapper/business/oa/notice/NoticeMapper.xml index 7e47a59..2b71588 100644 --- a/yun-admin/target/classes/mapper/business/oa/notice/NoticeMapper.xml +++ b/yun-admin/target/classes/mapper/business/oa/notice/NoticeMapper.xml @@ -253,6 +253,11 @@ from t_notice where notice_id = #{noticeId} + insert into t_notice_view_record (notice_id, employee_id, first_ip, first_user_agent, page_view_count) values (#{noticeId}, #{employeeId}, #{ip}, #{userAgent}, #{pageViewCount}) diff --git a/yun-admin/target/classes/mapper/letter/LetterMapper.xml b/yun-admin/target/classes/mapper/letter/LetterMapper.xml index d5ecde8..9b140ee 100644 --- a/yun-admin/target/classes/mapper/letter/LetterMapper.xml +++ b/yun-admin/target/classes/mapper/letter/LetterMapper.xml @@ -5,6 +5,7 @@ t_letter.letter_id, + t_letter.notice_id, t_letter.sort, t_letter.disabled_flag, t_letter.deleted_flag, @@ -19,6 +20,14 @@ FROM t_letter + diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.class index a21c9ea..30be856 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.class index 9eeb71f..3866e3e 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/controller/LetterController.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/controller/LetterController.class index 820172b..3e24322 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/controller/LetterController.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/controller/LetterController.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/dao/LetterDao.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/dao/LetterDao.class index 96f57dc..a1783ba 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/dao/LetterDao.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/dao/LetterDao.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.class index b356213..f2c5c0a 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.class index 4a2a16d..b0a6695 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/service/LetterService.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/service/LetterService.class index 27c475d..fcd2ba2 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/service/LetterService.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/letter/service/LetterService.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.class index 45dbe8a..d617395 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/service/LoginService.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/service/LoginService.class index ecfb10e..e3fbd5c 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/service/LoginService.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/system/login/service/LoginService.class differ diff --git a/yun-admin/target/classes/spy.properties b/yun-admin/target/classes/spy.properties deleted file mode 100644 index 667e1ea..0000000 --- a/yun-admin/target/classes/spy.properties +++ /dev/null @@ -1,18 +0,0 @@ -#相关的包 -modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory -# 日志格式 -logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger -#日志输出到控制台 -appender=com.p6spy.engine.spy.appender.StdoutLogger -# 设置 p6spy driver 代理 -deregisterdrivers=true -# 取消JDBC URL前缀 -useprefix=true -# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset. -excludecategories=info,debug,result,commit,resultset -# 日期格式 -dateformat=yyyy-MM-dd HH:mm:ss -# 开启慢sql -outagedetection=true -# 慢SQL记录标准(单位秒) -outagedetectioninterval=2 \ No newline at end of file diff --git a/yun-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java b/yun-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java index 7ccccff..daa6692 100644 --- a/yun-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java +++ b/yun-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java @@ -10,12 +10,7 @@ import org.springframework.web.filter.CorsFilter; /** * 跨域配置 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2021/11/15 20:38 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 + */ @Configuration @Conditional(SystemEnvironmentConfig.class) @@ -33,7 +28,7 @@ public class CorsFilterConfig { CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); // 设置访问源地址 - config.addAllowedOriginPattern(accessControlAllowOrigin); + config.addAllowedOrigin(accessControlAllowOrigin); // 设置访问源请求头 config.addAllowedHeader("*"); // 设置访问源请求方法 diff --git a/yun-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java b/yun-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java index caa641d..7d8ee5c 100644 --- a/yun-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java +++ b/yun-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java @@ -13,12 +13,6 @@ import org.springframework.core.type.AnnotatedTypeMetadata; /** * 系统环境 - * - * @Author 1024创新实验室-主任: 卓大 - * @Date 2021/08/13 18:56 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 */ @Configuration public class SystemEnvironmentConfig implements Condition { diff --git a/yun-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java b/yun-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java index 856bada..1915caf 100644 --- a/yun-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java +++ b/yun-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java @@ -1,5 +1,6 @@ package net.lab1024.sa.base.module.support.helpdoc.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.ResponseDTO; @@ -117,4 +118,12 @@ public class HelpDocService { public List queryHelpDocByRelationId(Long relationId) { return helpDocDao.queryHelpDocByRelationId(relationId); } + + public HelpDocEntity getOne() { + //获取第一条承诺书 + HelpDocEntity helpDocEntity = helpDocDao.selectOne( + new LambdaQueryWrapper() + .orderByAsc(HelpDocEntity::getSort).last("limit 1")); + return helpDocEntity; + } } diff --git a/yun-base/src/main/resources/prod/yun-base.yaml b/yun-base/src/main/resources/prod/yun-base.yaml index e724266..9b372e1 100644 --- a/yun-base/src/main/resources/prod/yun-base.yaml +++ b/yun-base/src/main/resources/prod/yun-base.yaml @@ -1,9 +1,9 @@ spring: # 数据库连接信息 datasource: - url: jdbc:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://8.148.67.92:3306/lawyer_welfare?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: root + password: sdy@2025# driver-class-name: com.mysql.cj.jdbc.Driver initial-size: 10 min-idle: 10 @@ -23,9 +23,9 @@ spring: # redis 连接池配置信息 redis: database: 1 - host: 127.0.0.1 + host: 8.148.67.92 port: 6379 - password: + password: sdy@2025# timeout: 10000ms lettuce: pool: @@ -133,6 +133,8 @@ http: read-timeout: 50000 write-timeout: 50000 keep-alive: 300000 +# 跨域配置 +access-control-allow-origin: '*' # 心跳配置 heart-beat: diff --git a/yun-base/target/classes/net/lab1024/sa/base/config/CorsFilterConfig.class b/yun-base/target/classes/net/lab1024/sa/base/config/CorsFilterConfig.class index 9ffbb61..2766f09 100644 Binary files a/yun-base/target/classes/net/lab1024/sa/base/config/CorsFilterConfig.class and b/yun-base/target/classes/net/lab1024/sa/base/config/CorsFilterConfig.class differ diff --git a/yun-base/target/classes/net/lab1024/sa/base/config/SystemEnvironmentConfig.class b/yun-base/target/classes/net/lab1024/sa/base/config/SystemEnvironmentConfig.class index aa3c15e..28d7c21 100644 Binary files a/yun-base/target/classes/net/lab1024/sa/base/config/SystemEnvironmentConfig.class and b/yun-base/target/classes/net/lab1024/sa/base/config/SystemEnvironmentConfig.class differ diff --git a/yun-base/target/classes/net/lab1024/sa/base/listener/WebServerListener.class b/yun-base/target/classes/net/lab1024/sa/base/listener/WebServerListener.class index d647c88..f96876d 100644 Binary files a/yun-base/target/classes/net/lab1024/sa/base/listener/WebServerListener.class and b/yun-base/target/classes/net/lab1024/sa/base/listener/WebServerListener.class differ diff --git a/yun-base/target/classes/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.class b/yun-base/target/classes/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.class index be467a6..44adf2e 100644 Binary files a/yun-base/target/classes/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.class and b/yun-base/target/classes/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.class differ diff --git a/yun-base/target/classes/yun-base.yaml b/yun-base/target/classes/yun-base.yaml index d267c7c..9b372e1 100644 --- a/yun-base/target/classes/yun-base.yaml +++ b/yun-base/target/classes/yun-base.yaml @@ -1,13 +1,13 @@ spring: # 数据库连接信息 datasource: - url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&connectionCollation=utf8mb4_general_ci + url: jdbc:mysql://8.148.67.92:3306/lawyer_welfare?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: root - driver-class-name: com.p6spy.engine.spy.P6SpyDriver - initial-size: 2 - min-idle: 2 - max-active: 10 + password: sdy@2025# + driver-class-name: com.mysql.cj.jdbc.Driver + initial-size: 10 + min-idle: 10 + max-active: 200 max-wait: 60000 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 @@ -23,17 +23,16 @@ spring: # redis 连接池配置信息 redis: database: 1 - host: 127.0.0.1 + host: 8.148.67.92 port: 6379 - password: + password: sdy@2025# timeout: 10000ms lettuce: pool: - max-active: 5 - min-idle: 1 - max-idle: 3 + max-active: 100 + min-idle: 10 + max-idle: 50 max-wait: 30000ms - # 邮件,置以SSL的方式发送, 这个需要使用这种方式并且端口是465 mail: host: smtp.163.com @@ -90,9 +89,10 @@ server: basedir: ${project.log-directory}/tomcat-logs accesslog: enabled: true - max-days: 7 + max-days: 30 pattern: "%t %{X-Forwarded-For}i %a %r %s (%D ms) %I (%B byte)" + # 文件上传 配置 file: storage: @@ -128,22 +128,21 @@ knife4j: # RestTemplate 请求配置 毫秒 http: pool: - max-total: 20 + max-total: 100 connect-timeout: 50000 read-timeout: 50000 write-timeout: 50000 keep-alive: 300000 - # 跨域配置 access-control-allow-origin: '*' # 心跳配置 heart-beat: - interval-seconds: 300 + interval-seconds: 60 # 热加载配置 reload: - interval-seconds: 300 + interval-seconds: 60 # sa-token 配置 sa-token: @@ -164,9 +163,9 @@ sa-token: # 是否打开自动续签 (如果此值为true,框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作) auto-renew: true # 是否输出操作日志 - is-log: true + is-log: false # 日志等级(trace、debug、info、warn、error、fatal) - log-level: debug + log-level: warn # 启动时的字符画打印 is-print: false # 是否从cookie读取token