Compare commits

...

2 Commits

Author SHA1 Message Date
vincent 38150d672c 修改了短信的相关配置 5 days ago
vincent 6c8dfad86a 修改了站内信相关地址 6 days ago
  1. 1
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/ZwSmsClient.java
  2. 1
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfNoticeInfoController.java
  3. 7
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java
  4. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java
  5. 2
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/handler/ApiSignInterceptor.java
  6. 2
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISysApiPlatformConfigService.java
  7. 31
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysApiPlatformConfigServiceImpl.java
  8. 8
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml
  9. 3
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml
  10. 6
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml

1
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/ZwSmsClient.java

@ -126,6 +126,7 @@ public class ZwSmsClient {
for (int i = 0; i < paramNames.length; i++) {
call.addParameter(paramNames[i], org.apache.axis.encoding.XMLType.XSD_STRING, ParameterMode.IN);
}
log.info("短信平台调用开始,operation={},参数:{}", operation.getLocalPart(), StringUtils.join(args, ", "));
call.setReturnType(org.apache.axis.encoding.XMLType.XSD_STRING);
String result = (String) call.invoke(args);
log.info("短信平台调用完成,operation={},返回:{}", operation.getLocalPart(), result);

1
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<SysNoticeInfoVo> list(SysNoticeInfoBo bo, PageQuery pageQuery) {
bo.setStatus(2);
return sysNoticeInfoService.queryPageList(bo, pageQuery);
}

7
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<SysNoticeInfoVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {

6
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<SysNoticeInfoVo> 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<Void> 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<Void> edit(@RequestBody SysNoticeInfoBo bo) {
return toAjax(sysNoticeInfoService.updateByBo(bo));

2
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");

2
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<SysApiPlatformConfigEntity> findByAppKey(String appKey);
Optional<SysApiPlatformConfigEntity> findByAppKeyFromDb(String appKey);
}

31
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<String, SysApiPlatformConfigEntity> consumerCache = new ConcurrentHashMap<>();
@PostConstruct
public void init() {
refreshCache();
}
public void refreshCache() {
List<SysApiPlatformConfigEntity> list = sysApiPlatformConfigMapper.selectList(
new LambdaQueryWrapper<SysApiPlatformConfigEntity>()
.eq(SysApiPlatformConfigEntity::getStatus, "0")
);
Map<String, SysApiPlatformConfigEntity> newMap = new ConcurrentHashMap<>();
for (SysApiPlatformConfigEntity entity : list) {
newMap.put(entity.getAppKey(), entity);
}
consumerCache.clear();
consumerCache.putAll(newMap);
log.info("API接入配置缓存刷新, 共加载{}个渠道", newMap.size());
}
public Optional<SysApiPlatformConfigEntity> findByAppKey(String appKey) {
return Optional.ofNullable(consumerCache.get(appKey));
}
@Override
public Optional<SysApiPlatformConfigEntity> findByAppKeyFromDb(String appKey) {
public Optional<SysApiPlatformConfigEntity> findByAppKey(String appKey) {
SysApiPlatformConfigEntity entity = sysApiPlatformConfigMapper.selectOne(
new LambdaQueryWrapper<SysApiPlatformConfigEntity>()
.eq(SysApiPlatformConfigEntity::getAppKey, appKey)
@ -55,4 +27,5 @@ public class SysApiPlatformConfigServiceImpl implements ISysApiPlatformConfigSer
);
return Optional.ofNullable(entity);
}
}

8
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
# 校验超时时间
@ -292,11 +292,11 @@ siq:
# secretKey: SXRpWEhVN3RHM3ZFbzRQcQ==
#测试
siqUrl: https://egbpub.siqhz.com/egb/api/thirdauth
siqBaseUrl: https://egbpub.siqhz.com
code: TEST
appId: CE07DEE723E241DFB34D80090A569B12
secretKey: ENC(6+WSjXj7UebpPJGq69e7aVZ1ZIrL9wnPcD+rU5XDFCNYGQM8fVvtcQ==)
msgAppId: CE07DEE723E241DFB34D80090A569B12
siqBaseUrl: https://egbpub.siqhz.com
msgSecretKey: 0C4E08DCC7DD490E86EF2B79E81691D1
msgTemplateId: 2076972618633498625
# 模拟数据开关(true=使用模拟数据,false=调用真实接口)

3
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml

@ -290,6 +290,7 @@ xss:
siq:
#正式
siqUrl: ENC(Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==)
siqBaseUrl: http://10.76.108.3/siqBase
code: ENC(Ogi+/4PPtXiuILnVlNg4Lw==)
secretKey: ENC(zTr/tj2VgFxQyunI4eIL7NyRWDPSMPSB0VlwTYeHTdsEWyu1H96xWw==)
msgAppId: C3AFBBDCC0BF4D5FB0F52731A900BE8F
@ -333,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
#市监代理页面

6
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
# 用户配置

Loading…
Cancel
Save