diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelH5ServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelH5ServiceImpl.java index f8c43173..04c4d453 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelH5ServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelH5ServiceImpl.java @@ -2,6 +2,7 @@ package com.mdd.admin.service.channel.impl; import com.mdd.admin.service.channel.IChannelH5Service; import com.mdd.common.utils.ConfigUtil; +import com.mdd.common.utils.RequestUtil; import org.springframework.stereotype.Service; import java.util.LinkedHashMap; @@ -26,6 +27,7 @@ public class ChannelH5ServiceImpl implements IChannelH5Service { map.put("status", Integer.parseInt(config.getOrDefault("status", "0"))); map.put("close", Integer.parseInt(config.getOrDefault("close", "0"))); map.put("url", config.getOrDefault("url", "")); + map.put("accessLink", RequestUtil.domain()+"/mobile"); return map; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelMpServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelMpServiceImpl.java index f1624d56..4af449c7 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelMpServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelMpServiceImpl.java @@ -2,6 +2,7 @@ package com.mdd.admin.service.channel.impl; import com.mdd.admin.service.channel.IChannelMpService; import com.mdd.common.utils.ConfigUtil; +import com.mdd.common.utils.RequestUtil; import com.mdd.common.utils.UrlUtil; import org.springframework.stereotype.Service; @@ -29,6 +30,15 @@ public class ChannelMpServiceImpl implements IChannelMpService { map.put("appId", config.getOrDefault("appId", "")); map.put("appSecret", config.getOrDefault("appSecret", "")); map.put("qrCode", UrlUtil.toAbsoluteUrl(config.getOrDefault("qrCode", ""))); + + String domain = RequestUtil.domain(); + map.put("requestDomain", domain); + map.put("socketDomain", domain); + map.put("uploadFileDomain", domain); + map.put("downloadFileDomain", domain); + map.put("udpDomain", domain); + map.put("tcpDomain", domain); + map.put("businessDomain", domain); return map; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java index 7fdc09a7..a91fe230 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java @@ -2,6 +2,7 @@ package com.mdd.admin.service.channel.impl; import com.mdd.admin.service.channel.IChannelOaService; import com.mdd.common.utils.ConfigUtil; +import com.mdd.common.utils.RequestUtil; import com.mdd.common.utils.UrlUtil; import org.springframework.stereotype.Service; @@ -29,6 +30,16 @@ public class ChannelOaServiceImpl implements IChannelOaService { map.put("qrCode", UrlUtil.toAbsoluteUrl(config.getOrDefault("qrCode", ""))); map.put("appId", config.getOrDefault("appId", "")); map.put("appSecret", config.getOrDefault("appSecret", "")); + map.put("url", config.getOrDefault("url", "")); + map.put("token", config.getOrDefault("token", "")); + map.put("encodingAesKey", config.getOrDefault("encodingAesKey", "")); + map.put("encryptionType", Integer.parseInt(config.getOrDefault("encryptionType", "1"))); + + String domain = RequestUtil.domain(); + map.put("businessDomain", domain); + map.put("jsDomain", domain); + map.put("webDomain", domain); + return map; } @@ -45,6 +56,10 @@ public class ChannelOaServiceImpl implements IChannelOaService { ConfigUtil.set("mp_channel", "qrCode", UrlUtil.toRelativeUrl(param.getOrDefault("qrCode", ""))); ConfigUtil.set("mp_channel", "appId", param.getOrDefault("appId", "")); ConfigUtil.set("mp_channel", "appSecret", param.getOrDefault("appSecret", "")); + ConfigUtil.set("mp_channel", "url", param.getOrDefault("url", "")); + ConfigUtil.set("mp_channel", "token", param.getOrDefault("token", "")); + ConfigUtil.set("mp_channel", "encodingAesKey", param.getOrDefault("encodingAesKey", "")); + ConfigUtil.set("mp_channel", "encryptionType", param.getOrDefault("encryptionType", "")); } } diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/notice/NoticeDriver.java b/server/like-common/src/main/java/com/mdd/common/plugin/notice/NoticeDriver.java index 6a50ed0e..5e990d5a 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/notice/NoticeDriver.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/notice/NoticeDriver.java @@ -1,18 +1,25 @@ package com.mdd.common.plugin.notice; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.gson.reflect.TypeToken; import com.mdd.common.entity.notice.NoticeSetting; import com.mdd.common.exception.OperateException; import com.mdd.common.mapper.notice.NoticeSettingMapper; import com.mdd.common.plugin.notice.engine.MpNotice; import com.mdd.common.plugin.notice.engine.OaNotice; import com.mdd.common.plugin.notice.engine.SmsNotice; +import com.mdd.common.utils.ArrayUtil; import com.mdd.common.utils.SpringUtil; import com.mdd.common.utils.StringUtil; import com.mdd.common.utils.ToolsUtil; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; import java.util.Map; public class NoticeDriver { diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java b/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java index cd35968c..66efa253 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java @@ -1,8 +1,10 @@ package com.mdd.common.plugin.notice.engine; +import com.alibaba.fastjson.JSON; import com.mdd.common.plugin.sms.SmsDriver; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.StringUtil; +import com.mdd.common.utils.ToolsUtil; import java.util.Map; @@ -10,10 +12,15 @@ public class SmsNotice { public Boolean send(Map params, Map smsTemplate) { String mobile = params.getOrDefault("mobile", "").toString(); - String scene = params.getOrDefault("scene", "").toString(); + String scene = params.getOrDefault("scene", "").toString(); if (!StringUtil.isNotEmpty(mobile) || !StringUtil.isNotEmpty(scene)) { return false; } + +// if (StringUtil.isNotNull(params.get("params"))) { +// ToolsUtil.objectToMap(params.get("params")); +// } + // System.out.println(this.getContent(params, smsTemplate)); // 发送短信 // (new SmsDriver())