feat: adjust package structure

spring-cloud-advance-common/spring-cloud-advance-common-core/pom.xml

@@ -38,13 +38,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

spring-cloud-advance-stream/pom.xml

@@ -10,7 +10,7 @@
     <artifactId>spring-cloud-advance-stream</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-cloud-advance-stream</name>
-    <description>Demo project for Spring Boot</description>
+    <description>Demo project for Spring Cloud Stream.</description>
 
     <properties>
         <java.version>1.8</java.version>

unified-exception-handling/ueh-discovery/pom.xml

@@ -10,7 +10,7 @@
     <artifactId>ueh-discovery</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>ueh-discovery</name>
-    <description>unified exception handling service discovery</description>
+    <description>service discovery</description>
 
     <dependencies>
         <dependency>

unified-exception-handling/ueh-licence/pom.xml

@@ -10,7 +10,7 @@
 	<artifactId>ueh-licence</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>ueh-licence</name>
-	<description>unified exception handling licence service</description>
+	<description>licence service</description>
 
 	<dependencies>
 		<dependency>
@@ -31,7 +31,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>2.0.1.RELEASE</version>
         </dependency>
 
         <dependency>

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/UehLicenceApplication.java

+package com.sprainkle.licence;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+@EnableFeignClients
+@EnableDiscoveryClient
+@SpringBootApplication
+public class UehLicenceApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(UehLicenceApplication.class, args);
+	}
+
+}

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/client/OrganizationClient.java

+package com.sprainkle.licence.client;
+
+import com.sprainkle.spring.cloud.advance.common.core.pojo.response.R;
+import com.sprainkle.spring.cloud.advance.proto.organization.response.OrganizationDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/4
+ */
+@FeignClient("ueh-organization")
+public interface OrganizationClient {
+
+    @GetMapping("/organization/{organizationId}")
+    R<OrganizationDTO> getOrganization(@PathVariable("organizationId") Long organizationId);
+
+}

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/config/MybatisPlusConfig.java

