Merge branch 'master' into test

sys-api-service/src/main/java/com/xy/entity/LogSysEvents.java

@@ -17,24 +17,29 @@ public class LogSysEvents {
     private String id;
 
     /**
-     * 事件名称
+     * 事件编码
      */
-    private String eventName;
+    private String code;
 
     /**
      * 事件等级
      */
     private Integer eventLevel;
 
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
     /**
      * 事件描述
      */
     private String eventDescript;
 
     /**
-     * 服务器IP
+     * 服务器端口
      */
-    private String serverIp;
+    private Integer port;
 
     /**
      * 服务名

sys-api/src/main/java/com/xy/dto/LogSysEventsDto.java

@@ -41,17 +41,20 @@ public class LogSysEventsDto {
         @ApiModelProperty("id")
         private String id;
 
-        @ApiModelProperty("事件名称")
-        private String eventName;
+        @ApiModelProperty("事件编码")
+        private String code;
 
         @ApiModelProperty("事件等级")
         private Integer eventLevel;
 
+        @ApiModelProperty("事件名称")
+        private String eventName;
+
         @ApiModelProperty("事件描述")
         private String eventDescript;
 
-        @ApiModelProperty("服务器IP")
-        private String serverIp;
+        @ApiModelProperty("服务器端口")
+        private Integer port;
 
         @ApiModelProperty("服务名")
         private String serviceName;

sys-sdk/src/main/java/com/xy/annotation/LogEvents.java

@@ -1,37 +0,0 @@
-package com.xy.annotation;
-
-import com.xy.enums.LogEnum;
-
-import java.lang.annotation.*;
-
-/**
- * 系统事件
- *
- * @author lijin
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface LogEvents {
-
-    /**
-     * 事件名称
-     *
-     * @return
-     */
-    String eventName() default "异常";
-
-    /**
-     * 事件等级
-     *
-     * @return
-     */
-    LogEnum.EventLevel eventLevel() default LogEnum.EventLevel.V1;
-
-    /**
-     * 事件描述
-     *
-     * @return
-     */
-    String eventDescript() default "";
-}

sys-sdk/src/main/java/com/xy/annotation/aspet/LogAspet.java

@@ -2,7 +2,6 @@ package com.xy.annotation.aspet;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
-import com.xy.annotation.LogEvents;
 import com.xy.annotation.LogOperate;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
@@ -86,42 +85,6 @@ public class LogAspet {
         return result;
     }
 
-    /**
-     * 系统事件
-     *
-     * @param joinPoint
-     * @param logEvents
-     * @return
-     * @throws Throwable
-     */
-    @Around("@annotation(logEvents)")
-    public Object logEvents(ProceedingJoinPoint joinPoint, LogEvents logEvents) throws Throwable {
-        //参数
-        Object[] args = joinPoint.getArgs();
-        Object result;
-        try {
-            result = joinPoint.proceed(args);
-        } catch (Exception e) {
-            String eventName = logEvents.eventName();
-            String eventDescript = logEvents.eventDescript();
-            LogEnum.EventLevel eventLevel = logEvents.eventLevel();
-            if (!Emptys.check(eventDescript)) {
-                String api = getApi(joinPoint);
-                Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
-                ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
-                if (apiOperation != null) {
-                    String value = apiOperation.value();
-                    eventDescript = api + "-" + value + "------" + e.getMessage();
-                }
-            }
-            if (Emptys.check(eventDescript)) {
-                LogUtils.events(eventName, eventLevel, eventDescript);
-            }
-            throw e;
-        }
-        return result;
-    }
-
     private String getApi(ProceedingJoinPoint joinPoint) {
         Class<?> classz = joinPoint.getTarget().getClass();
         Api api = classz.getAnnotation(Api.class);

sys-sdk/src/main/java/com/xy/config/SdkConfig.java

@@ -0,0 +1,18 @@
+package com.xy.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SdkConfig {
+
+    @Value("${server.port}")
+    private Integer port;
+
+    @Bean
+    public Integer getPort() {
+        return port;
+    }
+
+}

sys-sdk/src/main/java/com/xy/enums/LogEnum.java

@@ -39,19 +39,4 @@ public class LogEnum {
 
         private String msg;
     }
-
-    @Getter
-    public enum EventLevel {
-        V1(1, "未定义等级"),
-        ;
-
-        EventLevel(int value, String msg) {
-            this.value = value;
-            this.msg = msg;
-        }
-
-        private int value;
-
-        private String msg;
-    }
 }

sys-sdk/src/main/java/com/xy/utils/LogUtils.java

@@ -2,6 +2,7 @@ package com.xy.utils;
 
 import cn.hutool.json.JSONObject;
 import com.xy.config.SpringConfigs;
+import com.xy.entity.SysCodeConfigureRedis;
 import com.xy.enums.LogEnum;
 import com.xy.producer.LogsProducer;
 import com.xy.producer.LogsProducerConfiguration;
@@ -57,14 +58,19 @@ public class LogUtils {
     /**
      * 系统事件
      *
+     * @param code          事件编码
      * @param eventName     事件名称
-     * @param eventLevel    事件等级
      * @param eventDescript 事件描述
      */
-    public static void events(String eventName, LogEnum.EventLevel eventLevel, String eventDescript) {
+    public static void events(String code, String eventName, String eventDescript) {
+        String paterCode = code.substring(0, code.length() - 1);
+        SysCodeConfigureRedis sysCodeConfigureRedis = SysCodeConfigureUtils.get(paterCode, code);
+        Integer port = SpringBeanUtils.getBean("getPort", Integer.class);
         JSONObject jsonObject = new JSONObject()
+                .set("code", code)
+                .set("port", port)
                 .set("eventName", eventName)
-                .set("eventLevel", eventLevel.getValue())
+                .set("eventLevel", sysCodeConfigureRedis.getExpand())
                 .set("eventDescript", eventDescript)
                 .set("serviceName", springConfigs.getApplication().getName())
                 .set("createTime", DataTime.getSring())