From 96d686d975035f8b9628ff0b9a8fb09eb34632e1 Mon Sep 17 00:00:00 2001 From: huangxin Date: Thu, 19 Mar 2020 17:40:42 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E6=B7=BB=E5=8A=A0.gitignore?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=202.=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=9F=E6=88=90git=20version=E7=89=88=E6=9C=AC=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=84=9A=E6=9C=AC=203.=20=E5=8D=8F=E8=AE=AE=E7=B1=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A0=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0=204.=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E8=BF=94=E5=9B=9Eid=E5=9F=BA=E6=95=B0?= =?UTF-8?q?=E5=80=BC10000=205.=20=E5=A2=9E=E5=8A=A0IDEA=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 113 ++++++++++++++++++ .idea/.gitignore | 4 + .idea/compiler.xml | 19 +++ .idea/deployment.xml | 28 +++++ .idea/encodings.xml | 7 ++ .idea/misc.xml | 17 +++ .idea/modules.xml | 9 ++ .idea/vcs.xml | 6 + data-pom.xml | 21 ++++ .../controller/ProtocolController.java | 5 +- .../cmcc/hy/phoenix/pojo/dto/ProtocolDTO.java | 7 +- 11 files changed, 230 insertions(+), 6 deletions(-) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/deployment.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..5aa63ef8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,113 @@ +# Created by .ignore support plugin (hsz.mobi) +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Java template +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Maven template +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +/phoenix-data.iml +/phoenix-boot.iml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..93c48ed8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,4 @@ +# Default ignored files +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..8e8177e7 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 00000000..0ecce2a9 --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..aa00ffab --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..271d8279 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..f1e44ff5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/data-pom.xml b/data-pom.xml index e0b0f484..2eec91d8 100644 --- a/data-pom.xml +++ b/data-pom.xml @@ -254,6 +254,27 @@ ${project.build.sourceEncoding} + + pl.project13.maven + git-commit-id-plugin + 4.0.0 + + + get-the-git-infos + + revision + + initialize + + + + false + true + yyyy-MM-dd'T'HH:mm:ssZ + true + ${project.basedir}/src/main/resources/git.properties + + diff --git a/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java b/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java index f656375a..85d2747f 100644 --- a/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java +++ b/src/main/java/com/cmcc/hy/phoenix/controller/ProtocolController.java @@ -47,6 +47,9 @@ public class ProtocolController { @Resource private GitInformation gitInfo; + + private final int RESP_CMD_BASE = 10000; + /** * * @return @@ -77,7 +80,7 @@ public class ProtocolController { return ProtocolResp.result(Resp.SYSTEM_ERROR); } - return ProtocolResp.builder().cmdId(mr.getCmdId()) + return ProtocolResp.builder().cmdId(mr.getCmdId() + RESP_CMD_BASE) .ver(mr.getVer()) .cryptoType(mr.getCryptoType()) .timeStamp(System.currentTimeMillis()) diff --git a/src/main/java/com/cmcc/hy/phoenix/pojo/dto/ProtocolDTO.java b/src/main/java/com/cmcc/hy/phoenix/pojo/dto/ProtocolDTO.java index feda4b84..398845e1 100644 --- a/src/main/java/com/cmcc/hy/phoenix/pojo/dto/ProtocolDTO.java +++ b/src/main/java/com/cmcc/hy/phoenix/pojo/dto/ProtocolDTO.java @@ -3,10 +3,7 @@ package com.cmcc.hy.phoenix.pojo.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; +import lombok.*; /** * 通信协议定义 @@ -14,8 +11,8 @@ import lombok.ToString; @Getter @Setter @ToString -@Builder @ApiModel("通信协议实体") +@NoArgsConstructor public class ProtocolDTO { @ApiModelProperty(value="命令编号（必要字段）: \n" + "0-9999范围为请求命令\n" +