日志添加系统记录维度

bi-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -2,6 +2,7 @@ package com.diagbot.aop;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.SysLog;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
@@ -66,6 +67,7 @@ public class SysLoggerAspect {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());
+        sysLog.setSysType(SysTypeEnum.BI_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

bi-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2018-09-14
  */
 public class SysLog implements Serializable {
 
@@ -54,6 +54,11 @@ public class SysLog implements Serializable {
      */
     private String ip;
 
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
+
     /**
      * 方法
      */
@@ -131,6 +136,14 @@ public class SysLog implements Serializable {
         this.ip = ip;
     }
 
+    public Integer getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(Integer sysType) {
+        this.sysType = sysType;
+    }
+
     public String getMethod() {
         return method;
     }
@@ -173,6 +186,7 @@ public class SysLog implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", ip=" + ip +
+        ", sysType=" + sysType +
         ", method=" + method +
         ", operation=" + operation +
         ", params=" + params +

bi-service/src/main/resources/mapper/SysLogMapper.xml

@@ -5,8 +5,13 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
         <id column="id" property="id" />
-        <result column="create_date" property="createDate" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="ip" property="ip" />
+        <result column="sys_type" property="sysType" />
         <result column="method" property="method" />
         <result column="operation" property="operation" />
         <result column="params" property="params" />

common/src/main/java/com/diagbot/enums/SysTypeEnum.java

@@ -0,0 +1,57 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 访问的系统类型
+ *  1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,
+ *  5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+ * @author: gaodm
+ * @time: 2018/9/14 9:15
+ */
+public enum SysTypeEnum implements KeyedNamed {
+    USER_SERVICE(1, "user-service"),
+    DIAGBOTMAN_SERVICE(2, "diagbotman-service"),
+    UAA_SERVICE(3, "uaa-service"),
+    LOG_SERVICE(4, "log-service"),
+    BI_SERVICE(5, "bi-service"),
+    KNOWLEDGE_SERVICE(6, "knowledge-service"),
+    FEEDBACK_SERVICE(7, "feedback-service"),
+    ICSS_WEB(8, "icss-web");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    SysTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static SysTypeEnum getEnum(int key) {
+        for (SysTypeEnum item : SysTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        SysTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

diagbotman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -2,6 +2,7 @@ package com.diagbot.aop;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.SysLog;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
@@ -66,6 +67,7 @@ public class SysLoggerAspect {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());
+        sysLog.setSysType(SysTypeEnum.DIAGBOTMAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

diagbotman-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2018-09-14
  */
 public class SysLog implements Serializable {
 
@@ -54,6 +54,11 @@ public class SysLog implements Serializable {
      */
     private String ip;
 
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
+
     /**
      * 方法
      */
@@ -131,6 +136,14 @@ public class SysLog implements Serializable {
         this.ip = ip;
     }
 
+    public Integer getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(Integer sysType) {
+        this.sysType = sysType;
+    }
+
     public String getMethod() {
         return method;
     }
@@ -173,6 +186,7 @@ public class SysLog implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", ip=" + ip +
+        ", sysType=" + sysType +
         ", method=" + method +
         ", operation=" + operation +
         ", params=" + params +

diagbotman-service/src/main/resources/mapper/SysLogMapper.xml

@@ -5,8 +5,13 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
         <id column="id" property="id" />
-        <result column="create_date" property="createDate" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="ip" property="ip" />
+        <result column="sys_type" property="sysType" />
         <result column="method" property="method" />
         <result column="operation" property="operation" />
         <result column="params" property="params" />

diagbotman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -47,8 +47,8 @@ public class CodeGeneration {
         dsc.setDbType(DbType.MYSQL);
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");
+        dsc.setPassword("lantone");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf-8&useSSL=false");
         mpg.setDataSource(dsc);
 
         // 策略配置

docs/002.数据库设计/sys-log.sql

@@ -32,9 +32,10 @@ CREATE TABLE `sys_log` (
   `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
   `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `ip` varchar(255) NOT NULL DEFAULT '' COMMENT '访问者的IP',
+  `sys_type` int(11) NOT NULL DEFAULT '0' COMMENT '访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web',
   `method` varchar(255) NOT NULL DEFAULT '' COMMENT '方法',
   `operation` varchar(255) NOT NULL DEFAULT '' COMMENT '操作名',
   `params` varchar(255) NOT NULL DEFAULT '' COMMENT '参数',
   `username` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=267 DEFAULT CHARSET=utf8 COMMENT='系统操作日志表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='系统操作日志表';

feedback-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -2,6 +2,7 @@ package com.diagbot.aop;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.SysLog;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
@@ -66,6 +67,7 @@ public class SysLoggerAspect {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());
+        sysLog.setSysType(SysTypeEnum.FEEDBACK_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

feedback-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2018-09-14
  */
 public class SysLog implements Serializable {
 
@@ -54,6 +54,11 @@ public class SysLog implements Serializable {
      */
     private String ip;
 
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
+
     /**
      * 方法
      */
@@ -131,6 +136,14 @@ public class SysLog implements Serializable {
         this.ip = ip;
     }
 
+    public Integer getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(Integer sysType) {
+        this.sysType = sysType;
+    }
+
     public String getMethod() {
         return method;
     }
@@ -173,6 +186,7 @@ public class SysLog implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", ip=" + ip +
+        ", sysType=" + sysType +
         ", method=" + method +
         ", operation=" + operation +
         ", params=" + params +

feedback-service/src/main/resources/mapper/SysLogMapper.xml

@@ -5,8 +5,13 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
         <id column="id" property="id" />
-        <result column="create_date" property="createDate" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="ip" property="ip" />
+        <result column="sys_type" property="sysType" />
         <result column="method" property="method" />
         <result column="operation" property="operation" />
         <result column="params" property="params" />

knowledge-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -2,6 +2,7 @@ package com.diagbot.aop;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.SysLog;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
@@ -66,6 +67,7 @@ public class SysLoggerAspect {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());
+        sysLog.setSysType(SysTypeEnum.KNOWLEDGE_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

knowledge-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2018-09-14
  */
 public class SysLog implements Serializable {
 
@@ -54,6 +54,11 @@ public class SysLog implements Serializable {
      */
     private String ip;
 
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
+
     /**
      * 方法
      */
@@ -131,6 +136,14 @@ public class SysLog implements Serializable {
         this.ip = ip;
     }
 
+    public Integer getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(Integer sysType) {
+        this.sysType = sysType;
+    }
+
     public String getMethod() {
         return method;
     }
@@ -173,6 +186,7 @@ public class SysLog implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", ip=" + ip +
+        ", sysType=" + sysType +
         ", method=" + method +
         ", operation=" + operation +
         ", params=" + params +

knowledge-service/src/main/resources/mapper/SysLogMapper.xml

@@ -5,8 +5,13 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
         <id column="id" property="id" />
-        <result column="create_date" property="createDate" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
         <result column="ip" property="ip" />
+        <result column="sys_type" property="sysType" />
         <result column="method" property="method" />
         <result column="operation" property="operation" />
         <result column="params" property="params" />

log-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -2,6 +2,7 @@ package com.diagbot.aop;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.SysLog;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
@@ -66,6 +67,7 @@ public class SysLoggerAspect {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());
+        sysLog.setSysType(SysTypeEnum.LOG_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

log-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2018-09-14
  */
 public class SysLog implements Serializable {
 
@@ -54,6 +54,11 @@ public class SysLog implements Serializable {
      */
     private String ip;
 
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
+
     /**
      * 方法
      */
@@ -131,6 +136,14 @@ public class SysLog implements Serializable {
         this.ip = ip;
     }
 
+    public Integer getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(Integer sysType) {
+        this.sysType = sysType;
+    }
+
     public String getMethod() {
         return method;
     }
@@ -173,6 +186,7 @@ public class SysLog implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", ip=" + ip +
+        ", sysType=" + sysType +
         ", method=" + method +
         ", operation=" + operation +
         ", params=" + params +

log-service/src/main/resources/mapper/SysLogMapper.xml

@@ -11,6 +11,7 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
         <result column="ip" property="ip" />
+        <result column="sys_type" property="sysType" />
         <result column="method" property="method" />
         <result column="operation" property="operation" />
         <result column="params" property="params" />

log-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -47,8 +47,8 @@ public class CodeGeneration {
         dsc.setDbType(DbType.MYSQL);
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");
+        dsc.setPassword("lantone");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf-8&useSSL=false");
         mpg.setDataSource(dsc);
 
         // 策略配置

user-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -2,6 +2,7 @@ package com.diagbot.aop;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.SysLog;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
@@ -66,6 +67,7 @@ public class SysLoggerAspect {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());
+        sysLog.setSysType(SysTypeEnum.USER_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

user-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2018-09-14
  */
 public class SysLog implements Serializable {
 
@@ -54,6 +54,11 @@ public class SysLog implements Serializable {
      */
     private String ip;
 
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
+
     /**
      * 方法
      */
@@ -131,6 +136,14 @@ public class SysLog implements Serializable {
         this.ip = ip;
     }
 
+    public Integer getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(Integer sysType) {
+        this.sysType = sysType;
+    }
+
     public String getMethod() {
         return method;
     }
@@ -173,6 +186,7 @@ public class SysLog implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", ip=" + ip +
+        ", sysType=" + sysType +
         ", method=" + method +
         ", operation=" + operation +
         ", params=" + params +

user-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -47,13 +47,13 @@ public class CodeGeneration {
         dsc.setDbType(DbType.MYSQL);
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-user?useUnicode=true&characterEncoding=utf-8");
+        dsc.setPassword("lantone");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf-8&useSSL=false");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
+        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
         strategy.setInclude(new String[] { "user" }); // 需要生成的表