From defcf7bef38a66c88ec5c7c135d89080b25ee3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwangzihua=E2=80=9D?= Date: Wed, 7 Jan 2026 12:33:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=88=90=E6=9C=AC=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/oa/notice/dao/NoticeDao.java | 2 + .../oa/notice/service/NoticeService.java | 10 ++++ .../letter/controller/LetterController.java | 16 +++++-- .../sa/admin/module/letter/dao/LetterDao.java | 7 +++ .../letter/domain/entity/LetterEntity.java | 8 +++- .../letter/domain/form/LetterAddForm.java | 21 +++++++++ .../domain/form/LetterQueryFormNoPage.java | 21 +++++++++ .../module/letter/domain/vo/LetterVO.java | 13 +++++- .../module/letter/service/LetterService.java | 43 +++++++++++++++++- .../system/login/domain/LoginResultVO.java | 2 + .../system/login/service/LoginService.java | 6 ++- .../src/main/resources/dev/application.yaml | 2 +- .../business/oa/notice/NoticeMapper.xml | 5 ++ .../resources/mapper/letter/LetterMapper.xml | 9 ++++ .../src/main/resources/pre/application.yaml | 2 +- .../src/main/resources/prod/application.yaml | 4 +- yun-admin/target/classes/application.yaml | 6 +-- yun-admin/target/classes/log4j2-spring.xml | 7 +-- .../business/oa/notice/NoticeMapper.xml | 5 ++ .../classes/mapper/letter/LetterMapper.xml | 9 ++++ .../business/oa/notice/dao/NoticeDao.class | Bin 3780 -> 3877 bytes .../oa/notice/service/NoticeService.class | Bin 15708 -> 16201 bytes .../letter/controller/LetterController.class | Bin 1985 -> 2848 bytes .../admin/module/letter/dao/LetterDao.class | Bin 921 -> 962 bytes .../letter/domain/entity/LetterEntity.class | Bin 4712 -> 5228 bytes .../module/letter/domain/vo/LetterVO.class | Bin 4584 -> 5661 bytes .../module/letter/service/LetterService.class | Bin 3893 -> 5170 bytes .../system/login/domain/LoginResultVO.class | Bin 5330 -> 5888 bytes .../system/login/service/LoginService.class | Bin 22685 -> 22967 bytes yun-admin/target/classes/spy.properties | 18 -------- .../sa/base/config/CorsFilterConfig.java | 9 +--- .../base/config/SystemEnvironmentConfig.java | 6 --- .../helpdoc/service/HelpDocService.java | 9 ++++ .../src/main/resources/prod/yun-base.yaml | 10 ++-- .../sa/base/config/CorsFilterConfig.class | Bin 1758 -> 1751 bytes .../base/config/SystemEnvironmentConfig.class | Bin 2955 -> 2959 bytes .../sa/base/listener/WebServerListener.class | Bin 4707 -> 4646 bytes .../helpdoc/service/HelpDocService.class | Bin 5338 -> 7473 bytes yun-base/target/classes/yun-base.yaml | 37 ++++++++------- 39 files changed, 214 insertions(+), 73 deletions(-) create mode 100644 yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterAddForm.java create mode 100644 yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterQueryFormNoPage.java delete mode 100644 yun-admin/target/classes/spy.properties 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 a21c9ea22cdeaefdceb058a8719a0271725b29dc..30be8561dee60cdaf9023f17f8d382b482463897 100644 GIT binary patch delta 104 zcmX>iyHrm2)W2Q(7#J8#80^>?tl1fC*cog$3b%3bvZbe%_~)fEGWcp}`b?g{Z7^{? z+hh@Lk05drg AV*mgE delta 71 zcmZ1~cSKhB)W2Q(7#J8#7;M-XEZG^X*cq%h3b%1>{>0VF$jH07f~TEHj)9qh4XB0* UsLB*fn=zOJX*LE%1`7rT0Ci~$!Tox} zCz39@ktmE@QqonFLigyR3{j!G%P{9%`~OYFInU{NX4YQ&`_}h409z!$X_S2OQJ0|dNR@2Fvbx!0N{JY10 z@SiTvwCXqy6+FvB7k073*{U1QQF(Z-eLc?(o;5!|74b|>g==%_!F;b=`CRDoB9A@U z%ckBtgiXBI4t-qq_0X4>B=S=J%hPa~$IE$zmGujuC$DsQmCLIWc#VgCEU@zaHoO5I z2eQz^77ntGueFW`yDaiB$W~*Bo*e3On3XpiZqY}0EaoNF#Ym4O3SYx{E=Rd6t%!AY zxUpr#RR4#pj{Z>-s>t(>kfSTwm_Bjd7?;<%9P4tNe`m@F6Mt=C*+nA?iTsmV_#>Nl zulOxxv@>J^Zgn}{@Ou8+pcG{;Z!nn58(o$gOy^BRxJz+yS!vm*f|2=!WrK?cmez{r z&0*f6$AmC%HJr#vhPUx{!#g<6Oh{`GFGNebek+4?j_}!eALcH2jEDh_r~Va^k|uX_J3n!H@Zg zLHf{_^3@j=uDjrdqS2DVA)VRDJ1;hIfEa+wDmx{O} z3r7*|u%h8bWewXIC*&BStu=3bym@rBagv;5 zDYm*!W8*ZjFCXFK>3QwhtfE8S3GT*J z;iMn~_h1@gWLF#0;UgCJ2B=PS)r^`|_i5Ek=^V@w#{HNb8w4`ulwLs~xk!-mN(Fxv z!nhh~7=RoU%IP4qMG?-xkRYg*asixK6V#b_0CNNwk4|_H4+%2|jqorYkvkiTEkHy! zSGq?fNrqE}G#8ImA=6bwXNDzo@VNeUkZYV+amlH7Fof| zXtp3IiQzCjjfKjn1uw#)V4wOk9nWYMEBDvo*#Oy=sjHYC@wGVWt9%}o)HqvQ<7|l* zM&OpJ!V$Q|HE`D0);J4sRY-SHkyM2g7fq}1P|X-+!QL&P&WTqDUdI{dPBBn zXvHIP)(EY!N<4{?U24FS2xTo#BD%TKMR}54g)C8|3Ux%6Xxz_h;cC2KL9UUo?Dv~>Pjc|1cGUeo5fo@VWZdR?{S1){^d_UA-@R6GO z6ZO@n7>cc8?l!UZGd1iNV&j*p$99GMHQv%j?7>bP#x5HBL5AIItgpv*_?GA5dv?WM zUWolcQX`>HWYkg0ua@i6w4J7};dOC#53Uf{I&IrfLB1Jq%va4U@8acdCDvnuXrxq* zRYbFBMc5@;ksKkug}0S-Yc>gZ9N8#a%Lwj9F(!iBRs4(szawDno+3*Qx;&{`yAbE1 z#KpTRt&1*VC8%e$s&%}=pVKL$d{Z^fM(8*b(Kq<(>0*00^jo2!M7j^eh|(fI0sY|+Rp{c8vlmQ^#g)Nu7sb1eM=X0AtoIoV<=jB ziYp&RxTZ5WCRmkixwaaEE?a?XQwJ|c(OL{yg`olSdbC4AXh(Wb2U~byi=??a|DzXYbq~#0{Nu{t)8Uz$|iWC5y1@0Ik(!9Sy9#5bW(1 zT8d#Umt**Hj994GNEDGQXZ!&oB#3PRgl_&5Auf$Tl%Ifc+keH-CqxwEoM?T*t#nou z3+4Qk=(-#ukH3Wb9IJw23_j0;dSI2%kV=ac663o(=&brZAWA#cz+ond_R-F`)b=BQrXKB2E-Twn!%sk!z delta 3685 zcma)82Xs}%7Tx0W}&>^nb+?L`s5yBp_mW0mOnR z;*}yD8yG3#qe`(i#Db_;z)C1K>;)tFd+vM0!e8sVRx)?y%$$AB?6YU)y?oR5F|kbt zp4bSWy;H}-5N!9b10QCf6d#50F+TC|DL#v8es37f@wuJ-!qe=R9_HXH4_{-S?S13o zTMysidk;V0M-Q3!$zuF$hrf9E75nX~->j|L+J5(N05$1^7sDJNL zS;Gv|MBy-EdpWj=dOVD|wwLEJ-@4QhDC>qvvQ*#unBw#7H_@d2G!#+Bc6*=P?=txwAm~VcT>bYiEwLZtXJIo*g_M z&l6mBwAwp69GfU z+O3}z#wMO^n{!+idg#M*Gk6}0JT<*M_U8H4c0m|L?Bnu6mlvh;-yZt%Kh}P+P45zq zeR-*e&AiM8zT5`B!h#fg?8kF0(v=?jD@*oI=P53)aycM=gtOD-z&O3`4hO|gHy4Dw z!7fW&mbx6`KaevtUJ@;HN^ZnWF0VEm%3%gqW2npF1~>B>mm>@&v5bgx8#b)Gtb9cA z@WQLg2Mz0AmYv4(2uJEOD#B|GNAo(vF}&XJ2Ht2e5BD10#F)zp!?7G^IG#5XJ^cko z9`E0nmlvC0cnfcJd7I(wj2TYk9R}B6gyAIK>GCea$-LWe3hyzv4r2^`-s^Iz;WSPs zva4>pW%u%RJJ;M_vt%c%R`+8*rB4Y|bI_cFnHbvvlL`4NI#gFWa+l?4C*E zt7fe*oXdF;#^x*Y1rcmDyq^!ae9-VAJ{;k~><|}4_=sU8A2nReC5B5m&*d`1$GF_^ zamIp}Ts|X+XCr)$$lW`B(cbBc2KTSs?Y{Lh zT|RI40!8wRd`W!lt(duc-b1x343_d`!%d8dhs0dfgvC`;CjPO4uW++L{`I)Q<*SCT z@pYGP7_8(L;%t?vi$AeW)_^zpl;KvsW%xGB4Bz24!*}_f;rsl+a65M>#1+X^ zuD|h^X#BDkZmO1fL~$}!-T1oJ15^Bk1@RVP;}|Dm@D8>aye&aGIoc@R#8%gd8s{)O zcpY!}W7~FMUVL@iiF ziaZpf5w29w{%DJV=!`)@QmqsM=vtdpS4_n;0j8l7relUM8{tUYhnWgzQ?Udj=4NSb zwk%n2s*&enPBrSgdXA<+YUnN3}2kw^$4( z;3{k3th43#aD=Ln?_x=2HF8`uug2WkHmQQSD$G(WvwX{;N@cZ5ENry`DXmxGgth*T z6M6SR}DMB2`ohd#NhCOe8!e{#W26tVB<&`jcb}4^n|bty!)>InvML(u5<= zHllKdaz6>tKqm>wTAd{3W@#>|lZMqeToS29uH=%;dxaLRR5*Kzp6yr|q*z}P1D=$$ zo|0gm)(LtJN8@>P#0x=MjRgs%kT`|5w;F4NlZ9h~6cWPBu)=Jhc%fvdwOaB7)~OXm zDPsf@R-uamiq@i|qiC7&$tU(mXtf0O735WczNW+Yy105%XJM=M`xZJ#eSNSEm*ZXi ztb9*Ny)U(XAT{ogR6dmAK2oZm;1zr(eeT3>sG`9xHpXr?#U37uy*wRXum`^6x%we% zua@D^FHYoQJvPMPX-O_NiUUsomngHRRkl*WJriim*EX!~(iCnDo)teHREqr(8t6DtD9dF6_eCitf!jm+Oai|oU{z088C#S^c9`}Rvg1|T0!7`MsB@V9}&8valXkkW tWdQ8J)~C;hAP_%3*;SBYaBGmev( z1x_8qm^03wZrrUI(b94tn8A9NG*lNzBdL`NpggN?AT`oT_KKMl$8*Zw3=I-xZ z^HQS=7uEUYOTnynWY5^%3#B*8k0T8%|B!A0Nq>z~h=(q*ELd8&SBe+5DN)yKHD`@= t6^(05PLqwldXp_Jgc!fqQfw=#{-f>bz&7cqv~&w*qH0I|t`K`U`#*_48!!L> 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 96f57dcb58c155d8fae3559146a51cca5a0a40a3..a1783babd8f8fcabcd201613a9f88f87a719d984 100644 GIT binary patch delta 110 zcmbQqeu!Q8)W2Q(7#J8#7{u5agxMKH*cn7O3SVQC=g2JfNi8W!En;L4*6_(nEKAhS zNz6;v_sP#ox7PIB{G2hLk&$U~IJ1fx3nK#$1251JW(GDO$;80Nzz?Pc7zBYd8v`SQ H5Ca1M-whO$ delta 70 zcmX@aK9gPe)W2Q(7#J8#7)00^1lbvc*cpU33SVQ~%*B+;$jCUkf>}k5fti5~sDz1u Uhk+MN^D*!PX*LE%1_1^J0R9sR!~g&Q 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 b35621305585fb201caaba464682645f4bc4ec9e..f2c5c0a5ac58273ec596757274bed667562567ed 100644 GIT binary patch literal 5228 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 fa`+2B`rE7;wpaqs1hd!2#coo08E-I*{m z8x*66cnL~KKr{grQE`JBOi;3sV4*&URX+K^lfGybNz8*UmQ|KjV*F13Jv%+K9oVw0 zO3s}BobNmR|K~sFbSJ<6&-qsYti{6;dPn?1Of0$}UdiMoPtrbqd+tGsS9Q z+8HZU3VWxVjm2WAYF7)TVntzaq)^IL?zbl<5R!scV&_{A%ikDM*=u?Axn#vR!~;^HH}`s?ZQZ@fG!j=0|14tv^B$oMul zS}hmc?Iq{&7mgjdbn=Wss8T9d6*_$A;bPU{7P*DU#mAnwaQ>)*nJ-jqo+rO`%AVlz z;)&B2j?G@0edyAY&$~P2lbf6u4nKSOsplADrlPZD5PR|PIrju&)7vz)wYHu3c-gV5 z&K{D=`Pqxd=PnE->DzvUzJ;qaQD&-j< zIZ`M(J7%W$I^{jGeaVW%8MDg;S$oD%b+W+wxp}1MRC$|wZ@7NV+FZrX+4<>0F*jYx z&rCTvo!eZ#G;Py(u#_8d>tJlBT-AhA)l0dQ%&OJCYPEYsF$(8?{J>F9Sjw#QI zIQPxiQ!I#v{qEem&l#_-TYa~JDmAv3=TZols*_Gxp-l>^PgjgoM7wME88o2Y#~z?= zh`AATZ^kuSFVe1~u^lrS&}d9)pg%)t59hZfT$uEuY}C|<+A`@n^*MAZQySnm>9Yt$ zL%g%p4LXXyvArmMQ`>0O9^b#+KH&AFF>V*P$USi0P1==7-O%jrVWxT4?&0lQcn{Pg zWv4PT#R(Skr8m}B&t$kyC$6opF+XNs-k*nPU+vHdFOWV>%(ZJh(dXZ>Q7!2j=HMMI z&6LNTtpyn|Z6n@bxK7>F2cTr1}55sdH^T;I0tLRN%*;DA$PF%S8NNp0NtrdGo_ImH|BwRXQM z9xM1Uv67!JF|^3_LZP3l1b+wkcd&vXI(X#^9XUE!1`8c)=wN9qblgM-%VnYCW;$3x z3mv!6!LnNDSVsp-ZJ}cW9W1|vj@z(=MwT(dYb3T0_Rqm|msHwz3{qI3q2D2q4ZVi+ zNti>~&>Y%ph@=%JBxyymVZlURL*^vfvf*sR2TEB{f>M@|jS9%{K+&w>1EsAPL1`19e(Sf;z2KHYuQ# z2TEpBK2VpHCaBBGWYYr5c%XDP;{$bD9Rzh-o!Jfnb$XzVY-bG=I>okcUGP46U0*}3 z+0}mJ;qa2W)EMsNJEjGFY8xhKYem1>h)HT8Y*T$GPzz(bT8@3xBACJz?57q*8UNzS zfq}>IM@&iuvrc1q)c7~rqe#4o?kHCBkD=bg zQmw}Rzbcc$k3_FaZsD&?*|3zgblq}9xGaNby$Y$GUi=uAkFHuVy=t5*@(E*avhi$zt;k%VA;hv$ilqdl zuJBRyb&D9f5Uv4gm{6n1gGGF>Ij~>4Y zy&mDM5MGeP)q~XIybZ_;Wxi#odbGF4F(Av0|3=bXidmMNe6$~W1xxQbhiv8@b66(L zI)|RjJGGt^eYw^-k(XuOrFG8vo=mUS)1t4?I!Aj?=G|KF5d9jhckw6Fr}b{JUrT)s W?`i%F^#5Dokk=}TlT{|s*ZvDCR3_vA literal 4584 zcmbVPS#um$75-Y9neLwHSv0b2PvU@-D4;cy#UZ3+n{0L>BHO`=6%w|zG##m(S(I5E zb_fCDB*Zo$kmZ5mfwC#eRSp!93qu9+5~_IS37)9JHv9r!FyT9Wdo(>WZAz6Y>-4$j zeBYgO&vLu{=l@=O7r<`3k;E8UCQKX`@vMk1i};F&uZsAZh_CDTMv~8Oiujh0zAf5w zBEBQyc@f_g@jVgW7sv}bP9(7nEdwvg^Cb~48~A~NR}7pqaLT}G13xtIs(5~+<24ON z*=;u6`g}=4ZsC}7+$olw>S}SJR$ZObP&m@6Hoc0wZ)5W9>1ela~egb11MJ9lIIi`SJvE$!>v*!x3N<9)`iX0tgwIOJ4Z4f#+Qi_N;{2a?^yUpoEDm9uYah&5{UriS4VdcN9p84Q0carxw{moA>t zV3oXv!^leq%FZg6m)|&l>GYW^XP&$A+AsW=_{%-cODBHzuQz|rJz5Qw7lYW#CoV{! zhS*e?ma?|PN$l~eUUQ#@!HLNwMt6U$#Is}u8?Vx?AUmEEGsQL$93I5Zxw6&L);}w6)O#!u?D*O-Guv0%PF%i zT>%_kKIX18=O&-fpw+s&HE?N&*P3f?ohOmHj;q2+VKTlwWH5bz>g1$ys>P7+=x*M; z0(2X53K%}oP=E{DQa((&SK_b~qP@)eP8Fs)dQJhtCUq8}C`fRYjv>9+bXJ}|=&T1# zZLB!e{gOeB&6?9#Qxn1Qm}i0>IWm86KQl-@QFj}yGDq1AB_=+u@{k_yKCU%h3Li@! zZ=WF*kX3M|Z&$j}tf{8qJ+oMA)mPjDo=jqTA()?Az$`z(A$w0m)%h5JQ3AY#8bK81TM91!socw6o0+{fw! z_qDuoNg6BPj(tLvXuh=9!jJJ25wG)TGozi-?d7D*j7mDGWoJgi38f`NODCl?m@}g) zsnkWTF7m1I8K1fU?N?L=a5rVbH)dc{w-f+#*u#}3twY&O{tX7+?ja9HlG#}i z3(e za4>qG_*VB(Q>Nii^gfBL?xTiM!{O*W>s#GN&9H_?qVsHQbsshInq2HE&jSy!rbC?C zvFWKZh{w)NzX$Uz#0Sq!{}JZFnW+sV{Uw#up&1H0Hv1=}3bFSwbQacZA+`aljY!*Z zLeh4k5Eo41edNy~U5FPFAyCHF3Ch?;K^Kq_fb@b90%dKJpsbxNm;y=$AhVDRfpT_= zpqyL#0c8SEx{wKh@^+S>yqzm#1(XXw*+Q-jik;(d4EEi9 z=T!3ABcY995sxypBbtSyyblL>>tDqZZG)J?zwsEg7#_r5@mXqdHtJvSIJE@Icn42V z)A{B)kIzx#|A25BpQmQxb-aWxP)lM1PveW!QusaJ)L)`z;ct8wKS?c(zwmYlr0a)(_ckmI8fMWDfI;?14Ks2L>9qu*V0X=yQdS{3Khu|hGAHO_R z|KcP|C?8Ly-(lP17ci3FzJVRm#v9m~FDQM8kNkB?PmBF}rSp2)nct=Ktmro=oj20X e{700Y=Oh17iVckRzVO4}W~HFTG&KBKZ2k`lAy13| 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 27c475d22ec5f40d7ef2b2a28b0efa76882a8bd4..fcd2ba2959dbf7850a5e3a5b76154b7bc73d3ea2 100644 GIT binary patch delta 1856 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创新实验室 + */ @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 9ffbb615be3886df75c04030d6703cc8ed3de87f..2766f09e04df31e6106ab63e19c64f024b5160e9 100644 GIT binary patch delta 652 zcmY*XO=}ZT6g_Wd(n%&0o1~46wy|GY^D)h+snyzOt@WcqODIC2x{944ri4^t&}DXl z%ksdTTh|t3A_iQz6c_H?^{0sEO#~^!+;i@`ALrf6J4yUb?Ed)k^&5aCJhqUAV`9;Q zrm$?mfMdbM6~(T`kis>^Dp4#cyspf06gO1CO%p2?Msdr;s)_2+&Ucv;ALLWxtyq-D zdPe>dS$SgojM_Md^8!^lYvg2Ho7M%&wZ z@^rUI{~;a;6j+y)A4Mvnnr1Qo0oy+?l4~W zy!BS=@Qv@)I?YD2Es)7?{V#gb?KIns)xz$n)J?zc`JGco+kW@Op(lH~X9%q1IixFV zMy!WfE-KBH3a*7y5Hs}R#IyV-ULnhXP-~!_WXL57Vx-uII403BMLQB6rjR4IhY7fV zX?g-PRMEoX_t5zP)d948*1uZk}A``W6YBj?` X*!*&6^WkZl(E|MV+_MDfF-Eq1td;960*Bl(|{Lpo%h#CmP5E=SFi{d~jg&UsJt!c;*>f$@q!#dK4 zYM3QdIiC~n)p$`y7Ev8%kkfFM5TA-Sdc6({7??+1JnvY`0QZ_gpvV2 z01p^nQ zL~JUt;W@6?m&GN67x8~_)^oSK!Lyzl#0o*RP1Z=`s)1Ep6RO`0Xs8p)JZMJzQR6c@ zYFLvSx zH?$9(3nbUhF~TLAkr@5v7&D*vLqUwAJPD)_=P0R6KmsQi2`7C!Q2Q1%lwSG*m@>7BZ6H9!1(p+vbZvEKY3e%Ty6YK0N#TvZ;UQ62Nn&E6Kf$>69}xB2wi1nL=g#T5-*?V;zI*#1?@?az)6aJw0361& zjy$yJ@ZgvO$I+^x&4G5D(9waDS#Thr)6yxTQ(1&M&CsRe49+r~)6lKMi5`*f6@;LM zK8EuG+^-`S0}O)<7Z`>lxD$60v*DS}*jyxjYvIWjk4fM8OZh1um4kfV=9Px|ds}aw zIdMB4565QHxY!JZ5?Z?#Tps?#?&i-lk0PO-f0L?h9pO-{g@4wN zT;gAqf^vpY1DA1y;i`da7&8z;qk(Zu7`QH?0u=I1wM}CP8@Pc<{=;6)^Vw*QD0tIA zF$xVtFvgeJFn4KGt|d|felncBodY88K|`j`ZDuybIL57{cSBq)JSa;-i+xQ$2bCckHo z^1CeGErCT69n^J-D1H6G01s)yNmAvZvy_kznLacd#a=pO2fg>uQU#g@Xb*LwXEDkhN@qVVF^zDg?$m;C9t~WGPK8V zE+MOqqD3(E1yn`!R#MV+ssQSiO>%|&bbo87zm@5qO)mJ!A{hq=<$$t{8is>PyD;Ps z{bS_Rh#z4~73`{g3*B_AB57>G(e2xUa~;kRGkXO&8?@(Ig?llRGevG4xg)+M?0TM2 zC@|#G?$Ao<8vpxENMEQfLKoJl`Kq**}PY??+F)=o-T^N}a zCT?}ZLWz-|5m#zlyL0Kv#Ep9*-g#8Tn0DUWxpVKi_nbSA+z;K(Pd_)_0;t9ehayUC zVGoDKkUbT@6A#VAXD33jv8lxP0*6i9wuK)jKiln4kz*nY*`keor6Ysa!~q->AC;K! zD^DE`977SuafYa9P@=ktVw8v{dhwkXH_Dtw z6HPK!ZE5XiFy@lC<`T(;yA00Wh4}b%XMCR^ukFTMBgd#9Hha z#SK|tLVPg>L`roFu8pT~gkV)#Iu!a*+hk|ZpdGZ!i8iqYN(JI?5Du2G&r%1kVa0fz)f9egfwT8Ukc3 zLD!a5Sy{Cjw^Ke4Kqi8Fst5m652mYUQV-1}kU|_l>M7eOQ8eT+DM2{kb8jDMw#ciZLO~#2@+@!@U3gytY n;pK?t>`>nd2O}Gbfe`(72=}*(-mi2q0-Ka>Oj%sz#HWE@uI!$s 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 d647c88f9dc76c2a144fe1aa202b9791fc761502..f96876d354938737563d091ec059e44184448852 100644 GIT binary patch delta 1815 zcmZ`(Yiv|S6#ix(ckbSuZI{~@eYem;X=xW_0a>87^3Y0K&{}j+itF}vyLH)HcP~Zo zu|C22qz*W=bQQF%$e`Z zFHOgqa^L>_#a95r_|!lN?lDl0Z3Y@Kq|A0ddU3CT816F=$FM>zKSq!+unD6&l794I zOvn8?QXD%Bq+#nA*YN;H#y~%^1|00vF=1dA9@Md0#~vLI`H1{s9gi3_D8{3H9i?19RmCtyEs{UlJVqIG*8{bQ9 z^8iDe>@dn@iBTroj7G0O6PizNGTbaE@F5Oxd?fHOK4IvTp9MMzUyATlV5#r8zzLjW z2vN9nDqYLE$mx*V+@_nMMFmw!7cvCLViU1YDwa-!1{`%phB;S4J!!{ESQ$CTy8fR@il;-PJ006jh2nO`3Z*S4)NeV1PBJC8cv~wNO7qKAyoXHp@NkB1Qy%rU$nU*t zWuvwv$iNepv)Rr#c|r8ZecF8K<|`<*_Nid0>=#^q!%g`k9}^7Ph@IIHqp2(9e*Z$L z`Apg13kMhsb>qocD!Ip!lfF86+_!=fRMhLNY@Ci}XA+@oY9u@s>a`Q<7<>KUxfNGO zH_%<$ncZ@lg>$6dM(QDk`Ea316`LB%g#}nhu@>_EG%lilYZh(L$RUN1?I0*bBZ&px z)-zzA=hubEs!2dCmXH;N3Ahf|(-%{hMOH1|O1rqJhY)O=hO4i2@fo;V+s?pqg~)`5 zCN{xK=@^tuF(sl%8)zY|nb;GK8tu2qAA4fnL$NFm~*wl8c$9^gnR#w2h7TAtSmCC zu7MPvLbX{F)C;_ZqUDNKpGNIKR4en-`39oAQVc}(%D_N0s8tq`mHUI5QRjv#x|@3E zaBySpBKlZ4*0XAQ3RSs}6v}tG+^ptuxmm?*xdjU%f>p#&%5<#88oIc7xP(qpk(UJX z2X3U8M)qfPk;kzS-=P~fLB}A@V=cve7{e*7!(VPC!)KRyka5*>cIY?+&D)gM?FU`M;}K&$0o9byVRRFE5Bv=Z<56oxfOIf zl*=EwoMtP*7KE$3+euk0*i8~1nB`cSR~q1JZ99khX*68TRh6eI^nh=cO2-}lHBciF wsh`hmoWZ=)s8$4Fdc$ZaWK%^o9i%T8w&2eEcvrqFizyPN@2$kp+Jn3Q1!MV9IRF3v delta 1829 zcmZ`(TW}L)6#o8P_TOwaO}fyOw50;Qn5LHi7OI&FRIY^FU`)E+%m zJGXYj-mIA()qAt!X(K(5(R;GloS8J!xvasU^<{FS1G(MNm3mgsCry3m=oe?|#Sgw3w~84EiQj#liU$m}DmY}3VJ($Xw{5AwiCHS@ zp$WlGcoj4w%yB2fA_{K0*ye~3L<=H9QFbT_LA0r8r_>r;8yl?aTov=sNC6tdxqa*N zIV-t--7u0VoguVOWF0faGRHBm7hSlA<8Fo}Ht-=&n@dFuVp!>s72J!(oLrt)W|F%l z=n>y45fU%Oa*k!8Nz6<8^_H%w79qgTahtPxS~QbO*>I*zpr?d6a?D-1n9uIHnh z^?|s}saTKu8F)%J*XQ!4U9MgQactyxfT8kcdwR2`p3?IwHes{4o9Yr^m=Ln>az%2G*}>BgWJ zM{tzm6$&+%PeqN)uFjEYUoK_W@)(4e@O57P!x3S$4O&uED$~Rf*L-`T&Z}rZquA*V zi|<{>#h;F#m~gKuU^b1Hlm2cvP-D$4@gCYQiKs%<0WVbIeZ+f-R?y#XAV3dfR6?Wc zG*Yz?wSFFr6*2uXYA({nfjT-ZBoOvYTLQY#9+b@rQDQ8$J8}hg+-@_|wz0g^1B!GG zQD&tHcS@&0PCY&KpJmI3Fh_RSb#P~w5 z_Gnq-wltEZak`3lJf><-OC=kZr6INZR<%!i_J0g3wC8Wp#BVk7UqX#`Fd&z36$_VJ zxbh@kiYKHhFC`dH@Q@l$$RS@m5s*R^bn=itK83?hSY>yjPDBE03csPB1+kpfVlAwK zpDxv}+(fG6je4`{a=ld+z;T=)gy~Git2jxmn}fgb8jYVDZMcrtNhV=2e!&~Waje0Q zcoT2Y9B#xloFbWr*8LJDaI!$%&fx;y#yix|gAjO^)GE%=LZ2qihi_EwJx27dHp4H0;~=+eruMwKcIf zhK%7XL9;*)&F}|hj23&;XmKK~SJ6C)bGKtL8_EK5;zQfvNBG#L7wo0<6Tl~Q|C9jz Hz4+{3O=?Xc 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 be467a66f60fbc95f0be324c0ea4346e8d440e0b..44adf2e28e38a47e933da86cb443a24213095903 100644 GIT binary patch literal 7473 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 Z$6v4rxAMK2@3)cQZ^hg2cDw_({~z(9y^;U` delta 1481 zcmah}U2{`a6kX>g=}m5KlO~~QsZt9nO_Lj%phay92$Wh1trk>1LX}b?E!GAKMC%8k zpjMdC(b=Ou@(UbgbZXJD;}bH@@Z_6MI=(uNKKr@O&E@JaI!>qO+;jHcYpt_Ca<%u{ zuEwwb_-qBh{kUwxkYaL!6pVDhL{Q@K=68Ph*|HEo+(s0(e4~DqO~J3i7FOd96Kyh< z$jEp+9I|mI)<`*ip*aGDyKIEe5XD;DZDO6mL$Z)`q+K;eY^=gP3h!s+N}x}UHkF9J z8tZLzA|qckz4!4=V@k=N!3F7Vc(cL8CWS!;50ddg^qNE(OBBe~hkjW|Y;)PR*oc5Q z4`aKDZ3;UXuu)b*Df;cefLO^+h7V%M#3Ov)K$DGK7*+_Lo~V`;N*Vdy8j>5yB)#@v z)Wir$+NEG73GgT$6D!px=R+ULO2eXDG2f0_IH;)(DGYg3wtQz=lrV_HHlDz+>@W{Y zF+3t4gs)jT56{>*jwyL7)$1Nl*mxE*awFB{9%pS-a8iCrb;-GKw@gLKeERc>+Vx9* z3R?1`9bT_-=54%)mlV>c&X(uq_m*cS&P-Qkx6coiXHE`OCKc96#abKfvrxq=HqN0Y z#Z?)(8L7yuRc_G`ui3buA*?wsde<@eJUUvVNwLy^!9SLdCzB_=huvEy`L;WgXSM~` zMtXE}SKLF{PZ7K7hBR^206+&4T(v75kVJ~RVly<8EX{ADh87p)A~ghg(UMz6>qzz! zv^%+L=m=oc$uHyHk7x=&#+z0t+b)PM2I=2v*aO)nU%TfMMmY^na%$2f8X*vTrT^3fQY(QthxsF!vX4=4h@AEkWp0;|u z(yRh-fOR{_6db}DlsNU{w=~u?uAiG6PGOGhF}m%87I~WXFw}48G|@xL8Jy*+>+&u& z>5g%3Q