Browse Source

解决部署出现的问题

lixing 4 years ago
parent
commit
e78784eb26
26 changed files with 175 additions and 83 deletions
  1. 6 6
      fm-person/pom.xml
  2. 78 0
      fm-person/src/main/java/com/persagy/fm/common/jms/JmsConfig.java
  3. 0 1
      fm-person/src/main/java/com/persagy/fm/common/model/ConvertDmpTool.java
  4. 0 5
      fm-person/src/main/java/com/persagy/fm/common/utils/DmpResultUtil.java
  5. 10 4
      fm-person/src/main/java/com/persagy/fm/department/controller/DepartmentController.java
  6. 5 2
      fm-person/src/main/java/com/persagy/fm/department/model/ConvertDepartmentTool.java
  7. 1 1
      fm-person/src/main/java/com/persagy/fm/department/model/Department.java
  8. 2 0
      fm-person/src/main/java/com/persagy/fm/department/model/dto/AddDepartmentDTO.java
  9. 2 0
      fm-person/src/main/java/com/persagy/fm/department/model/dto/UpdateDepartmentDTO.java
  10. 0 2
      fm-person/src/main/java/com/persagy/fm/department/service/IDepTreeService.java
  11. 5 5
      fm-person/src/main/java/com/persagy/fm/department/service/IDepartmentService.java
  12. 2 2
      fm-person/src/main/java/com/persagy/fm/department/service/impl/DepTreeServiceImpl.java
  13. 3 3
      fm-person/src/main/java/com/persagy/fm/department/service/impl/DepartmentServiceImpl.java
  14. 5 4
      fm-person/src/main/java/com/persagy/fm/person/controller/PersonController.java
  15. 5 2
      fm-person/src/main/java/com/persagy/fm/person/model/ConvertPersonTool.java
  16. 1 1
      fm-person/src/main/java/com/persagy/fm/person/model/Person.java
  17. 0 2
      fm-person/src/main/java/com/persagy/fm/person/model/dto/PageQueryPersonByDepDTO.java
  18. 0 1
      fm-person/src/main/java/com/persagy/fm/person/model/vo/ResponsePersonListItemVO.java
  19. 3 6
      fm-person/src/main/java/com/persagy/fm/person/service/IPersonService.java
  20. 12 12
      fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java
  21. 11 8
      fm-person/src/main/java/com/persagy/fm/workresume/controller/WorkResumeController.java
  22. 4 2
      fm-person/src/main/java/com/persagy/fm/workresume/model/ConvertWorkResumeTool.java
  23. 1 1
      fm-person/src/main/java/com/persagy/fm/workresume/model/WorkResume.java
  24. 5 4
      fm-person/src/main/java/com/persagy/fm/workresume/service/IWorkResumeService.java
  25. 6 3
      fm-person/src/main/java/com/persagy/fm/workresume/service/impl/WorkResumeServiceImpl.java
  26. 8 6
      fm-person/src/main/resources/bootstrap.yml

+ 6 - 6
fm-person/pom.xml

@@ -35,11 +35,11 @@
             <version>${platform.version}</version>
         </dependency>
 
-<!--        &lt;!&ndash; 日志 &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.persagy</groupId>-->
-<!--            <artifactId>integrated-log-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
+        <!-- 日志 -->
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>integrated-log-spring-boot-starter</artifactId>
+        </dependency>
 
         <!-- feign -->
         <dependency>
@@ -100,7 +100,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <!-- 指定启动类 -->
                 <configuration>
-                    <mainClass>com.persagy.fm.server.ServerApplication</mainClass>
+                    <mainClass>com.persagy.ServerApplication</mainClass>
                 </configuration>
             </plugin>
             <!-- 按照测试要求打成zip需要的配置 -->

+ 78 - 0
fm-person/src/main/java/com/persagy/fm/common/jms/JmsConfig.java

