This commit is contained in:
77
2024-04-24 00:10:14 +08:00
parent eaa659b415
commit 9aa4bd3044
2 changed files with 18 additions and 0 deletions

View File

@@ -11,6 +11,8 @@ import com.ruoyi.xq.dto.app.areacode.AreaCodeHomeVo;
import com.ruoyi.xq.dto.app.areacode.AreaCodeQuery;
import com.ruoyi.xq.dto.app.areacode.AreaCodeTree;
import com.ruoyi.xq.dto.app.setting.AgreementDTO;
import com.ruoyi.xq.enums.common.SystemConfigEnum;
import com.ruoyi.xq.manager.SystemConfigManager;
import com.ruoyi.xq.mapper.AreaCodeMapper;
import com.ruoyi.xq.service.AgreementSettingService;
import com.ruoyi.xq.service.AreaCodeService;
@@ -22,7 +24,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/api/setting")
@@ -34,6 +38,8 @@ public class SettingAppController {
private AgreementSettingService agreementSettingService;
@Autowired
private AreaCodeService areaCodeService;
@Autowired
private SystemConfigManager systemConfigManager;
@GetMapping("/agreement/user")
@Operation(summary = "获取用户协议")
@@ -87,4 +93,15 @@ public class SettingAppController {
return R.ok(node);
}
@GetMapping("/customerService/pic")
@Operation(summary = "获取客服二维码")
@Log(title = "获取客服二维码", businessType = BusinessType.OTHER, isSaveDb = false)
@SaIgnore
public R<Map<String,String>> customerService(){
String url = systemConfigManager.getSystemConfig(SystemConfigEnum.CUSTOMER_SERVICE_URL);
Map<String,String> map = new HashMap<>();
map.put("customerService",url);
return R.ok(map);
}
}

View File

@@ -18,6 +18,7 @@ public enum SystemConfigEnum {
OPEN_WX_WITHDRAW("0", "是否开启微信提现", SystemConfigGroupEnum.BUSINESS, null),
OPEN_ALI_WITHDRAW("1", "是否开启支付宝提现", SystemConfigGroupEnum.BUSINESS, null),
VIP_INVITE_RATE("0.30","默认会员分销比例",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()),
CUSTOMER_SERVICE_URL("https://xq-oss-123121.oss-cn-guangzhou.aliyuncs.com/xq/images/service/customer-service.png","客服地址",SystemConfigGroupEnum.BUSINESS, null),
SENSITIVE_ENABLE("1", "是否开启手机号脱敏",SystemConfigGroupEnum.SYSTEM,new BooleanSystemConfigCheck()),
SMS_CODE_ADMIN("", "万能验证码",SystemConfigGroupEnum.SYSTEM),
PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM),