Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

src/main/java/com/peanut/config/ShiroConfig.java

@@ -69,6 +69,8 @@ public class ShiroConfig {
         filterMap.put("/sys/login", "anon");
         filterMap.put("/swagger/**", "anon");
         filterMap.put("/v2/api-docs", "anon");
+        filterMap.put("/sys/agreement/getPrivacyDetail","anon");
+        filterMap.put("/sys/agreement/getUserDetail","anon");
         filterMap.put("/swagger-ui.html", "anon");
         filterMap.put("/swagger-resources/**", "anon");
         filterMap.put("/captcha.jpg", "anon");

src/main/java/com/peanut/modules/sys/controller/SysAgreementController.java

@@ -68,4 +68,25 @@ public class SysAgreementController {
 		sysAgreementService.updateById(agre);
 		return R.ok();
 	}
+
+	/**
+	 * 获取隐私协议
+	 * @return
+	 */
+	@RequestMapping("/getPrivacyDetail")
+	public R getPrivacyDetail(){
+		SysAgreementEntity privacyDetail = sysAgreementService.getPrivacyDetail();
+		return R.ok().put("privacy",privacyDetail);
+	}
+
+	/**
+	 * 获取用户协议
+	 * @return
+	 */
+	@RequestMapping("/getUserDetail")
+	public R getUserDetail(){
+		SysAgreementEntity userDetail = sysAgreementService.getUserDetail();
+		return R.ok().put("user",userDetail);
+	}
+
 }

src/main/java/com/peanut/modules/sys/service/SysAgreementService.java

@@ -26,4 +26,8 @@ public interface SysAgreementService extends IService<SysAgreementEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
+    SysAgreementEntity getPrivacyDetail();
+
+    SysAgreementEntity getUserDetail();
+
 }

src/main/java/com/peanut/modules/sys/service/impl/SysAgreementServiceImpl.java

@@ -8,6 +8,7 @@
 
 package com.peanut.modules.sys.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -40,4 +41,20 @@ public class SysAgreementServiceImpl extends ServiceImpl<SysAgreementDao, SysAgr
 
         return new PageUtils(page);
     }
+
+    @Override
+    public SysAgreementEntity getPrivacyDetail() {
+        LambdaQueryWrapper<SysAgreementEntity> sysAgreementEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysAgreementEntityLambdaQueryWrapper.eq(SysAgreementEntity::getType,"privacy");
+        SysAgreementEntity one = getOne(sysAgreementEntityLambdaQueryWrapper);
+        return one;
+    }
+
+    @Override
+    public SysAgreementEntity getUserDetail() {
+        LambdaQueryWrapper<SysAgreementEntity> sysAgreementEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysAgreementEntityLambdaQueryWrapper.eq(SysAgreementEntity::getType,"user");
+        SysAgreementEntity one = getOne(sysAgreementEntityLambdaQueryWrapper);
+        return one;
+    }
 }