@@ -0,0 +1,78 @@
+package com.persagy.fm.common.jms;
+
+import com.rabbitmq.client.Channel;
+import org.springframework.amqp.core.*;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.io.IOException;
+
+
+/**
+ * 消息队列配置类
+ *
+ * @author lixing
+ * @version V1.0 2021/3/17 9:38 上午
+ **/
+@Configuration
+public class JmsConfig {
+    /**
+     * 运维平台exchange
+     */
+    @Value("${amqp.exchange.saas}")
+    private String saasExchange;
+
+    /**
+     * 运维平台routingKey
+     */
+    @Value("${amqp.routingKey.saas}")
+    private String saasRoutingKey;
+
+    /**
+     * 运维平台队列
+     */
+    @Value("${amqp.queue.saas}")
+    private String saasQueue;
+
+    @Bean
+    public TopicExchange saasExchange() {
+        return new TopicExchange(saasExchange);
+    }
+
+    @Bean
+    public Queue saasQueue(){
+        return new Queue(saasQueue);
+    }
+
+    @Bean
+    public Binding saasBinding() {
+        return BindingBuilder.bind(saasQueue()).to(saasExchange()).with(saasRoutingKey);
+    }
+
+    /**
+     * 监听saas队列
+     *
+     * @param message 消息体字符串
+     * @param channel 通道对象
+     * @param msg 消息对象
+     * @author lixing
+     * @version V1.0 2021/3/17 9:47 上午
+     */
+    @RabbitListener(queues = "${amqp.queue.saas}")
+    public void process(String message, Channel channel, Message msg) {
+        try {
+            // TODO: 2021/3/17 处理消息
+            // 手动确认消息已消费
+            channel.basicAck(msg.getMessageProperties().getDeliveryTag(),false);
+        } catch (Exception e) {
+            try {
+                // 将消费失败的消息移除消息队列,避免重复消费
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(),false);
+            } catch (IOException ex) {
+                // TODO: 2021/3/17 消息从队列中移除失败
+            }
+        }
+    }
+}

+ 0 - 1
fm-person/src/main/java/com/persagy/fm/common/model/ConvertDmpTool.java

@@ -1,6 +1,5 @@
 package com.persagy.fm.common.model;
 