+package com.sprainkle.licence.config;
+
+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;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+@Configuration
+@MapperScan("com.sprainkle.**.mapper")
+public class MybatisPlusConfig {
+
+    /**
+     * 分页插件
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+}
\ No newline at end of file

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/constant/LicenceTypeEnum.java

+package com.sprainkle.licence.constant;
+
+import com.sprainkle.spring.cloud.advance.common.core.constant.Dictionary;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * licence type
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+@Getter
+@ToString
+@AllArgsConstructor
+public enum LicenceTypeEnum implements Dictionary {
+
+	USER("user", "user"),
+	CORE_PROD("core-prod", "core-prod"),
+    ;
+
+    private String code;
+    private String name;
+
+	/**
+	 * code -> {@link LicenceTypeEnum}, 允许返回空
+	 * @param code
+	 * @return
+	 */
+	public static LicenceTypeEnum parseOfNullable(String code) {
+		if (code != null) {
+			for (LicenceTypeEnum e : values()) {
+				if (e.code.equals(code)) {
+					return e;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * code -> name, 允许返回空
+	 * @param code
+	 * @return
+	 */
+	public static String parseOfNameNullable(String code) {
+		LicenceTypeEnum enable = parseOfNullable(code);
+		return enable == null ? null : enable.getName();
+	}
+
+}

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/constant/ResponseEnum.java

+package com.sprainkle.licence.constant;
+
+import com.sprainkle.spring.cloud.advance.common.core.exception.assertion.BusinessExceptionAssert;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * <p>返回结果</p>
+ *
+ * @author sprainkle
+ * @date 2018.09.17
+ */
+@Getter
+@AllArgsConstructor
+public enum ResponseEnum implements BusinessExceptionAssert {
+
+    /**
+     *
+     */
+    BAD_LICENCE_TYPE(7001, "Bad licence type."),
+    /**
+     *
+     */
+    LICENCE_NOT_FOUND(7002, "Licence not found.")
+
+    ;
+
+    /**
+     * 返回码
+     */
+    private int code;
+    /**
+     * 返回消息
+     */
+    private String message;
+}

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/controller/LicenceController.java

+package com.sprainkle.licence.controller;
+
+import com.sprainkle.spring.cloud.advance.common.core.pojo.response.QR;
+import com.sprainkle.spring.cloud.advance.common.core.pojo.response.R;
+import com.sprainkle.spring.cloud.advance.proto.licence.param.LicenceParam;
+import com.sprainkle.spring.cloud.advance.proto.licence.request.LicenceAddRequest;
+import com.sprainkle.spring.cloud.advance.proto.licence.response.LicenceAddRespData;
+import com.sprainkle.spring.cloud.advance.proto.licence.response.LicenceDTO;
+import com.sprainkle.spring.cloud.advance.proto.licence.response.SimpleLicenceDTO;
+import com.sprainkle.licence.service.LicenceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+@RestController
+@RequestMapping(value = "/licence")
+public class LicenceController {
+
+    @Autowired
+    private LicenceService licenceService;
+
+    @GetMapping(value = "/{licenceId}")
+    public R<LicenceDTO> getLicence(@PathVariable("licenceId") Long licenceId) {
+        return new R<>(licenceService.queryDetail(licenceId));
+    }
+
+    @GetMapping(value = "/list")
+    public QR<SimpleLicenceDTO> getLicences(@Validated LicenceParam licenceParam) {
+        return new QR<>(licenceService.getLicences(licenceParam));
+    }
+
+    @PostMapping
+    public R<LicenceAddRespData> addLicence(@Validated @RequestBody LicenceAddRequest request) {
+        return new R<>(licenceService.addLicence(request));
+    }
+
+}

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/entity/Licence.java

+package com.sprainkle.licence.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+@Data
+@TableName("licence")
+public class Licence {
+
+    @TableId(value = "licence_id", type = IdType.AUTO)
+    private Long licenceId;
+
+    private Long organizationId;
+
+    private String licenceType;
+
+    private String productName;
+
+    private Integer licenceMax;
+
+    private Integer licenceAllocated;
+
+    private String comment;
+
+}

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/mapper/LicenceMapper.java

+package com.sprainkle.licence.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sprainkle.licence.entity.Licence;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+public interface LicenceMapper extends BaseMapper<Licence> {
+}

unified-exception-handling/ueh-licence/src/main/java/com/sprainkle/licence/service/LicenceService.java

+package com.sprainkle.licence.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sprainkle.licence.client.OrganizationClient;
+import com.sprainkle.licence.constant.LicenceTypeEnum;
+import com.sprainkle.licence.constant.ResponseEnum;
+import com.sprainkle.licence.entity.Licence;
+import com.sprainkle.licence.mapper.LicenceMapper;
+import com.sprainkle.spring.cloud.advance.common.core.pojo.param.QueryPage;
+import com.sprainkle.spring.cloud.advance.common.core.pojo.response.QueryData;
+import com.sprainkle.spring.cloud.advance.common.core.util.ClientUtil;
+import com.sprainkle.spring.cloud.advance.proto.licence.param.LicenceParam;
+import com.sprainkle.spring.cloud.advance.proto.licence.request.LicenceAddRequest;
+import com.sprainkle.spring.cloud.advance.proto.licence.response.LicenceAddRespData;
+import com.sprainkle.spring.cloud.advance.proto.licence.response.LicenceDTO;
+import com.sprainkle.spring.cloud.advance.proto.licence.response.SimpleLicenceDTO;
+import com.sprainkle.spring.cloud.advance.proto.organization.response.OrganizationDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+@Service
+public class LicenceService extends ServiceImpl<LicenceMapper, Licence> {
+
+    @Autowired
+    private OrganizationClient organizationClient;
+
+    /**
+     * 查询{@link Licence} 详情
+     * @param licenceId
+     * @return
+     */
+    public LicenceDTO queryDetail(Long licenceId) {
+        Licence licence = this.getById(licenceId);
+        // 校验非空
+        ResponseEnum.LICENCE_NOT_FOUND.assertNotNull(licence);
+
+        OrganizationDTO org = ClientUtil.execute(() -> organizationClient.getOrganization(licence.getOrganizationId()));
+        return toLicenceDTO(licence, org);
+    }
+
+    /**
+     * 分页获取
+     * @param licenceParam 分页查询参数
+     * @return
+     */
+    public QueryData<SimpleLicenceDTO> getLicences(LicenceParam licenceParam) {
+        String licenceType = licenceParam.getLicenceType();
+        LicenceTypeEnum licenceTypeEnum = LicenceTypeEnum.parseOfNullable(licenceType);
+        // 断言, 非空
+        ResponseEnum.BAD_LICENCE_TYPE.assertNotNull(licenceTypeEnum);
+
+        LambdaQueryWrapper<Licence> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Licence::getLicenceType, licenceType);
+        IPage<Licence> page = this.page(new QueryPage<>(licenceParam), wrapper);
+        return new QueryData<>(page, this::toSimpleLicenceDTO);
+    }
+
+    /**
+     * 新增{@link Licence}
+     * @param request 请求体
+     * @return
+     */
+    @Transactional(rollbackFor = Throwable.class)
+    public LicenceAddRespData addLicence(LicenceAddRequest request) {
+        // 省略校验参数
+        Licence licence = new Licence();
+        licence.setOrganizationId(request.getOrganizationId());
+        licence.setLicenceType(request.getLicenceType());
+        licence.setProductName(request.getProductName());
+        licence.setLicenceMax(request.getLicenceMax());
+        licence.setLicenceAllocated(request.getLicenceAllocated());
+        licence.setComment(request.getComment());
+        this.save(licence);
+
+        return new LicenceAddRespData(licence.getLicenceId());
+    }
+
+    /**
+     * entity -> simple dto
+     * @param licence {@link Licence} entity
+     * @return {@link SimpleLicenceDTO}
+     */
+    private SimpleLicenceDTO toSimpleLicenceDTO(Licence licence) {
+        SimpleLicenceDTO simpleLicenceDTO= new SimpleLicenceDTO();
+        simpleLicenceDTO.setLicenceId(String.valueOf(licence.getLicenceId()));
+        simpleLicenceDTO.setOrganizationId(String.valueOf(licence.getOrganizationId()));
+        simpleLicenceDTO.setLicenceType(licence.getLicenceType());
+        simpleLicenceDTO.setProductName(licence.getProductName());
+        simpleLicenceDTO.setLicenceMax(licence.getLicenceMax());
+        simpleLicenceDTO.setLicenceAllocated(licence.getLicenceAllocated());
+        simpleLicenceDTO.setComment(licence.getComment());
+        return simpleLicenceDTO;
+    }
+
+    /**
+     * entity -> dto
+     * @param licence {@link Licence} entity
+     * @param org {@link OrganizationDTO}
+     * @return {@link LicenceDTO}
+     */
+    private LicenceDTO toLicenceDTO(Licence licence, OrganizationDTO org) {
+        LicenceDTO licenceDTO= new LicenceDTO();
+        licenceDTO.setLicenceId(String.valueOf(licence.getLicenceId()));
+        licenceDTO.setOrganizationId(String.valueOf(licence.getOrganizationId()));
+        licenceDTO.setOrganizationName(org.getName());
+        licenceDTO.setContactName(org.getContactName());
+        licenceDTO.setContactEmail(org.getContactEmail());
+        licenceDTO.setContactPhone(org.getContactPhone());
+        licenceDTO.setLicenceType(licence.getLicenceType());
+        licenceDTO.setProductName(licence.getProductName());
+        licenceDTO.setLicenceMax(licence.getLicenceMax());
+        licenceDTO.setLicenceAllocated(licence.getLicenceAllocated());
+        licenceDTO.setComment(licence.getComment());
+        return licenceDTO;
+    }
+
+    /**
+     * 校验{@link Licence}存在
+     * @param licence
+     */
+    private void checkNotNull(Licence licence) {
+
+    }
+
+}

unified-exception-handling/ueh-organization/pom.xml

@@ -10,7 +10,7 @@
 	<artifactId>ueh-organization</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>ueh-organization</name>
-	<description>unified exception handling organization service</description>
+	<description>organization service</description>
 
 	<dependencies>
 		<dependency>

unified-exception-handling/ueh-organization/src/main/java/com/sprainkle/organization/UehOrganizationApplication.java

+package com.sprainkle.organization;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+public class UehOrganizationApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(UehOrganizationApplication.class, args);
+	}
+
+}

unified-exception-handling/ueh-organization/src/main/java/com/sprainkle/organization/config/MybatisPlusConfig.java

+package com.sprainkle.organization.config;
+
+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;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+@Configuration
+@MapperScan("com.sprainkle.**.mapper")
+public class MybatisPlusConfig {
+
+    /**
+     * 分页插件
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+}
\ No newline at end of file

unified-exception-handling/ueh-organization/src/main/java/com/sprainkle/organization/constant/ResponseEnum.java

+package com.sprainkle.organization.constant;
+
+import com.sprainkle.spring.cloud.advance.common.core.exception.assertion.BusinessExceptionAssert;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * <p>返回结果</p>
+ *
+ * @author sprainkle
+ * @date 2018.09.17
+ */
+@Getter
+@AllArgsConstructor
+public enum ResponseEnum implements BusinessExceptionAssert {
+
+    /**
+     *
+     */
+    ORGANIZATION_NOT_FOUND(6001, "Organization not found.")
+
+    ;
+
+    /**
+     * 返回码
+     */
+    private int code;
+    /**
+     * 返回消息
+     */
+    private String message;
+}

unified-exception-handling/ueh-organization/src/main/java/com/sprainkle/organization/controller/OrganizationController.java

+package com.sprainkle.organization.controller;
+
+import com.sprainkle.organization.service.OrganizationService;
+import com.sprainkle.spring.cloud.advance.common.core.pojo.response.R;
+import com.sprainkle.spring.cloud.advance.proto.organization.response.OrganizationDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/18
+ */
+@RequestMapping("/organization")
+@RestController
+public class OrganizationController {
+
+    @Autowired
+    private OrganizationService organizationService;
+
+    @GetMapping("/{organizationId}")
+    public R<OrganizationDTO> getOrganization(@PathVariable("organizationId") Long organizationId) {
+        return new R<>(organizationService.queryDetail(organizationId));
+    }
+
+}

unified-exception-handling/ueh-organization/src/main/java/com/sprainkle/organization/entity/Organization.java

+package com.sprainkle.organization.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/3
+ */
+@Data
+@TableName("organization")
+public class Organization {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String name;
+
+    private String contactName;
+
+    private String contactEmail;
+
+    private String contactPhone;
+}

unified-exception-handling/ueh-organization/src/main/java/com/sprainkle/organization/mapper/OrganizationMapper.java

+package com.sprainkle.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sprainkle.organization.entity.Organization;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/18
+ */
+public interface OrganizationMapper extends BaseMapper<Organization> {
+}

unified-exception-handling/ueh-organization/src/main/java/com/sprainkle/organization/service/OrganizationService.java

+package com.sprainkle.organization.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sprainkle.organization.constant.ResponseEnum;
+import com.sprainkle.organization.entity.Organization;
+import com.sprainkle.organization.mapper.OrganizationMapper;
+import com.sprainkle.spring.cloud.advance.proto.organization.response.OrganizationDTO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <pre>
+ *
+ * </pre>
+ *
+ * @author sprainkle
+ * @date 2019/5/18
+ */
+@Service
+public class OrganizationService extends ServiceImpl<OrganizationMapper, Organization> {
+
+    /**
+     * get organization detail by id.
+     * @param orgId organization id.
+     * @return {@link OrganizationDTO}
+     */
+    public OrganizationDTO queryDetail(Long orgId) {
+        Organization organization = this.getById(orgId);
+        ResponseEnum.ORGANIZATION_NOT_FOUND.assertNotNull(organization);
+
+        return toOrganizationDTO(organization);
+    }
+
+    /**
+     * entity -> dto
+     * @param organization {@link Organization}
+     * @return
+     */
+    private OrganizationDTO toOrganizationDTO(Organization organization) {
+        OrganizationDTO organizationDTO= new OrganizationDTO();
+        organizationDTO.setId(organization.getId());
+        organizationDTO.setName(organization.getName());
+        organizationDTO.setContactName(organization.getContactName());
+        organizationDTO.setContactEmail(organization.getContactEmail());
+        organizationDTO.setContactPhone(organization.getContactPhone());
+        return organizationDTO;
+    }
+
+}