Merge branch 'han' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-api/src/main/java/com/usky/system/RemoteMceService.java

@@ -0,0 +1,27 @@
+package com.usky.system;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.factory.RemoteMceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 消息服务
+ * 
+ * @author ruoyi
+ */
+@FeignClient(contextId = "remoteMceService", value = "usky-system", fallbackFactory = RemoteMceFallbackFactory.class)
+public interface RemoteMceService
+{
+    /**
+     * 新增消息推送
+     *
+     * @param mceInfo 消息信息
+     * @return 结果
+     */
+    @PostMapping("/addMce")
+    public ApiResult<Void> addMce(@RequestBody String mceInfo);
+}

base-modules/service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteMceFallbackFactory.java

@@ -0,0 +1,34 @@
+package com.usky.system.factory;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.RemoteMceService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 消息服务降级处理
+ * 
+ * @author ruoyi
+ */
+@Component
+public class RemoteMceFallbackFactory implements FallbackFactory<RemoteMceService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteMceFallbackFactory.class);
+
+    @Override
+    public RemoteMceService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteMceService()
+        {
+            @Override
+            public ApiResult<Void> addMce(String mceInfo)
+            {
+                return ApiResult.error("500","新增消息失败:" + throwable.getMessage());
+            }
+        };
+    }
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysMceControllerApi.java

@@ -0,0 +1,22 @@
+package com.usky.system.controller.api;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.RemoteMceService;
+import com.usky.system.service.MceReceiveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+public class SysMceControllerApi implements RemoteMceService {
+
+
+    @Autowired
+    private MceReceiveService mceReceiveService;
+
+    @Override
+    public ApiResult<Void> addMce(String mceInfo) {
+        mceReceiveService.add(mceInfo);
+        return ApiResult.success();
+    }
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysOperLogServiceImpl.java

@@ -10,11 +10,9 @@ import com.usky.system.service.ISysOperLogService;
 import com.usky.system.service.vo.SysOperLogExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.util.calendar.BaseCalendar;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 操作日志 服务层处理