-import com.persagy.fm.common.model.RequiredParams;
 import com.persagy.fm.common.model.dto.DmpRequiredParam;
 
 /**

+ 0 - 5
fm-person/src/main/java/com/persagy/fm/common/utils/DmpResultUtil.java

@@ -1,10 +1,5 @@
 package com.persagy.fm.common.utils;
 
-import com.persagy.fm.common.response.FmDmpResponseUtil;
-import com.persagy.fm.common.response.FmResponseItem;
-import com.persagy.fm.common.response.FmResponseUtil;
-import com.persagy.fm.department.model.vo.ResponseDepartmentItemVO;
-
 /**
  * 处理数据中台返回结果
  *

+ 10 - 4
fm-person/src/main/java/com/persagy/fm/department/controller/DepartmentController.java

@@ -1,21 +1,27 @@
 package com.persagy.fm.department.controller;
 
 import com.persagy.fm.common.constant.enums.BoolEnum;
+import com.persagy.fm.department.model.ConvertDepartmentTool;
+import com.persagy.fm.department.model.Department;
+import com.persagy.fm.department.model.vo.ResponseDepartmentItemVO;
+import com.persagy.fm.department.model.vo.ResponseDepartmentListItemVO;
+import com.persagy.fm.department.model.vo.ResponseDepartmentTreeItemVO;
 import com.persagy.fm.department.service.IDepTreeService;
 import com.persagy.fm.department.service.IDepartmentService;
-import com.persagy.fm.department.service.impl.DepartmentServiceImpl;
 
 import com.persagy.fm.department.utils.DepDataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.persagy.fm.department.model.*;
-import com.persagy.fm.department.model.vo.*;
 import com.persagy.fm.department.model.dto.*;
 import com.persagy.fm.common.response.*;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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;
+
 
 import javax.validation.Valid;
 import java.util.List;

+ 5 - 2
fm-person/src/main/java/com/persagy/fm/department/model/ConvertDepartmentTool.java

@@ -1,10 +1,13 @@
 package com.persagy.fm.department.model;
 
+import com.persagy.fm.department.model.dto.AddDepartmentDTO;
+import com.persagy.fm.department.model.dto.UpdateDepartmentDTO;
+import com.persagy.fm.department.model.vo.ResponseDepartmentItemVO;
+import com.persagy.fm.department.model.vo.ResponseDepartmentListItemVO;
+import com.persagy.fm.department.model.vo.ResponseDepartmentTreeItemVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.factory.Mappers;
-import com.persagy.fm.department.model.vo.*;
-import com.persagy.fm.department.model.dto.*;
 
 import java.util.List;
 

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/department/model/Department.java

@@ -1,10 +1,10 @@
 package com.persagy.fm.department.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.persagy.fm.common.model.entity.AuditableEntity;
 
 import java.io.Serializable;
 

+ 2 - 0
fm-person/src/main/java/com/persagy/fm/department/model/dto/AddDepartmentDTO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotNull;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * @author lixing
@@ -16,6 +17,7 @@ import lombok.Data;
 public class AddDepartmentDTO {
     @ApiModelProperty(value = "部门名称", required = true)
     @NotNull(message = "部门名称不能为空")
+    @Length(max = 100, message = "部门名称长度不能超过100字")
     private String name;
 
     @ApiModelProperty(value = "部门类型", required = true)

+ 2 - 0
fm-person/src/main/java/com/persagy/fm/department/model/dto/UpdateDepartmentDTO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotNull;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * @author lixing
@@ -20,6 +21,7 @@ public class UpdateDepartmentDTO {
 
     @ApiModelProperty(value = "部门名称", required = true)
     @NotNull(message = "部门名称不能为空")
+    @Length(max = 100, message = "部门名称长度不能超过100字")
     private String name;
 
     @ApiModelProperty(value = "部门类型", required = true)

+ 0 - 2
fm-person/src/main/java/com/persagy/fm/department/service/IDepTreeService.java

@@ -3,8 +3,6 @@ package com.persagy.fm.department.service;
 
 import com.persagy.fm.department.model.dto.QueryDepartmentTreeDTO;
 import com.persagy.fm.department.model.vo.ResponseDepartmentTreeItemVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
 

+ 5 - 5
fm-person/src/main/java/com/persagy/fm/department/service/IDepartmentService.java

@@ -1,13 +1,13 @@
 package com.persagy.fm.department.service;
 
-import com.persagy.fm.department.model.*;
-import com.persagy.fm.department.model.dto.*;
-
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.persagy.fm.department.model.dto.AddDepartmentDTO;
+import com.persagy.fm.department.model.Department;
+import com.persagy.fm.department.model.dto.PageQueryDepartmentDTO;
+import com.persagy.fm.department.model.dto.QueryDepartmentDTO;
+import com.persagy.fm.department.model.dto.UpdateDepartmentDTO;
 
 /**
  * 部门(Department) service接口

+ 2 - 2
fm-person/src/main/java/com/persagy/fm/department/service/impl/DepTreeServiceImpl.java

@@ -1,13 +1,13 @@
 package com.persagy.fm.department.service.impl;
 
 import com.google.common.collect.Lists;
-import com.persagy.fm.common.constant.enums.BoolEnum;
 import com.persagy.fm.department.model.ConvertDepartmentTool;
 import com.persagy.fm.department.model.Department;
+import com.persagy.fm.department.service.IDepartmentService;
+import com.persagy.fm.common.constant.enums.BoolEnum;
 import com.persagy.fm.department.model.dto.QueryDepartmentTreeDTO;
 import com.persagy.fm.department.model.vo.ResponseDepartmentTreeItemVO;
 import com.persagy.fm.department.service.IDepTreeService;
-import com.persagy.fm.department.service.IDepartmentService;
 import com.persagy.fm.department.utils.DepDataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 3 - 3
fm-person/src/main/java/com/persagy/fm/department/service/impl/DepartmentServiceImpl.java

@@ -8,18 +8,18 @@ import com.google.common.base.CaseFormat;
 import com.google.common.collect.Lists;
 import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.exception.BusinessException;
+import com.persagy.fm.department.model.ConvertDepartmentTool;
+import com.persagy.fm.department.model.dto.AddDepartmentDTO;
+import com.persagy.fm.department.service.IDepartmentService;
 import com.persagy.fm.common.constant.enums.ValidEnum;
 import com.persagy.fm.common.model.RequiredParamsStorage;
 import com.persagy.fm.common.model.dto.Sort;
 import com.persagy.fm.department.constant.enums.ResourceFromEnum;
 import com.persagy.fm.department.dao.DepartmentMapper;
-import com.persagy.fm.department.model.ConvertDepartmentTool;
 import com.persagy.fm.department.model.Department;
-import com.persagy.fm.department.model.dto.AddDepartmentDTO;
 import com.persagy.fm.department.model.dto.PageQueryDepartmentDTO;
 import com.persagy.fm.department.model.dto.QueryDepartmentDTO;
 import com.persagy.fm.department.model.dto.UpdateDepartmentDTO;
-import com.persagy.fm.department.service.IDepartmentService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

+ 5 - 4
fm-person/src/main/java/com/persagy/fm/person/controller/PersonController.java

@@ -2,13 +2,14 @@ package com.persagy.fm.person.controller;
 
 import com.persagy.fm.person.service.IPersonService;
 
+import com.persagy.fm.person.model.ConvertPersonTool;
+import com.persagy.fm.person.model.Person;
+import com.persagy.fm.person.model.vo.ResponsePersonItemVO;
+import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
+import com.persagy.fm.person.model.dto.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.persagy.fm.person.model.*;
-import com.persagy.fm.person.model.vo.*;
-import com.persagy.fm.person.model.dto.*;
 import com.persagy.fm.common.response.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+ 5 - 2
fm-person/src/main/java/com/persagy/fm/person/model/ConvertPersonTool.java

@@ -1,11 +1,14 @@
 package com.persagy.fm.person.model;
 
+import com.persagy.fm.person.model.dto.AddPersonDTO;
+import com.persagy.fm.person.model.dto.PageQueryPersonByDepDTO;
+import com.persagy.fm.person.model.dto.UpdatePersonDTO;
+import com.persagy.fm.person.model.vo.ResponsePersonItemVO;
+import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
 import com.persagy.fm.workresume.model.dto.PageQueryWorkResumeDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.factory.Mappers;
-import com.persagy.fm.person.model.vo.*;
-import com.persagy.fm.person.model.dto.*;
 
 import java.util.List;
 

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/person/model/Person.java

@@ -1,9 +1,9 @@
 package com.persagy.fm.person.model;
 
+import com.persagy.fm.common.model.entity.AuditableEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.persagy.fm.common.model.entity.AuditableEntity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 0 - 2
fm-person/src/main/java/com/persagy/fm/person/model/dto/PageQueryPersonByDepDTO.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author lixing
  * @version V1.0 2021-03-15 17:20:33

+ 0 - 1
fm-person/src/main/java/com/persagy/fm/person/model/vo/ResponsePersonListItemVO.java

@@ -3,7 +3,6 @@ package com.persagy.fm.person.model.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**

+ 3 - 6
fm-person/src/main/java/com/persagy/fm/person/service/IPersonService.java

@@ -1,15 +1,12 @@
 package com.persagy.fm.person.service;
 
-import com.persagy.fm.person.model.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.fm.person.model.Person;
 import com.persagy.fm.person.model.dto.*;
+import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
 /**
  * 人员(Person) service接口
  *

+ 12 - 12
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -1,31 +1,31 @@
 package com.persagy.fm.person.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.google.common.base.CaseFormat;
+import com.persagy.fm.common.constant.enums.ValidEnum;
 import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.common.model.dto.Sort;
 import com.persagy.fm.person.dao.PersonMapper;
+import com.persagy.fm.person.model.ConvertPersonTool;
+import com.persagy.fm.person.model.Person;
+import com.persagy.fm.person.model.dto.*;
 import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
 import com.persagy.fm.person.service.IPersonService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.fm.workresume.model.WorkResume;
 import com.persagy.fm.workresume.model.dto.PageQueryWorkResumeDTO;
 import com.persagy.fm.workresume.service.IWorkResumeService;
+import org.apache.commons.lang.StringUtils;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.apache.commons.lang.StringUtils;
-import com.persagy.fm.common.constant.enums.ValidEnum;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.fm.person.model.*;
-import com.persagy.fm.person.model.dto.*;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.base.CaseFormat;
-import com.persagy.fm.common.model.dto.Sort;
-import org.springframework.util.CollectionUtils;
-
 /**
  * 人员(Person) service层
  *

+ 11 - 8
fm-person/src/main/java/com/persagy/fm/workresume/controller/WorkResumeController.java

@@ -1,17 +1,20 @@
 package com.persagy.fm.workresume.controller;
 
+import com.persagy.fm.common.response.*;
+import com.persagy.fm.workresume.model.ConvertWorkResumeTool;
+import com.persagy.fm.workresume.model.WorkResume;
+import com.persagy.fm.workresume.model.dto.*;
+import com.persagy.fm.workresume.model.vo.ResponseWorkResumeItemVO;
+import com.persagy.fm.workresume.model.vo.ResponseWorkResumeListItemVO;
 import com.persagy.fm.workresume.service.IWorkResumeService;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.persagy.fm.workresume.model.*;
-import com.persagy.fm.workresume.model.vo.*;
-import com.persagy.fm.workresume.model.dto.*;
-import com.persagy.fm.common.response.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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;
 
 import javax.validation.Valid;
 import java.util.List;

+ 4 - 2
fm-person/src/main/java/com/persagy/fm/workresume/model/ConvertWorkResumeTool.java

@@ -1,10 +1,12 @@
 package com.persagy.fm.workresume.model;
 
+import com.persagy.fm.workresume.model.dto.AddWorkResumeDTO;
+import com.persagy.fm.workresume.model.dto.UpdateWorkResumeDTO;
+import com.persagy.fm.workresume.model.vo.ResponseWorkResumeItemVO;
+import com.persagy.fm.workresume.model.vo.ResponseWorkResumeListItemVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.factory.Mappers;
-import com.persagy.fm.workresume.model.vo.*;
-import com.persagy.fm.workresume.model.dto.*;
 
 import java.util.List;
 

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/workresume/model/WorkResume.java

@@ -1,9 +1,9 @@
 package com.persagy.fm.workresume.model;
 
+import com.persagy.fm.common.model.entity.AuditableEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.persagy.fm.common.model.entity.AuditableEntity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 5 - 4
fm-person/src/main/java/com/persagy/fm/workresume/service/IWorkResumeService.java

@@ -1,13 +1,14 @@
 package com.persagy.fm.workresume.service;
 
-import com.persagy.fm.workresume.model.*;
-import com.persagy.fm.workresume.model.dto.*;
+import com.persagy.fm.workresume.model.WorkResume;
+import com.persagy.fm.workresume.model.dto.AddWorkResumeDTO;
+import com.persagy.fm.workresume.model.dto.PageQueryWorkResumeDTO;
+import com.persagy.fm.workresume.model.dto.QueryWorkResumeDTO;
+import com.persagy.fm.workresume.model.dto.UpdateWorkResumeDTO;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 工作信息(WorkResume) service接口

+ 6 - 3
fm-person/src/main/java/com/persagy/fm/workresume/service/impl/WorkResumeServiceImpl.java

@@ -1,15 +1,18 @@
 package com.persagy.fm.workresume.service.impl;
 
 import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.workresume.model.ConvertWorkResumeTool;
+import com.persagy.fm.workresume.model.WorkResume;
+import com.persagy.fm.workresume.model.dto.AddWorkResumeDTO;
+import com.persagy.fm.workresume.model.dto.PageQueryWorkResumeDTO;
+import com.persagy.fm.workresume.model.dto.QueryWorkResumeDTO;
+import com.persagy.fm.workresume.model.dto.UpdateWorkResumeDTO;
 import com.persagy.fm.workresume.dao.WorkResumeMapper;
 import com.persagy.fm.workresume.service.IWorkResumeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.apache.commons.lang.StringUtils;
 import com.persagy.fm.common.constant.enums.ValidEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.fm.workresume.model.*;
-import com.persagy.fm.workresume.model.dto.*;
 
 import java.util.List;
 

+ 8 - 6
fm-person/src/main/resources/bootstrap.yml

@@ -1,16 +1,18 @@
 spring:
   application:
     name: fm-person
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.100.210:33306/fm_person?useUnicode=true&characterEncoding=utf-8&mysqlEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-    username: root
-    password: 123456
-    type: com.alibaba.druid.pool.DruidDataSource
 
 server:
   port: ${SERVER_PORT:8814}
 
+amqp:
+  exchange:
+    saas: saas-exchange
+  routingKey:
+    saas: saas-routingKey
+  queue:
+    saas: saas-queue
+
 #mybatis-plus:
 #  mapper-locations: classpath*:/mapper/*Mapper.xml
 #  typeAliasesPackage: com.persagy.fm.test.model.entity