fix(tcm):调整业务代码结构

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/common/BaseEntity.java

-package com.yeejoin.amos.boot.module.jyjc.api.common;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @description: 公共实体
- * @author: duanwei
- **/
-@Data
-public class BaseEntity implements Serializable {
-    private static final long serialVersionUID = -5464322936854328207L;
-    @TableId(type = IdType.ID_WORKER)
-    private Long id;
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_date", fill = FieldFill.INSERT)
-    private Date createDate;
-    
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time", fill = FieldFill.UPDATE)
-    private Date updateTime;
-}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

@@ -3,11 +3,10 @@ package com.yeejoin.amos.boot.module.jyjc.api.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
 import java.util.Date;
 
 /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningApplication> {
 
-    Page<JyjcOpeningApplicationDto> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
-                                                                     @Param("jyjcOpeningApplicationDto") JyjcOpeningApplicationDto jyjcOpeningApplicationDto);
+    Page<JyjcOpeningApplicationModel> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
+                                                                     @Param("jyjcOpeningApplicationModel") JyjcOpeningApplicationModel jyjcOpeningApplicationModel);
 
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/JyjcOpeningApplicationDto.java → amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

-package com.yeejoin.amos.boot.module.jyjc.api.dto;
+package com.yeejoin.amos.boot.module.jyjc.api.model;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import java.util.Date;
 import java.util.List;
 
