diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java index 1e7f5e49..0e11857a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java @@ -111,7 +111,8 @@ public class SettingAppController { @Log(title = "获取用户协议", businessType = BusinessType.OTHER, isSaveDb = false) @SaIgnore public R userAgreement() { - String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); +// String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); + String userAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.USER_AGREEMENT); return R.ok(new AgreementDTO(userAgreement)); } @@ -120,7 +121,8 @@ public class SettingAppController { @Log(title = "获取隐私协议", businessType = BusinessType.OTHER, isSaveDb = false) @SaIgnore public R privacyAgreement() { - String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement(); +// String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement(); + String privacyAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.PRIVACY_AGREEMENT); return R.ok(new AgreementDTO(privacyAgreement)); } @@ -128,7 +130,8 @@ public class SettingAppController { @Operation(summary = "用户主播入驻协议") @Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false) public R 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)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java index 9fb0860d..9aa21891 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java @@ -58,6 +58,9 @@ public enum SystemConfigEnum { PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM), COS_DOMAIN("http://nono-1257812345.cos.ap-shanghai.myqcloud.com/", "文件系统域名前缀",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), ;