nginx反向代理多個服務

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityAdvertisingController.java

@@ -3,10 +3,12 @@ package com.zhongzheng.controller.activity;
 import java.util.Arrays;
 import java.util.List;
 
+import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.activity.bo.ActivityAdvertisingAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityAdvertisingEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
 import com.zhongzheng.modules.activity.service.IActivityAdvertisingService;
 import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
 import lombok.RequiredArgsConstructor;
@@ -83,7 +85,15 @@ public class ActivityAdvertisingController extends BaseController {
     @PostMapping("addActivity")
     public AjaxResult add(@RequestBody ActivityAdvertisingAddBo bo) {
         long l = iActivityAdvertisingService.insertByAddBo(bo);
-        String content = "";
+        String content = "新增广告：";
+        content.concat((StrUtil.isBlank(bo.getAdvName())?"":"广告名称："+bo.getAdvName()));
+        content.concat((StrUtil.isBlank(bo.getAdverUrl())?"":"广告图片："+bo.getAdverUrl()));
+        content.concat((StrUtil.isBlank(bo.getJumpUrl())?"":"跳转url："+bo.getJumpUrl()));
+        content.concat((bo.getStatus()==null)?"":"有效时间："+bo.getStartTime().toString());
+        content.concat((bo.getStatus()==null)?"":"有效时间："+bo.getEndTime().toString());
+        content.concat((StrUtil.isBlank(bo.getRemarks())?"":"备注："+bo.getRemarks()));
+        content.concat((bo.getStatus()==null)?"":(bo.getReStatus()==1)?"发布方式：定时发布":"发布方式：手动发布");
+        content.concat((bo.getStatus()==null)?"":(bo.getStatus()==1)?"状态：待发布":(bo.getStatus()==2)?"状态：撤回":"状态：发布成功");
         return AjaxResult.success_log(l,content);
     }
 
@@ -95,7 +105,17 @@ public class ActivityAdvertisingController extends BaseController {
     @Log(title = "广告发布储存", businessType = BusinessType.UPDATE)
     @PostMapping("updateActivity")
     public AjaxResult<Void> edit(@RequestBody ActivityAdvertisingEditBo bo) {
-        return toAjax(iActivityAdvertisingService.updateByEditBo(bo) ? 1 : 0);
+        ActivityAdvertisingVo activityAdvertising = iActivityAdvertisingService.updateByEditBo(bo);
+        String content = "修改广告：";
+        content.concat((StrUtil.isBlank(bo.getAdvName())?"":"修改广告名称："+bo.getAdvName()+"原名称："+activityAdvertising.getAdvName()));
+        content.concat((StrUtil.isBlank(bo.getAdverUrl())?"":"广告图片："+bo.getAdverUrl()));
+        content.concat((StrUtil.isBlank(bo.getJumpUrl())?"":"跳转url："+bo.getJumpUrl()));
+        content.concat((bo.getStatus()==null)?"":"有效时间："+bo.getStartTime().toString());
+        content.concat((bo.getStatus()==null)?"":"有效时间："+bo.getEndTime().toString());
+        content.concat((StrUtil.isBlank(bo.getRemarks())?"":"备注："+bo.getRemarks()));
+        content.concat((bo.getStatus()==null)?"":(bo.getReStatus()==1)?"发布方式：定时发布":"发布方式：手动发布");
+        content.concat((bo.getStatus()==null)?"":(bo.getStatus()==1)?"状态：待发布":(bo.getStatus()==2)?"状态：撤回":"状态：发布成功");
+        return AjaxResult.success_log(bo.getId(),content);
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityAdvertisingService.java

@@ -41,7 +41,7 @@ public interface IActivityAdvertisingService extends IService<ActivityAdvertisin
 	 * @param bo 广告发布储存编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(ActivityAdvertisingEditBo bo);
+	ActivityAdvertisingVo updateByEditBo(ActivityAdvertisingEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -84,11 +84,13 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByEditBo(ActivityAdvertisingEditBo bo) {
+    public ActivityAdvertisingVo updateByEditBo(ActivityAdvertisingEditBo bo) {
         ActivityAdvertising update = BeanUtil.toBean(bo, ActivityAdvertising.class);
+        ActivityAdvertisingVo activityAdvertisingVo = this.queryById(update.getId());
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+        this.updateById(update);
+        return activityAdvertisingVo;
     }
 
     /**