@@ -16,12 +16,11 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode (callSuper = true)
-@ApiModel (value = "JyjcOpeningApplicationDto", description = "")
-public class JyjcOpeningApplicationDto extends BaseDto {
+@ApiModel (value = "JyjcOpeningApplicationModel", description = "")
+public class JyjcOpeningApplicationModel extends BaseModel {
 
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty (value = "单位编码")
     private String unitCode;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="selectJyjcOpeningApplicationList"
-            resultType="com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto">
+            resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel">
         select
         unit_code,
         detection_region,
@@ -22,20 +22,20 @@
         apply_time
         from tz_jyjc_opening_application
         <where>
-            <if test="jyjcOpeningApplicationDto.applicationSeq != '' and jyjcOpeningApplicationDto.applicationSeq != null">
-                and application_seq like concat('%',#{jyjcOpeningApplicationDto.applicationSeq},'%')
+            <if test="jyjcOpeningApplicationModel.applicationSeq != '' and jyjcOpeningApplicationModel.applicationSeq != null">
+                and application_seq like concat('%',#{jyjcOpeningApplicationModel.applicationSeq},'%')
             </if>
-            <if test="jyjcOpeningApplicationDto.unitCode != '' and jyjcOpeningApplicationDto.unitCode != null">
-                and unit_code like concat('%',#{jyjcOpeningApplicationDto.unitCode},'%')
+            <if test="jyjcOpeningApplicationModel.unitCode != '' and jyjcOpeningApplicationModel.unitCode != null">
+                and unit_code like concat('%',#{jyjcOpeningApplicationModel.unitCode},'%')
             </if>
-            <if test="jyjcOpeningApplicationDto.acceptDate != '' and jyjcOpeningApplicationDto.acceptDate != null">
-                and accept_date like concat('%',#{jyjcOpeningApplicationDto.acceptDate},'%')
+            <if test="jyjcOpeningApplicationModel.acceptDate != '' and jyjcOpeningApplicationModel.acceptDate != null">
+                and accept_date like concat('%',#{jyjcOpeningApplicationModel.acceptDate},'%')
             </if>
-            <if test="jyjcOpeningApplicationDto.status != '' and jyjcOpeningApplicationDto.status != null">
-                and status like concat('%',#{jyjcOpeningApplicationDto.status},'%')
+            <if test="jyjcOpeningApplicationModel.status != '' and jyjcOpeningApplicationModel.status != null">
+                and status like concat('%',#{jyjcOpeningApplicationModel.status},'%')
             </if>
-            <if test="jyjcOpeningApplicationDto.applyTime != '' and jyjcOpeningApplicationDto.applyTime != null">
-                and apply_time like concat('%',#{jyjcOpeningApplicationDto.applyTime},'%')
+            <if test="jyjcOpeningApplicationModel.applyTime != '' and jyjcOpeningApplicationModel.applyTime != null">
+                and apply_time like concat('%',#{jyjcOpeningApplicationModel.applyTime},'%')
             </if>
         </where>
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -14,9 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import java.util.List;
 
 /**
  *
@@ -39,7 +39,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JyjcOpeningApplicationDto> save(@RequestBody JyjcOpeningApplicationDto model) {
+	public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JyjcOpeningApplicationModel model) {
 	    model = jyjcOpeningApplicationServiceImpl.saveModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
@@ -53,7 +53,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<JyjcOpeningApplicationDto> updateBySequenceNbrJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.updateWithModel(model));
 	}
@@ -80,7 +80,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/detail")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<JyjcOpeningApplicationDto> selectOne(@RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
+	public ResponseModel<JyjcOpeningApplicationModel> selectOne(@RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr));
 	}
 
@@ -94,8 +94,8 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<JyjcOpeningApplicationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,JyjcOpeningApplicationDto jyjcOpeningApplicationDto) {
+	public ResponseModel<Page<JyjcOpeningApplicationModel>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size,JyjcOpeningApplicationModel jyjcOpeningApplicationDto) {
 	    Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
 	    page.setCurrent(current);
 	    page.setSize(size);
@@ -111,7 +111,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<JyjcOpeningApplicationDto>> selectForList() {
+	public ResponseModel<List<JyjcOpeningApplicationModel>> selectForList() {
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationList());
 	}
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -11,13 +11,12 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
-import com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.CommonException;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.enums.CommonErrorEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -26,19 +25,16 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.apache.commons.lang3.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,7 +47,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningApplicationDto, JyjcOpeningApplication, JyjcOpeningApplicationMapper> implements IJyjcOpeningApplicationService {
+public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningApplicationModel, JyjcOpeningApplication, JyjcOpeningApplicationMapper> implements IJyjcOpeningApplicationService {
 
     @Autowired
     CommonserviceImpl commonserviceImpl;
@@ -69,7 +65,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     private RedisUtils redisUtils;
 
     @Transactional (rollbackFor = {Exception.class, CommonException.class})
-    public JyjcOpeningApplicationDto saveModel(JyjcOpeningApplicationDto model) {
+    public JyjcOpeningApplicationModel saveModel(JyjcOpeningApplicationModel model) {
         // 开启工作流 startProcess
         try {
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
@@ -113,24 +109,24 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 分页查询
      */
 
-    public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplicationDto> page) {
+    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplicationModel> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationList() {
+    public List<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationList() {
         return this.queryForList("", false);
     }
 
-    public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationDto jyjcOpeningApplicationDto) {
+    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
         //根据申请单中的单位信息对于列表数据进行过滤
         CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
         if (companyBo.getLevel().equals("company")) {
-            jyjcOpeningApplicationDto.setUnitCode(companyBo.getCompanyCode());
+            jyjcOpeningApplicationModel.setUnitCode(companyBo.getCompanyCode());
         }
-        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationDto);
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationModel);
     }
 
 
@@ -142,16 +138,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * @throws
      * @author yangyang
      */
-    public JyjcOpeningApplicationDto queryDetail(Long sequenceNbr) {
+    public JyjcOpeningApplicationModel queryDetail(Long sequenceNbr) {
         ReginParams reginParams = commonserviceImpl.getReginParamsOfCurrentUser();
         if (ValidationUtil.isEmpty(reginParams.getCompany())) {
             throw new RuntimeException("未指定人员归属单位信息");
         }
-        JyjcOpeningApplicationDto jyjcOpeningApplicationDto;
+        JyjcOpeningApplicationModel jyjcOpeningApplicationModel;
         if (null != sequenceNbr) {
-            jyjcOpeningApplicationDto = this.queryBySeq(sequenceNbr);
+            jyjcOpeningApplicationModel = this.queryBySeq(sequenceNbr);
         } else {
-            jyjcOpeningApplicationDto = new JyjcOpeningApplicationDto();
+            jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
         }
         String unitCode = reginParams.getCompany().getCompanyCode();
         TzBaseEnterpriseInfoDto baseEnterpriseInfoDto = baseMapper.selectEnterpriseInfo(unitCode);
@@ -162,15 +158,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         // 获取检验人员信息
         List<TzsUserInfoDto> userInfos = baseMapper.selectUserInfoByUnitCodeList(unitCode);
         if (baseEnterpriseInfoDto != null) {
-            jyjcOpeningApplicationDto.setUseContact(baseEnterpriseInfoDto.getUseContact());
-            jyjcOpeningApplicationDto.setContactPhone(baseEnterpriseInfoDto.getContactPhone());
-            jyjcOpeningApplicationDto.setIndustrySupervisor(baseEnterpriseInfoDto.getIndustrySupervisor());
-            jyjcOpeningApplicationDto.setLongitude(baseEnterpriseInfoDto.getLongitude());
-            jyjcOpeningApplicationDto.setLatitude(baseEnterpriseInfoDto.getLatitude());
-        }
-        jyjcOpeningApplicationDto.setBaseUnitLicences(baseUnitLicences);
-        jyjcOpeningApplicationDto.setUserInfos(userInfos);
-        return jyjcOpeningApplicationDto;
+            jyjcOpeningApplicationModel.setUseContact(baseEnterpriseInfoDto.getUseContact());
+            jyjcOpeningApplicationModel.setContactPhone(baseEnterpriseInfoDto.getContactPhone());
+            jyjcOpeningApplicationModel.setIndustrySupervisor(baseEnterpriseInfoDto.getIndustrySupervisor());
+            jyjcOpeningApplicationModel.setLongitude(baseEnterpriseInfoDto.getLongitude());
+            jyjcOpeningApplicationModel.setLatitude(baseEnterpriseInfoDto.getLatitude());
+        }
+        jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences);
+        jyjcOpeningApplicationModel.setUserInfos(userInfos);
+        return jyjcOpeningApplicationModel;
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -2,6 +2,18 @@
 spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
 spring.datasource.password=Yeejoin@2023
+spring.datasource.driver-class-name=cn.com.vastbase.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=25
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=120000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+## eureka properties:
 eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
@@ -23,12 +35,6 @@ spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.min-idle=0
 redis.cache.failure.time=10800
 
-## ES properties:
-elasticsearch.username=elastic
-elasticsearch.password=a123456
-spring.elasticsearch.rest.uris=http://172.16.10.243:9200
-
-## emqx properties:
 emqx.clean-session=false
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.243:1883
@@ -36,5 +42,10 @@ emqx.client-user-name=super
 emqx.client-password=123456
 emqx.keepAliveInterval=1000
 
+## ES properties:
+spring.elasticsearch.rest.uris=http://172.16.10.243:9200
+elasticsearch.username= elastic
+elasticsearch.password= a123456
+
 #检验检测流程KEY
 process-definition-key.jyjc.openapplication=inspectionBusinessOpened
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application.properties

@@ -26,21 +26,6 @@ eureka.instance.lease-renewal-interval-in-seconds=5
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
 eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
-#DB properties:
-spring.datasource.driver-class-name=cn.com.vastbase.Driver
-spring.datasource.type=com.zaxxer.hikari.HikariDataSource
-spring.datasource.hikari.minimum-idle=10
-spring.datasource.hikari.maximum-pool-size=25
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=30000
-spring.datasource.hikari.pool-name=DatebookHikariCP
-spring.datasource.hikari.max-lifetime=120000
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.connection-test-query=SELECT 1
-
-iot.fegin.name=AMOS-API-IOT
-equip.fegin.name=AMOS-EQUIPMANAGE
-supervision.feign.name = AMOS-SUPERVISION-API
 
 knife4j.production=false
 knife4j.enable=true