小修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbNewsController.java

@@ -78,10 +78,7 @@ public class TbNewsController extends BaseController {
     public AjaxResult add(@RequestBody TbNews tbNews) {
         tbNews.setCreateTime(new Date());
         tbNews.setDescs(StripHT(tbNews.getContents()));
-        for (int i=0;i<20;i++){
-            iTbNewsService.save(tbNews);
-        }
-        return toAjax(1);
+        return toAjax(iTbNewsService.save(tbNews) ? 1 : 0);
     }
 
     /**

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyAlbumController.java

@@ -60,8 +60,6 @@ public class FamilyAlbumController extends AppBaseController {
     @GetMapping("/list")
     public AjaxResult list(@ApiIgnore TbFamilyAlbum tbFamilyAlbum)
     {
-        //校验数据是否为空，家族id不能为空
-        ValidatorUtils.validateEntity(tbFamilyAlbum);
 
         List<TbFamilyAlbum> list = iTbFamilyAlbumService.queryList(tbFamilyAlbum);
         return AjaxResult.success(list);

ruoyi-app/src/main/java/com/ruoyi/app/interceptor/AuthenticationInterceptor.java

@@ -1,11 +1,15 @@
 package com.ruoyi.app.interceptor;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.app.annotation.PassToken;
 import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.base.AppTokenService;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.ServletUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -43,16 +47,22 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
         }
         // 执行认证
         if (token == null) {
-            throw new RuntimeException("无token，请重新登录");
+            //throw new RuntimeException("无token，请重新登录");
+            ServletUtils.renderString(httpServletResponse, JSON.toJSONString(AjaxResult.error(HttpStatus.UNAUTHORIZED, "无token，请重新登录")));
+            return false;
         }
         // 获取 token 中的 loginUser
         AppLoginUser loginUser = appTokenService.getLoginUser(token);
         if (loginUser == null) {
-            throw new RuntimeException("用户不存在，请重新登录");
+           // throw new RuntimeException("用户不存在，请重新登录");
+            ServletUtils.renderString(httpServletResponse, JSON.toJSONString(AjaxResult.error(HttpStatus.UNAUTHORIZED, "用户不存在，请重新登录")));
+            return false;
         }
         AppMemberVo user = loginUser.getUser();
         if (user == null) {
-            throw new RuntimeException("用户不存在，请重新登录");
+            ServletUtils.renderString(httpServletResponse, JSON.toJSONString(AjaxResult.error(HttpStatus.UNAUTHORIZED, "用户不存在，请重新登录")));
+            return false;
+            //throw new RuntimeException("用户不存在，请重新登录");
         }
         // 验证 token
         appTokenService.verifyToken(loginUser);

ruoyi-app/src/main/resources/alipay.properties

@@ -5,4 +5,4 @@ alipay.appCertPath=\u5E94\u7528\u516C\u94A5\u8BC1\u4E66
 alipay.aliPayCertPath=\u652F\u4ED8\u5B9D\u516C\u94A5\u8BC1\u4E66
 alipay.aliPayRootCertPath=\u652F\u4ED8\u5B9D\u6839\u8BC1\u4E66
 alipay.serverUrl=https://openapi.alipay.com/gateway.do
-alipay.domain=http://15s255o329.iask.in/
+alipay.domain=http://sys.ssyznkj.com//

ruoyi-app/src/main/resources/wxpay.properties

@@ -3,4 +3,4 @@ wxpay.appSecret=afae4e36aec1e5ba04302716ef8f1a59
 wxpay.mchId=1602298908
 wxpay.partnerKey=058856f561c64c0fa13b79b48a22ccfc
 wxpay.certPath=D:/1602298908_20200909_cert/apiclient_cert.p12
-wxpay.domain=http://15s255o329.iask.in/
+wxpay.domain=http://sys.ssyznkj.com/

ruoyi-system/src/main/java/com/ruoyi/app/family/album/service/impl/TbFamilyAlbumServiceImpl.java

@@ -31,9 +31,7 @@ public class TbFamilyAlbumServiceImpl extends ServiceImpl<TbFamilyAlbumMapper, T
     @Override
     public List<TbFamilyAlbum> queryList(TbFamilyAlbum  entity) {
         LambdaQueryWrapper<TbFamilyAlbum> lqw = new LambdaQueryWrapper<TbFamilyAlbum>();
-        if (entity.getFamilyId() != null){
-            lqw.eq(TbFamilyAlbum::getFamilyId ,entity.getFamilyId());
-        }
+        lqw.eq(TbFamilyAlbum::getFamilyId ,entity.getFamilyId());
         if (StringUtils.isNotBlank(entity.getTitle())){
             lqw.eq(TbFamilyAlbum::getTitle ,entity.getTitle());
         }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyGardenServiceImpl.java

@@ -34,9 +34,7 @@ public class TbFamilyGardenServiceImpl extends ServiceImpl<TbFamilyGardenMapper,
         if (StringUtils.isNotBlank(entity.getTitle())){
             lqw.like(TbFamilyGarden::getTitle ,entity.getTitle());
         }
-        if (entity.getFamilyId() != null) {
-            lqw.eq(TbFamilyGarden::getFamilyId, entity.getFamilyId());
-        }
+        lqw.eq(TbFamilyGarden::getFamilyId, entity.getFamilyId());
         List<TbFamilyGarden> list = this.list(lqw);
         if (list.size() > 0) {
             list.forEach(item->{