From 38150d672c270de4f7dfa2f1bbab395a5f829f25 Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 28 Oct 2026 10:39:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnfNoticeInfoController.java | 1 + .../enterprise/AppNoticeInfoController.java | 7 +++-- .../supervision/SysNoticeInfoController.java | 6 ++-- .../handler/ApiSignInterceptor.java | 2 +- .../service/ISysApiPlatformConfigService.java | 2 -- .../impl/SysApiPlatformConfigServiceImpl.java | 31 ++----------------- .../src/main/resources/application-dev.yml | 6 ++-- .../src/main/resources/application-prod.yml | 4 +-- .../src/main/resources/application.yml | 6 ++-- 9 files changed, 19 insertions(+), 46 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfNoticeInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfNoticeInfoController.java index b5eddac9..7752a9c6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfNoticeInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfNoticeInfoController.java @@ -55,6 +55,7 @@ public class AppEnfNoticeInfoController extends BaseController { // @SaCheckPermission("enforcementcode:noticeInfo:list") @GetMapping("/list") public TableDataInfo list(SysNoticeInfoBo bo, PageQuery pageQuery) { + bo.setStatus(2); return sysNoticeInfoService.queryPageList(bo, pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java index e75c45c8..ec521bbc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java @@ -55,6 +55,7 @@ public class AppNoticeInfoController extends BaseController { */ @GetMapping("/list") public TableDataInfo list(SysNoticeInfoBo bo, PageQuery pageQuery) { + bo.setStatus(Integer.valueOf(2)); return sysNoticeInfoService.queryPageList(bo, pageQuery); } @@ -74,7 +75,7 @@ public class AppNoticeInfoController extends BaseController { /** * 新增系统公告信息主 */ - @Log(title = "系统公告信息主", businessType = BusinessType.INSERT) +// @Log(title = "系统公告信息主", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysNoticeInfoBo bo) { @@ -84,7 +85,7 @@ public class AppNoticeInfoController extends BaseController { /** * 修改系统公告信息主 */ - @Log(title = "系统公告信息主", businessType = BusinessType.UPDATE) +// @Log(title = "系统公告信息主", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody SysNoticeInfoBo bo) { @@ -96,7 +97,7 @@ public class AppNoticeInfoController extends BaseController { * * @param ids 主键串 */ - @Log(title = "系统公告信息主", businessType = BusinessType.DELETE) +// @Log(title = "系统公告信息主", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java index 592064af..8b6fdaa1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java @@ -50,7 +50,7 @@ public class SysNoticeInfoController extends BaseController { * 导出系统公告信息主列表 */ @SaCheckPermission("enforcementcode:noticeInfo:export") - @Log(title = "系统公告信息主", businessType = BusinessType.EXPORT) +// @Log(title = "系统公告信息主", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysNoticeInfoBo bo, HttpServletResponse response) { List list = sysNoticeInfoService.queryList(bo); @@ -71,7 +71,7 @@ public class SysNoticeInfoController extends BaseController { /** * 新增系统公告信息主 */ - @Log(title = "系统公告信息主", businessType = BusinessType.INSERT) +// @Log(title = "系统公告信息主", businessType = BusinessType.INSERT) @PostMapping("/add") public R add(@RequestBody SysNoticeInfoBo bo) { return toAjax(sysNoticeInfoService.insertByBo(bo)); @@ -80,7 +80,7 @@ public class SysNoticeInfoController extends BaseController { /** * 修改系统公告信息主 */ - @Log(title = "系统公告信息主", businessType = BusinessType.UPDATE) +// @Log(title = "系统公告信息主", businessType = BusinessType.UPDATE) @PostMapping("/edit") public R edit(@RequestBody SysNoticeInfoBo bo) { return toAjax(sysNoticeInfoService.updateByBo(bo)); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/handler/ApiSignInterceptor.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/handler/ApiSignInterceptor.java index 8442fa20..6b5022a5 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/handler/ApiSignInterceptor.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/handler/ApiSignInterceptor.java @@ -51,7 +51,7 @@ public class ApiSignInterceptor implements HandlerInterceptor { return false; } - SysApiPlatformConfigEntity consumer = sysApiPlatformConfigService.findByAppKeyFromDb(appKey).orElse(null); + SysApiPlatformConfigEntity consumer = sysApiPlatformConfigService.findByAppKey(appKey).orElse(null); if (consumer == null) { writeError(response, "无效的 appKey"); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISysApiPlatformConfigService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISysApiPlatformConfigService.java index e51b9100..21c6cee8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISysApiPlatformConfigService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISysApiPlatformConfigService.java @@ -6,9 +6,7 @@ import java.util.Optional; public interface ISysApiPlatformConfigService { - void refreshCache(); Optional findByAppKey(String appKey); - Optional findByAppKeyFromDb(String appKey); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysApiPlatformConfigServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysApiPlatformConfigServiceImpl.java index 376ded2d..38d67a67 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysApiPlatformConfigServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysApiPlatformConfigServiceImpl.java @@ -8,11 +8,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import jakarta.annotation.PostConstruct; -import java.util.List; -import java.util.Map; import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; @Slf4j @Service @@ -21,33 +17,9 @@ public class SysApiPlatformConfigServiceImpl implements ISysApiPlatformConfigSer private final SysApiPlatformConfigMapper sysApiPlatformConfigMapper; - private final Map consumerCache = new ConcurrentHashMap<>(); - - @PostConstruct - public void init() { - refreshCache(); - } - - public void refreshCache() { - List list = sysApiPlatformConfigMapper.selectList( - new LambdaQueryWrapper() - .eq(SysApiPlatformConfigEntity::getStatus, "0") - ); - Map newMap = new ConcurrentHashMap<>(); - for (SysApiPlatformConfigEntity entity : list) { - newMap.put(entity.getAppKey(), entity); - } - consumerCache.clear(); - consumerCache.putAll(newMap); - log.info("API接入配置缓存刷新, 共加载{}个渠道", newMap.size()); - } - - public Optional findByAppKey(String appKey) { - return Optional.ofNullable(consumerCache.get(appKey)); - } @Override - public Optional findByAppKeyFromDb(String appKey) { + public Optional findByAppKey(String appKey) { SysApiPlatformConfigEntity entity = sysApiPlatformConfigMapper.selectOne( new LambdaQueryWrapper() .eq(SysApiPlatformConfigEntity::getAppKey, appKey) @@ -55,4 +27,5 @@ public class SysApiPlatformConfigServiceImpl implements ISysApiPlatformConfigSer ); return Optional.ofNullable(entity); } + } diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index 84dc33e3..9bb4e40e 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -49,7 +49,7 @@ spring: # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: true + p6spy: false # 设置默认的数据源或者数据源组,默认值即为 master primary: master # 严格模式 匹配不到数据源则报错 @@ -95,9 +95,9 @@ spring: # password: root hikari: # 最大连接池数量 - maxPoolSize: 20 + maxPoolSize: 500 # 最小空闲线程数量 - minIdle: 10 + minIdle: 20 # 配置获取连接等待超时的时间 connectionTimeout: 30000 # 校验超时时间 diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml index ee15cd25..7c0ed2e7 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml @@ -290,7 +290,7 @@ xss: siq: #正式 siqUrl: ENC(Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==) - siqBaseUrl: https://egbpub.siqhz.com + siqBaseUrl: http://10.76.108.3/siqBase code: ENC(Ogi+/4PPtXiuILnVlNg4Lw==) secretKey: ENC(zTr/tj2VgFxQyunI4eIL7NyRWDPSMPSB0VlwTYeHTdsEWyu1H96xWw==) msgAppId: C3AFBBDCC0BF4D5FB0F52731A900BE8F @@ -334,7 +334,7 @@ sms: account: 122 pwd: szsfj1800 batch: 2409 - url: https://szsms.sz.gov.cn:8000/services/Sms + url: http://10.132.108.1/sms/services/Sms #市监代理页面 diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml index 7eca7dc1..4b91cabd 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml @@ -33,11 +33,11 @@ captcha: # 日志配置 logging: level: - org.dromara: "${logging.level:debug}" + org.dromara: "${logging.level:info}" org.springframework: warn - org.mybatis.spring.mapper: debug + org.mybatis.spring.mapper: warn org.apache.fury: warn - com.zdxt.enforcementcode: debug + com.zdxt.enforcementcode: info config: classpath:logback-plus.xml # 用户配置