shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-03-27 16:57:51 +08:00
parent 6f92585337
commit be74c6dc53
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java
View File

@@ -111,7 +111,8 @@ public class SettingAppController {
@Log(title = "获取用户协议", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取用户协议", businessType = BusinessType.OTHER, isSaveDb = false)
@SaIgnore @SaIgnore
public R<AgreementDTO> userAgreement() { public R<AgreementDTO> userAgreement() {
String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); // String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement();
String userAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.USER_AGREEMENT);
return R.ok(new AgreementDTO(userAgreement)); return R.ok(new AgreementDTO(userAgreement));
} }
@@ -120,7 +121,8 @@ public class SettingAppController {
@Log(title = "获取隐私协议", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取隐私协议", businessType = BusinessType.OTHER, isSaveDb = false)
@SaIgnore @SaIgnore
public R<AgreementDTO> privacyAgreement() { public R<AgreementDTO> privacyAgreement() {
String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement(); // String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement();
String privacyAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.PRIVACY_AGREEMENT);
return R.ok(new AgreementDTO(privacyAgreement)); return R.ok(new AgreementDTO(privacyAgreement));
} }
@@ -128,7 +130,8 @@ public class SettingAppController {
@Operation(summary = "用户主播入驻协议") @Operation(summary = "用户主播入驻协议")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false)
public R<AgreementDTO> anchorJoinAgreement() { public R<AgreementDTO> anchorJoinAgreement() {
String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement(); // String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement();
String anchorJoinAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.ANCHOR_JOIN_AGREEMENT);
return R.ok(new AgreementDTO(anchorJoinAgreement)); return R.ok(new AgreementDTO(anchorJoinAgreement));
} }

3
ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java
View File

@@ -58,6 +58,9 @@ public enum SystemConfigEnum {
PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM), PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM),
COS_DOMAIN("http://nono-1257812345.cos.ap-shanghai.myqcloud.com/", "文件系统域名前缀",SystemConfigGroupEnum.SYSTEM), COS_DOMAIN("http://nono-1257812345.cos.ap-shanghai.myqcloud.com/", "文件系统域名前缀",SystemConfigGroupEnum.SYSTEM),
SYSTEM_CUSTOMER_SERVICE("2,4", "系统客服",SystemConfigGroupEnum.SYSTEM), SYSTEM_CUSTOMER_SERVICE("2,4", "系统客服",SystemConfigGroupEnum.SYSTEM),
PRIVACY_AGREEMENT("/#/agreement/privacy", "隐私协议地址",SystemConfigGroupEnum.SYSTEM),
USER_AGREEMENT("/#/agreement/user", "用户协议地址",SystemConfigGroupEnum.SYSTEM),
ANCHOR_JOIN_AGREEMENT("/#/agreement/anchor-join", "主播入驻协议地址",SystemConfigGroupEnum.SYSTEM),
WS_SOCKET_URL("ws://localhost:8080/ws?token=%s&room_id=%s", "ws通讯地址",SystemConfigGroupEnum.SYSTEM), WS_SOCKET_URL("ws://localhost:8080/ws?token=%s&room_id=%s", "ws通讯地址",SystemConfigGroupEnum.SYSTEM),
; ;