From 4a7fd71da7474037e62466854620db9cf9af0e94 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 27 Dec 2022 17:16:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BC=94=E7=A4=BA=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=20=20*****=20=E6=95=8F=E6=84=9F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/admin/LikeAdminInterceptor.java | 3 ++- .../mdd/admin/service/IChannelMpConfigService.java | 2 +- .../service/impl/ChannelMpConfigServiceImpl.java | 12 ++++++------ .../service/impl/ChannelOaConfigServiceImpl.java | 11 ++++++----- .../admin/service/impl/ChannelOpServiceImpl.java | 9 +++++++-- .../admin/service/impl/SettingSmsServiceImpl.java | 14 +++++++++----- .../service/impl/SettingStorageServiceImpl.java | 8 ++++++-- 7 files changed, 37 insertions(+), 22 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java index e8fa754f..9d2b57db 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java @@ -54,7 +54,8 @@ public class LikeAdminInterceptor implements HandlerInterceptor { } // 演示环境拦截 - if (YmlUtils.get("like.production").equals("true")) { + String env = YmlUtils.get("like.production"); + if (StringUtils.isNotNull(env) && env.equals("true")) { List ignoreUrl = Arrays.asList("system:login", "system:logout"); if (request.getMethod().equals("POST") && !ignoreUrl.contains(auths)) { String message = "演示环境不支持修改数据，请下载源码本地部署体验"; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java index 433e6353..395b5bf4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java @@ -20,7 +20,7 @@ public interface IChannelMpConfigService { * 微信小程序设置保存 * * @author fzr - * @param channelMpValidate + * @param channelMpValidate 参数 */ void save(ChannelMpValidate channelMpValidate); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java index 560d0945..f6249db0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java @@ -3,9 +3,7 @@ package com.mdd.admin.service.impl; import com.mdd.admin.service.IChannelMpConfigService; import com.mdd.admin.validate.channel.ChannelMpValidate; import com.mdd.admin.vo.channel.ChannelMpVo; -import com.mdd.common.util.ConfigUtils; -import com.mdd.common.util.RequestUtils; -import com.mdd.common.util.UrlUtils; +import com.mdd.common.util.*; import org.springframework.stereotype.Service; import java.util.Map; @@ -26,14 +24,16 @@ public class ChannelMpConfigServiceImpl implements IChannelMpConfigService { public ChannelMpVo detail() { Map config = ConfigUtils.get("mp_channel"); + String env = YmlUtils.get("like.production"); + boolean envStatus = StringUtils.isNotNull(env) && env.equals("true"); + ChannelMpVo vo = new ChannelMpVo(); vo.setName(config.getOrDefault("name", "")); vo.setPrimaryId(config.getOrDefault("primaryId", "")); - vo.setAppId(config.getOrDefault("appId", "")); - vo.setAppSecret(config.getOrDefault("appSecret", "")); + vo.setAppId(envStatus ? "******" : config.getOrDefault("appId", "")); + vo.setAppSecret(envStatus ? "******" : config.getOrDefault("appSecret", "")); vo.setQrCode(UrlUtils.toAbsoluteUrl(config.getOrDefault("qrCode", ""))); - String domain = RequestUtils.domain(); vo.setRequestDomain(domain); vo.setSocketDomain(domain); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java index e2996e99..e03ed9b2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java @@ -3,9 +3,7 @@ package com.mdd.admin.service.impl; import com.mdd.admin.service.IChannelOaConfigService; import com.mdd.admin.validate.channel.ChannelOaValidate; import com.mdd.admin.vo.channel.ChannelOaVo; -import com.mdd.common.util.ConfigUtils; -import com.mdd.common.util.RequestUtils; -import com.mdd.common.util.UrlUtils; +import com.mdd.common.util.*; import org.springframework.stereotype.Service; import java.util.Map; @@ -27,11 +25,14 @@ public class ChannelOaConfigServiceImpl implements IChannelOaConfigService { Map config = ConfigUtils.get("oa_channel"); ChannelOaVo vo = new ChannelOaVo(); + String env = YmlUtils.get("like.production"); + boolean envStatus = StringUtils.isNotNull(env) && env.equals("true"); + vo.setQrCode(UrlUtils.toAbsoluteUrl(config.getOrDefault("qrCode", ""))); vo.setName(config.getOrDefault("name", "")); vo.setPrimaryId(config.getOrDefault("primaryId", "")); - vo.setAppId(config.getOrDefault("appId", "")); - vo.setAppSecret(config.getOrDefault("appSecret", "")); + vo.setAppId(envStatus ? "******" : config.getOrDefault("appId", "")); + vo.setAppSecret(envStatus ? "******" : config.getOrDefault("appSecret", "")); vo.setUrl(config.getOrDefault("url", "")); vo.setToken(config.getOrDefault("token", "")); vo.setEncodingAesKey(config.getOrDefault("encodingAesKey", "")); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOpServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOpServiceImpl.java index 1350bfbd..5c45bdf9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOpServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOpServiceImpl.java @@ -4,6 +4,8 @@ import com.mdd.admin.service.IChannelOpService; import com.mdd.admin.validate.channel.ChannelOpValidate; import com.mdd.admin.vo.channel.ChannelOpVo; import com.mdd.common.util.ConfigUtils; +import com.mdd.common.util.StringUtils; +import com.mdd.common.util.YmlUtils; import org.springframework.stereotype.Service; /** @@ -23,9 +25,12 @@ public class ChannelOpServiceImpl implements IChannelOpService { String appId = ConfigUtils.get("op_channel", "appId", ""); String appSecret = ConfigUtils.get("op_channel", "appSecret", ""); + String env = YmlUtils.get("like.production"); + boolean envStatus = StringUtils.isNotNull(env) && env.equals("true"); + ChannelOpVo vo = new ChannelOpVo(); - vo.setAppId(appId); - vo.setAppSecret(appSecret); + vo.setAppId(envStatus ? "******" : appId); + vo.setAppSecret(envStatus ? "******" : appSecret); return vo; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java index 0fc39664..4a9517e1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.mdd.admin.service.ISettingSmsService; import com.mdd.common.util.ConfigUtils; import com.mdd.common.util.StringUtils; +import com.mdd.common.util.YmlUtils; import org.springframework.stereotype.Service; import java.util.*; @@ -48,6 +49,9 @@ public class SettingSmsServiceImpl implements ISettingSmsService { */ @Override public Map detail(String alias) { + String env = YmlUtils.get("like.production"); + boolean envStatus = StringUtils.isNotNull(env) && env.equals("true"); + String engine = ConfigUtils.get("sms", "default", "local"); Map config = ConfigUtils.getMap("sms", alias); config = StringUtils.isNotNull(config) ? config : Collections.emptyMap(); @@ -60,13 +64,13 @@ public class SettingSmsServiceImpl implements ISettingSmsService { switch (alias) { case "aliyun": - map.put("appKey", config.getOrDefault("appKey", "")); - map.put("secretKey", config.getOrDefault("secretKey", "")); + map.put("appKey", envStatus ? "******" : config.getOrDefault("appKey", "")); + map.put("secretKey", envStatus ? "******" : config.getOrDefault("secretKey", "")); break; case "tencent": - map.put("appId", config.getOrDefault("appId", "")); - map.put("secretId", config.getOrDefault("secretId", "")); - map.put("secretKey", config.getOrDefault("secretKey", "")); + map.put("appId", envStatus ? "******" : config.getOrDefault("appId", "")); + map.put("secretId", envStatus ? "******" : config.getOrDefault("secretId", "")); + map.put("secretKey", envStatus ? "******" : config.getOrDefault("secretKey", "")); break; case "huawei": break; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java index b365059a..6e41fcb7 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.admin.service.ISettingStorageService; import com.mdd.common.util.ConfigUtils; import com.mdd.common.util.StringUtils; +import com.mdd.common.util.YmlUtils; import org.springframework.stereotype.Service; import java.util.*; @@ -66,6 +67,9 @@ public class SettingStorageServiceImpl implements ISettingStorageService { */ @Override public Map detail(String alias) { + String env = YmlUtils.get("like.production"); + boolean envStatus = StringUtils.isNotNull(env) && env.equals("true"); + String engine = ConfigUtils.get("storage", "default", "local"); Map config = ConfigUtils.getMap("storage", alias); config = StringUtils.isNotNull(config) ? config : Collections.emptyMap(); @@ -76,8 +80,8 @@ public class SettingStorageServiceImpl implements ISettingStorageService { map.put("status", engine.equals(alias) ? 1 : 0); if (!alias.equals("local")) { map.put("bucket", config.getOrDefault("bucket", "")); - map.put("secretKey", config.getOrDefault("secretKey", "")); - map.put("accessKey", config.getOrDefault("accessKey", "")); + map.put("secretKey", envStatus ? "******" : config.getOrDefault("secretKey", "")); + map.put("accessKey", envStatus ? "******" : config.getOrDefault("accessKey", "")); map.put("domain", config.getOrDefault("domain", "")); if (alias.equals("qcloud")) { map.put("region", config.getOrDefault("region", ""));