Your Name
2023-03-24 7330728153970cb96e8ae90fa816516079e978c6
支持厂拍门禁
9个文件已修改
42 ■■■■ 已修改文件
java110-doc/src/main/java/com/java110/doc/annotation/Java110CmdDoc.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-doc/src/main/java/com/java110/doc/entity/RequestMappingsDocDto.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-doc/src/main/java/com/java110/doc/registrar/ApiDocCmdPublishing.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-doc/src/main/java/com/java110/doc/registrar/ApiDocPublishing.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/java/com/java110/boot/rest/RestApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-doc/src/main/java/com/java110/doc/annotation/Java110CmdDoc.java
@@ -50,5 +50,7 @@
    String author() default "";
    int seq() default 999;
}
java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java
@@ -2,7 +2,7 @@
import java.io.Serializable;
public class CmdDocDto implements Serializable {
public class CmdDocDto implements Serializable, Comparable<CmdDocDto> {
    /**
     * api title
@@ -32,6 +32,8 @@
     * @return
     */
    private String httpMethod;
    private int seq;
    /**
     * request url
@@ -119,4 +121,17 @@
    public void setServiceCode(String serviceCode) {
        this.serviceCode = serviceCode;
    }
    public int getSeq() {
        return seq;
    }
    public void setSeq(int seq) {
        this.seq = seq;
    }
    @Override
    public int compareTo(CmdDocDto o) {
        return this.getSeq() - o.getSeq();
    }
}
java110-doc/src/main/java/com/java110/doc/entity/RequestMappingsDocDto.java
@@ -2,7 +2,7 @@
import java.io.Serializable;
public class RequestMappingsDocDto implements Serializable {
public class RequestMappingsDocDto implements Serializable, Comparable<RequestMappingsDocDto> {
    private String name;
@@ -65,4 +65,9 @@
    public void setStartWay(String startWay) {
        this.startWay = startWay;
    }
    @Override
    public int compareTo(RequestMappingsDocDto o) {
        return this.getSeq() - o.getSeq();
    }
}
java110-doc/src/main/java/com/java110/doc/registrar/ApiDocCmdPublishing.java
@@ -3,6 +3,7 @@
import com.java110.doc.entity.CmdDocDto;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@@ -38,6 +39,10 @@
            }
        }
        // 根据字段排序
        Collections.sort(retCmdDocDto);
        return retCmdDocDto;
    }
java110-doc/src/main/java/com/java110/doc/registrar/ApiDocPublishing.java
@@ -3,6 +3,7 @@
import com.java110.doc.entity.ApiDocDto;
import com.java110.doc.entity.RequestMappingsDocDto;
import java.util.Collections;
import java.util.List;
/**
@@ -25,6 +26,7 @@
     */
    public static void setApiDoc(ApiDocDto apiDocDto, List<RequestMappingsDocDto> mappingsDocDtos) {
        ApiDocPublishing.apiDocDto = apiDocDto;
        Collections.sort(mappingsDocDtos);
        ApiDocPublishing.mappingsDocDtos = mappingsDocDtos;
    }
java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java
@@ -112,6 +112,7 @@
                    cmdDocDto.setVersion(attributes.get("version").toString());
                    cmdDocDto.setHttpMethod(attributes.get("httpMethod").toString());
                    cmdDocDto.setServiceCode(attributes.get("serviceCode").toString());
                    cmdDocDto.setSeq(Integer.parseInt(attributes.get("seq").toString()));
                    /*BeanDefinitionHolder definitionHolder = new BeanDefinitionHolder(beanDefinition, beanName);
service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java
@@ -37,7 +37,8 @@
        url = "http://{ip}:{port}/app/login.adminLoginProperty",
        resource = "userDoc",
        author = "吴学文",
        serviceCode = "login.adminLoginProperty"
        serviceCode = "login.adminLoginProperty",
        seq = 2
)
@Java110ParamsDoc(params = {
service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
@@ -46,7 +46,8 @@
        url = "http://{ip}:{port}/app/login.pcUserLogin",
        resource = "userDoc",
        author = "吴学文",
        serviceCode = "login.pcUserLogin"
        serviceCode = "login.pcUserLogin",
        seq = 1
)
@Java110ParamsDoc(params = {
springboot/src/main/java/com/java110/boot/rest/RestApi.java
@@ -34,7 +34,7 @@
        title = "HC小区管理系统api接口文档",
        description = "HC小区管理系统api接口文档",
        company = "Java110工作室",
        version = "v1.4"
        version = "v1.5"
)
@Java110RequestMappingsDoc(