Merge remote-tracking branch 'origin/dev/one' into dev/one

bi-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @Description: MybatisPlus配置类
  * @author: gaodm
  * @time: 2018/8/2 13:39
  */
+@EnableTransactionManagement
 @Configuration
 @MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
 public class MybatisPlusConfigurer {

diagbotman-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @Description: MybatisPlus配置类
  * @author: gaodm
  * @time: 2018/8/2 13:39
  */
+@EnableTransactionManagement
 @Configuration
 @MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
 public class MybatisPlusConfigurer {

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

@@ -0,0 +1,152 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 服务端维护表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@TableName("diag_product_service")
+public class ProductService implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除 N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 客户服务id
+     */
+    private Long serviceId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public Long getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(Long serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "ProductService{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", productId=" + productId +
+        ", serviceId=" + serviceId +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,132 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户服务表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@TableName("diag_service_info")
+public class ServiceInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除 N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    private String name;
+
+    private String description;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", name=" + name +
+        ", description=" + description +
+        "}";
+    }
+}

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

@@ -0,0 +1,194 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 服务令牌表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@TableName("diag_service_token")
+public class ServiceToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除 N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 产品服务关联id
+     */
+    private Long productSeviceId;
+
+    /**
+     * 服务调用id
+     */
+    private String appKeyId;
+
+    /**
+     * 服务调用密码
+     */
+    private String appKeySecret;
+
+    /**
+     * 令牌类型
+     */
+    private Integer type;
+
+    /**
+     * 状态（0：禁用，1：启用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getProductSeviceId() {
+        return productSeviceId;
+    }
+
+    public void setProductSeviceId(Long productSeviceId) {
+        this.productSeviceId = productSeviceId;
+    }
+
+    public String getAppKeyId() {
+        return appKeyId;
+    }
+
+    public void setAppKeyId(String appKeyId) {
+        this.appKeyId = appKeyId;
+    }
+
+    public String getAppKeySecret() {
+        return appKeySecret;
+    }
+
+    public void setAppKeySecret(String appKeySecret) {
+        this.appKeySecret = appKeySecret;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceToken{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", productSeviceId=" + productSeviceId +
+        ", appKeyId=" + appKeyId +
+        ", appKeySecret=" + appKeySecret +
+        ", type=" + type +
+        ", status=" + status +
+        ", remark=" + remark +
+        "}";
+    }
+}

diagbotman-service/src/main/java/com/diagbot/mapper/ProductServiceMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.ProductService;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 服务端维护表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+public interface ProductServiceMapper extends BaseMapper<ProductService> {
+
+}

diagbotman-service/src/main/java/com/diagbot/mapper/ServiceInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.ServiceInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户服务表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+public interface ServiceInfoMapper extends BaseMapper<ServiceInfo> {
+
+}

diagbotman-service/src/main/java/com/diagbot/mapper/ServiceTokenMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.ServiceToken;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 服务令牌表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+public interface ServiceTokenMapper extends BaseMapper<ServiceToken> {
+
+}

diagbotman-service/src/main/java/com/diagbot/service/ProductServiceService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.ProductService;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 服务端维护表 服务类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+public interface ProductServiceService extends IService<ProductService> {
+
+}

diagbotman-service/src/main/java/com/diagbot/service/ServiceInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.ServiceInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户服务表 服务类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+public interface ServiceInfoService extends IService<ServiceInfo> {
+
+}

diagbotman-service/src/main/java/com/diagbot/service/ServiceTokenService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.ServiceToken;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 服务令牌表 服务类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+public interface ServiceTokenService extends IService<ServiceToken> {
+
+}

diagbotman-service/src/main/java/com/diagbot/service/impl/ProductServiceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.ProductService;
+import com.diagbot.mapper.ProductServiceMapper;
+import com.diagbot.service.ProductServiceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务端维护表 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@Service
+public class ProductServiceServiceImpl extends ServiceImpl<ProductServiceMapper, ProductService> implements ProductServiceService {
+
+}

diagbotman-service/src/main/java/com/diagbot/service/impl/ServiceInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.ServiceInfo;
+import com.diagbot.mapper.ServiceInfoMapper;
+import com.diagbot.service.ServiceInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户服务表 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@Service
+public class ServiceInfoServiceImpl extends ServiceImpl<ServiceInfoMapper, ServiceInfo> implements ServiceInfoService {
+
+}

diagbotman-service/src/main/java/com/diagbot/service/impl/ServiceTokenServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.ServiceToken;
+import com.diagbot.mapper.ServiceTokenMapper;
+import com.diagbot.service.ServiceTokenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务令牌表 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@Service
+public class ServiceTokenServiceImpl extends ServiceImpl<ServiceTokenMapper, ServiceToken> implements ServiceTokenService {
+
+}

diagbotman-service/src/main/java/com/diagbot/web/ProductServiceController.java

@@ -0,0 +1,21 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 服务端维护表 前端控制器
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@Controller
+@RequestMapping("/productService")
+public class ProductServiceController {
+
+}
+

diagbotman-service/src/main/java/com/diagbot/web/ServiceInfoController.java

@@ -0,0 +1,21 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 用户服务表 前端控制器
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@Controller
+@RequestMapping("/serviceInfo")
+public class ServiceInfoController {
+
+}
+

diagbotman-service/src/main/java/com/diagbot/web/ServiceTokenController.java

@@ -0,0 +1,21 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 服务令牌表 前端控制器
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-09-17
+ */
+@Controller
+@RequestMapping("/serviceToken")
+public class ServiceTokenController {
+
+}
+

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.ProductServiceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.ProductService">
+        <id column="id" property="id" />
+        <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="product_id" property="productId" />
+        <result column="service_id" property="serviceId" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.ServiceInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.ServiceInfo">
+        <id column="id" property="id" />
+        <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="name" property="name" />
+        <result column="description" property="description" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.ServiceTokenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.ServiceToken">
+        <id column="id" property="id" />
+        <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="product_sevice_id" property="productSeviceId" />
+        <result column="app_key_id" property="appKeyId" />
+        <result column="app_key_secret" property="appKeySecret" />
+        <result column="type" property="type" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -11,8 +11,8 @@ CREATE TABLE `sys_user` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `username` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名',
   `password` varchar(255) NOT NULL DEFAULT '' COMMENT '用户密码',
   `linkman` varchar(255) NOT NULL DEFAULT '' COMMENT '联系人',
@@ -31,8 +31,8 @@ CREATE TABLE `sys_role` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `name` varchar(255) NOT NULL DEFAULT '' COMMENT '角色名称',
   `roleLevel` int(11) NOT NULL DEFAULT '0' COMMENT '角色等级',
   `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '角色描述',
@@ -51,8 +51,8 @@ CREATE TABLE `sys_user_role` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `user_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统用户表.用户ID',
   `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统角色表.角色ID',
    `remark`  varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
@@ -68,8 +68,8 @@ CREATE TABLE `sys_permission` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `name` varchar(255) NOT NULL DEFAULT '' COMMENT '资源名称',
   `permissionUrl` varchar(255) NOT NULL DEFAULT '' COMMENT '资源Url',
   `method` varchar(255) NOT NULL DEFAULT 'ALL' COMMENT '资源允许的请求方式',
@@ -85,8 +85,8 @@ CREATE TABLE `sys_organization` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `name` varchar(255) NOT NULL DEFAULT '' COMMENT '机构名称',
    `remark`  varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`id`)
@@ -99,8 +99,8 @@ CREATE TABLE `sys_user_organization` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `user_id`  bigint(20) NOT NULL DEFAULT 0 COMMENT '用户主键',
 	`organization_id`  bigint(20) NOT NULL DEFAULT 0 COMMENT '机构主键',
 	 `remark`  varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
@@ -117,8 +117,8 @@ CREATE TABLE `sys_role_permission` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统角色表.角色ID',
   `permission_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统资源表.资源ID',
    `remark`  varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
@@ -132,8 +132,8 @@ CREATE TABLE `sys_menu` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `name` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单名称',
   `parent_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '-1：表示顶级,其他值表示上级菜单的id',
   `code` varchar(255) NOT NULL DEFAULT '' COMMENT '与前端对应',
@@ -149,8 +149,8 @@ CREATE TABLE `sys_role_menu` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `role_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '角色id',
   `menu_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '菜单id',
   `remark`  varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
@@ -164,8 +164,8 @@ CREATE TABLE `sys_menu_permission` (
   `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(255) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(255) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
 	`menu_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '菜单id',
   `permission_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '系统资源id',
   `remark`  varchar(255) NOT NULL DEFAULT '' COMMENT '备注',

feedback-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @Description: MybatisPlus配置类
  * @author: gaodm
  * @time: 2018/8/2 13:39
  */
+@EnableTransactionManagement
 @Configuration
 @MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
 public class MybatisPlusConfigurer {

knowledge-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @Description: MybatisPlus配置类
  * @author: gaodm
  * @time: 2018/8/2 13:39
  */
+@EnableTransactionManagement
 @Configuration
 @MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
 public class MybatisPlusConfigurer {

log-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @Description: MybatisPlus配置类
  * @author: gaodm
  * @time: 2018/8/2 13:39
  */
+@EnableTransactionManagement
 @Configuration
 @MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
 public class MybatisPlusConfigurer {

uaa-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @Description: MybatisPlus配置类
  * @author: gaodm
  * @time: 2018/8/2 13:39
  */
+@EnableTransactionManagement
 @Configuration
 @MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
 public class MybatisPlusConfigurer {

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

@@ -47,15 +47,15 @@ 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.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "sys_user","sys_role","sys_permission" }); // 需要生成的表
+        strategy.setInclude(new String[] { "sys_user","sys_menu","sys_role","sys_permission" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

user-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @Description: MybatisPlus配置类
  * @author: gaodm
  * @time: 2018/8/2 13:39
  */
+@EnableTransactionManagement
 @Configuration
 @MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
 public class MybatisPlusConfigurer {

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -1,6 +1,7 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.User;
 import org.apache.ibatis.annotations.Param;
@@ -20,5 +21,5 @@ public interface UserMapper extends BaseMapper<User> {
 
     User findByName(String username);
 
-    List<User> selectUserListPage(Page<Map> mapPage, @Param("user") User user);
+    IPage<User> selectUserListPage(Page page, @Param("user") User user);
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -21,5 +21,5 @@ public interface UserService extends IService<User> {
 
     User findByName(String username);
 
-    Page<User> selectUserListPage(Page<Map> mapPage, User user);
+    IPage<User> selectUserListPage(Page<User> page, User user);
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.User;
@@ -26,11 +27,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public Page<User> selectUserListPage(Page<Map> mapPage, User user) {
-        Page<User> pageRes = new Page<>(mapPage.getCurrent(),mapPage.getSize());// 当前页，总条数 构造 page 对象
-        List<User> users =  baseMapper.selectUserListPage(mapPage, user);
-        pageRes.setRecords(users);
-        pageRes.setTotal(mapPage.getTotal());
-        return pageRes;
+    public IPage<User> selectUserListPage(Page<User> page, User user) {
+        return baseMapper.selectUserListPage(page, user);
     }
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -1,5 +1,6 @@
 package com.diagbot.web;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.LoginDTO;
@@ -7,6 +8,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.User;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.UserSaveVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,14 +21,14 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
-import java.util.Map;
 
 /**
- * @Description: 用户对外接口层
+ * @Description: 用户操作API
  * @author: gaodm
  * @time: 2018/8/2 13:56
  */
 @RestController
+@Api(value="用户操作API", tags={"用户操作API"})
 @RequestMapping("/user")
 public class UserController {
 
@@ -87,11 +89,9 @@ public class UserController {
     @SysLogger("getUserInfoByID")
     @ApiIgnore
     public RespDTO getUserInfoByID(Long id, Page page){
-        //参数判读省略
-        Page<Map> mapPage = new Page<>(page.getCurrent(),page.getSize());
         User userVo = new User();
         userVo.setId(id);
-        Page<User> user=  userFacade.selectUserListPage(mapPage, userVo);
+        IPage<User> user=  userFacade.selectUserListPage(page, userVo);
         return RespDTO.onSuc(user);
     }
 

user-service/src/main/java/com/diagbot/web/VerController.java

@@ -7,6 +7,7 @@ import com.diagbot.facade.VerFacade;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.SmsVerCreatVO;
 import com.diagbot.vo.SmsVerVerVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +23,7 @@ import javax.validation.Valid;
  * @time: 2018/9/4 19:30
  */
 @RestController
+@Api(value="用户验证API", tags={"用户验证API"})
 @RequestMapping("/userver")
 public class VerController {
     @Autowired