server/.gitignore
@@ -7,6 +7,7 @@ *.iws *.iml *.ipr *.xml .mvn mvnw mvnw.cmd server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -71,6 +71,9 @@ @ApiModelProperty(value = "é¨ç¦ç¹å¯ä¸æ¥å ¥ç¼ç ") @ExcelColumn(name="é¨ç¦ç¹å¯ä¸æ¥å ¥ç¼ç ") private String srcIndex; @ApiModelProperty(value = "æ§å¶å¨è®¾å¤å¯ä¸æ¥å ¥ç¼ç ") @ExcelColumn(name="æ§å¶å¨è®¾å¤å¯ä¸æ¥å ¥ç¼ç ") private String srcParentIndex; @ApiModelProperty(value = "é¨ç¦åç§°") @ExcelColumn(name="é¨ç¦åç§°") server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -74,7 +74,7 @@ private Date cancelDate; @ApiModelProperty(value = "忶夿³¨") private String cANCElInfo; private String cancelInfo; @ApiModelProperty(value = "æå±å ¬å¸ç¼ç ") @TableField(exist = false) server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -158,6 +158,7 @@ event.setSrcType(request.getSrcType()); event.setSrcName(request.getSrcName()); event.setSrcIndex(request.getSrcIndex()); event.setSrcParentIndex(request.getSrcParentIndex()); event.setSeq(request.getData().getSeq()); event.setTimeout(request.getTimeout()); event.setExtEventType(request.getData().getExtEventType()); server/openapi/src/main/java/com/doumee/api/ApiController.java
ÎļþÃû´Ó server/openapi/src/main/java/com/doumee/web/ApiController.java ÐÞ¸Ä @@ -1,4 +1,4 @@ package com.doumee.web; package com.doumee.api; import com.doumee.config.Jwt.JwtTokenUtil; import lombok.extern.slf4j.Slf4j; server/openapi/src/main/java/com/doumee/api/ErpResourceController.java
ÎļþÃû´Ó server/openapi/src/main/java/com/doumee/web/ErpResourceController.java ÐÞ¸Ä @@ -1,4 +1,4 @@ package com.doumee.web; package com.doumee.api; import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse; import com.doumee.core.haikang.model.param.respose.OrgListResponse; server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -57,7 +57,7 @@ .apiInfo(this.getApiInfo()).groupName("ãåæè®¿å®¢ç³»ç»äº¤äºæ¥å£openapiã") .host(host) .select() .apis( basePackage("com.doumee.api.web")) .apis( basePackage("com.doumee.api")) // 设置éè¦è¢«æ«æçç±»ï¼è¿é设置为添å äº@Api注解çç±» // .apis(RequestHandlerSelectors.withClassAnnotation(Api.class)) .paths(PathSelectors.any())