IM 相关配置提交
This commit is contained in:
parent
a3564c746c
commit
3459169885
2
DB/version4.2.2to4.2.3.sql
Normal file
2
DB/version4.2.2to4.2.3.sql
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
/** 新增会员获的总积分 **/
|
||||||
|
ALTER TABLE li_store ADD merchant_euid varchar(255) COMMENT '客服标识';
|
@ -97,6 +97,11 @@ public class Store extends BaseEntity {
|
|||||||
@ApiModelProperty(value = "腾讯云智服小程序唯一标识")
|
@ApiModelProperty(value = "腾讯云智服小程序唯一标识")
|
||||||
private String yzfMpSign;
|
private String yzfMpSign;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "udesk IM标识")
|
||||||
|
private String merchantEuid;
|
||||||
|
|
||||||
|
|
||||||
public Store(Member member) {
|
public Store(Member member) {
|
||||||
this.memberId = member.getId();
|
this.memberId = member.getId();
|
||||||
this.memberName = member.getUsername();
|
this.memberName = member.getUsername();
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
@ -42,5 +42,7 @@ public enum SettingEnum {
|
|||||||
//支付宝支付设置
|
//支付宝支付设置
|
||||||
ALIPAY_PAYMENT,
|
ALIPAY_PAYMENT,
|
||||||
//微信支付设置
|
//微信支付设置
|
||||||
WECHAT_PAYMENT;
|
WECHAT_PAYMENT,
|
||||||
|
//IM 配置
|
||||||
|
IM;
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ public class SettingManagerController {
|
|||||||
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
|
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
|
||||||
"QQ_WEB_CONNECT,QQ_APP_CONNECT," +
|
"QQ_WEB_CONNECT,QQ_APP_CONNECT," +
|
||||||
"QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_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) {
|
public ResultMessage saveConfig(@PathVariable String key, @RequestBody String configValue) {
|
||||||
SettingEnum settingEnum = SettingEnum.valueOf(key);
|
SettingEnum settingEnum = SettingEnum.valueOf(key);
|
||||||
//获取系统配置
|
//获取系统配置
|
||||||
@ -92,7 +92,7 @@ public class SettingManagerController {
|
|||||||
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
|
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
|
||||||
"QQ_WEB_CONNECT,QQ_APP_CONNECT," +
|
"QQ_WEB_CONNECT,QQ_APP_CONNECT," +
|
||||||
"QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_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) {
|
public ResultMessage settingGet(@PathVariable String key) {
|
||||||
return createSetting(key);
|
return createSetting(key);
|
||||||
@ -179,6 +179,10 @@ public class SettingManagerController {
|
|||||||
return setting == null ?
|
return setting == null ?
|
||||||
ResultUtil.data(new ExperienceSetting()) :
|
ResultUtil.data(new ExperienceSetting()) :
|
||||||
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), ExperienceSetting.class));
|
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:
|
default:
|
||||||
throw new ServiceException(ResultCode.SETTING_NOT_TO_SET);
|
throw new ServiceException(ResultCode.SETTING_NOT_TO_SET);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user