From 3459169885dfb3ad650fcc479f9d7539d6cd1a17 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 16 Sep 2021 15:32:09 +0800 Subject: [PATCH] =?UTF-8?q?IM=20=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/version4.2.2to4.2.3.sql | 2 ++ .../lili/modules/store/entity/dos/Store.java | 5 ++++ .../modules/system/entity/dto/ImSetting.java | 26 +++++++++++++++++++ .../system/entity/enums/SettingEnum.java | 4 ++- .../setting/SettingManagerController.java | 8 ++++-- 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 DB/version4.2.2to4.2.3.sql create mode 100644 framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java diff --git a/DB/version4.2.2to4.2.3.sql b/DB/version4.2.2to4.2.3.sql new file mode 100644 index 00000000..712abb3b --- /dev/null +++ b/DB/version4.2.2to4.2.3.sql @@ -0,0 +1,2 @@ +/** 新增会员获的总积分 **/ +ALTER TABLE li_store ADD merchant_euid varchar(255) COMMENT '客服标识'; \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java index 2a4c7a9b..980bac72 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java @@ -97,6 +97,11 @@ public class Store extends BaseEntity { @ApiModelProperty(value = "腾讯云智服小程序唯一标识") private String yzfMpSign; + + @ApiModelProperty(value = "udesk IM标识") + private String merchantEuid; + + public Store(Member member) { this.memberId = member.getId(); this.memberName = member.getUsername(); diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java new file mode 100644 index 00000000..87ca2b74 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java @@ -0,0 +1,26 @@ +package cn.lili.modules.system.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * IM设置 + * + * @author Bulbasaur + * @since 2021/5/16 11:10 下午 + */ +@Data +public class ImSetting implements Serializable { + + + @ApiModelProperty(value = "平台地址") + private String httpUrl; + + + @ApiModelProperty(value = "平台ID") + private Integer tenantId; + + +} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java index 727f1a83..8e511b96 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java @@ -42,5 +42,7 @@ public enum SettingEnum { //支付宝支付设置 ALIPAY_PAYMENT, //微信支付设置 - WECHAT_PAYMENT; + WECHAT_PAYMENT, + //IM 配置 + IM; } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index ee1ecd45..7255c165 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -46,7 +46,7 @@ public class SettingManagerController { "WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_CONNECT," + - "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING,EXPERIENCE_SETTING") + "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING,EXPERIENCE_SETTING,IM") public ResultMessage saveConfig(@PathVariable String key, @RequestBody String configValue) { SettingEnum settingEnum = SettingEnum.valueOf(key); //获取系统配置 @@ -92,7 +92,7 @@ public class SettingManagerController { "WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_CONNECT," + - "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING,EXPERIENCE_SETTING" + "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING,EXPERIENCE_SETTING,IM" ) public ResultMessage settingGet(@PathVariable String key) { return createSetting(key); @@ -179,6 +179,10 @@ public class SettingManagerController { return setting == null ? ResultUtil.data(new ExperienceSetting()) : ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), ExperienceSetting.class)); + case IM: + return setting == null ? + ResultUtil.data(new ExperienceSetting()) : + ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), ImSetting.class)); default: throw new ServiceException(ResultCode.SETTING_NOT_TO_SET); }