daiyihua 1 vuosi sitten
vanhempi
commit
38e7b4e312
40 muutettua tiedostoa jossa 2959 lisäystä ja 2739 poistoa
  1. 1 1
      grpc_def/drug.proto
  2. 50 0
      grpc_def/log.proto
  3. 34 17
      pom.xml
  4. 12 20
      src/main/java/com/ywt/gapi/BaseMq.java
  5. 204 128
      src/main/java/com/ywt/gapi/Result.java
  6. 14 4
      src/main/java/com/ywt/gapi/ResultCode.java
  7. 183 113
      src/main/java/com/ywt/gapi/ResultDouble.java
  8. 7 2
      src/main/java/com/ywt/gapi/ResultDoubleOrBuilder.java
  9. 179 108
      src/main/java/com/ywt/gapi/ResultInt.java
  10. 179 108
      src/main/java/com/ywt/gapi/ResultInt64.java
  11. 7 2
      src/main/java/com/ywt/gapi/ResultInt64OrBuilder.java
  12. 7 2
      src/main/java/com/ywt/gapi/ResultIntOrBuilder.java
  13. 9 3
      src/main/java/com/ywt/gapi/ResultOrBuilder.java
  14. 225 0
      src/main/java/com/ywt/gapi/base/log/DubboYWTLogServiceTriple.java
  15. 12 20
      src/main/java/com/ywt/gapi/base/log/LogProto.java
  16. 235 161
      src/main/java/com/ywt/gapi/base/log/SaveCommentLogRequest.java
  17. 16 5
      src/main/java/com/ywt/gapi/base/log/SaveCommentLogRequestOrBuilder.java
  18. 154 96
      src/main/java/com/ywt/gapi/base/log/SaveCommentLogResponse.java
  19. 4 1
      src/main/java/com/ywt/gapi/base/log/SaveCommentLogResponseOrBuilder.java
  20. 228 143
      src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogRequest.java
  21. 11 3
      src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogRequestOrBuilder.java
  22. 154 96
      src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogResponse.java
  23. 4 1
      src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogResponseOrBuilder.java
  24. 71 313
      src/main/java/com/ywt/gapi/base/log/YWTLogService.java
  25. 0 357
      src/main/java/com/ywt/gapi/base/log/YWTLogServiceGrpc.java
  26. 16 24
      src/main/java/com/ywt/gapi/drug/DrugProto.java
  27. 43 232
      src/main/java/com/ywt/gapi/drug/DrugService.java
  28. 0 289
      src/main/java/com/ywt/gapi/drug/DrugServiceGrpc.java
  29. 171 0
      src/main/java/com/ywt/gapi/drug/DubboDrugServiceTriple.java
  30. 167 135
      src/main/java/com/ywt/gapi/drug/PrescriptionInfo.java
  31. 138 40
      src/main/java/com/ywt/gapi/drug/PrescriptionInfoOrBuilder.java
  32. 161 111
      src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionRequest.java
  33. 5 4
      src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionRequestOrBuilder.java
  34. 223 143
      src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionResponse.java
  35. 10 3
      src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionResponseOrBuilder.java
  36. 3 2
      src/main/java/com/ywt/mg/Main.java
  37. 0 19
      src/main/java/com/ywt/mg/configs/GrpcChannelBeans.java
  38. 0 25
      src/main/java/com/ywt/mg/configs/ServiceGrpcStubBeans.java
  39. 7 8
      src/main/java/com/ywt/mg/web/controller/DrugController.java
  40. 15 0
      src/main/resources/application.properties

+ 1 - 1
grpc_def/drug.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 package com.ywt.gapi.drug;
 
-option java_generic_services = true;
 option java_multiple_files = true;
+option java_outer_classname = "DrugProto";
 option java_package = "com.ywt.gapi.drug";
 
 //处方信息

+ 50 - 0
grpc_def/log.proto

@@ -0,0 +1,50 @@
+/**
+日志记录服务
+*/
+syntax = "proto3";
+
+package com.ywt.gapi.base.log;
+
+option java_multiple_files = true;
+option java_outer_classname = "LogProto";
+option java_package = "com.ywt.gapi.base.log";
+
+//记录日志请求
+message SaveCommentLogRequest{
+    string typeCode = 1;    // 日志分类编码,自定义
+    string typeDesc = 2;    // 日志分类描述,自定义
+    string content = 3;     // 日志的内容,自定义
+    string remark = 4;      // 日志备注,自定义
+    string ip = 5;          // ip地址
+    int32 userId = 6;
+}
+
+//记录日志响应
+message SaveCommentLogResponse{
+    int32 code = 1;
+    string info = 2;
+}
+
+//记录日志请求
+message SaveOpenHisPushApiLogRequest{
+    string path = 1;    // 请求路径
+    string req = 2;     // 请求json
+    string res = 3;     // 响应json
+    int32 difftime = 4; // 响应时间
+    int32 httpStatus = 6;  // 响应状态
+}
+
+//记录日志响应
+message SaveOpenHisPushApiLogResponse{
+    int32 code = 1;
+    string info = 2;
+}
+
+//医务通日志服务  // 对应 base-service 项目的 log.js 文件
+service YWTLogService {
+
+    // 记录日志
+    rpc saveCommentLog(SaveCommentLogRequest) returns (SaveCommentLogResponse);
+    // 保存his外转处方日志
+    rpc saveOpenHisPushApiLog(SaveOpenHisPushApiLogRequest) returns (SaveOpenHisPushApiLogResponse);
+}

+ 34 - 17
pom.xml

@@ -77,23 +77,21 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-            <version>1.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-protobuf</artifactId>
-            <version>1.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-stub</artifactId>
-            <version>1.7.0</version>
-        </dependency>
-
-
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-netty</artifactId>-->
+<!--            <version>1.7.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-protobuf</artifactId>-->
+<!--            <version>1.7.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-stub</artifactId>-->
+<!--            <version>1.7.0</version>-->
+<!--        </dependency>-->
         <!-- https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j-light -->
         <dependency>
             <groupId>net.sf.barcode4j</groupId>
@@ -119,6 +117,25 @@
             <artifactId>java-jwt</artifactId>
             <version>3.18.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.19.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+            <version>3.2.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.boot</groupId>
+            <artifactId>nacos-discovery-spring-boot-starter</artifactId>
+            <version>0.1.10</version>
+        </dependency>
     </dependencies>
 
     <profiles>

+ 12 - 20
src/main/java/com/ywt/gapi/Base.java → src/main/java/com/ywt/gapi/BaseMq.java

@@ -3,8 +3,8 @@
 
 package com.ywt.gapi;
 
-public final class Base {
-  private Base() {}
+public final class BaseMq {
+  private BaseMq() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -42,7 +42,7 @@ public final class Base {
   private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n\nbase.proto\022\014com.ywt.gapi\"M\n\006Result\022&\n\004" +
       "code\030\001 \001(\0162\030.com.ywt.gapi.ResultCode\022\014\n\004" +
       "info\030\002 \001(\t\022\r\n\005value\030\003 \001(\t\"P\n\tResultInt\022&" +
@@ -52,47 +52,39 @@ public final class Base {
       "de\022\014\n\004info\030\002 \001(\t\022\r\n\005value\030\003 \001(\003\"S\n\014Resul" +
       "tDouble\022&\n\004code\030\001 \001(\0162\030.com.ywt.gapi.Res" +
       "ultCode\022\014\n\004info\030\002 \001(\t\022\r\n\005value\030\003 \001(\001*a\n\n" +
-      "ResultCode\022\013\n\007SUCCEED\020\000\022\023\n\017PARAMETER_ERR",
+      "ResultCode\022\013\n\007SUCCEED\020\000\022\023\n\017PARAMETER_ERR" +
       "OR\020\001\022\017\n\013OTHER_ERROR\020\002\022\r\n\tAPP_ERROR\020\003\022\021\n\r" +
-      "APP_EXCEPTION\020\004B\023\n\014com.ywt.gapiP\001\210\001\001b\006pr" +
-      "oto3"
+      "APP_EXCEPTION\020\004B\030\n\014com.ywt.gapiB\006BaseMqP" +
+      "\001b\006proto3"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
+        });
     internal_static_com_ywt_gapi_Result_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_com_ywt_gapi_Result_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_Result_descriptor,
-        new java.lang.String[] { "Code", "Info", "Value", });
+        new String[] { "Code", "Info", "Value", });
     internal_static_com_ywt_gapi_ResultInt_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_com_ywt_gapi_ResultInt_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_ResultInt_descriptor,
-        new java.lang.String[] { "Code", "Info", "Value", });
+        new String[] { "Code", "Info", "Value", });
     internal_static_com_ywt_gapi_ResultInt64_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_com_ywt_gapi_ResultInt64_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_ResultInt64_descriptor,
-        new java.lang.String[] { "Code", "Info", "Value", });
+        new String[] { "Code", "Info", "Value", });
     internal_static_com_ywt_gapi_ResultDouble_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_com_ywt_gapi_ResultDouble_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_ResultDouble_descriptor,
-        new java.lang.String[] { "Code", "Info", "Value", });
+        new String[] { "Code", "Info", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

+ 204 - 128
src/main/java/com/ywt/gapi/Result.java

@@ -6,10 +6,11 @@ package com.ywt.gapi;
 /**
  * Protobuf type {@code com.ywt.gapi.Result}
  */
-public  final class Result extends
+public final class Result extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.Result)
     ResultOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use Result.newBuilder() to construct.
   private Result(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -20,17 +21,28 @@ public  final class Result extends
     value_ = "";
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new Result();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private Result(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    int mutable_bitField0_ = 0;
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -39,12 +51,6 @@ public  final class Result extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -52,17 +58,24 @@ public  final class Result extends
             break;
           }
           case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             info_ = s;
             break;
           }
           case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             value_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -71,64 +84,73 @@ public  final class Result extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_Result_descriptor;
+    return BaseMq.internal_static_com_ywt_gapi_Result_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_Result_fieldAccessorTable
+    return BaseMq.internal_static_com_ywt_gapi_Result_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.Result.class, com.ywt.gapi.Result.Builder.class);
+            Result.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
   private int code_;
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
-  public int getCodeValue() {
+  @Override public int getCodeValue() {
     return code_;
   }
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  public com.ywt.gapi.ResultCode getCode() {
-    com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-    return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+  @Override public ResultCode getCode() {
+    @SuppressWarnings("deprecation")
+    ResultCode result = ResultCode.valueOf(code_);
+    return result == null ? ResultCode.UNRECOGNIZED : result;
   }
 
   public static final int INFO_FIELD_NUMBER = 2;
-  private volatile java.lang.Object info_;
+  private volatile Object info_;
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getInfo() {
+    Object ref = info_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       info_ = s;
       return s;
     }
   }
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
+  @Override
   public com.google.protobuf.ByteString
       getInfoBytes() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
+    Object ref = info_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       info_ = b;
       return b;
     } else {
@@ -137,32 +159,36 @@ public  final class Result extends
   }
 
   public static final int VALUE_FIELD_NUMBER = 3;
-  private volatile java.lang.Object value_;
+  private volatile Object value_;
   /**
    * <code>string value = 3;</code>
+   * @return The value.
    */
-  public java.lang.String getValue() {
-    java.lang.Object ref = value_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getValue() {
+    Object ref = value_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       value_ = s;
       return s;
     }
   }
   /**
    * <code>string value = 3;</code>
+   * @return The bytes for value.
    */
+  @Override
   public com.google.protobuf.ByteString
       getValueBytes() {
-    java.lang.Object ref = value_;
-    if (ref instanceof java.lang.String) {
+    Object ref = value_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       value_ = b;
       return b;
     } else {
@@ -171,6 +197,7 @@ public  final class Result extends
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -180,59 +207,62 @@ public  final class Result extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       output.writeEnum(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    if (!getValueBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, value_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    if (!getValueBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, value_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.Result)) {
+    if (!(obj instanceof Result)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.Result other = (com.ywt.gapi.Result) obj;
+    Result other = (Result) obj;
 
-    boolean result = true;
-    result = result && code_ == other.code_;
-    result = result && getInfo()
-        .equals(other.getInfo());
-    result = result && getValue()
-        .equals(other.getValue());
-    return result;
+    if (code_ != other.code_) return false;
+    if (!getInfo()
+        .equals(other.getInfo())) return false;
+    if (!getValue()
+        .equals(other.getValue())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -250,69 +280,69 @@ public  final class Result extends
     return hash;
   }
 
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.Result parseFrom(byte[] data)
+  public static Result parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.Result parseFrom(java.io.InputStream input)
+  public static Result parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.Result parseDelimitedFrom(java.io.InputStream input)
+  public static Result parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.Result parseDelimitedFrom(
+  public static Result parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.Result parseFrom(
+  public static Result parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -320,21 +350,23 @@ public  final class Result extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.Result prototype) {
+  public static Builder newBuilder(Result prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -344,17 +376,18 @@ public  final class Result extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.Result)
-      com.ywt.gapi.ResultOrBuilder {
+      ResultOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_Result_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_Result_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_Result_fieldAccessorTable
+      return BaseMq.internal_static_com_ywt_gapi_Result_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.Result.class, com.ywt.gapi.Result.Builder.class);
+              Result.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.Result.newBuilder()
@@ -363,7 +396,7 @@ public  final class Result extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -372,6 +405,7 @@ public  final class Result extends
               .alwaysUseFieldBuilders) {
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -383,25 +417,29 @@ public  final class Result extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_Result_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_Result_descriptor;
     }
 
-    public com.ywt.gapi.Result getDefaultInstanceForType() {
-      return com.ywt.gapi.Result.getDefaultInstance();
+    @Override
+    public Result getDefaultInstanceForType() {
+      return Result.getDefaultInstance();
     }
 
-    public com.ywt.gapi.Result build() {
-      com.ywt.gapi.Result result = buildPartial();
+    @Override
+    public Result build() {
+      Result result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.Result buildPartial() {
-      com.ywt.gapi.Result result = new com.ywt.gapi.Result(this);
+    @Override
+    public Result buildPartial() {
+      Result result = new Result(this);
       result.code_ = code_;
       result.info_ = info_;
       result.value_ = value_;
@@ -409,43 +447,50 @@ public  final class Result extends
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.Result) {
-        return mergeFrom((com.ywt.gapi.Result)other);
+      if (other instanceof Result) {
+        return mergeFrom((Result)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.Result other) {
-      if (other == com.ywt.gapi.Result.getDefaultInstance()) return this;
+    public Builder mergeFrom(Result other) {
+      if (other == Result.getDefaultInstance()) return this;
       if (other.code_ != 0) {
         setCodeValue(other.getCodeValue());
       }
@@ -457,23 +502,26 @@ public  final class Result extends
         value_ = other.value_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.Result parsedMessage = null;
+      Result parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.Result) e.getUnfinishedMessage();
+        parsedMessage = (Result) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -486,29 +534,38 @@ public  final class Result extends
     private int code_ = 0;
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The enum numeric value on the wire for code.
      */
-    public int getCodeValue() {
+    @Override public int getCodeValue() {
       return code_;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The enum numeric value on the wire for code to set.
+     * @return This builder for chaining.
      */
     public Builder setCodeValue(int value) {
+      
       code_ = value;
       onChanged();
       return this;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The code.
      */
-    public com.ywt.gapi.ResultCode getCode() {
-      com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-      return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+    @Override
+    public ResultCode getCode() {
+      @SuppressWarnings("deprecation")
+      ResultCode result = ResultCode.valueOf(code_);
+      return result == null ? ResultCode.UNRECOGNIZED : result;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The code to set.
+     * @return This builder for chaining.
      */
-    public Builder setCode(com.ywt.gapi.ResultCode value) {
+    public Builder setCode(ResultCode value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -519,6 +576,7 @@ public  final class Result extends
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearCode() {
       
@@ -527,32 +585,34 @@ public  final class Result extends
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private Object info_ = "";
     /**
      * <code>string info = 2;</code>
+     * @return The info.
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getInfo() {
+      Object ref = info_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         info_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string info = 2;</code>
+     * @return The bytes for info.
      */
     public com.google.protobuf.ByteString
         getInfoBytes() {
-      java.lang.Object ref = info_;
+      Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         info_ = b;
         return b;
       } else {
@@ -561,9 +621,11 @@ public  final class Result extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -574,6 +636,7 @@ public  final class Result extends
     }
     /**
      * <code>string info = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearInfo() {
       
@@ -583,6 +646,8 @@ public  final class Result extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The bytes for info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
@@ -596,32 +661,34 @@ public  final class Result extends
       return this;
     }
 
-    private java.lang.Object value_ = "";
+    private Object value_ = "";
     /**
      * <code>string value = 3;</code>
+     * @return The value.
      */
-    public java.lang.String getValue() {
-      java.lang.Object ref = value_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getValue() {
+      Object ref = value_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         value_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string value = 3;</code>
+     * @return The bytes for value.
      */
     public com.google.protobuf.ByteString
         getValueBytes() {
-      java.lang.Object ref = value_;
+      Object ref = value_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         value_ = b;
         return b;
       } else {
@@ -630,9 +697,11 @@ public  final class Result extends
     }
     /**
      * <code>string value = 3;</code>
+     * @param value The value to set.
+     * @return This builder for chaining.
      */
     public Builder setValue(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -643,6 +712,7 @@ public  final class Result extends
     }
     /**
      * <code>string value = 3;</code>
+     * @return This builder for chaining.
      */
     public Builder clearValue() {
       
@@ -652,6 +722,8 @@ public  final class Result extends
     }
     /**
      * <code>string value = 3;</code>
+     * @param value The bytes for value to set.
+     * @return This builder for chaining.
      */
     public Builder setValueBytes(
         com.google.protobuf.ByteString value) {
@@ -664,14 +736,16 @@ public  final class Result extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -679,22 +753,23 @@ public  final class Result extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.Result)
-  private static final com.ywt.gapi.Result DEFAULT_INSTANCE;
+  private static final Result DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.Result();
+    DEFAULT_INSTANCE = new Result();
   }
 
-  public static com.ywt.gapi.Result getDefaultInstance() {
+  public static Result getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<Result>
       PARSER = new com.google.protobuf.AbstractParser<Result>() {
+    @Override
     public Result parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Result(input, extensionRegistry);
+      return new Result(input, extensionRegistry);
     }
   };
 
@@ -702,12 +777,13 @@ public  final class Result extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<Result> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.Result getDefaultInstanceForType() {
+  @Override
+  public Result getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 14 - 4
src/main/java/com/ywt/gapi/ResultCode.java

@@ -55,20 +55,26 @@ public enum ResultCode
 
   public final int getNumber() {
     if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
+      throw new IllegalArgumentException(
           "Can't get the number of an unknown enum value.");
     }
     return value;
   }
 
   /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
    * @deprecated Use {@link #forNumber(int)} instead.
    */
-  @java.lang.Deprecated
+  @Deprecated
   public static ResultCode valueOf(int value) {
     return forNumber(value);
   }
 
+  /**
+   * @param value The numeric wire value of the corresponding enum entry.
+   * @return The enum associated with the given numeric wire value.
+   */
   public static ResultCode forNumber(int value) {
     switch (value) {
       case 0: return SUCCEED;
@@ -94,6 +100,10 @@ public enum ResultCode
 
   public final com.google.protobuf.Descriptors.EnumValueDescriptor
       getValueDescriptor() {
+    if (this == UNRECOGNIZED) {
+      throw new IllegalStateException(
+          "Can't get the descriptor of an unrecognized enum value.");
+    }
     return getDescriptor().getValues().get(ordinal());
   }
   public final com.google.protobuf.Descriptors.EnumDescriptor
@@ -102,7 +112,7 @@ public enum ResultCode
   }
   public static final com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
-    return com.ywt.gapi.Base.getDescriptor().getEnumTypes().get(0);
+    return BaseMq.getDescriptor().getEnumTypes().get(0);
   }
 
   private static final ResultCode[] VALUES = values();
@@ -110,7 +120,7 @@ public enum ResultCode
   public static ResultCode valueOf(
       com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
     if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
+      throw new IllegalArgumentException(
         "EnumValueDescriptor is not for this type.");
     }
     if (desc.getIndex() == -1) {

+ 183 - 113
src/main/java/com/ywt/gapi/ResultDouble.java

@@ -6,10 +6,11 @@ package com.ywt.gapi;
 /**
  * Protobuf type {@code com.ywt.gapi.ResultDouble}
  */
-public  final class ResultDouble extends
+public final class ResultDouble extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ResultDouble)
     ResultDoubleOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ResultDouble.newBuilder() to construct.
   private ResultDouble(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -17,20 +18,30 @@ public  final class ResultDouble extends
   private ResultDouble() {
     code_ = 0;
     info_ = "";
-    value_ = 0D;
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new ResultDouble();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ResultDouble(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    int mutable_bitField0_ = 0;
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -39,12 +50,6 @@ public  final class ResultDouble extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -52,7 +57,7 @@ public  final class ResultDouble extends
             break;
           }
           case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             info_ = s;
             break;
@@ -62,6 +67,13 @@ public  final class ResultDouble extends
             value_ = input.readDouble();
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -70,64 +82,73 @@ public  final class ResultDouble extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultDouble_descriptor;
+    return BaseMq.internal_static_com_ywt_gapi_ResultDouble_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultDouble_fieldAccessorTable
+    return BaseMq.internal_static_com_ywt_gapi_ResultDouble_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.ResultDouble.class, com.ywt.gapi.ResultDouble.Builder.class);
+            ResultDouble.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
   private int code_;
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
-  public int getCodeValue() {
+  @Override public int getCodeValue() {
     return code_;
   }
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  public com.ywt.gapi.ResultCode getCode() {
-    com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-    return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+  @Override public ResultCode getCode() {
+    @SuppressWarnings("deprecation")
+    ResultCode result = ResultCode.valueOf(code_);
+    return result == null ? ResultCode.UNRECOGNIZED : result;
   }
 
   public static final int INFO_FIELD_NUMBER = 2;
-  private volatile java.lang.Object info_;
+  private volatile Object info_;
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getInfo() {
+    Object ref = info_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       info_ = s;
       return s;
     }
   }
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
+  @Override
   public com.google.protobuf.ByteString
       getInfoBytes() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
+    Object ref = info_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       info_ = b;
       return b;
     } else {
@@ -139,12 +160,15 @@ public  final class ResultDouble extends
   private double value_;
   /**
    * <code>double value = 3;</code>
+   * @return The value.
    */
+  @Override
   public double getValue() {
     return value_;
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,62 +178,64 @@ public  final class ResultDouble extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       output.writeEnum(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    if (value_ != 0D) {
+    if (Double.doubleToRawLongBits(value_) != 0) {
       output.writeDouble(3, value_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    if (value_ != 0D) {
+    if (Double.doubleToRawLongBits(value_) != 0) {
       size += com.google.protobuf.CodedOutputStream
         .computeDoubleSize(3, value_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.ResultDouble)) {
+    if (!(obj instanceof ResultDouble)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.ResultDouble other = (com.ywt.gapi.ResultDouble) obj;
+    ResultDouble other = (ResultDouble) obj;
 
-    boolean result = true;
-    result = result && code_ == other.code_;
-    result = result && getInfo()
-        .equals(other.getInfo());
-    result = result && (
-        java.lang.Double.doubleToLongBits(getValue())
-        == java.lang.Double.doubleToLongBits(
-            other.getValue()));
-    return result;
+    if (code_ != other.code_) return false;
+    if (!getInfo()
+        .equals(other.getInfo())) return false;
+    if (Double.doubleToLongBits(getValue())
+        != Double.doubleToLongBits(
+            other.getValue())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -222,75 +248,75 @@ public  final class ResultDouble extends
     hash = (53 * hash) + getInfo().hashCode();
     hash = (37 * hash) + VALUE_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        java.lang.Double.doubleToLongBits(getValue()));
+        Double.doubleToLongBits(getValue()));
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(byte[] data)
+  public static ResultDouble parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(java.io.InputStream input)
+  public static ResultDouble parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultDouble parseDelimitedFrom(java.io.InputStream input)
+  public static ResultDouble parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultDouble parseDelimitedFrom(
+  public static ResultDouble parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultDouble parseFrom(
+  public static ResultDouble parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -298,21 +324,23 @@ public  final class ResultDouble extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.ResultDouble prototype) {
+  public static Builder newBuilder(ResultDouble prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -322,17 +350,18 @@ public  final class ResultDouble extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.ResultDouble)
-      com.ywt.gapi.ResultDoubleOrBuilder {
+      ResultDoubleOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultDouble_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_ResultDouble_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultDouble_fieldAccessorTable
+      return BaseMq.internal_static_com_ywt_gapi_ResultDouble_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.ResultDouble.class, com.ywt.gapi.ResultDouble.Builder.class);
+              ResultDouble.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.ResultDouble.newBuilder()
@@ -341,7 +370,7 @@ public  final class ResultDouble extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -350,6 +379,7 @@ public  final class ResultDouble extends
               .alwaysUseFieldBuilders) {
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -361,25 +391,29 @@ public  final class ResultDouble extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultDouble_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_ResultDouble_descriptor;
     }
 
-    public com.ywt.gapi.ResultDouble getDefaultInstanceForType() {
-      return com.ywt.gapi.ResultDouble.getDefaultInstance();
+    @Override
+    public ResultDouble getDefaultInstanceForType() {
+      return ResultDouble.getDefaultInstance();
     }
 
-    public com.ywt.gapi.ResultDouble build() {
-      com.ywt.gapi.ResultDouble result = buildPartial();
+    @Override
+    public ResultDouble build() {
+      ResultDouble result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.ResultDouble buildPartial() {
-      com.ywt.gapi.ResultDouble result = new com.ywt.gapi.ResultDouble(this);
+    @Override
+    public ResultDouble buildPartial() {
+      ResultDouble result = new ResultDouble(this);
       result.code_ = code_;
       result.info_ = info_;
       result.value_ = value_;
@@ -387,43 +421,50 @@ public  final class ResultDouble extends
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.ResultDouble) {
-        return mergeFrom((com.ywt.gapi.ResultDouble)other);
+      if (other instanceof ResultDouble) {
+        return mergeFrom((ResultDouble)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.ResultDouble other) {
-      if (other == com.ywt.gapi.ResultDouble.getDefaultInstance()) return this;
+    public Builder mergeFrom(ResultDouble other) {
+      if (other == ResultDouble.getDefaultInstance()) return this;
       if (other.code_ != 0) {
         setCodeValue(other.getCodeValue());
       }
@@ -434,23 +475,26 @@ public  final class ResultDouble extends
       if (other.getValue() != 0D) {
         setValue(other.getValue());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.ResultDouble parsedMessage = null;
+      ResultDouble parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.ResultDouble) e.getUnfinishedMessage();
+        parsedMessage = (ResultDouble) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -463,29 +507,38 @@ public  final class ResultDouble extends
     private int code_ = 0;
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The enum numeric value on the wire for code.
      */
-    public int getCodeValue() {
+    @Override public int getCodeValue() {
       return code_;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The enum numeric value on the wire for code to set.
+     * @return This builder for chaining.
      */
     public Builder setCodeValue(int value) {
+      
       code_ = value;
       onChanged();
       return this;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The code.
      */
-    public com.ywt.gapi.ResultCode getCode() {
-      com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-      return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+    @Override
+    public ResultCode getCode() {
+      @SuppressWarnings("deprecation")
+      ResultCode result = ResultCode.valueOf(code_);
+      return result == null ? ResultCode.UNRECOGNIZED : result;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The code to set.
+     * @return This builder for chaining.
      */
-    public Builder setCode(com.ywt.gapi.ResultCode value) {
+    public Builder setCode(ResultCode value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -496,6 +549,7 @@ public  final class ResultDouble extends
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearCode() {
       
@@ -504,32 +558,34 @@ public  final class ResultDouble extends
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private Object info_ = "";
     /**
      * <code>string info = 2;</code>
+     * @return The info.
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getInfo() {
+      Object ref = info_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         info_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string info = 2;</code>
+     * @return The bytes for info.
      */
     public com.google.protobuf.ByteString
         getInfoBytes() {
-      java.lang.Object ref = info_;
+      Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         info_ = b;
         return b;
       } else {
@@ -538,9 +594,11 @@ public  final class ResultDouble extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -551,6 +609,7 @@ public  final class ResultDouble extends
     }
     /**
      * <code>string info = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearInfo() {
       
@@ -560,6 +619,8 @@ public  final class ResultDouble extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The bytes for info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
@@ -576,12 +637,16 @@ public  final class ResultDouble extends
     private double value_ ;
     /**
      * <code>double value = 3;</code>
+     * @return The value.
      */
+    @Override
     public double getValue() {
       return value_;
     }
     /**
      * <code>double value = 3;</code>
+     * @param value The value to set.
+     * @return This builder for chaining.
      */
     public Builder setValue(double value) {
       
@@ -591,6 +656,7 @@ public  final class ResultDouble extends
     }
     /**
      * <code>double value = 3;</code>
+     * @return This builder for chaining.
      */
     public Builder clearValue() {
       
@@ -598,14 +664,16 @@ public  final class ResultDouble extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -613,22 +681,23 @@ public  final class ResultDouble extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.ResultDouble)
-  private static final com.ywt.gapi.ResultDouble DEFAULT_INSTANCE;
+  private static final ResultDouble DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.ResultDouble();
+    DEFAULT_INSTANCE = new ResultDouble();
   }
 
-  public static com.ywt.gapi.ResultDouble getDefaultInstance() {
+  public static ResultDouble getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<ResultDouble>
       PARSER = new com.google.protobuf.AbstractParser<ResultDouble>() {
+    @Override
     public ResultDouble parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ResultDouble(input, extensionRegistry);
+      return new ResultDouble(input, extensionRegistry);
     }
   };
 
@@ -636,12 +705,13 @@ public  final class ResultDouble extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<ResultDouble> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.ResultDouble getDefaultInstanceForType() {
+  @Override
+  public ResultDouble getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 7 - 2
src/main/java/com/ywt/gapi/ResultDoubleOrBuilder.java

@@ -9,25 +9,30 @@ public interface ResultDoubleOrBuilder extends
 
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
   int getCodeValue();
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  com.ywt.gapi.ResultCode getCode();
+  ResultCode getCode();
 
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  java.lang.String getInfo();
+  String getInfo();
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
   com.google.protobuf.ByteString
       getInfoBytes();
 
   /**
    * <code>double value = 3;</code>
+   * @return The value.
    */
   double getValue();
 }

+ 179 - 108
src/main/java/com/ywt/gapi/ResultInt.java

@@ -6,10 +6,11 @@ package com.ywt.gapi;
 /**
  * Protobuf type {@code com.ywt.gapi.ResultInt}
  */
-public  final class ResultInt extends
+public final class ResultInt extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ResultInt)
     ResultIntOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ResultInt.newBuilder() to construct.
   private ResultInt(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -17,20 +18,30 @@ public  final class ResultInt extends
   private ResultInt() {
     code_ = 0;
     info_ = "";
-    value_ = 0;
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new ResultInt();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ResultInt(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    int mutable_bitField0_ = 0;
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -39,12 +50,6 @@ public  final class ResultInt extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -52,7 +57,7 @@ public  final class ResultInt extends
             break;
           }
           case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             info_ = s;
             break;
@@ -62,6 +67,13 @@ public  final class ResultInt extends
             value_ = input.readInt32();
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -70,64 +82,73 @@ public  final class ResultInt extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt_descriptor;
+    return BaseMq.internal_static_com_ywt_gapi_ResultInt_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt_fieldAccessorTable
+    return BaseMq.internal_static_com_ywt_gapi_ResultInt_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.ResultInt.class, com.ywt.gapi.ResultInt.Builder.class);
+            ResultInt.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
   private int code_;
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
-  public int getCodeValue() {
+  @Override public int getCodeValue() {
     return code_;
   }
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  public com.ywt.gapi.ResultCode getCode() {
-    com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-    return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+  @Override public ResultCode getCode() {
+    @SuppressWarnings("deprecation")
+    ResultCode result = ResultCode.valueOf(code_);
+    return result == null ? ResultCode.UNRECOGNIZED : result;
   }
 
   public static final int INFO_FIELD_NUMBER = 2;
-  private volatile java.lang.Object info_;
+  private volatile Object info_;
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getInfo() {
+    Object ref = info_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       info_ = s;
       return s;
     }
   }
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
+  @Override
   public com.google.protobuf.ByteString
       getInfoBytes() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
+    Object ref = info_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       info_ = b;
       return b;
     } else {
@@ -139,12 +160,15 @@ public  final class ResultInt extends
   private int value_;
   /**
    * <code>int32 value = 3;</code>
+   * @return The value.
    */
+  @Override
   public int getValue() {
     return value_;
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,60 +178,63 @@ public  final class ResultInt extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       output.writeEnum(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
     if (value_ != 0) {
       output.writeInt32(3, value_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
     if (value_ != 0) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(3, value_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.ResultInt)) {
+    if (!(obj instanceof ResultInt)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.ResultInt other = (com.ywt.gapi.ResultInt) obj;
+    ResultInt other = (ResultInt) obj;
 
-    boolean result = true;
-    result = result && code_ == other.code_;
-    result = result && getInfo()
-        .equals(other.getInfo());
-    result = result && (getValue()
-        == other.getValue());
-    return result;
+    if (code_ != other.code_) return false;
+    if (!getInfo()
+        .equals(other.getInfo())) return false;
+    if (getValue()
+        != other.getValue()) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -225,69 +252,69 @@ public  final class ResultInt extends
     return hash;
   }
 
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(byte[] data)
+  public static ResultInt parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(java.io.InputStream input)
+  public static ResultInt parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt parseDelimitedFrom(java.io.InputStream input)
+  public static ResultInt parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultInt parseDelimitedFrom(
+  public static ResultInt parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultInt parseFrom(
+  public static ResultInt parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -295,21 +322,23 @@ public  final class ResultInt extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.ResultInt prototype) {
+  public static Builder newBuilder(ResultInt prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -319,17 +348,18 @@ public  final class ResultInt extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.ResultInt)
-      com.ywt.gapi.ResultIntOrBuilder {
+      ResultIntOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_ResultInt_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt_fieldAccessorTable
+      return BaseMq.internal_static_com_ywt_gapi_ResultInt_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.ResultInt.class, com.ywt.gapi.ResultInt.Builder.class);
+              ResultInt.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.ResultInt.newBuilder()
@@ -338,7 +368,7 @@ public  final class ResultInt extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -347,6 +377,7 @@ public  final class ResultInt extends
               .alwaysUseFieldBuilders) {
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -358,25 +389,29 @@ public  final class ResultInt extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_ResultInt_descriptor;
     }
 
-    public com.ywt.gapi.ResultInt getDefaultInstanceForType() {
-      return com.ywt.gapi.ResultInt.getDefaultInstance();
+    @Override
+    public ResultInt getDefaultInstanceForType() {
+      return ResultInt.getDefaultInstance();
     }
 
-    public com.ywt.gapi.ResultInt build() {
-      com.ywt.gapi.ResultInt result = buildPartial();
+    @Override
+    public ResultInt build() {
+      ResultInt result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.ResultInt buildPartial() {
-      com.ywt.gapi.ResultInt result = new com.ywt.gapi.ResultInt(this);
+    @Override
+    public ResultInt buildPartial() {
+      ResultInt result = new ResultInt(this);
       result.code_ = code_;
       result.info_ = info_;
       result.value_ = value_;
@@ -384,43 +419,50 @@ public  final class ResultInt extends
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.ResultInt) {
-        return mergeFrom((com.ywt.gapi.ResultInt)other);
+      if (other instanceof ResultInt) {
+        return mergeFrom((ResultInt)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.ResultInt other) {
-      if (other == com.ywt.gapi.ResultInt.getDefaultInstance()) return this;
+    public Builder mergeFrom(ResultInt other) {
+      if (other == ResultInt.getDefaultInstance()) return this;
       if (other.code_ != 0) {
         setCodeValue(other.getCodeValue());
       }
@@ -431,23 +473,26 @@ public  final class ResultInt extends
       if (other.getValue() != 0) {
         setValue(other.getValue());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.ResultInt parsedMessage = null;
+      ResultInt parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.ResultInt) e.getUnfinishedMessage();
+        parsedMessage = (ResultInt) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -460,29 +505,38 @@ public  final class ResultInt extends
     private int code_ = 0;
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The enum numeric value on the wire for code.
      */
-    public int getCodeValue() {
+    @Override public int getCodeValue() {
       return code_;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The enum numeric value on the wire for code to set.
+     * @return This builder for chaining.
      */
     public Builder setCodeValue(int value) {
+      
       code_ = value;
       onChanged();
       return this;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The code.
      */
-    public com.ywt.gapi.ResultCode getCode() {
-      com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-      return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+    @Override
+    public ResultCode getCode() {
+      @SuppressWarnings("deprecation")
+      ResultCode result = ResultCode.valueOf(code_);
+      return result == null ? ResultCode.UNRECOGNIZED : result;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The code to set.
+     * @return This builder for chaining.
      */
-    public Builder setCode(com.ywt.gapi.ResultCode value) {
+    public Builder setCode(ResultCode value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -493,6 +547,7 @@ public  final class ResultInt extends
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearCode() {
       
@@ -501,32 +556,34 @@ public  final class ResultInt extends
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private Object info_ = "";
     /**
      * <code>string info = 2;</code>
+     * @return The info.
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getInfo() {
+      Object ref = info_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         info_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string info = 2;</code>
+     * @return The bytes for info.
      */
     public com.google.protobuf.ByteString
         getInfoBytes() {
-      java.lang.Object ref = info_;
+      Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         info_ = b;
         return b;
       } else {
@@ -535,9 +592,11 @@ public  final class ResultInt extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -548,6 +607,7 @@ public  final class ResultInt extends
     }
     /**
      * <code>string info = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearInfo() {
       
@@ -557,6 +617,8 @@ public  final class ResultInt extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The bytes for info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
@@ -573,12 +635,16 @@ public  final class ResultInt extends
     private int value_ ;
     /**
      * <code>int32 value = 3;</code>
+     * @return The value.
      */
+    @Override
     public int getValue() {
       return value_;
     }
     /**
      * <code>int32 value = 3;</code>
+     * @param value The value to set.
+     * @return This builder for chaining.
      */
     public Builder setValue(int value) {
       
@@ -588,6 +654,7 @@ public  final class ResultInt extends
     }
     /**
      * <code>int32 value = 3;</code>
+     * @return This builder for chaining.
      */
     public Builder clearValue() {
       
@@ -595,14 +662,16 @@ public  final class ResultInt extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -610,22 +679,23 @@ public  final class ResultInt extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.ResultInt)
-  private static final com.ywt.gapi.ResultInt DEFAULT_INSTANCE;
+  private static final ResultInt DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.ResultInt();
+    DEFAULT_INSTANCE = new ResultInt();
   }
 
-  public static com.ywt.gapi.ResultInt getDefaultInstance() {
+  public static ResultInt getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<ResultInt>
       PARSER = new com.google.protobuf.AbstractParser<ResultInt>() {
+    @Override
     public ResultInt parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ResultInt(input, extensionRegistry);
+      return new ResultInt(input, extensionRegistry);
     }
   };
 
@@ -633,12 +703,13 @@ public  final class ResultInt extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<ResultInt> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.ResultInt getDefaultInstanceForType() {
+  @Override
+  public ResultInt getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 179 - 108
src/main/java/com/ywt/gapi/ResultInt64.java

@@ -6,10 +6,11 @@ package com.ywt.gapi;
 /**
  * Protobuf type {@code com.ywt.gapi.ResultInt64}
  */
-public  final class ResultInt64 extends
+public final class ResultInt64 extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ResultInt64)
     ResultInt64OrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ResultInt64.newBuilder() to construct.
   private ResultInt64(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -17,20 +18,30 @@ public  final class ResultInt64 extends
   private ResultInt64() {
     code_ = 0;
     info_ = "";
-    value_ = 0L;
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new ResultInt64();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ResultInt64(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    int mutable_bitField0_ = 0;
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -39,12 +50,6 @@ public  final class ResultInt64 extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -52,7 +57,7 @@ public  final class ResultInt64 extends
             break;
           }
           case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             info_ = s;
             break;
@@ -62,6 +67,13 @@ public  final class ResultInt64 extends
             value_ = input.readInt64();
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -70,64 +82,73 @@ public  final class ResultInt64 extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt64_descriptor;
+    return BaseMq.internal_static_com_ywt_gapi_ResultInt64_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt64_fieldAccessorTable
+    return BaseMq.internal_static_com_ywt_gapi_ResultInt64_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.ResultInt64.class, com.ywt.gapi.ResultInt64.Builder.class);
+            ResultInt64.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
   private int code_;
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
-  public int getCodeValue() {
+  @Override public int getCodeValue() {
     return code_;
   }
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  public com.ywt.gapi.ResultCode getCode() {
-    com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-    return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+  @Override public ResultCode getCode() {
+    @SuppressWarnings("deprecation")
+    ResultCode result = ResultCode.valueOf(code_);
+    return result == null ? ResultCode.UNRECOGNIZED : result;
   }
 
   public static final int INFO_FIELD_NUMBER = 2;
-  private volatile java.lang.Object info_;
+  private volatile Object info_;
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getInfo() {
+    Object ref = info_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       info_ = s;
       return s;
     }
   }
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
+  @Override
   public com.google.protobuf.ByteString
       getInfoBytes() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
+    Object ref = info_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       info_ = b;
       return b;
     } else {
@@ -139,12 +160,15 @@ public  final class ResultInt64 extends
   private long value_;
   /**
    * <code>int64 value = 3;</code>
+   * @return The value.
    */
+  @Override
   public long getValue() {
     return value_;
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,60 +178,63 @@ public  final class ResultInt64 extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       output.writeEnum(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
     if (value_ != 0L) {
       output.writeInt64(3, value_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (code_ != com.ywt.gapi.ResultCode.SUCCEED.getNumber()) {
+    if (code_ != ResultCode.SUCCEED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
     if (value_ != 0L) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(3, value_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.ResultInt64)) {
+    if (!(obj instanceof ResultInt64)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.ResultInt64 other = (com.ywt.gapi.ResultInt64) obj;
+    ResultInt64 other = (ResultInt64) obj;
 
-    boolean result = true;
-    result = result && code_ == other.code_;
-    result = result && getInfo()
-        .equals(other.getInfo());
-    result = result && (getValue()
-        == other.getValue());
-    return result;
+    if (code_ != other.code_) return false;
+    if (!getInfo()
+        .equals(other.getInfo())) return false;
+    if (getValue()
+        != other.getValue()) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -226,69 +253,69 @@ public  final class ResultInt64 extends
     return hash;
   }
 
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(byte[] data)
+  public static ResultInt64 parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(java.io.InputStream input)
+  public static ResultInt64 parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt64 parseDelimitedFrom(java.io.InputStream input)
+  public static ResultInt64 parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultInt64 parseDelimitedFrom(
+  public static ResultInt64 parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.ResultInt64 parseFrom(
+  public static ResultInt64 parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -296,21 +323,23 @@ public  final class ResultInt64 extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.ResultInt64 prototype) {
+  public static Builder newBuilder(ResultInt64 prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -320,17 +349,18 @@ public  final class ResultInt64 extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.ResultInt64)
-      com.ywt.gapi.ResultInt64OrBuilder {
+      ResultInt64OrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt64_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_ResultInt64_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt64_fieldAccessorTable
+      return BaseMq.internal_static_com_ywt_gapi_ResultInt64_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.ResultInt64.class, com.ywt.gapi.ResultInt64.Builder.class);
+              ResultInt64.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.ResultInt64.newBuilder()
@@ -339,7 +369,7 @@ public  final class ResultInt64 extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -348,6 +378,7 @@ public  final class ResultInt64 extends
               .alwaysUseFieldBuilders) {
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -359,25 +390,29 @@ public  final class ResultInt64 extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.Base.internal_static_com_ywt_gapi_ResultInt64_descriptor;
+      return BaseMq.internal_static_com_ywt_gapi_ResultInt64_descriptor;
     }
 
-    public com.ywt.gapi.ResultInt64 getDefaultInstanceForType() {
-      return com.ywt.gapi.ResultInt64.getDefaultInstance();
+    @Override
+    public ResultInt64 getDefaultInstanceForType() {
+      return ResultInt64.getDefaultInstance();
     }
 
-    public com.ywt.gapi.ResultInt64 build() {
-      com.ywt.gapi.ResultInt64 result = buildPartial();
+    @Override
+    public ResultInt64 build() {
+      ResultInt64 result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.ResultInt64 buildPartial() {
-      com.ywt.gapi.ResultInt64 result = new com.ywt.gapi.ResultInt64(this);
+    @Override
+    public ResultInt64 buildPartial() {
+      ResultInt64 result = new ResultInt64(this);
       result.code_ = code_;
       result.info_ = info_;
       result.value_ = value_;
@@ -385,43 +420,50 @@ public  final class ResultInt64 extends
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.ResultInt64) {
-        return mergeFrom((com.ywt.gapi.ResultInt64)other);
+      if (other instanceof ResultInt64) {
+        return mergeFrom((ResultInt64)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.ResultInt64 other) {
-      if (other == com.ywt.gapi.ResultInt64.getDefaultInstance()) return this;
+    public Builder mergeFrom(ResultInt64 other) {
+      if (other == ResultInt64.getDefaultInstance()) return this;
       if (other.code_ != 0) {
         setCodeValue(other.getCodeValue());
       }
@@ -432,23 +474,26 @@ public  final class ResultInt64 extends
       if (other.getValue() != 0L) {
         setValue(other.getValue());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.ResultInt64 parsedMessage = null;
+      ResultInt64 parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.ResultInt64) e.getUnfinishedMessage();
+        parsedMessage = (ResultInt64) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -461,29 +506,38 @@ public  final class ResultInt64 extends
     private int code_ = 0;
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The enum numeric value on the wire for code.
      */
-    public int getCodeValue() {
+    @Override public int getCodeValue() {
       return code_;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The enum numeric value on the wire for code to set.
+     * @return This builder for chaining.
      */
     public Builder setCodeValue(int value) {
+      
       code_ = value;
       onChanged();
       return this;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return The code.
      */
-    public com.ywt.gapi.ResultCode getCode() {
-      com.ywt.gapi.ResultCode result = com.ywt.gapi.ResultCode.valueOf(code_);
-      return result == null ? com.ywt.gapi.ResultCode.UNRECOGNIZED : result;
+    @Override
+    public ResultCode getCode() {
+      @SuppressWarnings("deprecation")
+      ResultCode result = ResultCode.valueOf(code_);
+      return result == null ? ResultCode.UNRECOGNIZED : result;
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @param value The code to set.
+     * @return This builder for chaining.
      */
-    public Builder setCode(com.ywt.gapi.ResultCode value) {
+    public Builder setCode(ResultCode value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -494,6 +548,7 @@ public  final class ResultInt64 extends
     }
     /**
      * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearCode() {
       
@@ -502,32 +557,34 @@ public  final class ResultInt64 extends
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private Object info_ = "";
     /**
      * <code>string info = 2;</code>
+     * @return The info.
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getInfo() {
+      Object ref = info_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         info_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string info = 2;</code>
+     * @return The bytes for info.
      */
     public com.google.protobuf.ByteString
         getInfoBytes() {
-      java.lang.Object ref = info_;
+      Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         info_ = b;
         return b;
       } else {
@@ -536,9 +593,11 @@ public  final class ResultInt64 extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -549,6 +608,7 @@ public  final class ResultInt64 extends
     }
     /**
      * <code>string info = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearInfo() {
       
@@ -558,6 +618,8 @@ public  final class ResultInt64 extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The bytes for info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
@@ -574,12 +636,16 @@ public  final class ResultInt64 extends
     private long value_ ;
     /**
      * <code>int64 value = 3;</code>
+     * @return The value.
      */
+    @Override
     public long getValue() {
       return value_;
     }
     /**
      * <code>int64 value = 3;</code>
+     * @param value The value to set.
+     * @return This builder for chaining.
      */
     public Builder setValue(long value) {
       
@@ -589,6 +655,7 @@ public  final class ResultInt64 extends
     }
     /**
      * <code>int64 value = 3;</code>
+     * @return This builder for chaining.
      */
     public Builder clearValue() {
       
@@ -596,14 +663,16 @@ public  final class ResultInt64 extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -611,22 +680,23 @@ public  final class ResultInt64 extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.ResultInt64)
-  private static final com.ywt.gapi.ResultInt64 DEFAULT_INSTANCE;
+  private static final ResultInt64 DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.ResultInt64();
+    DEFAULT_INSTANCE = new ResultInt64();
   }
 
-  public static com.ywt.gapi.ResultInt64 getDefaultInstance() {
+  public static ResultInt64 getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<ResultInt64>
       PARSER = new com.google.protobuf.AbstractParser<ResultInt64>() {
+    @Override
     public ResultInt64 parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ResultInt64(input, extensionRegistry);
+      return new ResultInt64(input, extensionRegistry);
     }
   };
 
@@ -634,12 +704,13 @@ public  final class ResultInt64 extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<ResultInt64> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.ResultInt64 getDefaultInstanceForType() {
+  @Override
+  public ResultInt64 getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 7 - 2
src/main/java/com/ywt/gapi/ResultInt64OrBuilder.java

@@ -9,25 +9,30 @@ public interface ResultInt64OrBuilder extends
 
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
   int getCodeValue();
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  com.ywt.gapi.ResultCode getCode();
+  ResultCode getCode();
 
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  java.lang.String getInfo();
+  String getInfo();
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
   com.google.protobuf.ByteString
       getInfoBytes();
 
   /**
    * <code>int64 value = 3;</code>
+   * @return The value.
    */
   long getValue();
 }

+ 7 - 2
src/main/java/com/ywt/gapi/ResultIntOrBuilder.java

@@ -9,25 +9,30 @@ public interface ResultIntOrBuilder extends
 
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
   int getCodeValue();
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  com.ywt.gapi.ResultCode getCode();
+  ResultCode getCode();
 
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  java.lang.String getInfo();
+  String getInfo();
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
   com.google.protobuf.ByteString
       getInfoBytes();
 
   /**
    * <code>int32 value = 3;</code>
+   * @return The value.
    */
   int getValue();
 }

+ 9 - 3
src/main/java/com/ywt/gapi/ResultOrBuilder.java

@@ -9,29 +9,35 @@ public interface ResultOrBuilder extends
 
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The enum numeric value on the wire for code.
    */
   int getCodeValue();
   /**
    * <code>.com.ywt.gapi.ResultCode code = 1;</code>
+   * @return The code.
    */
-  com.ywt.gapi.ResultCode getCode();
+  ResultCode getCode();
 
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  java.lang.String getInfo();
+  String getInfo();
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
   com.google.protobuf.ByteString
       getInfoBytes();
 
   /**
    * <code>string value = 3;</code>
+   * @return The value.
    */
-  java.lang.String getValue();
+  String getValue();
   /**
    * <code>string value = 3;</code>
+   * @return The bytes for value.
    */
   com.google.protobuf.ByteString
       getValueBytes();

+ 225 - 0
src/main/java/com/ywt/gapi/base/log/DubboYWTLogServiceTriple.java

@@ -0,0 +1,225 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+    package com.ywt.gapi.base.log;
+
+import com.google.protobuf.Message;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.stream.StreamObserver;
+import org.apache.dubbo.rpc.*;
+import org.apache.dubbo.rpc.model.MethodDescriptor;
+import org.apache.dubbo.rpc.model.ServiceDescriptor;
+import org.apache.dubbo.rpc.model.StubMethodDescriptor;
+import org.apache.dubbo.rpc.model.StubServiceDescriptor;
+import org.apache.dubbo.rpc.stub.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+
+public final class DubboYWTLogServiceTriple {
+
+    public static final String SERVICE_NAME = YWTLogService.SERVICE_NAME;
+
+    private static final StubServiceDescriptor serviceDescriptor = new StubServiceDescriptor(SERVICE_NAME,YWTLogService.class);
+
+    static {
+        org.apache.dubbo.rpc.protocol.tri.service.SchemaDescriptorRegistry.addSchemaDescriptor(SERVICE_NAME,LogProto.getDescriptor());
+        StubSuppliers.addSupplier(SERVICE_NAME, DubboYWTLogServiceTriple::newStub);
+        StubSuppliers.addSupplier(YWTLogService.JAVA_SERVICE_NAME,  DubboYWTLogServiceTriple::newStub);
+        StubSuppliers.addDescriptor(SERVICE_NAME, serviceDescriptor);
+        StubSuppliers.addDescriptor(YWTLogService.JAVA_SERVICE_NAME, serviceDescriptor);
+    }
+
+    @SuppressWarnings("all")
+    public static YWTLogService newStub(Invoker<?> invoker) {
+        return new YWTLogServiceStub((Invoker<YWTLogService>)invoker);
+    }
+
+    /**
+         * <pre>
+         *  日志分类编码,自定义
+         * </pre>
+         */
+    private static final StubMethodDescriptor saveCommentLogMethod = new StubMethodDescriptor("saveCommentLog",
+    SaveCommentLogRequest.class, SaveCommentLogResponse.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveCommentLogRequest::parseFrom,
+    SaveCommentLogResponse::parseFrom);
+
+    private static final StubMethodDescriptor saveCommentLogAsyncMethod = new StubMethodDescriptor("saveCommentLog",
+    SaveCommentLogRequest.class, CompletableFuture.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveCommentLogRequest::parseFrom,
+    SaveCommentLogResponse::parseFrom);
+
+    private static final StubMethodDescriptor saveCommentLogProxyAsyncMethod = new StubMethodDescriptor("saveCommentLogAsync",
+    SaveCommentLogRequest.class, SaveCommentLogResponse.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveCommentLogRequest::parseFrom,
+    SaveCommentLogResponse::parseFrom);
+
+    /**
+         * <pre>
+         *  日志分类描述,自定义
+         * </pre>
+         */
+    private static final StubMethodDescriptor saveOpenHisPushApiLogMethod = new StubMethodDescriptor("saveOpenHisPushApiLog",
+    SaveOpenHisPushApiLogRequest.class, SaveOpenHisPushApiLogResponse.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveOpenHisPushApiLogRequest::parseFrom,
+    SaveOpenHisPushApiLogResponse::parseFrom);
+
+    private static final StubMethodDescriptor saveOpenHisPushApiLogAsyncMethod = new StubMethodDescriptor("saveOpenHisPushApiLog",
+    SaveOpenHisPushApiLogRequest.class, CompletableFuture.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveOpenHisPushApiLogRequest::parseFrom,
+    SaveOpenHisPushApiLogResponse::parseFrom);
+
+    private static final StubMethodDescriptor saveOpenHisPushApiLogProxyAsyncMethod = new StubMethodDescriptor("saveOpenHisPushApiLogAsync",
+    SaveOpenHisPushApiLogRequest.class, SaveOpenHisPushApiLogResponse.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveOpenHisPushApiLogRequest::parseFrom,
+    SaveOpenHisPushApiLogResponse::parseFrom);
+
+
+
+
+
+    public static class YWTLogServiceStub implements YWTLogService{
+        private final Invoker<YWTLogService> invoker;
+
+        public YWTLogServiceStub(Invoker<YWTLogService> invoker) {
+            this.invoker = invoker;
+        }
+
+            /**
+         * <pre>
+         *  日志分类编码,自定义
+         * </pre>
+         */
+        @Override
+        public SaveCommentLogResponse saveCommentLog(SaveCommentLogRequest request){
+            return StubInvocationUtil.unaryCall(invoker, saveCommentLogMethod, request);
+        }
+
+        public CompletableFuture<SaveCommentLogResponse> saveCommentLogAsync(SaveCommentLogRequest request){
+            return StubInvocationUtil.unaryCall(invoker, saveCommentLogAsyncMethod, request);
+        }
+
+            /**
+         * <pre>
+         *  日志分类编码,自定义
+         * </pre>
+         */
+        @Override
+        public void saveCommentLog(SaveCommentLogRequest request, StreamObserver<SaveCommentLogResponse> responseObserver){
+            StubInvocationUtil.unaryCall(invoker, saveCommentLogMethod , request, responseObserver);
+        }
+            /**
+         * <pre>
+         *  日志分类描述,自定义
+         * </pre>
+         */
+        @Override
+        public SaveOpenHisPushApiLogResponse saveOpenHisPushApiLog(SaveOpenHisPushApiLogRequest request){
+            return StubInvocationUtil.unaryCall(invoker, saveOpenHisPushApiLogMethod, request);
+        }
+
+        public CompletableFuture<SaveOpenHisPushApiLogResponse> saveOpenHisPushApiLogAsync(SaveOpenHisPushApiLogRequest request){
+            return StubInvocationUtil.unaryCall(invoker, saveOpenHisPushApiLogAsyncMethod, request);
+        }
+
+            /**
+         * <pre>
+         *  日志分类描述,自定义
+         * </pre>
+         */
+        @Override
+        public void saveOpenHisPushApiLog(SaveOpenHisPushApiLogRequest request, StreamObserver<SaveOpenHisPushApiLogResponse> responseObserver){
+            StubInvocationUtil.unaryCall(invoker, saveOpenHisPushApiLogMethod , request, responseObserver);
+        }
+
+
+
+    }
+
+    public static abstract class YWTLogServiceImplBase implements YWTLogService, ServerService<YWTLogService> {
+
+        private <T, R> BiConsumer<T, StreamObserver<R>> syncToAsync(java.util.function.Function<T, R> syncFun) {
+            return new BiConsumer<T, StreamObserver<R>>() {
+                @Override
+                public void accept(T t, StreamObserver<R> observer) {
+                    try {
+                        R ret = syncFun.apply(t);
+                        observer.onNext(ret);
+                        observer.onCompleted();
+                    } catch (Throwable e) {
+                        observer.onError(e);
+                    }
+                }
+            };
+        }
+
+        @Override
+        public final Invoker<YWTLogService> getInvoker(URL url) {
+            PathResolver pathResolver = url.getOrDefaultFrameworkModel()
+            .getExtensionLoader(PathResolver.class)
+            .getDefaultExtension();
+            Map<String,StubMethodHandler<?, ?>> handlers = new HashMap<>();
+
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/saveCommentLog" );
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/saveCommentLogAsync" );
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/saveOpenHisPushApiLog" );
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/saveOpenHisPushApiLogAsync" );
+
+            BiConsumer<SaveCommentLogRequest, StreamObserver<SaveCommentLogResponse>> saveCommentLogFunc = this::saveCommentLog;
+            handlers.put(saveCommentLogMethod.getMethodName(), new UnaryStubMethodHandler<>(saveCommentLogFunc));
+            BiConsumer<SaveCommentLogRequest, StreamObserver<SaveCommentLogResponse>> saveCommentLogAsyncFunc = syncToAsync(this::saveCommentLog);
+            handlers.put(saveCommentLogProxyAsyncMethod.getMethodName(), new UnaryStubMethodHandler<>(saveCommentLogAsyncFunc));
+            BiConsumer<SaveOpenHisPushApiLogRequest, StreamObserver<SaveOpenHisPushApiLogResponse>> saveOpenHisPushApiLogFunc = this::saveOpenHisPushApiLog;
+            handlers.put(saveOpenHisPushApiLogMethod.getMethodName(), new UnaryStubMethodHandler<>(saveOpenHisPushApiLogFunc));
+            BiConsumer<SaveOpenHisPushApiLogRequest, StreamObserver<SaveOpenHisPushApiLogResponse>> saveOpenHisPushApiLogAsyncFunc = syncToAsync(this::saveOpenHisPushApiLog);
+            handlers.put(saveOpenHisPushApiLogProxyAsyncMethod.getMethodName(), new UnaryStubMethodHandler<>(saveOpenHisPushApiLogAsyncFunc));
+
+
+
+
+            return new StubInvoker<>(this, url, YWTLogService.class, handlers);
+        }
+
+
+        @Override
+        public SaveCommentLogResponse saveCommentLog(SaveCommentLogRequest request){
+            throw unimplementedMethodException(saveCommentLogMethod);
+        }
+
+        @Override
+        public SaveOpenHisPushApiLogResponse saveOpenHisPushApiLog(SaveOpenHisPushApiLogRequest request){
+            throw unimplementedMethodException(saveOpenHisPushApiLogMethod);
+        }
+
+
+
+
+
+        @Override
+        public final ServiceDescriptor getServiceDescriptor() {
+            return serviceDescriptor;
+        }
+        private RpcException unimplementedMethodException(StubMethodDescriptor methodDescriptor) {
+            return TriRpcStatus.UNIMPLEMENTED.withDescription(String.format("Method %s is unimplemented",
+                "/" + serviceDescriptor.getInterfaceName() + "/" + methodDescriptor.getMethodName())).asException();
+        }
+    }
+
+}

+ 12 - 20
src/main/java/com/ywt/gapi/base/log/Log.java → src/main/java/com/ywt/gapi/base/log/LogProto.java

@@ -3,8 +3,8 @@
 
 package com.ywt.gapi.base.log;
 
-public final class Log {
-  private Log() {}
+public final class LogProto {
+  private LogProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -42,7 +42,7 @@ public final class Log {
   private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n\tlog.proto\022\025com.ywt.gapi.base.log\"x\n\025Sa" +
       "veCommentLogRequest\022\020\n\010typeCode\030\001 \001(\t\022\020\n" +
       "\010typeDesc\030\002 \001(\t\022\017\n\007content\030\003 \001(\t\022\016\n\006rema" +
@@ -52,52 +52,44 @@ public final class Log {
       "st\022\014\n\004path\030\001 \001(\t\022\013\n\003req\030\002 \001(\t\022\013\n\003res\030\003 \001" +
       "(\t\022\020\n\010difftime\030\004 \001(\005\022\022\n\nhttpStatus\030\006 \001(\005" +
       "\";\n\035SaveOpenHisPushApiLogResponse\022\014\n\004cod" +
-      "e\030\001 \001(\005\022\014\n\004info\030\002 \001(\t2\203\002\n\rYWTLogService\022",
+      "e\030\001 \001(\005\022\014\n\004info\030\002 \001(\t2\203\002\n\rYWTLogService\022" +
       "m\n\016saveCommentLog\022,.com.ywt.gapi.base.lo" +
       "g.SaveCommentLogRequest\032-.com.ywt.gapi.b" +
       "ase.log.SaveCommentLogResponse\022\202\001\n\025saveO" +
       "penHisPushApiLog\0223.com.ywt.gapi.base.log" +
       ".SaveOpenHisPushApiLogRequest\0324.com.ywt." +
       "gapi.base.log.SaveOpenHisPushApiLogRespo" +
-      "nseB\034\n\025com.ywt.gapi.base.logP\001\210\001\001b\006proto" +
-      "3"
+      "nseB#\n\025com.ywt.gapi.base.logB\010LogProtoP\001" +
+      "b\006proto3"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
+        });
     internal_static_com_ywt_gapi_base_log_SaveCommentLogRequest_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_com_ywt_gapi_base_log_SaveCommentLogRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_base_log_SaveCommentLogRequest_descriptor,
-        new java.lang.String[] { "TypeCode", "TypeDesc", "Content", "Remark", "Ip", "UserId", });
+        new String[] { "TypeCode", "TypeDesc", "Content", "Remark", "Ip", "UserId", });
     internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor,
-        new java.lang.String[] { "Code", "Info", });
+        new String[] { "Code", "Info", });
     internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogRequest_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogRequest_descriptor,
-        new java.lang.String[] { "Path", "Req", "Res", "Difftime", "HttpStatus", });
+        new String[] { "Path", "Req", "Res", "Difftime", "HttpStatus", });
     internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor,
-        new java.lang.String[] { "Code", "Info", });
+        new String[] { "Code", "Info", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 235 - 161
src/main/java/com/ywt/gapi/base/log/SaveCommentLogRequest.java


+ 16 - 5
src/main/java/com/ywt/gapi/base/log/SaveCommentLogRequestOrBuilder.java

@@ -13,14 +13,16 @@ public interface SaveCommentLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string typeCode = 1;</code>
+   * @return The typeCode.
    */
-  java.lang.String getTypeCode();
+  String getTypeCode();
   /**
    * <pre>
    * 日志分类编码,自定义
    * </pre>
    *
    * <code>string typeCode = 1;</code>
+   * @return The bytes for typeCode.
    */
   com.google.protobuf.ByteString
       getTypeCodeBytes();
@@ -31,14 +33,16 @@ public interface SaveCommentLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string typeDesc = 2;</code>
+   * @return The typeDesc.
    */
-  java.lang.String getTypeDesc();
+  String getTypeDesc();
   /**
    * <pre>
    * 日志分类描述,自定义
    * </pre>
    *
    * <code>string typeDesc = 2;</code>
+   * @return The bytes for typeDesc.
    */
   com.google.protobuf.ByteString
       getTypeDescBytes();
@@ -49,14 +53,16 @@ public interface SaveCommentLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string content = 3;</code>
+   * @return The content.
    */
-  java.lang.String getContent();
+  String getContent();
   /**
    * <pre>
    * 日志的内容,自定义
    * </pre>
    *
    * <code>string content = 3;</code>
+   * @return The bytes for content.
    */
   com.google.protobuf.ByteString
       getContentBytes();
@@ -67,14 +73,16 @@ public interface SaveCommentLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string remark = 4;</code>
+   * @return The remark.
    */
-  java.lang.String getRemark();
+  String getRemark();
   /**
    * <pre>
    * 日志备注,自定义
    * </pre>
    *
    * <code>string remark = 4;</code>
+   * @return The bytes for remark.
    */
   com.google.protobuf.ByteString
       getRemarkBytes();
@@ -85,20 +93,23 @@ public interface SaveCommentLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string ip = 5;</code>
+   * @return The ip.
    */
-  java.lang.String getIp();
+  String getIp();
   /**
    * <pre>
    * ip地址
    * </pre>
    *
    * <code>string ip = 5;</code>
+   * @return The bytes for ip.
    */
   com.google.protobuf.ByteString
       getIpBytes();
 
   /**
    * <code>int32 userId = 6;</code>
+   * @return The userId.
    */
   int getUserId();
 }

+ 154 - 96
src/main/java/com/ywt/gapi/base/log/SaveCommentLogResponse.java

@@ -10,30 +10,41 @@ package com.ywt.gapi.base.log;
  *
  * Protobuf type {@code com.ywt.gapi.base.log.SaveCommentLogResponse}
  */
-public  final class SaveCommentLogResponse extends
+public final class SaveCommentLogResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.base.log.SaveCommentLogResponse)
     SaveCommentLogResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SaveCommentLogResponse.newBuilder() to construct.
   private SaveCommentLogResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
   }
   private SaveCommentLogResponse() {
-    code_ = 0;
     info_ = "";
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new SaveCommentLogResponse();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SaveCommentLogResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    int mutable_bitField0_ = 0;
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,23 +53,24 @@ public  final class SaveCommentLogResponse extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             code_ = input.readInt32();
             break;
           }
           case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             info_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -67,57 +79,65 @@ public  final class SaveCommentLogResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor;
+    return LogProto.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_fieldAccessorTable
+    return LogProto.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.base.log.SaveCommentLogResponse.class, com.ywt.gapi.base.log.SaveCommentLogResponse.Builder.class);
+            SaveCommentLogResponse.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
   private int code_;
   /**
    * <code>int32 code = 1;</code>
+   * @return The code.
    */
+  @Override
   public int getCode() {
     return code_;
   }
 
   public static final int INFO_FIELD_NUMBER = 2;
-  private volatile java.lang.Object info_;
+  private volatile Object info_;
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getInfo() {
+    Object ref = info_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       info_ = s;
       return s;
     }
   }
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
+  @Override
   public com.google.protobuf.ByteString
       getInfoBytes() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
+    Object ref = info_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       info_ = b;
       return b;
     } else {
@@ -126,6 +146,7 @@ public  final class SaveCommentLogResponse extends
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,16 +156,19 @@ public  final class SaveCommentLogResponse extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (code_ != 0) {
       output.writeInt32(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -154,33 +178,33 @@ public  final class SaveCommentLogResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.base.log.SaveCommentLogResponse)) {
+    if (!(obj instanceof SaveCommentLogResponse)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.base.log.SaveCommentLogResponse other = (com.ywt.gapi.base.log.SaveCommentLogResponse) obj;
+    SaveCommentLogResponse other = (SaveCommentLogResponse) obj;
 
-    boolean result = true;
-    result = result && (getCode()
-        == other.getCode());
-    result = result && getInfo()
-        .equals(other.getInfo());
-    return result;
+    if (getCode()
+        != other.getCode()) return false;
+    if (!getInfo()
+        .equals(other.getInfo())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -196,69 +220,69 @@ public  final class SaveCommentLogResponse extends
     return hash;
   }
 
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(byte[] data)
+  public static SaveCommentLogResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(java.io.InputStream input)
+  public static SaveCommentLogResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseDelimitedFrom(java.io.InputStream input)
+  public static SaveCommentLogResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseDelimitedFrom(
+  public static SaveCommentLogResponse parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse parseFrom(
+  public static SaveCommentLogResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -266,21 +290,23 @@ public  final class SaveCommentLogResponse extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.base.log.SaveCommentLogResponse prototype) {
+  public static Builder newBuilder(SaveCommentLogResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -294,17 +320,18 @@ public  final class SaveCommentLogResponse extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.base.log.SaveCommentLogResponse)
-      com.ywt.gapi.base.log.SaveCommentLogResponseOrBuilder {
+      SaveCommentLogResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor;
+      return LogProto.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_fieldAccessorTable
+      return LogProto.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.base.log.SaveCommentLogResponse.class, com.ywt.gapi.base.log.SaveCommentLogResponse.Builder.class);
+              SaveCommentLogResponse.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.base.log.SaveCommentLogResponse.newBuilder()
@@ -313,7 +340,7 @@ public  final class SaveCommentLogResponse extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -322,6 +349,7 @@ public  final class SaveCommentLogResponse extends
               .alwaysUseFieldBuilders) {
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -331,68 +359,79 @@ public  final class SaveCommentLogResponse extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor;
+      return LogProto.internal_static_com_ywt_gapi_base_log_SaveCommentLogResponse_descriptor;
     }
 
-    public com.ywt.gapi.base.log.SaveCommentLogResponse getDefaultInstanceForType() {
-      return com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance();
+    @Override
+    public SaveCommentLogResponse getDefaultInstanceForType() {
+      return SaveCommentLogResponse.getDefaultInstance();
     }
 
-    public com.ywt.gapi.base.log.SaveCommentLogResponse build() {
-      com.ywt.gapi.base.log.SaveCommentLogResponse result = buildPartial();
+    @Override
+    public SaveCommentLogResponse build() {
+      SaveCommentLogResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.base.log.SaveCommentLogResponse buildPartial() {
-      com.ywt.gapi.base.log.SaveCommentLogResponse result = new com.ywt.gapi.base.log.SaveCommentLogResponse(this);
+    @Override
+    public SaveCommentLogResponse buildPartial() {
+      SaveCommentLogResponse result = new SaveCommentLogResponse(this);
       result.code_ = code_;
       result.info_ = info_;
       onBuilt();
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.base.log.SaveCommentLogResponse) {
-        return mergeFrom((com.ywt.gapi.base.log.SaveCommentLogResponse)other);
+      if (other instanceof SaveCommentLogResponse) {
+        return mergeFrom((SaveCommentLogResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.base.log.SaveCommentLogResponse other) {
-      if (other == com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(SaveCommentLogResponse other) {
+      if (other == SaveCommentLogResponse.getDefaultInstance()) return this;
       if (other.getCode() != 0) {
         setCode(other.getCode());
       }
@@ -400,23 +439,26 @@ public  final class SaveCommentLogResponse extends
         info_ = other.info_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.base.log.SaveCommentLogResponse parsedMessage = null;
+      SaveCommentLogResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.base.log.SaveCommentLogResponse) e.getUnfinishedMessage();
+        parsedMessage = (SaveCommentLogResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -429,12 +471,16 @@ public  final class SaveCommentLogResponse extends
     private int code_ ;
     /**
      * <code>int32 code = 1;</code>
+     * @return The code.
      */
+    @Override
     public int getCode() {
       return code_;
     }
     /**
      * <code>int32 code = 1;</code>
+     * @param value The code to set.
+     * @return This builder for chaining.
      */
     public Builder setCode(int value) {
       
@@ -444,6 +490,7 @@ public  final class SaveCommentLogResponse extends
     }
     /**
      * <code>int32 code = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearCode() {
       
@@ -452,32 +499,34 @@ public  final class SaveCommentLogResponse extends
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private Object info_ = "";
     /**
      * <code>string info = 2;</code>
+     * @return The info.
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getInfo() {
+      Object ref = info_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         info_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string info = 2;</code>
+     * @return The bytes for info.
      */
     public com.google.protobuf.ByteString
         getInfoBytes() {
-      java.lang.Object ref = info_;
+      Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         info_ = b;
         return b;
       } else {
@@ -486,9 +535,11 @@ public  final class SaveCommentLogResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -499,6 +550,7 @@ public  final class SaveCommentLogResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearInfo() {
       
@@ -508,6 +560,8 @@ public  final class SaveCommentLogResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The bytes for info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
@@ -520,14 +574,16 @@ public  final class SaveCommentLogResponse extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -535,22 +591,23 @@ public  final class SaveCommentLogResponse extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.base.log.SaveCommentLogResponse)
-  private static final com.ywt.gapi.base.log.SaveCommentLogResponse DEFAULT_INSTANCE;
+  private static final SaveCommentLogResponse DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.base.log.SaveCommentLogResponse();
+    DEFAULT_INSTANCE = new SaveCommentLogResponse();
   }
 
-  public static com.ywt.gapi.base.log.SaveCommentLogResponse getDefaultInstance() {
+  public static SaveCommentLogResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<SaveCommentLogResponse>
       PARSER = new com.google.protobuf.AbstractParser<SaveCommentLogResponse>() {
+    @Override
     public SaveCommentLogResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SaveCommentLogResponse(input, extensionRegistry);
+      return new SaveCommentLogResponse(input, extensionRegistry);
     }
   };
 
@@ -558,12 +615,13 @@ public  final class SaveCommentLogResponse extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<SaveCommentLogResponse> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.base.log.SaveCommentLogResponse getDefaultInstanceForType() {
+  @Override
+  public SaveCommentLogResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 4 - 1
src/main/java/com/ywt/gapi/base/log/SaveCommentLogResponseOrBuilder.java

@@ -9,15 +9,18 @@ public interface SaveCommentLogResponseOrBuilder extends
 
   /**
    * <code>int32 code = 1;</code>
+   * @return The code.
    */
   int getCode();
 
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  java.lang.String getInfo();
+  String getInfo();
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
   com.google.protobuf.ByteString
       getInfoBytes();

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 228 - 143
src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogRequest.java


+ 11 - 3
src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogRequestOrBuilder.java

@@ -13,14 +13,16 @@ public interface SaveOpenHisPushApiLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string path = 1;</code>
+   * @return The path.
    */
-  java.lang.String getPath();
+  String getPath();
   /**
    * <pre>
    * 请求路径
    * </pre>
    *
    * <code>string path = 1;</code>
+   * @return The bytes for path.
    */
   com.google.protobuf.ByteString
       getPathBytes();
@@ -31,14 +33,16 @@ public interface SaveOpenHisPushApiLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string req = 2;</code>
+   * @return The req.
    */
-  java.lang.String getReq();
+  String getReq();
   /**
    * <pre>
    * 请求json
    * </pre>
    *
    * <code>string req = 2;</code>
+   * @return The bytes for req.
    */
   com.google.protobuf.ByteString
       getReqBytes();
@@ -49,14 +53,16 @@ public interface SaveOpenHisPushApiLogRequestOrBuilder extends
    * </pre>
    *
    * <code>string res = 3;</code>
+   * @return The res.
    */
-  java.lang.String getRes();
+  String getRes();
   /**
    * <pre>
    * 响应json
    * </pre>
    *
    * <code>string res = 3;</code>
+   * @return The bytes for res.
    */
   com.google.protobuf.ByteString
       getResBytes();
@@ -67,6 +73,7 @@ public interface SaveOpenHisPushApiLogRequestOrBuilder extends
    * </pre>
    *
    * <code>int32 difftime = 4;</code>
+   * @return The difftime.
    */
   int getDifftime();
 
@@ -76,6 +83,7 @@ public interface SaveOpenHisPushApiLogRequestOrBuilder extends
    * </pre>
    *
    * <code>int32 httpStatus = 6;</code>
+   * @return The httpStatus.
    */
   int getHttpStatus();
 }

+ 154 - 96
src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogResponse.java

@@ -10,30 +10,41 @@ package com.ywt.gapi.base.log;
  *
  * Protobuf type {@code com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse}
  */
-public  final class SaveOpenHisPushApiLogResponse extends
+public final class SaveOpenHisPushApiLogResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse)
     SaveOpenHisPushApiLogResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SaveOpenHisPushApiLogResponse.newBuilder() to construct.
   private SaveOpenHisPushApiLogResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
   }
   private SaveOpenHisPushApiLogResponse() {
-    code_ = 0;
     info_ = "";
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new SaveOpenHisPushApiLogResponse();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SaveOpenHisPushApiLogResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    int mutable_bitField0_ = 0;
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,23 +53,24 @@ public  final class SaveOpenHisPushApiLogResponse extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             code_ = input.readInt32();
             break;
           }
           case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             info_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -67,57 +79,65 @@ public  final class SaveOpenHisPushApiLogResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor;
+    return LogProto.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_fieldAccessorTable
+    return LogProto.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.class, com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.Builder.class);
+            SaveOpenHisPushApiLogResponse.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
   private int code_;
   /**
    * <code>int32 code = 1;</code>
+   * @return The code.
    */
+  @Override
   public int getCode() {
     return code_;
   }
 
   public static final int INFO_FIELD_NUMBER = 2;
-  private volatile java.lang.Object info_;
+  private volatile Object info_;
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getInfo() {
+    Object ref = info_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       info_ = s;
       return s;
     }
   }
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
+  @Override
   public com.google.protobuf.ByteString
       getInfoBytes() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
+    Object ref = info_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       info_ = b;
       return b;
     } else {
@@ -126,6 +146,7 @@ public  final class SaveOpenHisPushApiLogResponse extends
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,16 +156,19 @@ public  final class SaveOpenHisPushApiLogResponse extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (code_ != 0) {
       output.writeInt32(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -154,33 +178,33 @@ public  final class SaveOpenHisPushApiLogResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse)) {
+    if (!(obj instanceof SaveOpenHisPushApiLogResponse)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse other = (com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse) obj;
+    SaveOpenHisPushApiLogResponse other = (SaveOpenHisPushApiLogResponse) obj;
 
-    boolean result = true;
-    result = result && (getCode()
-        == other.getCode());
-    result = result && getInfo()
-        .equals(other.getInfo());
-    return result;
+    if (getCode()
+        != other.getCode()) return false;
+    if (!getInfo()
+        .equals(other.getInfo())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -196,69 +220,69 @@ public  final class SaveOpenHisPushApiLogResponse extends
     return hash;
   }
 
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(byte[] data)
+  public static SaveOpenHisPushApiLogResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(java.io.InputStream input)
+  public static SaveOpenHisPushApiLogResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseDelimitedFrom(java.io.InputStream input)
+  public static SaveOpenHisPushApiLogResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseDelimitedFrom(
+  public static SaveOpenHisPushApiLogResponse parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parseFrom(
+  public static SaveOpenHisPushApiLogResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -266,21 +290,23 @@ public  final class SaveOpenHisPushApiLogResponse extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse prototype) {
+  public static Builder newBuilder(SaveOpenHisPushApiLogResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -294,17 +320,18 @@ public  final class SaveOpenHisPushApiLogResponse extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse)
-      com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponseOrBuilder {
+      SaveOpenHisPushApiLogResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor;
+      return LogProto.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_fieldAccessorTable
+      return LogProto.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.class, com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.Builder.class);
+              SaveOpenHisPushApiLogResponse.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.newBuilder()
@@ -313,7 +340,7 @@ public  final class SaveOpenHisPushApiLogResponse extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -322,6 +349,7 @@ public  final class SaveOpenHisPushApiLogResponse extends
               .alwaysUseFieldBuilders) {
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -331,68 +359,79 @@ public  final class SaveOpenHisPushApiLogResponse extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.base.log.Log.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor;
+      return LogProto.internal_static_com_ywt_gapi_base_log_SaveOpenHisPushApiLogResponse_descriptor;
     }
 
-    public com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse getDefaultInstanceForType() {
-      return com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance();
+    @Override
+    public SaveOpenHisPushApiLogResponse getDefaultInstanceForType() {
+      return SaveOpenHisPushApiLogResponse.getDefaultInstance();
     }
 
-    public com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse build() {
-      com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse result = buildPartial();
+    @Override
+    public SaveOpenHisPushApiLogResponse build() {
+      SaveOpenHisPushApiLogResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse buildPartial() {
-      com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse result = new com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse(this);
+    @Override
+    public SaveOpenHisPushApiLogResponse buildPartial() {
+      SaveOpenHisPushApiLogResponse result = new SaveOpenHisPushApiLogResponse(this);
       result.code_ = code_;
       result.info_ = info_;
       onBuilt();
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse) {
-        return mergeFrom((com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse)other);
+      if (other instanceof SaveOpenHisPushApiLogResponse) {
+        return mergeFrom((SaveOpenHisPushApiLogResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse other) {
-      if (other == com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(SaveOpenHisPushApiLogResponse other) {
+      if (other == SaveOpenHisPushApiLogResponse.getDefaultInstance()) return this;
       if (other.getCode() != 0) {
         setCode(other.getCode());
       }
@@ -400,23 +439,26 @@ public  final class SaveOpenHisPushApiLogResponse extends
         info_ = other.info_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse parsedMessage = null;
+      SaveOpenHisPushApiLogResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse) e.getUnfinishedMessage();
+        parsedMessage = (SaveOpenHisPushApiLogResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -429,12 +471,16 @@ public  final class SaveOpenHisPushApiLogResponse extends
     private int code_ ;
     /**
      * <code>int32 code = 1;</code>
+     * @return The code.
      */
+    @Override
     public int getCode() {
       return code_;
     }
     /**
      * <code>int32 code = 1;</code>
+     * @param value The code to set.
+     * @return This builder for chaining.
      */
     public Builder setCode(int value) {
       
@@ -444,6 +490,7 @@ public  final class SaveOpenHisPushApiLogResponse extends
     }
     /**
      * <code>int32 code = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearCode() {
       
@@ -452,32 +499,34 @@ public  final class SaveOpenHisPushApiLogResponse extends
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private Object info_ = "";
     /**
      * <code>string info = 2;</code>
+     * @return The info.
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getInfo() {
+      Object ref = info_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         info_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string info = 2;</code>
+     * @return The bytes for info.
      */
     public com.google.protobuf.ByteString
         getInfoBytes() {
-      java.lang.Object ref = info_;
+      Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         info_ = b;
         return b;
       } else {
@@ -486,9 +535,11 @@ public  final class SaveOpenHisPushApiLogResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -499,6 +550,7 @@ public  final class SaveOpenHisPushApiLogResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearInfo() {
       
@@ -508,6 +560,8 @@ public  final class SaveOpenHisPushApiLogResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The bytes for info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
@@ -520,14 +574,16 @@ public  final class SaveOpenHisPushApiLogResponse extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -535,22 +591,23 @@ public  final class SaveOpenHisPushApiLogResponse extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse)
-  private static final com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse DEFAULT_INSTANCE;
+  private static final SaveOpenHisPushApiLogResponse DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse();
+    DEFAULT_INSTANCE = new SaveOpenHisPushApiLogResponse();
   }
 
-  public static com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse getDefaultInstance() {
+  public static SaveOpenHisPushApiLogResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<SaveOpenHisPushApiLogResponse>
       PARSER = new com.google.protobuf.AbstractParser<SaveOpenHisPushApiLogResponse>() {
+    @Override
     public SaveOpenHisPushApiLogResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SaveOpenHisPushApiLogResponse(input, extensionRegistry);
+      return new SaveOpenHisPushApiLogResponse(input, extensionRegistry);
     }
   };
 
@@ -558,12 +615,13 @@ public  final class SaveOpenHisPushApiLogResponse extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<SaveOpenHisPushApiLogResponse> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse getDefaultInstanceForType() {
+  @Override
+  public SaveOpenHisPushApiLogResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 4 - 1
src/main/java/com/ywt/gapi/base/log/SaveOpenHisPushApiLogResponseOrBuilder.java

@@ -9,15 +9,18 @@ public interface SaveOpenHisPushApiLogResponseOrBuilder extends
 
   /**
    * <code>int32 code = 1;</code>
+   * @return The code.
    */
   int getCode();
 
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  java.lang.String getInfo();
+  String getInfo();
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
   com.google.protobuf.ByteString
       getInfoBytes();

+ 71 - 313
src/main/java/com/ywt/gapi/base/log/YWTLogService.java

@@ -1,328 +1,86 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: log.proto
-
-package com.ywt.gapi.base.log;
-
-/**
- * <pre>
- *医务通日志服务  // 对应 base-service 项目的 log.js 文件
- * </pre>
- *
- * Protobuf service {@code com.ywt.gapi.base.log.YWTLogService}
- */
-public  abstract class YWTLogService
-    implements com.google.protobuf.Service {
-  protected YWTLogService() {}
-
-  public interface Interface {
-    /**
-     * <pre>
-     * 记录日志
-     * </pre>
-     *
-     * <code>rpc saveCommentLog(.com.ywt.gapi.base.log.SaveCommentLogRequest) returns (.com.ywt.gapi.base.log.SaveCommentLogResponse);</code>
-     */
-    public abstract void saveCommentLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveCommentLogRequest request,
-        com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveCommentLogResponse> done);
-
-    /**
-     * <pre>
-     * 保存his外转处方日志
-     * </pre>
-     *
-     * <code>rpc saveOpenHisPushApiLog(.com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest) returns (.com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse);</code>
-     */
-    public abstract void saveOpenHisPushApiLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request,
-        com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> done);
-
-  }
-
-  public static com.google.protobuf.Service newReflectiveService(
-      final Interface impl) {
-    return new YWTLogService() {
-      @java.lang.Override
-      public  void saveCommentLog(
-          com.google.protobuf.RpcController controller,
-          com.ywt.gapi.base.log.SaveCommentLogRequest request,
-          com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveCommentLogResponse> done) {
-        impl.saveCommentLog(controller, request, done);
-      }
-
-      @java.lang.Override
-      public  void saveOpenHisPushApiLog(
-          com.google.protobuf.RpcController controller,
-          com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request,
-          com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> done) {
-        impl.saveOpenHisPushApiLog(controller, request, done);
-      }
-
-    };
-  }
-
-  public static com.google.protobuf.BlockingService
-      newReflectiveBlockingService(final BlockingInterface impl) {
-    return new com.google.protobuf.BlockingService() {
-      public final com.google.protobuf.Descriptors.ServiceDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-
-      public final com.google.protobuf.Message callBlockingMethod(
-          com.google.protobuf.Descriptors.MethodDescriptor method,
-          com.google.protobuf.RpcController controller,
-          com.google.protobuf.Message request)
-          throws com.google.protobuf.ServiceException {
-        if (method.getService() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "Service.callBlockingMethod() given method descriptor for " +
-            "wrong service type.");
-        }
-        switch(method.getIndex()) {
-          case 0:
-            return impl.saveCommentLog(controller, (com.ywt.gapi.base.log.SaveCommentLogRequest)request);
-          case 1:
-            return impl.saveOpenHisPushApiLog(controller, (com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest)request);
-          default:
-            throw new java.lang.AssertionError("Can't get here.");
-        }
-      }
-
-      public final com.google.protobuf.Message
-          getRequestPrototype(
-          com.google.protobuf.Descriptors.MethodDescriptor method) {
-        if (method.getService() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "Service.getRequestPrototype() given method " +
-            "descriptor for wrong service type.");
-        }
-        switch(method.getIndex()) {
-          case 0:
-            return com.ywt.gapi.base.log.SaveCommentLogRequest.getDefaultInstance();
-          case 1:
-            return com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest.getDefaultInstance();
-          default:
-            throw new java.lang.AssertionError("Can't get here.");
-        }
-      }
-
-      public final com.google.protobuf.Message
-          getResponsePrototype(
-          com.google.protobuf.Descriptors.MethodDescriptor method) {
-        if (method.getService() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "Service.getResponsePrototype() given method " +
-            "descriptor for wrong service type.");
-        }
-        switch(method.getIndex()) {
-          case 0:
-            return com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance();
-          case 1:
-            return com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance();
-          default:
-            throw new java.lang.AssertionError("Can't get here.");
-        }
-      }
-
-    };
-  }
-
-  /**
-   * <pre>
-   * 记录日志
-   * </pre>
-   *
-   * <code>rpc saveCommentLog(.com.ywt.gapi.base.log.SaveCommentLogRequest) returns (.com.ywt.gapi.base.log.SaveCommentLogResponse);</code>
-   */
-  public abstract void saveCommentLog(
-      com.google.protobuf.RpcController controller,
-      com.ywt.gapi.base.log.SaveCommentLogRequest request,
-      com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveCommentLogResponse> done);
-
-  /**
-   * <pre>
-   * 保存his外转处方日志
-   * </pre>
-   *
-   * <code>rpc saveOpenHisPushApiLog(.com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest) returns (.com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse);</code>
-   */
-  public abstract void saveOpenHisPushApiLog(
-      com.google.protobuf.RpcController controller,
-      com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request,
-      com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> done);
-
-  public static final
-      com.google.protobuf.Descriptors.ServiceDescriptor
-      getDescriptor() {
-    return com.ywt.gapi.base.log.Log.getDescriptor().getServices().get(0);
-  }
-  public final com.google.protobuf.Descriptors.ServiceDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-
-  public final void callMethod(
-      com.google.protobuf.Descriptors.MethodDescriptor method,
-      com.google.protobuf.RpcController controller,
-      com.google.protobuf.Message request,
-      com.google.protobuf.RpcCallback<
-        com.google.protobuf.Message> done) {
-    if (method.getService() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "Service.callMethod() given method descriptor for wrong " +
-        "service type.");
-    }
-    switch(method.getIndex()) {
-      case 0:
-        this.saveCommentLog(controller, (com.ywt.gapi.base.log.SaveCommentLogRequest)request,
-          com.google.protobuf.RpcUtil.<com.ywt.gapi.base.log.SaveCommentLogResponse>specializeCallback(
-            done));
-        return;
-      case 1:
-        this.saveOpenHisPushApiLog(controller, (com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest)request,
-          com.google.protobuf.RpcUtil.<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse>specializeCallback(
-            done));
-        return;
-      default:
-        throw new java.lang.AssertionError("Can't get here.");
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+    package com.ywt.gapi.base.log;
+
+import org.apache.dubbo.common.stream.StreamObserver;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface YWTLogService extends org.apache.dubbo.rpc.model.DubboStub {
+
+    String JAVA_SERVICE_NAME = "com.ywt.gapi.base.log.YWTLogService";
+    String SERVICE_NAME = "com.ywt.gapi.base.log.YWTLogService";
+
+        /**
+         * <pre>
+         *  日志分类编码,自定义
+         * </pre>
+         */
+    SaveCommentLogResponse saveCommentLog(SaveCommentLogRequest request);
+
+    default CompletableFuture<SaveCommentLogResponse> saveCommentLogAsync(SaveCommentLogRequest request){
+        return CompletableFuture.completedFuture(saveCommentLog(request));
     }
-  }
 
-  public final com.google.protobuf.Message
-      getRequestPrototype(
-      com.google.protobuf.Descriptors.MethodDescriptor method) {
-    if (method.getService() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "Service.getRequestPrototype() given method " +
-        "descriptor for wrong service type.");
-    }
-    switch(method.getIndex()) {
-      case 0:
-        return com.ywt.gapi.base.log.SaveCommentLogRequest.getDefaultInstance();
-      case 1:
-        return com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest.getDefaultInstance();
-      default:
-        throw new java.lang.AssertionError("Can't get here.");
-    }
-  }
-
-  public final com.google.protobuf.Message
-      getResponsePrototype(
-      com.google.protobuf.Descriptors.MethodDescriptor method) {
-    if (method.getService() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "Service.getResponsePrototype() given method " +
-        "descriptor for wrong service type.");
-    }
-    switch(method.getIndex()) {
-      case 0:
-        return com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance();
-      case 1:
-        return com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance();
-      default:
-        throw new java.lang.AssertionError("Can't get here.");
-    }
-  }
-
-  public static Stub newStub(
-      com.google.protobuf.RpcChannel channel) {
-    return new Stub(channel);
-  }
-
-  public static final class Stub extends com.ywt.gapi.base.log.YWTLogService implements Interface {
-    private Stub(com.google.protobuf.RpcChannel channel) {
-      this.channel = channel;
-    }
-
-    private final com.google.protobuf.RpcChannel channel;
-
-    public com.google.protobuf.RpcChannel getChannel() {
-      return channel;
+    /**
+    * This server stream type unary method is <b>only</b> used for generated stub to support async unary method.
+    * It will not be called if you are NOT using Dubbo3 generated triple stub and <b>DO NOT</b> implement this method.
+    */
+    default void saveCommentLog(SaveCommentLogRequest request, StreamObserver<SaveCommentLogResponse> responseObserver){
+        saveCommentLogAsync(request).whenComplete((r, t) -> {
+            if (t != null) {
+                responseObserver.onError(t);
+            } else {
+                responseObserver.onNext(r);
+                responseObserver.onCompleted();
+            }
+        });
     }
 
-    public  void saveCommentLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveCommentLogRequest request,
-        com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveCommentLogResponse> done) {
-      channel.callMethod(
-        getDescriptor().getMethods().get(0),
-        controller,
-        request,
-        com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance(),
-        com.google.protobuf.RpcUtil.generalizeCallback(
-          done,
-          com.ywt.gapi.base.log.SaveCommentLogResponse.class,
-          com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance()));
-    }
+        /**
+         * <pre>
+         *  日志分类描述,自定义
+         * </pre>
+         */
+    SaveOpenHisPushApiLogResponse saveOpenHisPushApiLog(SaveOpenHisPushApiLogRequest request);
 
-    public  void saveOpenHisPushApiLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request,
-        com.google.protobuf.RpcCallback<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> done) {
-      channel.callMethod(
-        getDescriptor().getMethods().get(1),
-        controller,
-        request,
-        com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance(),
-        com.google.protobuf.RpcUtil.generalizeCallback(
-          done,
-          com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.class,
-          com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance()));
+    default CompletableFuture<SaveOpenHisPushApiLogResponse> saveOpenHisPushApiLogAsync(SaveOpenHisPushApiLogRequest request){
+        return CompletableFuture.completedFuture(saveOpenHisPushApiLog(request));
     }
-  }
-
-  public static BlockingInterface newBlockingStub(
-      com.google.protobuf.BlockingRpcChannel channel) {
-    return new BlockingStub(channel);
-  }
-
-  public interface BlockingInterface {
-    public com.ywt.gapi.base.log.SaveCommentLogResponse saveCommentLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveCommentLogRequest request)
-        throws com.google.protobuf.ServiceException;
-
-    public com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse saveOpenHisPushApiLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request)
-        throws com.google.protobuf.ServiceException;
-  }
 
-  private static final class BlockingStub implements BlockingInterface {
-    private BlockingStub(com.google.protobuf.BlockingRpcChannel channel) {
-      this.channel = channel;
+    /**
+    * This server stream type unary method is <b>only</b> used for generated stub to support async unary method.
+    * It will not be called if you are NOT using Dubbo3 generated triple stub and <b>DO NOT</b> implement this method.
+    */
+    default void saveOpenHisPushApiLog(SaveOpenHisPushApiLogRequest request, StreamObserver<SaveOpenHisPushApiLogResponse> responseObserver){
+        saveOpenHisPushApiLogAsync(request).whenComplete((r, t) -> {
+            if (t != null) {
+                responseObserver.onError(t);
+            } else {
+                responseObserver.onNext(r);
+                responseObserver.onCompleted();
+            }
+        });
     }
 
-    private final com.google.protobuf.BlockingRpcChannel channel;
 
-    public com.ywt.gapi.base.log.SaveCommentLogResponse saveCommentLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveCommentLogRequest request)
-        throws com.google.protobuf.ServiceException {
-      return (com.ywt.gapi.base.log.SaveCommentLogResponse) channel.callBlockingMethod(
-        getDescriptor().getMethods().get(0),
-        controller,
-        request,
-        com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance());
-    }
 
 
-    public com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse saveOpenHisPushApiLog(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request)
-        throws com.google.protobuf.ServiceException {
-      return (com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse) channel.callBlockingMethod(
-        getDescriptor().getMethods().get(1),
-        controller,
-        request,
-        com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance());
-    }
 
-  }
 
-  // @@protoc_insertion_point(class_scope:com.ywt.gapi.base.log.YWTLogService)
 }
-

+ 0 - 357
src/main/java/com/ywt/gapi/base/log/YWTLogServiceGrpc.java

@@ -1,357 +0,0 @@
-package com.ywt.gapi.base.log;
-
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
-import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
-import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
-
-/**
- * <pre>
- *医务通日志服务  // 对应 base-service 项目的 log.js 文件
- * </pre>
- */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.2-SNAPSHOT)",
-    comments = "Source: log.proto")
-public final class YWTLogServiceGrpc {
-
-  private YWTLogServiceGrpc() {}
-
-  public static final String SERVICE_NAME = "com.ywt.gapi.base.log.YWTLogService";
-
-  // Static method descriptors that strictly reflect the proto.
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static final io.grpc.MethodDescriptor<com.ywt.gapi.base.log.SaveCommentLogRequest,
-      com.ywt.gapi.base.log.SaveCommentLogResponse> METHOD_SAVE_COMMENT_LOG =
-      io.grpc.MethodDescriptor.<com.ywt.gapi.base.log.SaveCommentLogRequest, com.ywt.gapi.base.log.SaveCommentLogResponse>newBuilder()
-          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName(generateFullMethodName(
-              "com.ywt.gapi.base.log.YWTLogService", "saveCommentLog"))
-          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              com.ywt.gapi.base.log.SaveCommentLogRequest.getDefaultInstance()))
-          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              com.ywt.gapi.base.log.SaveCommentLogResponse.getDefaultInstance()))
-          .setSchemaDescriptor(new YWTLogServiceMethodDescriptorSupplier("saveCommentLog"))
-          .build();
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static final io.grpc.MethodDescriptor<com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest,
-      com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> METHOD_SAVE_OPEN_HIS_PUSH_API_LOG =
-      io.grpc.MethodDescriptor.<com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest, com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse>newBuilder()
-          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName(generateFullMethodName(
-              "com.ywt.gapi.base.log.YWTLogService", "saveOpenHisPushApiLog"))
-          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest.getDefaultInstance()))
-          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse.getDefaultInstance()))
-          .setSchemaDescriptor(new YWTLogServiceMethodDescriptorSupplier("saveOpenHisPushApiLog"))
-          .build();
-
-  /**
-   * Creates a new async stub that supports all call types for the service
-   */
-  public static YWTLogServiceStub newStub(io.grpc.Channel channel) {
-    return new YWTLogServiceStub(channel);
-  }
-
-  /**
-   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
-   */
-  public static YWTLogServiceBlockingStub newBlockingStub(
-      io.grpc.Channel channel) {
-    return new YWTLogServiceBlockingStub(channel);
-  }
-
-  /**
-   * Creates a new ListenableFuture-style stub that supports unary calls on the service
-   */
-  public static YWTLogServiceFutureStub newFutureStub(
-      io.grpc.Channel channel) {
-    return new YWTLogServiceFutureStub(channel);
-  }
-
-  /**
-   * <pre>
-   *医务通日志服务  // 对应 base-service 项目的 log.js 文件
-   * </pre>
-   */
-  public static abstract class YWTLogServiceImplBase implements io.grpc.BindableService {
-
-    /**
-     * <pre>
-     * 记录日志
-     * </pre>
-     */
-    public void saveCommentLog(com.ywt.gapi.base.log.SaveCommentLogRequest request,
-        io.grpc.stub.StreamObserver<com.ywt.gapi.base.log.SaveCommentLogResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(METHOD_SAVE_COMMENT_LOG, responseObserver);
-    }
-
-    /**
-     * <pre>
-     * 保存his外转处方日志
-     * </pre>
-     */
-    public void saveOpenHisPushApiLog(com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request,
-        io.grpc.stub.StreamObserver<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(METHOD_SAVE_OPEN_HIS_PUSH_API_LOG, responseObserver);
-    }
-
-    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-            METHOD_SAVE_COMMENT_LOG,
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.ywt.gapi.base.log.SaveCommentLogRequest,
-                com.ywt.gapi.base.log.SaveCommentLogResponse>(
-                  this, METHODID_SAVE_COMMENT_LOG)))
-          .addMethod(
-            METHOD_SAVE_OPEN_HIS_PUSH_API_LOG,
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest,
-                com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse>(
-                  this, METHODID_SAVE_OPEN_HIS_PUSH_API_LOG)))
-          .build();
-    }
-  }
-
-  /**
-   * <pre>
-   *医务通日志服务  // 对应 base-service 项目的 log.js 文件
-   * </pre>
-   */
-  public static final class YWTLogServiceStub extends io.grpc.stub.AbstractStub<YWTLogServiceStub> {
-    private YWTLogServiceStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private YWTLogServiceStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected YWTLogServiceStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new YWTLogServiceStub(channel, callOptions);
-    }
-
-    /**
-     * <pre>
-     * 记录日志
-     * </pre>
-     */
-    public void saveCommentLog(com.ywt.gapi.base.log.SaveCommentLogRequest request,
-        io.grpc.stub.StreamObserver<com.ywt.gapi.base.log.SaveCommentLogResponse> responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(METHOD_SAVE_COMMENT_LOG, getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * <pre>
-     * 保存his外转处方日志
-     * </pre>
-     */
-    public void saveOpenHisPushApiLog(com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request,
-        io.grpc.stub.StreamObserver<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(METHOD_SAVE_OPEN_HIS_PUSH_API_LOG, getCallOptions()), request, responseObserver);
-    }
-  }
-
-  /**
-   * <pre>
-   *医务通日志服务  // 对应 base-service 项目的 log.js 文件
-   * </pre>
-   */
-  public static final class YWTLogServiceBlockingStub extends io.grpc.stub.AbstractStub<YWTLogServiceBlockingStub> {
-    private YWTLogServiceBlockingStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private YWTLogServiceBlockingStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected YWTLogServiceBlockingStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new YWTLogServiceBlockingStub(channel, callOptions);
-    }
-
-    /**
-     * <pre>
-     * 记录日志
-     * </pre>
-     */
-    public com.ywt.gapi.base.log.SaveCommentLogResponse saveCommentLog(com.ywt.gapi.base.log.SaveCommentLogRequest request) {
-      return blockingUnaryCall(
-          getChannel(), METHOD_SAVE_COMMENT_LOG, getCallOptions(), request);
-    }
-
-    /**
-     * <pre>
-     * 保存his外转处方日志
-     * </pre>
-     */
-    public com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse saveOpenHisPushApiLog(com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request) {
-      return blockingUnaryCall(
-          getChannel(), METHOD_SAVE_OPEN_HIS_PUSH_API_LOG, getCallOptions(), request);
-    }
-  }
-
-  /**
-   * <pre>
-   *医务通日志服务  // 对应 base-service 项目的 log.js 文件
-   * </pre>
-   */
-  public static final class YWTLogServiceFutureStub extends io.grpc.stub.AbstractStub<YWTLogServiceFutureStub> {
-    private YWTLogServiceFutureStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private YWTLogServiceFutureStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected YWTLogServiceFutureStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new YWTLogServiceFutureStub(channel, callOptions);
-    }
-
-    /**
-     * <pre>
-     * 记录日志
-     * </pre>
-     */
-    public com.google.common.util.concurrent.ListenableFuture<com.ywt.gapi.base.log.SaveCommentLogResponse> saveCommentLog(
-        com.ywt.gapi.base.log.SaveCommentLogRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(METHOD_SAVE_COMMENT_LOG, getCallOptions()), request);
-    }
-
-    /**
-     * <pre>
-     * 保存his外转处方日志
-     * </pre>
-     */
-    public com.google.common.util.concurrent.ListenableFuture<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse> saveOpenHisPushApiLog(
-        com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(METHOD_SAVE_OPEN_HIS_PUSH_API_LOG, getCallOptions()), request);
-    }
-  }
-
-  private static final int METHODID_SAVE_COMMENT_LOG = 0;
-  private static final int METHODID_SAVE_OPEN_HIS_PUSH_API_LOG = 1;
-
-  private static final class MethodHandlers<Req, Resp> implements
-      io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
-      io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
-      io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
-      io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
-    private final YWTLogServiceImplBase serviceImpl;
-    private final int methodId;
-
-    MethodHandlers(YWTLogServiceImplBase serviceImpl, int methodId) {
-      this.serviceImpl = serviceImpl;
-      this.methodId = methodId;
-    }
-
-    @java.lang.Override
-    @java.lang.SuppressWarnings("unchecked")
-    public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
-      switch (methodId) {
-        case METHODID_SAVE_COMMENT_LOG:
-          serviceImpl.saveCommentLog((com.ywt.gapi.base.log.SaveCommentLogRequest) request,
-              (io.grpc.stub.StreamObserver<com.ywt.gapi.base.log.SaveCommentLogResponse>) responseObserver);
-          break;
-        case METHODID_SAVE_OPEN_HIS_PUSH_API_LOG:
-          serviceImpl.saveOpenHisPushApiLog((com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest) request,
-              (io.grpc.stub.StreamObserver<com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse>) responseObserver);
-          break;
-        default:
-          throw new AssertionError();
-      }
-    }
-
-    @java.lang.Override
-    @java.lang.SuppressWarnings("unchecked")
-    public io.grpc.stub.StreamObserver<Req> invoke(
-        io.grpc.stub.StreamObserver<Resp> responseObserver) {
-      switch (methodId) {
-        default:
-          throw new AssertionError();
-      }
-    }
-  }
-
-  private static abstract class YWTLogServiceBaseDescriptorSupplier
-      implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
-    YWTLogServiceBaseDescriptorSupplier() {}
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return com.ywt.gapi.base.log.Log.getDescriptor();
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
-      return getFileDescriptor().findServiceByName("YWTLogService");
-    }
-  }
-
-  private static final class YWTLogServiceFileDescriptorSupplier
-      extends YWTLogServiceBaseDescriptorSupplier {
-    YWTLogServiceFileDescriptorSupplier() {}
-  }
-
-  private static final class YWTLogServiceMethodDescriptorSupplier
-      extends YWTLogServiceBaseDescriptorSupplier
-      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
-
-    YWTLogServiceMethodDescriptorSupplier(String methodName) {
-      this.methodName = methodName;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
-      return getServiceDescriptor().findMethodByName(methodName);
-    }
-  }
-
-  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
-
-  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
-    io.grpc.ServiceDescriptor result = serviceDescriptor;
-    if (result == null) {
-      synchronized (YWTLogServiceGrpc.class) {
-        result = serviceDescriptor;
-        if (result == null) {
-          serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
-              .setSchemaDescriptor(new YWTLogServiceFileDescriptorSupplier())
-              .addMethod(METHOD_SAVE_COMMENT_LOG)
-              .addMethod(METHOD_SAVE_OPEN_HIS_PUSH_API_LOG)
-              .build();
-        }
-      }
-    }
-    return result;
-  }
-}

+ 16 - 24
src/main/java/com/ywt/gapi/drug/Drug.java → src/main/java/com/ywt/gapi/drug/DrugProto.java

@@ -3,8 +3,8 @@
 
 package com.ywt.gapi.drug;
 
-public final class Drug {
-  private Drug() {}
+public final class DrugProto {
+  private DrugProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -42,7 +42,7 @@ public final class Drug {
   private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    java.lang.String[] descriptorData = {
+    String[] descriptorData = {
       "\n\ndrug.proto\022\021com.ywt.gapi.drug\"\315\017\n\020Pres" +
       "criptionInfo\022\r\n\005no3th\030\001 \001(\t\022\022\n\ndoctorNam" +
       "e\030\002 \001(\t\022\023\n\013patientName\030\003 \001(\t\022\022\n\npatientA" +
@@ -52,7 +52,7 @@ public final class Drug {
       "\nhosptialId\030\014 \001(\005\022\022\n\norgCode3th\030\r \001(\t\022G\n" +
       "\005drugs\030\016 \003(\01328.com.ywt.gapi.drug.Prescri" +
       "ptionInfo.PrescriptionDrugInfo\022\022\n\ntotalP" +
-      "rice\030\017 \001(\005\022\016\n\006status\030\020 \001(\005\022\021\n\tstatusStr\030",
+      "rice\030\017 \001(\005\022\016\n\006status\030\020 \001(\005\022\021\n\tstatusStr\030" +
       "\021 \001(\t\022\020\n\010createOn\030\022 \001(\003\022\021\n\tpayStatus\030\023 \001" +
       "(\005\022\023\n\013createOnStr\030\024 \001(\t\022\025\n\rpatientMobile" +
       "\030\025 \001(\t\022\023\n\013description\030\026 \001(\t\022\027\n\017allergicH" +
@@ -62,7 +62,7 @@ public final class Drug {
       "Id\030\035 \001(\005\022\026\n\016deliveryMethod\030\036 \001(\005\022\016\n\006send" +
       "No\030\037 \001(\t\022\021\n\tqrCodeUrl\030  \001(\t\022\027\n\017pharmacyA" +
       "ddress\030! \001(\t\022\024\n\014pharmacyName\030\" \001(\t\022\021\n\tfi" +
-      "nshTime\030# \001(\003\022\020\n\010doctorId\030$ \001(\005\022\022\n\nindiv",
+      "nshTime\030# \001(\003\022\020\n\010doctorId\030$ \001(\005\022\022\n\nindiv" +
       "idual\030% \001(\005\022\021\n\textStatus\030& \001(\005\022\027\n\017needPr" +
       "intStatus\030\' \001(\005\022\017\n\007freight\030( \001(\005\022\020\n\010idCa" +
       "rdNo\030) \001(\t\022\022\n\npharmacyId\030* \001(\005\022\030\n\020prescr" +
@@ -72,7 +72,7 @@ public final class Drug {
       "ime\0301 \001(\003\022\026\n\016invoiceEndTime\0302 \001(\t\022\020\n\010ter" +
       "minal\0303 \001(\005\022\027\n\017hisOeoriOrderId\0304 \001(\t\022\024\n\014" +
       "hisPatientId\0305 \001(\t\022\025\n\rhisClinicCode\0306 \001(" +
-      "\t\022\024\n\014cancelStatus\0307 \001(\005\022\024\n\014cancelRemark\030",
+      "\t\022\024\n\014cancelStatus\0307 \001(\005\022\024\n\014cancelRemark\030" +
       "8 \001(\t\022\025\n\rpatientAgeInt\0309 \001(\005\022\025\n\rpatientS" +
       "exInt\030: \001(\005\022\020\n\010icdCodes\030; \001(\t\022\026\n\016patient" +
       "Address\030< \001(\t\022\017\n\007remarks\030= \001(\t\022\027\n\017addres" +
@@ -82,7 +82,7 @@ public final class Drug {
       "\n\toneDosage\030\003 \001(\001\022\025\n\roneDosageUnit\030\004 \001(\t" +
       "\022\016\n\006amount\030\005 \001(\005\022\r\n\005units\030\006 \001(\t\022\025\n\rfrequ" +
       "encyCode\030\007 \001(\t\022\021\n\tfrequency\030\010 \001(\t\022\024\n\014fre" +
-      "quencyQty\030\t \001(\005\022\021\n\tusageCode\030\n \001(\t\022\r\n\005us",
+      "quencyQty\030\t \001(\005\022\021\n\tusageCode\030\n \001(\t\022\r\n\005us" +
       "age\030\013 \001(\t\022\r\n\005price\030\014 \001(\005\022\020\n\010drugName\030\r \001" +
       "(\t\022\020\n\010drugSpec\030\016 \001(\t\022\020\n\010quantity\030\017 \001(\005\022\r" +
       "\n\005total\030\020 \001(\005\022\016\n\006course\030\021 \001(\005\022\r\n\005group\030\022" +
@@ -92,7 +92,7 @@ public final class Drug {
       "(\t\022\027\n\017oneDosageDetail\030\031 \001(\t\022\024\n\014usageRema" +
       "rks\030\032 \001(\t\022\025\n\rdrugPrintName\030\033 \001(\t\022\031\n\021drug" +
       "Refrigeration\030\034 \001(\t\022\016\n\006drugId\030\035 \001(\005\022\020\n\010p" +
-      "roducer\030\036 \001(\t\022\022\n\nspecDosage\030\037 \001(\001\022\020\n\010adv",
+      "roducer\030\036 \001(\t\022\022\n\nspecDosage\030\037 \001(\001\022\020\n\010adv" +
       "iceId\030  \001(\t\022\022\n\nadviceFlag\030! \001(\005\"q\n!SaveH" +
       "isOpenApiPrescriptionRequest\022>\n\021prescrip" +
       "tionInfos\030\001 \003(\0132#.com.ywt.gapi.drug.Pres" +
@@ -102,45 +102,37 @@ public final class Drug {
       "\t2\231\001\n\013DrugService\022\211\001\n\032saveHisOpenApiPres" +
       "cription\0224.com.ywt.gapi.drug.SaveHisOpen" +
       "ApiPrescriptionRequest\0325.com.ywt.gapi.dr" +
-      "ug.SaveHisOpenApiPrescriptionResponseB\030\n",
-      "\021com.ywt.gapi.drugP\001\210\001\001b\006proto3"
+      "ug.SaveHisOpenApiPrescriptionResponseB \n" +
+      "\021com.ywt.gapi.drugB\tDrugProtoP\001b\006proto3"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
+        });
     internal_static_com_ywt_gapi_drug_PrescriptionInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_com_ywt_gapi_drug_PrescriptionInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_drug_PrescriptionInfo_descriptor,
-        new java.lang.String[] { "No3Th", "DoctorName", "PatientName", "PatientAge", "PatientSex", "PatientNo", "Diagnose", "Dept", "Source", "HosptialCode", "HosptialId", "OrgCode3Th", "Drugs", "TotalPrice", "Status", "StatusStr", "CreateOn", "PayStatus", "CreateOnStr", "PatientMobile", "Description", "AllergicHistory", "DoctorSignId", "PrescriptionId", "BizNo", "UserId", "HisOrderNo", "AddressId", "DeliveryMethod", "SendNo", "QrCodeUrl", "PharmacyAddress", "PharmacyName", "FinshTime", "DoctorId", "Individual", "ExtStatus", "NeedPrintStatus", "Freight", "IdCardNo", "PharmacyId", "PrescriptionDate", "TimeStandard", "OrderNo", "OrderId", "RefundNo", "RefundStatus", "PayTime", "InvoiceEndTime", "Terminal", "HisOeoriOrderId", "HisPatientId", "HisClinicCode", "CancelStatus", "CancelRemark", "PatientAgeInt", "PatientSexInt", "IcdCodes", "PatientAddress", "Remarks", "AddressModified", "PostSource", "Presctype", });
+        new String[] { "No3Th", "DoctorName", "PatientName", "PatientAge", "PatientSex", "PatientNo", "Diagnose", "Dept", "Source", "HosptialCode", "HosptialId", "OrgCode3Th", "Drugs", "TotalPrice", "Status", "StatusStr", "CreateOn", "PayStatus", "CreateOnStr", "PatientMobile", "Description", "AllergicHistory", "DoctorSignId", "PrescriptionId", "BizNo", "UserId", "HisOrderNo", "AddressId", "DeliveryMethod", "SendNo", "QrCodeUrl", "PharmacyAddress", "PharmacyName", "FinshTime", "DoctorId", "Individual", "ExtStatus", "NeedPrintStatus", "Freight", "IdCardNo", "PharmacyId", "PrescriptionDate", "TimeStandard", "OrderNo", "OrderId", "RefundNo", "RefundStatus", "PayTime", "InvoiceEndTime", "Terminal", "HisOeoriOrderId", "HisPatientId", "HisClinicCode", "CancelStatus", "CancelRemark", "PatientAgeInt", "PatientSexInt", "IcdCodes", "PatientAddress", "Remarks", "AddressModified", "PostSource", "Presctype", });
     internal_static_com_ywt_gapi_drug_PrescriptionInfo_PrescriptionDrugInfo_descriptor =
       internal_static_com_ywt_gapi_drug_PrescriptionInfo_descriptor.getNestedTypes().get(0);
     internal_static_com_ywt_gapi_drug_PrescriptionInfo_PrescriptionDrugInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_drug_PrescriptionInfo_PrescriptionDrugInfo_descriptor,
-        new java.lang.String[] { "DrugCode", "DrugCode3Th", "OneDosage", "OneDosageUnit", "Amount", "Units", "FrequencyCode", "Frequency", "FrequencyQty", "UsageCode", "Usage", "Price", "DrugName", "DrugSpec", "Quantity", "Total", "Course", "Group", "OrderIndex", "Combination", "Remark", "ExecuteDate", "Injections", "PackDetail", "OneDosageDetail", "UsageRemarks", "DrugPrintName", "DrugRefrigeration", "DrugId", "Producer", "SpecDosage", "AdviceId", "AdviceFlag", });
+        new String[] { "DrugCode", "DrugCode3Th", "OneDosage", "OneDosageUnit", "Amount", "Units", "FrequencyCode", "Frequency", "FrequencyQty", "UsageCode", "Usage", "Price", "DrugName", "DrugSpec", "Quantity", "Total", "Course", "Group", "OrderIndex", "Combination", "Remark", "ExecuteDate", "Injections", "PackDetail", "OneDosageDetail", "UsageRemarks", "DrugPrintName", "DrugRefrigeration", "DrugId", "Producer", "SpecDosage", "AdviceId", "AdviceFlag", });
     internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor,
-        new java.lang.String[] { "PrescriptionInfos", "Flag", });
+        new String[] { "PrescriptionInfos", "Flag", });
     internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor,
-        new java.lang.String[] { "Code", "Info", "BizNo", "Data", });
+        new String[] { "Code", "Info", "BizNo", "Data", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

+ 43 - 232
src/main/java/com/ywt/gapi/drug/DrugService.java

@@ -1,249 +1,60 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: drug.proto
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
-package com.ywt.gapi.drug;
+    package com.ywt.gapi.drug;
 
-/**
- * <pre>
- *药品相关服务
- * </pre>
- *
- * Protobuf service {@code com.ywt.gapi.drug.DrugService}
- */
-public  abstract class DrugService
-    implements com.google.protobuf.Service {
-  protected DrugService() {}
+import org.apache.dubbo.common.stream.StreamObserver;
 
-  public interface Interface {
-    /**
-     * <pre>
-     * 保存从his_open_api过来的处方信息
-     * </pre>
-     *
-     * <code>rpc saveHisOpenApiPrescription(.com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest) returns (.com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse);</code>
-     */
-    public abstract void saveHisOpenApiPrescription(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request,
-        com.google.protobuf.RpcCallback<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> done);
-
-  }
-
-  public static com.google.protobuf.Service newReflectiveService(
-      final Interface impl) {
-    return new DrugService() {
-      @java.lang.Override
-      public  void saveHisOpenApiPrescription(
-          com.google.protobuf.RpcController controller,
-          com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request,
-          com.google.protobuf.RpcCallback<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> done) {
-        impl.saveHisOpenApiPrescription(controller, request, done);
-      }
-
-    };
-  }
-
-  public static com.google.protobuf.BlockingService
-      newReflectiveBlockingService(final BlockingInterface impl) {
-    return new com.google.protobuf.BlockingService() {
-      public final com.google.protobuf.Descriptors.ServiceDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-
-      public final com.google.protobuf.Message callBlockingMethod(
-          com.google.protobuf.Descriptors.MethodDescriptor method,
-          com.google.protobuf.RpcController controller,
-          com.google.protobuf.Message request)
-          throws com.google.protobuf.ServiceException {
-        if (method.getService() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "Service.callBlockingMethod() given method descriptor for " +
-            "wrong service type.");
-        }
-        switch(method.getIndex()) {
-          case 0:
-            return impl.saveHisOpenApiPrescription(controller, (com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest)request);
-          default:
-            throw new java.lang.AssertionError("Can't get here.");
-        }
-      }
-
-      public final com.google.protobuf.Message
-          getRequestPrototype(
-          com.google.protobuf.Descriptors.MethodDescriptor method) {
-        if (method.getService() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "Service.getRequestPrototype() given method " +
-            "descriptor for wrong service type.");
-        }
-        switch(method.getIndex()) {
-          case 0:
-            return com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.getDefaultInstance();
-          default:
-            throw new java.lang.AssertionError("Can't get here.");
-        }
-      }
-
-      public final com.google.protobuf.Message
-          getResponsePrototype(
-          com.google.protobuf.Descriptors.MethodDescriptor method) {
-        if (method.getService() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "Service.getResponsePrototype() given method " +
-            "descriptor for wrong service type.");
-        }
-        switch(method.getIndex()) {
-          case 0:
-            return com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance();
-          default:
-            throw new java.lang.AssertionError("Can't get here.");
-        }
-      }
-
-    };
-  }
-
-  /**
-   * <pre>
-   * 保存从his_open_api过来的处方信息
-   * </pre>
-   *
-   * <code>rpc saveHisOpenApiPrescription(.com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest) returns (.com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse);</code>
-   */
-  public abstract void saveHisOpenApiPrescription(
-      com.google.protobuf.RpcController controller,
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request,
-      com.google.protobuf.RpcCallback<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> done);
-
-  public static final
-      com.google.protobuf.Descriptors.ServiceDescriptor
-      getDescriptor() {
-    return com.ywt.gapi.drug.Drug.getDescriptor().getServices().get(0);
-  }
-  public final com.google.protobuf.Descriptors.ServiceDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-
-  public final void callMethod(
-      com.google.protobuf.Descriptors.MethodDescriptor method,
-      com.google.protobuf.RpcController controller,
-      com.google.protobuf.Message request,
-      com.google.protobuf.RpcCallback<
-        com.google.protobuf.Message> done) {
-    if (method.getService() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "Service.callMethod() given method descriptor for wrong " +
-        "service type.");
-    }
-    switch(method.getIndex()) {
-      case 0:
-        this.saveHisOpenApiPrescription(controller, (com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest)request,
-          com.google.protobuf.RpcUtil.<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse>specializeCallback(
-            done));
-        return;
-      default:
-        throw new java.lang.AssertionError("Can't get here.");
-    }
-  }
+import java.util.concurrent.CompletableFuture;
 
-  public final com.google.protobuf.Message
-      getRequestPrototype(
-      com.google.protobuf.Descriptors.MethodDescriptor method) {
-    if (method.getService() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "Service.getRequestPrototype() given method " +
-        "descriptor for wrong service type.");
-    }
-    switch(method.getIndex()) {
-      case 0:
-        return com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.getDefaultInstance();
-      default:
-        throw new java.lang.AssertionError("Can't get here.");
-    }
-  }
+public interface DrugService extends org.apache.dubbo.rpc.model.DubboStub {
 
-  public final com.google.protobuf.Message
-      getResponsePrototype(
-      com.google.protobuf.Descriptors.MethodDescriptor method) {
-    if (method.getService() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "Service.getResponsePrototype() given method " +
-        "descriptor for wrong service type.");
-    }
-    switch(method.getIndex()) {
-      case 0:
-        return com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance();
-      default:
-        throw new java.lang.AssertionError("Can't get here.");
-    }
-  }
+    String JAVA_SERVICE_NAME = "com.ywt.gapi.drug.DrugService";
+    String SERVICE_NAME = "com.ywt.gapi.drug.DrugService";
 
-  public static Stub newStub(
-      com.google.protobuf.RpcChannel channel) {
-    return new Stub(channel);
-  }
+        /**
+         * <pre>
+         * 处方药品信息
+         * </pre>
+         */
+    SaveHisOpenApiPrescriptionResponse saveHisOpenApiPrescription(SaveHisOpenApiPrescriptionRequest request);
 
-  public static final class Stub extends com.ywt.gapi.drug.DrugService implements Interface {
-    private Stub(com.google.protobuf.RpcChannel channel) {
-      this.channel = channel;
+    default CompletableFuture<SaveHisOpenApiPrescriptionResponse> saveHisOpenApiPrescriptionAsync(SaveHisOpenApiPrescriptionRequest request){
+        return CompletableFuture.completedFuture(saveHisOpenApiPrescription(request));
     }
 
-    private final com.google.protobuf.RpcChannel channel;
-
-    public com.google.protobuf.RpcChannel getChannel() {
-      return channel;
-    }
-
-    public  void saveHisOpenApiPrescription(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request,
-        com.google.protobuf.RpcCallback<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> done) {
-      channel.callMethod(
-        getDescriptor().getMethods().get(0),
-        controller,
-        request,
-        com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance(),
-        com.google.protobuf.RpcUtil.generalizeCallback(
-          done,
-          com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.class,
-          com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance()));
+    /**
+    * This server stream type unary method is <b>only</b> used for generated stub to support async unary method.
+    * It will not be called if you are NOT using Dubbo3 generated triple stub and <b>DO NOT</b> implement this method.
+    */
+    default void saveHisOpenApiPrescription(SaveHisOpenApiPrescriptionRequest request, StreamObserver<SaveHisOpenApiPrescriptionResponse> responseObserver){
+        saveHisOpenApiPrescriptionAsync(request).whenComplete((r, t) -> {
+            if (t != null) {
+                responseObserver.onError(t);
+            } else {
+                responseObserver.onNext(r);
+                responseObserver.onCompleted();
+            }
+        });
     }
-  }
-
-  public static BlockingInterface newBlockingStub(
-      com.google.protobuf.BlockingRpcChannel channel) {
-    return new BlockingStub(channel);
-  }
 
-  public interface BlockingInterface {
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse saveHisOpenApiPrescription(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request)
-        throws com.google.protobuf.ServiceException;
-  }
 
-  private static final class BlockingStub implements BlockingInterface {
-    private BlockingStub(com.google.protobuf.BlockingRpcChannel channel) {
-      this.channel = channel;
-    }
 
-    private final com.google.protobuf.BlockingRpcChannel channel;
 
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse saveHisOpenApiPrescription(
-        com.google.protobuf.RpcController controller,
-        com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request)
-        throws com.google.protobuf.ServiceException {
-      return (com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse) channel.callBlockingMethod(
-        getDescriptor().getMethods().get(0),
-        controller,
-        request,
-        com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance());
-    }
 
-  }
 
-  // @@protoc_insertion_point(class_scope:com.ywt.gapi.drug.DrugService)
 }
-

+ 0 - 289
src/main/java/com/ywt/gapi/drug/DrugServiceGrpc.java

@@ -1,289 +0,0 @@
-package com.ywt.gapi.drug;
-
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
-import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
-import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
-
-/**
- * <pre>
- *药品相关服务
- * </pre>
- */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.2-SNAPSHOT)",
-    comments = "Source: drug.proto")
-public final class DrugServiceGrpc {
-
-  private DrugServiceGrpc() {}
-
-  public static final String SERVICE_NAME = "com.ywt.gapi.drug.DrugService";
-
-  // Static method descriptors that strictly reflect the proto.
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static final io.grpc.MethodDescriptor<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest,
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> METHOD_SAVE_HIS_OPEN_API_PRESCRIPTION =
-      io.grpc.MethodDescriptor.<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest, com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse>newBuilder()
-          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName(generateFullMethodName(
-              "com.ywt.gapi.drug.DrugService", "saveHisOpenApiPrescription"))
-          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.getDefaultInstance()))
-          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance()))
-          .setSchemaDescriptor(new DrugServiceMethodDescriptorSupplier("saveHisOpenApiPrescription"))
-          .build();
-
-  /**
-   * Creates a new async stub that supports all call types for the service
-   */
-  public static DrugServiceStub newStub(io.grpc.Channel channel) {
-    return new DrugServiceStub(channel);
-  }
-
-  /**
-   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
-   */
-  public static DrugServiceBlockingStub newBlockingStub(
-      io.grpc.Channel channel) {
-    return new DrugServiceBlockingStub(channel);
-  }
-
-  /**
-   * Creates a new ListenableFuture-style stub that supports unary calls on the service
-   */
-  public static DrugServiceFutureStub newFutureStub(
-      io.grpc.Channel channel) {
-    return new DrugServiceFutureStub(channel);
-  }
-
-  /**
-   * <pre>
-   *药品相关服务
-   * </pre>
-   */
-  public static abstract class DrugServiceImplBase implements io.grpc.BindableService {
-
-    /**
-     * <pre>
-     * 保存从his_open_api过来的处方信息
-     * </pre>
-     */
-    public void saveHisOpenApiPrescription(com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request,
-        io.grpc.stub.StreamObserver<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(METHOD_SAVE_HIS_OPEN_API_PRESCRIPTION, responseObserver);
-    }
-
-    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-            METHOD_SAVE_HIS_OPEN_API_PRESCRIPTION,
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest,
-                com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse>(
-                  this, METHODID_SAVE_HIS_OPEN_API_PRESCRIPTION)))
-          .build();
-    }
-  }
-
-  /**
-   * <pre>
-   *药品相关服务
-   * </pre>
-   */
-  public static final class DrugServiceStub extends io.grpc.stub.AbstractStub<DrugServiceStub> {
-    private DrugServiceStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private DrugServiceStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected DrugServiceStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new DrugServiceStub(channel, callOptions);
-    }
-
-    /**
-     * <pre>
-     * 保存从his_open_api过来的处方信息
-     * </pre>
-     */
-    public void saveHisOpenApiPrescription(com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request,
-        io.grpc.stub.StreamObserver<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(METHOD_SAVE_HIS_OPEN_API_PRESCRIPTION, getCallOptions()), request, responseObserver);
-    }
-  }
-
-  /**
-   * <pre>
-   *药品相关服务
-   * </pre>
-   */
-  public static final class DrugServiceBlockingStub extends io.grpc.stub.AbstractStub<DrugServiceBlockingStub> {
-    private DrugServiceBlockingStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private DrugServiceBlockingStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected DrugServiceBlockingStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new DrugServiceBlockingStub(channel, callOptions);
-    }
-
-    /**
-     * <pre>
-     * 保存从his_open_api过来的处方信息
-     * </pre>
-     */
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse saveHisOpenApiPrescription(com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request) {
-      return blockingUnaryCall(
-          getChannel(), METHOD_SAVE_HIS_OPEN_API_PRESCRIPTION, getCallOptions(), request);
-    }
-  }
-
-  /**
-   * <pre>
-   *药品相关服务
-   * </pre>
-   */
-  public static final class DrugServiceFutureStub extends io.grpc.stub.AbstractStub<DrugServiceFutureStub> {
-    private DrugServiceFutureStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private DrugServiceFutureStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected DrugServiceFutureStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new DrugServiceFutureStub(channel, callOptions);
-    }
-
-    /**
-     * <pre>
-     * 保存从his_open_api过来的处方信息
-     * </pre>
-     */
-    public com.google.common.util.concurrent.ListenableFuture<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse> saveHisOpenApiPrescription(
-        com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(METHOD_SAVE_HIS_OPEN_API_PRESCRIPTION, getCallOptions()), request);
-    }
-  }
-
-  private static final int METHODID_SAVE_HIS_OPEN_API_PRESCRIPTION = 0;
-
-  private static final class MethodHandlers<Req, Resp> implements
-      io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
-      io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
-      io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
-      io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
-    private final DrugServiceImplBase serviceImpl;
-    private final int methodId;
-
-    MethodHandlers(DrugServiceImplBase serviceImpl, int methodId) {
-      this.serviceImpl = serviceImpl;
-      this.methodId = methodId;
-    }
-
-    @java.lang.Override
-    @java.lang.SuppressWarnings("unchecked")
-    public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
-      switch (methodId) {
-        case METHODID_SAVE_HIS_OPEN_API_PRESCRIPTION:
-          serviceImpl.saveHisOpenApiPrescription((com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest) request,
-              (io.grpc.stub.StreamObserver<com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse>) responseObserver);
-          break;
-        default:
-          throw new AssertionError();
-      }
-    }
-
-    @java.lang.Override
-    @java.lang.SuppressWarnings("unchecked")
-    public io.grpc.stub.StreamObserver<Req> invoke(
-        io.grpc.stub.StreamObserver<Resp> responseObserver) {
-      switch (methodId) {
-        default:
-          throw new AssertionError();
-      }
-    }
-  }
-
-  private static abstract class DrugServiceBaseDescriptorSupplier
-      implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
-    DrugServiceBaseDescriptorSupplier() {}
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return com.ywt.gapi.drug.Drug.getDescriptor();
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
-      return getFileDescriptor().findServiceByName("DrugService");
-    }
-  }
-
-  private static final class DrugServiceFileDescriptorSupplier
-      extends DrugServiceBaseDescriptorSupplier {
-    DrugServiceFileDescriptorSupplier() {}
-  }
-
-  private static final class DrugServiceMethodDescriptorSupplier
-      extends DrugServiceBaseDescriptorSupplier
-      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
-
-    DrugServiceMethodDescriptorSupplier(String methodName) {
-      this.methodName = methodName;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
-      return getServiceDescriptor().findMethodByName(methodName);
-    }
-  }
-
-  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
-
-  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
-    io.grpc.ServiceDescriptor result = serviceDescriptor;
-    if (result == null) {
-      synchronized (DrugServiceGrpc.class) {
-        result = serviceDescriptor;
-        if (result == null) {
-          serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
-              .setSchemaDescriptor(new DrugServiceFileDescriptorSupplier())
-              .addMethod(METHOD_SAVE_HIS_OPEN_API_PRESCRIPTION)
-              .build();
-        }
-      }
-    }
-    return result;
-  }
-}

+ 171 - 0
src/main/java/com/ywt/gapi/drug/DubboDrugServiceTriple.java

@@ -0,0 +1,171 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+    package com.ywt.gapi.drug;
+
+import com.google.protobuf.Message;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.stream.StreamObserver;
+import org.apache.dubbo.rpc.*;
+import org.apache.dubbo.rpc.model.MethodDescriptor;
+import org.apache.dubbo.rpc.model.ServiceDescriptor;
+import org.apache.dubbo.rpc.model.StubMethodDescriptor;
+import org.apache.dubbo.rpc.model.StubServiceDescriptor;
+import org.apache.dubbo.rpc.stub.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+
+public final class DubboDrugServiceTriple {
+
+    public static final String SERVICE_NAME = DrugService.SERVICE_NAME;
+
+    private static final StubServiceDescriptor serviceDescriptor = new StubServiceDescriptor(SERVICE_NAME,DrugService.class);
+
+    static {
+        org.apache.dubbo.rpc.protocol.tri.service.SchemaDescriptorRegistry.addSchemaDescriptor(SERVICE_NAME,DrugProto.getDescriptor());
+        StubSuppliers.addSupplier(SERVICE_NAME, DubboDrugServiceTriple::newStub);
+        StubSuppliers.addSupplier(DrugService.JAVA_SERVICE_NAME,  DubboDrugServiceTriple::newStub);
+        StubSuppliers.addDescriptor(SERVICE_NAME, serviceDescriptor);
+        StubSuppliers.addDescriptor(DrugService.JAVA_SERVICE_NAME, serviceDescriptor);
+    }
+
+    @SuppressWarnings("all")
+    public static DrugService newStub(Invoker<?> invoker) {
+        return new DrugServiceStub((Invoker<DrugService>)invoker);
+    }
+
+    /**
+         * <pre>
+         * 处方药品信息
+         * </pre>
+         */
+    private static final StubMethodDescriptor saveHisOpenApiPrescriptionMethod = new StubMethodDescriptor("saveHisOpenApiPrescription",
+    SaveHisOpenApiPrescriptionRequest.class, SaveHisOpenApiPrescriptionResponse.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveHisOpenApiPrescriptionRequest::parseFrom,
+    SaveHisOpenApiPrescriptionResponse::parseFrom);
+
+    private static final StubMethodDescriptor saveHisOpenApiPrescriptionAsyncMethod = new StubMethodDescriptor("saveHisOpenApiPrescription",
+    SaveHisOpenApiPrescriptionRequest.class, CompletableFuture.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveHisOpenApiPrescriptionRequest::parseFrom,
+    SaveHisOpenApiPrescriptionResponse::parseFrom);
+
+    private static final StubMethodDescriptor saveHisOpenApiPrescriptionProxyAsyncMethod = new StubMethodDescriptor("saveHisOpenApiPrescriptionAsync",
+    SaveHisOpenApiPrescriptionRequest.class, SaveHisOpenApiPrescriptionResponse.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), SaveHisOpenApiPrescriptionRequest::parseFrom,
+    SaveHisOpenApiPrescriptionResponse::parseFrom);
+
+
+
+
+
+    public static class DrugServiceStub implements DrugService{
+        private final Invoker<DrugService> invoker;
+
+        public DrugServiceStub(Invoker<DrugService> invoker) {
+            this.invoker = invoker;
+        }
+
+            /**
+         * <pre>
+         * 处方药品信息
+         * </pre>
+         */
+        @Override
+        public SaveHisOpenApiPrescriptionResponse saveHisOpenApiPrescription(SaveHisOpenApiPrescriptionRequest request){
+            return StubInvocationUtil.unaryCall(invoker, saveHisOpenApiPrescriptionMethod, request);
+        }
+
+        public CompletableFuture<SaveHisOpenApiPrescriptionResponse> saveHisOpenApiPrescriptionAsync(SaveHisOpenApiPrescriptionRequest request){
+            return StubInvocationUtil.unaryCall(invoker, saveHisOpenApiPrescriptionAsyncMethod, request);
+        }
+
+            /**
+         * <pre>
+         * 处方药品信息
+         * </pre>
+         */
+        @Override
+        public void saveHisOpenApiPrescription(SaveHisOpenApiPrescriptionRequest request, StreamObserver<SaveHisOpenApiPrescriptionResponse> responseObserver){
+            StubInvocationUtil.unaryCall(invoker, saveHisOpenApiPrescriptionMethod , request, responseObserver);
+        }
+
+
+
+    }
+
+    public static abstract class DrugServiceImplBase implements DrugService, ServerService<DrugService> {
+
+        private <T, R> BiConsumer<T, StreamObserver<R>> syncToAsync(java.util.function.Function<T, R> syncFun) {
+            return new BiConsumer<T, StreamObserver<R>>() {
+                @Override
+                public void accept(T t, StreamObserver<R> observer) {
+                    try {
+                        R ret = syncFun.apply(t);
+                        observer.onNext(ret);
+                        observer.onCompleted();
+                    } catch (Throwable e) {
+                        observer.onError(e);
+                    }
+                }
+            };
+        }
+
+        @Override
+        public final Invoker<DrugService> getInvoker(URL url) {
+            PathResolver pathResolver = url.getOrDefaultFrameworkModel()
+            .getExtensionLoader(PathResolver.class)
+            .getDefaultExtension();
+            Map<String,StubMethodHandler<?, ?>> handlers = new HashMap<>();
+
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/saveHisOpenApiPrescription" );
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/saveHisOpenApiPrescriptionAsync" );
+
+            BiConsumer<SaveHisOpenApiPrescriptionRequest, StreamObserver<SaveHisOpenApiPrescriptionResponse>> saveHisOpenApiPrescriptionFunc = this::saveHisOpenApiPrescription;
+            handlers.put(saveHisOpenApiPrescriptionMethod.getMethodName(), new UnaryStubMethodHandler<>(saveHisOpenApiPrescriptionFunc));
+            BiConsumer<SaveHisOpenApiPrescriptionRequest, StreamObserver<SaveHisOpenApiPrescriptionResponse>> saveHisOpenApiPrescriptionAsyncFunc = syncToAsync(this::saveHisOpenApiPrescription);
+            handlers.put(saveHisOpenApiPrescriptionProxyAsyncMethod.getMethodName(), new UnaryStubMethodHandler<>(saveHisOpenApiPrescriptionAsyncFunc));
+
+
+
+
+            return new StubInvoker<>(this, url, DrugService.class, handlers);
+        }
+
+
+        @Override
+        public SaveHisOpenApiPrescriptionResponse saveHisOpenApiPrescription(SaveHisOpenApiPrescriptionRequest request){
+            throw unimplementedMethodException(saveHisOpenApiPrescriptionMethod);
+        }
+
+
+
+
+
+        @Override
+        public final ServiceDescriptor getServiceDescriptor() {
+            return serviceDescriptor;
+        }
+        private RpcException unimplementedMethodException(StubMethodDescriptor methodDescriptor) {
+            return TriRpcStatus.UNIMPLEMENTED.withDescription(String.format("Method %s is unimplemented",
+                "/" + serviceDescriptor.getInterfaceName() + "/" + methodDescriptor.getMethodName())).asException();
+        }
+    }
+
+}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 167 - 135
src/main/java/com/ywt/gapi/drug/PrescriptionInfo.java


+ 138 - 40
src/main/java/com/ywt/gapi/drug/PrescriptionInfoOrBuilder.java

@@ -9,110 +9,132 @@ public interface PrescriptionInfoOrBuilder extends
 
   /**
    * <code>string no3th = 1;</code>
+   * @return The no3th.
    */
-  java.lang.String getNo3Th();
+  String getNo3Th();
   /**
    * <code>string no3th = 1;</code>
+   * @return The bytes for no3th.
    */
   com.google.protobuf.ByteString
       getNo3ThBytes();
 
   /**
    * <code>string doctorName = 2;</code>
+   * @return The doctorName.
    */
-  java.lang.String getDoctorName();
+  String getDoctorName();
   /**
    * <code>string doctorName = 2;</code>
+   * @return The bytes for doctorName.
    */
   com.google.protobuf.ByteString
       getDoctorNameBytes();
 
   /**
    * <code>string patientName = 3;</code>
+   * @return The patientName.
    */
-  java.lang.String getPatientName();
+  String getPatientName();
   /**
    * <code>string patientName = 3;</code>
+   * @return The bytes for patientName.
    */
   com.google.protobuf.ByteString
       getPatientNameBytes();
 
   /**
    * <code>string patientAge = 4;</code>
+   * @return The patientAge.
    */
-  java.lang.String getPatientAge();
+  String getPatientAge();
   /**
    * <code>string patientAge = 4;</code>
+   * @return The bytes for patientAge.
    */
   com.google.protobuf.ByteString
       getPatientAgeBytes();
 
   /**
    * <code>string patientSex = 5;</code>
+   * @return The patientSex.
    */
-  java.lang.String getPatientSex();
+  String getPatientSex();
   /**
    * <code>string patientSex = 5;</code>
+   * @return The bytes for patientSex.
    */
   com.google.protobuf.ByteString
       getPatientSexBytes();
 
   /**
    * <code>string patientNo = 6;</code>
+   * @return The patientNo.
    */
-  java.lang.String getPatientNo();
+  String getPatientNo();
   /**
    * <code>string patientNo = 6;</code>
+   * @return The bytes for patientNo.
    */
   com.google.protobuf.ByteString
       getPatientNoBytes();
 
   /**
    * <code>string diagnose = 7;</code>
+   * @return The diagnose.
    */
-  java.lang.String getDiagnose();
+  String getDiagnose();
   /**
    * <code>string diagnose = 7;</code>
+   * @return The bytes for diagnose.
    */
   com.google.protobuf.ByteString
       getDiagnoseBytes();
 
   /**
    * <code>string dept = 8;</code>
+   * @return The dept.
    */
-  java.lang.String getDept();
+  String getDept();
   /**
    * <code>string dept = 8;</code>
+   * @return The bytes for dept.
    */
   com.google.protobuf.ByteString
       getDeptBytes();
 
   /**
    * <code>int32 source = 10;</code>
+   * @return The source.
    */
   int getSource();
 
   /**
    * <code>string hosptialCode = 11;</code>
+   * @return The hosptialCode.
    */
-  java.lang.String getHosptialCode();
+  String getHosptialCode();
   /**
    * <code>string hosptialCode = 11;</code>
+   * @return The bytes for hosptialCode.
    */
   com.google.protobuf.ByteString
       getHosptialCodeBytes();
 
   /**
    * <code>int32 hosptialId = 12;</code>
+   * @return The hosptialId.
    */
   int getHosptialId();
 
   /**
    * <code>string orgCode3th = 13;</code>
+   * @return The orgCode3th.
    */
-  java.lang.String getOrgCode3Th();
+  String getOrgCode3Th();
   /**
    * <code>string orgCode3th = 13;</code>
+   * @return The bytes for orgCode3th.
    */
   com.google.protobuf.ByteString
       getOrgCode3ThBytes();
@@ -120,12 +142,12 @@ public interface PrescriptionInfoOrBuilder extends
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfo drugs = 14;</code>
    */
-  java.util.List<com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfo> 
+  java.util.List<PrescriptionInfo.PrescriptionDrugInfo>
       getDrugsList();
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfo drugs = 14;</code>
    */
-  com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfo getDrugs(int index);
+  PrescriptionInfo.PrescriptionDrugInfo getDrugs(int index);
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfo drugs = 14;</code>
    */
@@ -133,60 +155,70 @@ public interface PrescriptionInfoOrBuilder extends
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfo drugs = 14;</code>
    */
-  java.util.List<? extends com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfoOrBuilder> 
+  java.util.List<? extends PrescriptionInfo.PrescriptionDrugInfoOrBuilder>
       getDrugsOrBuilderList();
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfo drugs = 14;</code>
    */
-  com.ywt.gapi.drug.PrescriptionInfo.PrescriptionDrugInfoOrBuilder getDrugsOrBuilder(
+  PrescriptionInfo.PrescriptionDrugInfoOrBuilder getDrugsOrBuilder(
       int index);
 
   /**
    * <code>int32 totalPrice = 15;</code>
+   * @return The totalPrice.
    */
   int getTotalPrice();
 
   /**
    * <code>int32 status = 16;</code>
+   * @return The status.
    */
   int getStatus();
 
   /**
    * <code>string statusStr = 17;</code>
+   * @return The statusStr.
    */
-  java.lang.String getStatusStr();
+  String getStatusStr();
   /**
    * <code>string statusStr = 17;</code>
+   * @return The bytes for statusStr.
    */
   com.google.protobuf.ByteString
       getStatusStrBytes();
 
   /**
    * <code>int64 createOn = 18;</code>
+   * @return The createOn.
    */
   long getCreateOn();
 
   /**
    * <code>int32 payStatus = 19;</code>
+   * @return The payStatus.
    */
   int getPayStatus();
 
   /**
    * <code>string createOnStr = 20;</code>
+   * @return The createOnStr.
    */
-  java.lang.String getCreateOnStr();
+  String getCreateOnStr();
   /**
    * <code>string createOnStr = 20;</code>
+   * @return The bytes for createOnStr.
    */
   com.google.protobuf.ByteString
       getCreateOnStrBytes();
 
   /**
    * <code>string patientMobile = 21;</code>
+   * @return The patientMobile.
    */
-  java.lang.String getPatientMobile();
+  String getPatientMobile();
   /**
    * <code>string patientMobile = 21;</code>
+   * @return The bytes for patientMobile.
    */
   com.google.protobuf.ByteString
       getPatientMobileBytes();
@@ -197,14 +229,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string description = 22;</code>
+   * @return The description.
    */
-  java.lang.String getDescription();
+  String getDescription();
   /**
    * <pre>
    *病情描述
    * </pre>
    *
    * <code>string description = 22;</code>
+   * @return The bytes for description.
    */
   com.google.protobuf.ByteString
       getDescriptionBytes();
@@ -215,14 +249,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string allergicHistory = 23;</code>
+   * @return The allergicHistory.
    */
-  java.lang.String getAllergicHistory();
+  String getAllergicHistory();
   /**
    * <pre>
    *过敏史
    * </pre>
    *
    * <code>string allergicHistory = 23;</code>
+   * @return The bytes for allergicHistory.
    */
   com.google.protobuf.ByteString
       getAllergicHistoryBytes();
@@ -233,6 +269,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 doctorSignId = 24;</code>
+   * @return The doctorSignId.
    */
   int getDoctorSignId();
 
@@ -242,6 +279,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 prescriptionId = 25;</code>
+   * @return The prescriptionId.
    */
   int getPrescriptionId();
 
@@ -251,14 +289,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string bizNo = 26;</code>
+   * @return The bizNo.
    */
-  java.lang.String getBizNo();
+  String getBizNo();
   /**
    * <pre>
    *业务编码
    * </pre>
    *
    * <code>string bizNo = 26;</code>
+   * @return The bytes for bizNo.
    */
   com.google.protobuf.ByteString
       getBizNoBytes();
@@ -269,6 +309,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 userId = 27;</code>
+   * @return The userId.
    */
   int getUserId();
 
@@ -278,14 +319,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string hisOrderNo = 28;</code>
+   * @return The hisOrderNo.
    */
-  java.lang.String getHisOrderNo();
+  String getHisOrderNo();
   /**
    * <pre>
    *HIS单号
    * </pre>
    *
    * <code>string hisOrderNo = 28;</code>
+   * @return The bytes for hisOrderNo.
    */
   com.google.protobuf.ByteString
       getHisOrderNoBytes();
@@ -296,6 +339,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 addressId = 29;</code>
+   * @return The addressId.
    */
   int getAddressId();
 
@@ -305,6 +349,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 deliveryMethod = 30;</code>
+   * @return The deliveryMethod.
    */
   int getDeliveryMethod();
 
@@ -314,14 +359,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string sendNo = 31;</code>
+   * @return The sendNo.
    */
-  java.lang.String getSendNo();
+  String getSendNo();
   /**
    * <pre>
    * 配送号
    * </pre>
    *
    * <code>string sendNo = 31;</code>
+   * @return The bytes for sendNo.
    */
   com.google.protobuf.ByteString
       getSendNoBytes();
@@ -332,14 +379,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string qrCodeUrl = 32;</code>
+   * @return The qrCodeUrl.
    */
-  java.lang.String getQrCodeUrl();
+  String getQrCodeUrl();
   /**
    * <pre>
    * 取药二维码
    * </pre>
    *
    * <code>string qrCodeUrl = 32;</code>
+   * @return The bytes for qrCodeUrl.
    */
   com.google.protobuf.ByteString
       getQrCodeUrlBytes();
@@ -350,14 +399,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string pharmacyAddress = 33;</code>
+   * @return The pharmacyAddress.
    */
-  java.lang.String getPharmacyAddress();
+  String getPharmacyAddress();
   /**
    * <pre>
    * 药店地址(由省、市、区、详细地址组成)
    * </pre>
    *
    * <code>string pharmacyAddress = 33;</code>
+   * @return The bytes for pharmacyAddress.
    */
   com.google.protobuf.ByteString
       getPharmacyAddressBytes();
@@ -368,14 +419,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string pharmacyName = 34;</code>
+   * @return The pharmacyName.
    */
-  java.lang.String getPharmacyName();
+  String getPharmacyName();
   /**
    * <pre>
    * 药店名称
    * </pre>
    *
    * <code>string pharmacyName = 34;</code>
+   * @return The bytes for pharmacyName.
    */
   com.google.protobuf.ByteString
       getPharmacyNameBytes();
@@ -386,6 +439,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int64 finshTime = 35;</code>
+   * @return The finshTime.
    */
   long getFinshTime();
 
@@ -395,6 +449,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 doctorId = 36;</code>
+   * @return The doctorId.
    */
   int getDoctorId();
 
@@ -404,6 +459,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 individual = 37;</code>
+   * @return The individual.
    */
   int getIndividual();
 
@@ -413,6 +469,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 extStatus = 38;</code>
+   * @return The extStatus.
    */
   int getExtStatus();
 
@@ -422,6 +479,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 needPrintStatus = 39;</code>
+   * @return The needPrintStatus.
    */
   int getNeedPrintStatus();
 
@@ -431,6 +489,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 freight = 40;</code>
+   * @return The freight.
    */
   int getFreight();
 
@@ -440,14 +499,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string idCardNo = 41;</code>
+   * @return The idCardNo.
    */
-  java.lang.String getIdCardNo();
+  String getIdCardNo();
   /**
    * <pre>
    *身份证号
    * </pre>
    *
    * <code>string idCardNo = 41;</code>
+   * @return The bytes for idCardNo.
    */
   com.google.protobuf.ByteString
       getIdCardNoBytes();
@@ -458,6 +519,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 pharmacyId = 42;</code>
+   * @return The pharmacyId.
    */
   int getPharmacyId();
 
@@ -467,14 +529,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string prescriptionDate = 43;</code>
+   * @return The prescriptionDate.
    */
-  java.lang.String getPrescriptionDate();
+  String getPrescriptionDate();
   /**
    * <pre>
    *处方日期(一般用于第三方来源)
    * </pre>
    *
    * <code>string prescriptionDate = 43;</code>
+   * @return The bytes for prescriptionDate.
    */
   com.google.protobuf.ByteString
       getPrescriptionDateBytes();
@@ -485,14 +549,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string timeStandard = 44;</code>
+   * @return The timeStandard.
    */
-  java.lang.String getTimeStandard();
+  String getTimeStandard();
   /**
    * <pre>
    * 时效标准(快递的预计送达时间)
    * </pre>
    *
    * <code>string timeStandard = 44;</code>
+   * @return The bytes for timeStandard.
    */
   com.google.protobuf.ByteString
       getTimeStandardBytes();
@@ -503,14 +569,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string orderNo = 45;</code>
+   * @return The orderNo.
    */
-  java.lang.String getOrderNo();
+  String getOrderNo();
   /**
    * <pre>
    * 订单号
    * </pre>
    *
    * <code>string orderNo = 45;</code>
+   * @return The bytes for orderNo.
    */
   com.google.protobuf.ByteString
       getOrderNoBytes();
@@ -521,6 +589,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 orderId = 46;</code>
+   * @return The orderId.
    */
   int getOrderId();
 
@@ -530,14 +599,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string refundNo = 47;</code>
+   * @return The refundNo.
    */
-  java.lang.String getRefundNo();
+  String getRefundNo();
   /**
    * <pre>
    *退款单号
    * </pre>
    *
    * <code>string refundNo = 47;</code>
+   * @return The bytes for refundNo.
    */
   com.google.protobuf.ByteString
       getRefundNoBytes();
@@ -548,6 +619,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 refundStatus = 48;</code>
+   * @return The refundStatus.
    */
   int getRefundStatus();
 
@@ -557,6 +629,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int64 payTime = 49;</code>
+   * @return The payTime.
    */
   long getPayTime();
 
@@ -566,14 +639,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string invoiceEndTime = 50;</code>
+   * @return The invoiceEndTime.
    */
-  java.lang.String getInvoiceEndTime();
+  String getInvoiceEndTime();
   /**
    * <pre>
    * 发票开具结束时间
    * </pre>
    *
    * <code>string invoiceEndTime = 50;</code>
+   * @return The bytes for invoiceEndTime.
    */
   com.google.protobuf.ByteString
       getInvoiceEndTimeBytes();
@@ -584,6 +659,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>int32 terminal = 51;</code>
+   * @return The terminal.
    */
   int getTerminal();
 
@@ -593,89 +669,106 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string hisOeoriOrderId = 52;</code>
+   * @return The hisOeoriOrderId.
    */
-  java.lang.String getHisOeoriOrderId();
+  String getHisOeoriOrderId();
   /**
    * <pre>
    * HIS 医嘱订单编号
    * </pre>
    *
    * <code>string hisOeoriOrderId = 52;</code>
+   * @return The bytes for hisOeoriOrderId.
    */
   com.google.protobuf.ByteString
       getHisOeoriOrderIdBytes();
 
   /**
    * <code>string hisPatientId = 53;</code>
+   * @return The hisPatientId.
    */
-  java.lang.String getHisPatientId();
+  String getHisPatientId();
   /**
    * <code>string hisPatientId = 53;</code>
+   * @return The bytes for hisPatientId.
    */
   com.google.protobuf.ByteString
       getHisPatientIdBytes();
 
   /**
    * <code>string hisClinicCode = 54;</code>
+   * @return The hisClinicCode.
    */
-  java.lang.String getHisClinicCode();
+  String getHisClinicCode();
   /**
    * <code>string hisClinicCode = 54;</code>
+   * @return The bytes for hisClinicCode.
    */
   com.google.protobuf.ByteString
       getHisClinicCodeBytes();
 
   /**
    * <code>int32 cancelStatus = 55;</code>
+   * @return The cancelStatus.
    */
   int getCancelStatus();
 
   /**
    * <code>string cancelRemark = 56;</code>
+   * @return The cancelRemark.
    */
-  java.lang.String getCancelRemark();
+  String getCancelRemark();
   /**
    * <code>string cancelRemark = 56;</code>
+   * @return The bytes for cancelRemark.
    */
   com.google.protobuf.ByteString
       getCancelRemarkBytes();
 
   /**
    * <code>int32 patientAgeInt = 57;</code>
+   * @return The patientAgeInt.
    */
   int getPatientAgeInt();
 
   /**
    * <code>int32 patientSexInt = 58;</code>
+   * @return The patientSexInt.
    */
   int getPatientSexInt();
 
   /**
    * <code>string icdCodes = 59;</code>
+   * @return The icdCodes.
    */
-  java.lang.String getIcdCodes();
+  String getIcdCodes();
   /**
    * <code>string icdCodes = 59;</code>
+   * @return The bytes for icdCodes.
    */
   com.google.protobuf.ByteString
       getIcdCodesBytes();
 
   /**
    * <code>string patientAddress = 60;</code>
+   * @return The patientAddress.
    */
-  java.lang.String getPatientAddress();
+  String getPatientAddress();
   /**
    * <code>string patientAddress = 60;</code>
+   * @return The bytes for patientAddress.
    */
   com.google.protobuf.ByteString
       getPatientAddressBytes();
 
   /**
    * <code>string remarks = 61;</code>
+   * @return The remarks.
    */
-  java.lang.String getRemarks();
+  String getRemarks();
   /**
    * <code>string remarks = 61;</code>
+   * @return The bytes for remarks.
    */
   com.google.protobuf.ByteString
       getRemarksBytes();
@@ -686,6 +779,7 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>bool addressModified = 62;</code>
+   * @return The addressModified.
    */
   boolean getAddressModified();
 
@@ -695,14 +789,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string postSource = 63;</code>
+   * @return The postSource.
    */
-  java.lang.String getPostSource();
+  String getPostSource();
   /**
    * <pre>
    *邮寄服务
    * </pre>
    *
    * <code>string postSource = 63;</code>
+   * @return The bytes for postSource.
    */
   com.google.protobuf.ByteString
       getPostSourceBytes();
@@ -713,14 +809,16 @@ public interface PrescriptionInfoOrBuilder extends
    * </pre>
    *
    * <code>string presctype = 64;</code>
+   * @return The presctype.
    */
-  java.lang.String getPresctype();
+  String getPresctype();
   /**
    * <pre>
    *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
    * </pre>
    *
    * <code>string presctype = 64;</code>
+   * @return The bytes for presctype.
    */
   com.google.protobuf.ByteString
       getPresctypeBytes();

+ 161 - 111
src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionRequest.java

@@ -6,30 +6,42 @@ package com.ywt.gapi.drug;
 /**
  * Protobuf type {@code com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest}
  */
-public  final class SaveHisOpenApiPrescriptionRequest extends
+public final class SaveHisOpenApiPrescriptionRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest)
     SaveHisOpenApiPrescriptionRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SaveHisOpenApiPrescriptionRequest.newBuilder() to construct.
   private SaveHisOpenApiPrescriptionRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
   }
   private SaveHisOpenApiPrescriptionRequest() {
     prescriptionInfos_ = java.util.Collections.emptyList();
-    flag_ = 0;
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new SaveHisOpenApiPrescriptionRequest();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SaveHisOpenApiPrescriptionRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,19 +50,13 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              prescriptionInfos_ = new java.util.ArrayList<com.ywt.gapi.drug.PrescriptionInfo>();
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              prescriptionInfos_ = new java.util.ArrayList<PrescriptionInfo>();
               mutable_bitField0_ |= 0x00000001;
             }
             prescriptionInfos_.add(
-                input.readMessage(com.ywt.gapi.drug.PrescriptionInfo.parser(), extensionRegistry));
+                input.readMessage(PrescriptionInfo.parser(), extensionRegistry));
             break;
           }
           case 16: {
@@ -58,6 +64,13 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
             flag_ = input.readInt32();
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -66,56 +79,62 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
         prescriptionInfos_ = java.util.Collections.unmodifiableList(prescriptionInfos_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor;
+    return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_fieldAccessorTable
+    return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.class, com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.Builder.class);
+            SaveHisOpenApiPrescriptionRequest.class, Builder.class);
   }
 
-  private int bitField0_;
   public static final int PRESCRIPTIONINFOS_FIELD_NUMBER = 1;
-  private java.util.List<com.ywt.gapi.drug.PrescriptionInfo> prescriptionInfos_;
+  private java.util.List<PrescriptionInfo> prescriptionInfos_;
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  public java.util.List<com.ywt.gapi.drug.PrescriptionInfo> getPrescriptionInfosList() {
+  @Override
+  public java.util.List<PrescriptionInfo> getPrescriptionInfosList() {
     return prescriptionInfos_;
   }
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  public java.util.List<? extends com.ywt.gapi.drug.PrescriptionInfoOrBuilder> 
+  @Override
+  public java.util.List<? extends PrescriptionInfoOrBuilder>
       getPrescriptionInfosOrBuilderList() {
     return prescriptionInfos_;
   }
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
+  @Override
   public int getPrescriptionInfosCount() {
     return prescriptionInfos_.size();
   }
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  public com.ywt.gapi.drug.PrescriptionInfo getPrescriptionInfos(int index) {
+  @Override
+  public PrescriptionInfo getPrescriptionInfos(int index) {
     return prescriptionInfos_.get(index);
   }
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  public com.ywt.gapi.drug.PrescriptionInfoOrBuilder getPrescriptionInfosOrBuilder(
+  @Override
+  public PrescriptionInfoOrBuilder getPrescriptionInfosOrBuilder(
       int index) {
     return prescriptionInfos_.get(index);
   }
@@ -124,12 +143,15 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
   private int flag_;
   /**
    * <code>int32 flag = 2;</code>
+   * @return The flag.
    */
+  @Override
   public int getFlag() {
     return flag_;
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -139,6 +161,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < prescriptionInfos_.size(); i++) {
@@ -147,8 +170,10 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     if (flag_ != 0) {
       output.writeInt32(2, flag_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -162,30 +187,30 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(2, flag_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest)) {
+    if (!(obj instanceof SaveHisOpenApiPrescriptionRequest)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest other = (com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest) obj;
+    SaveHisOpenApiPrescriptionRequest other = (SaveHisOpenApiPrescriptionRequest) obj;
 
-    boolean result = true;
-    result = result && getPrescriptionInfosList()
-        .equals(other.getPrescriptionInfosList());
-    result = result && (getFlag()
-        == other.getFlag());
-    return result;
+    if (!getPrescriptionInfosList()
+        .equals(other.getPrescriptionInfosList())) return false;
+    if (getFlag()
+        != other.getFlag()) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -203,69 +228,69 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     return hash;
   }
 
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(byte[] data)
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(java.io.InputStream input)
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseDelimitedFrom(java.io.InputStream input)
+  public static SaveHisOpenApiPrescriptionRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseDelimitedFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parseFrom(
+  public static SaveHisOpenApiPrescriptionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -273,21 +298,23 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest prototype) {
+  public static Builder newBuilder(SaveHisOpenApiPrescriptionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -297,17 +324,18 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest)
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequestOrBuilder {
+      SaveHisOpenApiPrescriptionRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor;
+      return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_fieldAccessorTable
+      return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.class, com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.Builder.class);
+              SaveHisOpenApiPrescriptionRequest.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.newBuilder()
@@ -316,7 +344,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -326,6 +354,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
         getPrescriptionInfosFieldBuilder();
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       if (prescriptionInfosBuilder_ == null) {
@@ -339,29 +368,32 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor;
+      return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionRequest_descriptor;
     }
 
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest getDefaultInstanceForType() {
-      return com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.getDefaultInstance();
+    @Override
+    public SaveHisOpenApiPrescriptionRequest getDefaultInstanceForType() {
+      return SaveHisOpenApiPrescriptionRequest.getDefaultInstance();
     }
 
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest build() {
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest result = buildPartial();
+    @Override
+    public SaveHisOpenApiPrescriptionRequest build() {
+      SaveHisOpenApiPrescriptionRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest buildPartial() {
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest result = new com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest(this);
+    @Override
+    public SaveHisOpenApiPrescriptionRequest buildPartial() {
+      SaveHisOpenApiPrescriptionRequest result = new SaveHisOpenApiPrescriptionRequest(this);
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
       if (prescriptionInfosBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           prescriptionInfos_ = java.util.Collections.unmodifiableList(prescriptionInfos_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
@@ -370,48 +402,54 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
         result.prescriptionInfos_ = prescriptionInfosBuilder_.build();
       }
       result.flag_ = flag_;
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest) {
-        return mergeFrom((com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest)other);
+      if (other instanceof SaveHisOpenApiPrescriptionRequest) {
+        return mergeFrom((SaveHisOpenApiPrescriptionRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest other) {
-      if (other == com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(SaveHisOpenApiPrescriptionRequest other) {
+      if (other == SaveHisOpenApiPrescriptionRequest.getDefaultInstance()) return this;
       if (prescriptionInfosBuilder_ == null) {
         if (!other.prescriptionInfos_.isEmpty()) {
           if (prescriptionInfos_.isEmpty()) {
@@ -441,23 +479,26 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
       if (other.getFlag() != 0) {
         setFlag(other.getFlag());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest parsedMessage = null;
+      SaveHisOpenApiPrescriptionRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest) e.getUnfinishedMessage();
+        parsedMessage = (SaveHisOpenApiPrescriptionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -468,22 +509,22 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     }
     private int bitField0_;
 
-    private java.util.List<com.ywt.gapi.drug.PrescriptionInfo> prescriptionInfos_ =
+    private java.util.List<PrescriptionInfo> prescriptionInfos_ =
       java.util.Collections.emptyList();
     private void ensurePrescriptionInfosIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        prescriptionInfos_ = new java.util.ArrayList<com.ywt.gapi.drug.PrescriptionInfo>(prescriptionInfos_);
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        prescriptionInfos_ = new java.util.ArrayList<PrescriptionInfo>(prescriptionInfos_);
         bitField0_ |= 0x00000001;
        }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.ywt.gapi.drug.PrescriptionInfo, com.ywt.gapi.drug.PrescriptionInfo.Builder, com.ywt.gapi.drug.PrescriptionInfoOrBuilder> prescriptionInfosBuilder_;
+        PrescriptionInfo, PrescriptionInfo.Builder, PrescriptionInfoOrBuilder> prescriptionInfosBuilder_;
 
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public java.util.List<com.ywt.gapi.drug.PrescriptionInfo> getPrescriptionInfosList() {
+    public java.util.List<PrescriptionInfo> getPrescriptionInfosList() {
       if (prescriptionInfosBuilder_ == null) {
         return java.util.Collections.unmodifiableList(prescriptionInfos_);
       } else {
@@ -503,7 +544,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public com.ywt.gapi.drug.PrescriptionInfo getPrescriptionInfos(int index) {
+    public PrescriptionInfo getPrescriptionInfos(int index) {
       if (prescriptionInfosBuilder_ == null) {
         return prescriptionInfos_.get(index);
       } else {
@@ -514,7 +555,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
     public Builder setPrescriptionInfos(
-        int index, com.ywt.gapi.drug.PrescriptionInfo value) {
+        int index, PrescriptionInfo value) {
       if (prescriptionInfosBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -531,7 +572,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
     public Builder setPrescriptionInfos(
-        int index, com.ywt.gapi.drug.PrescriptionInfo.Builder builderForValue) {
+        int index, PrescriptionInfo.Builder builderForValue) {
       if (prescriptionInfosBuilder_ == null) {
         ensurePrescriptionInfosIsMutable();
         prescriptionInfos_.set(index, builderForValue.build());
@@ -544,7 +585,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public Builder addPrescriptionInfos(com.ywt.gapi.drug.PrescriptionInfo value) {
+    public Builder addPrescriptionInfos(PrescriptionInfo value) {
       if (prescriptionInfosBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -561,7 +602,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
     public Builder addPrescriptionInfos(
-        int index, com.ywt.gapi.drug.PrescriptionInfo value) {
+        int index, PrescriptionInfo value) {
       if (prescriptionInfosBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -578,7 +619,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
     public Builder addPrescriptionInfos(
-        com.ywt.gapi.drug.PrescriptionInfo.Builder builderForValue) {
+        PrescriptionInfo.Builder builderForValue) {
       if (prescriptionInfosBuilder_ == null) {
         ensurePrescriptionInfosIsMutable();
         prescriptionInfos_.add(builderForValue.build());
@@ -592,7 +633,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
     public Builder addPrescriptionInfos(
-        int index, com.ywt.gapi.drug.PrescriptionInfo.Builder builderForValue) {
+        int index, PrescriptionInfo.Builder builderForValue) {
       if (prescriptionInfosBuilder_ == null) {
         ensurePrescriptionInfosIsMutable();
         prescriptionInfos_.add(index, builderForValue.build());
@@ -606,7 +647,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
     public Builder addAllPrescriptionInfos(
-        java.lang.Iterable<? extends com.ywt.gapi.drug.PrescriptionInfo> values) {
+        Iterable<? extends PrescriptionInfo> values) {
       if (prescriptionInfosBuilder_ == null) {
         ensurePrescriptionInfosIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -646,14 +687,14 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public com.ywt.gapi.drug.PrescriptionInfo.Builder getPrescriptionInfosBuilder(
+    public PrescriptionInfo.Builder getPrescriptionInfosBuilder(
         int index) {
       return getPrescriptionInfosFieldBuilder().getBuilder(index);
     }
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public com.ywt.gapi.drug.PrescriptionInfoOrBuilder getPrescriptionInfosOrBuilder(
+    public PrescriptionInfoOrBuilder getPrescriptionInfosOrBuilder(
         int index) {
       if (prescriptionInfosBuilder_ == null) {
         return prescriptionInfos_.get(index);  } else {
@@ -663,7 +704,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public java.util.List<? extends com.ywt.gapi.drug.PrescriptionInfoOrBuilder> 
+    public java.util.List<? extends PrescriptionInfoOrBuilder>
          getPrescriptionInfosOrBuilderList() {
       if (prescriptionInfosBuilder_ != null) {
         return prescriptionInfosBuilder_.getMessageOrBuilderList();
@@ -674,33 +715,33 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public com.ywt.gapi.drug.PrescriptionInfo.Builder addPrescriptionInfosBuilder() {
+    public PrescriptionInfo.Builder addPrescriptionInfosBuilder() {
       return getPrescriptionInfosFieldBuilder().addBuilder(
-          com.ywt.gapi.drug.PrescriptionInfo.getDefaultInstance());
+          PrescriptionInfo.getDefaultInstance());
     }
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public com.ywt.gapi.drug.PrescriptionInfo.Builder addPrescriptionInfosBuilder(
+    public PrescriptionInfo.Builder addPrescriptionInfosBuilder(
         int index) {
       return getPrescriptionInfosFieldBuilder().addBuilder(
-          index, com.ywt.gapi.drug.PrescriptionInfo.getDefaultInstance());
+          index, PrescriptionInfo.getDefaultInstance());
     }
     /**
      * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
      */
-    public java.util.List<com.ywt.gapi.drug.PrescriptionInfo.Builder> 
+    public java.util.List<PrescriptionInfo.Builder>
          getPrescriptionInfosBuilderList() {
       return getPrescriptionInfosFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.ywt.gapi.drug.PrescriptionInfo, com.ywt.gapi.drug.PrescriptionInfo.Builder, com.ywt.gapi.drug.PrescriptionInfoOrBuilder> 
+        PrescriptionInfo, PrescriptionInfo.Builder, PrescriptionInfoOrBuilder>
         getPrescriptionInfosFieldBuilder() {
       if (prescriptionInfosBuilder_ == null) {
         prescriptionInfosBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.ywt.gapi.drug.PrescriptionInfo, com.ywt.gapi.drug.PrescriptionInfo.Builder, com.ywt.gapi.drug.PrescriptionInfoOrBuilder>(
+            PrescriptionInfo, PrescriptionInfo.Builder, PrescriptionInfoOrBuilder>(
                 prescriptionInfos_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         prescriptionInfos_ = null;
@@ -711,12 +752,16 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     private int flag_ ;
     /**
      * <code>int32 flag = 2;</code>
+     * @return The flag.
      */
+    @Override
     public int getFlag() {
       return flag_;
     }
     /**
      * <code>int32 flag = 2;</code>
+     * @param value The flag to set.
+     * @return This builder for chaining.
      */
     public Builder setFlag(int value) {
       
@@ -726,6 +771,7 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     }
     /**
      * <code>int32 flag = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearFlag() {
       
@@ -733,14 +779,16 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -748,22 +796,23 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest)
-  private static final com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest DEFAULT_INSTANCE;
+  private static final SaveHisOpenApiPrescriptionRequest DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest();
+    DEFAULT_INSTANCE = new SaveHisOpenApiPrescriptionRequest();
   }
 
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest getDefaultInstance() {
+  public static SaveHisOpenApiPrescriptionRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<SaveHisOpenApiPrescriptionRequest>
       PARSER = new com.google.protobuf.AbstractParser<SaveHisOpenApiPrescriptionRequest>() {
+    @Override
     public SaveHisOpenApiPrescriptionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SaveHisOpenApiPrescriptionRequest(input, extensionRegistry);
+      return new SaveHisOpenApiPrescriptionRequest(input, extensionRegistry);
     }
   };
 
@@ -771,12 +820,13 @@ public  final class SaveHisOpenApiPrescriptionRequest extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<SaveHisOpenApiPrescriptionRequest> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest getDefaultInstanceForType() {
+  @Override
+  public SaveHisOpenApiPrescriptionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 5 - 4
src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionRequestOrBuilder.java

@@ -10,12 +10,12 @@ public interface SaveHisOpenApiPrescriptionRequestOrBuilder extends
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  java.util.List<com.ywt.gapi.drug.PrescriptionInfo> 
+  java.util.List<PrescriptionInfo>
       getPrescriptionInfosList();
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  com.ywt.gapi.drug.PrescriptionInfo getPrescriptionInfos(int index);
+  PrescriptionInfo getPrescriptionInfos(int index);
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
@@ -23,16 +23,17 @@ public interface SaveHisOpenApiPrescriptionRequestOrBuilder extends
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  java.util.List<? extends com.ywt.gapi.drug.PrescriptionInfoOrBuilder> 
+  java.util.List<? extends PrescriptionInfoOrBuilder>
       getPrescriptionInfosOrBuilderList();
   /**
    * <code>repeated .com.ywt.gapi.drug.PrescriptionInfo prescriptionInfos = 1;</code>
    */
-  com.ywt.gapi.drug.PrescriptionInfoOrBuilder getPrescriptionInfosOrBuilder(
+  PrescriptionInfoOrBuilder getPrescriptionInfosOrBuilder(
       int index);
 
   /**
    * <code>int32 flag = 2;</code>
+   * @return The flag.
    */
   int getFlag();
 }

+ 223 - 143
src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionResponse.java

@@ -6,32 +6,43 @@ package com.ywt.gapi.drug;
 /**
  * Protobuf type {@code com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse}
  */
-public  final class SaveHisOpenApiPrescriptionResponse extends
+public final class SaveHisOpenApiPrescriptionResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse)
     SaveHisOpenApiPrescriptionResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SaveHisOpenApiPrescriptionResponse.newBuilder() to construct.
   private SaveHisOpenApiPrescriptionResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
   }
   private SaveHisOpenApiPrescriptionResponse() {
-    code_ = 0;
     info_ = "";
     bizNo_ = "";
     data_ = "";
   }
 
-  @java.lang.Override
+  @Override
+  @SuppressWarnings({"unused"})
+  protected Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new SaveHisOpenApiPrescriptionResponse();
+  }
+
+  @Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SaveHisOpenApiPrescriptionResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    int mutable_bitField0_ = 0;
+    if (extensionRegistry == null) {
+      throw new NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -40,35 +51,36 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
           case 0:
             done = true;
             break;
-          default: {
-            if (!input.skipField(tag)) {
-              done = true;
-            }
-            break;
-          }
           case 8: {
 
             code_ = input.readInt32();
             break;
           }
           case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             info_ = s;
             break;
           }
           case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             bizNo_ = s;
             break;
           }
           case 34: {
-            java.lang.String s = input.readStringRequireUtf8();
+            String s = input.readStringRequireUtf8();
 
             data_ = s;
             break;
           }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,57 +89,65 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor;
+    return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+  @Override
+  protected FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_fieldAccessorTable
+    return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.class, com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.Builder.class);
+            SaveHisOpenApiPrescriptionResponse.class, Builder.class);
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
   private int code_;
   /**
    * <code>int32 code = 1;</code>
+   * @return The code.
    */
+  @Override
   public int getCode() {
     return code_;
   }
 
   public static final int INFO_FIELD_NUMBER = 2;
-  private volatile java.lang.Object info_;
+  private volatile Object info_;
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getInfo() {
+    Object ref = info_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       info_ = s;
       return s;
     }
   }
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
+  @Override
   public com.google.protobuf.ByteString
       getInfoBytes() {
-    java.lang.Object ref = info_;
-    if (ref instanceof java.lang.String) {
+    Object ref = info_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       info_ = b;
       return b;
     } else {
@@ -136,32 +156,36 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
   }
 
   public static final int BIZNO_FIELD_NUMBER = 3;
-  private volatile java.lang.Object bizNo_;
+  private volatile Object bizNo_;
   /**
    * <code>string bizNo = 3;</code>
+   * @return The bizNo.
    */
-  public java.lang.String getBizNo() {
-    java.lang.Object ref = bizNo_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getBizNo() {
+    Object ref = bizNo_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       bizNo_ = s;
       return s;
     }
   }
   /**
    * <code>string bizNo = 3;</code>
+   * @return The bytes for bizNo.
    */
+  @Override
   public com.google.protobuf.ByteString
       getBizNoBytes() {
-    java.lang.Object ref = bizNo_;
-    if (ref instanceof java.lang.String) {
+    Object ref = bizNo_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       bizNo_ = b;
       return b;
     } else {
@@ -170,32 +194,36 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
   }
 
   public static final int DATA_FIELD_NUMBER = 4;
-  private volatile java.lang.Object data_;
+  private volatile Object data_;
   /**
    * <code>string data = 4;</code>
+   * @return The data.
    */
-  public java.lang.String getData() {
-    java.lang.Object ref = data_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
+  @Override
+  public String getData() {
+    Object ref = data_;
+    if (ref instanceof String) {
+      return (String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
+      String s = bs.toStringUtf8();
       data_ = s;
       return s;
     }
   }
   /**
    * <code>string data = 4;</code>
+   * @return The bytes for data.
    */
+  @Override
   public com.google.protobuf.ByteString
       getDataBytes() {
-    java.lang.Object ref = data_;
-    if (ref instanceof java.lang.String) {
+    Object ref = data_;
+    if (ref instanceof String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+              (String) ref);
       data_ = b;
       return b;
     } else {
@@ -204,6 +232,7 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
   }
 
   private byte memoizedIsInitialized = -1;
+  @Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,22 +242,25 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     return true;
   }
 
+  @Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (code_ != 0) {
       output.writeInt32(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    if (!getBizNoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bizNo_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, bizNo_);
     }
-    if (!getDataBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(data_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, data_);
     }
+    unknownFields.writeTo(output);
   }
 
+  @Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -238,43 +270,43 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, code_);
     }
-    if (!getInfoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(info_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    if (!getBizNoBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bizNo_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, bizNo_);
     }
-    if (!getDataBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(data_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, data_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
+  @Override
+  public boolean equals(final Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse)) {
+    if (!(obj instanceof SaveHisOpenApiPrescriptionResponse)) {
       return super.equals(obj);
     }
-    com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse other = (com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse) obj;
-
-    boolean result = true;
-    result = result && (getCode()
-        == other.getCode());
-    result = result && getInfo()
-        .equals(other.getInfo());
-    result = result && getBizNo()
-        .equals(other.getBizNo());
-    result = result && getData()
-        .equals(other.getData());
-    return result;
+    SaveHisOpenApiPrescriptionResponse other = (SaveHisOpenApiPrescriptionResponse) obj;
+
+    if (getCode()
+        != other.getCode()) return false;
+    if (!getInfo()
+        .equals(other.getInfo())) return false;
+    if (!getBizNo()
+        .equals(other.getBizNo())) return false;
+    if (!getData()
+        .equals(other.getData())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
   }
 
-  @java.lang.Override
+  @Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -294,69 +326,69 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     return hash;
   }
 
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(byte[] data)
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(java.io.InputStream input)
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseDelimitedFrom(java.io.InputStream input)
+  public static SaveHisOpenApiPrescriptionResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseDelimitedFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parseFrom(
+  public static SaveHisOpenApiPrescriptionResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -364,21 +396,23 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
+  @Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse prototype) {
+  public static Builder newBuilder(SaveHisOpenApiPrescriptionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
+  @Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @java.lang.Override
+  @Override
   protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -388,17 +422,18 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse)
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponseOrBuilder {
+      SaveHisOpenApiPrescriptionResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor;
+      return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    @Override
+    protected FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_fieldAccessorTable
+      return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.class, com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.Builder.class);
+              SaveHisOpenApiPrescriptionResponse.class, Builder.class);
     }
 
     // Construct using com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.newBuilder()
@@ -407,7 +442,7 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
 
     private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
@@ -416,6 +451,7 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
               .alwaysUseFieldBuilders) {
       }
     }
+    @Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -429,25 +465,29 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       return this;
     }
 
+    @Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.ywt.gapi.drug.Drug.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor;
+      return DrugProto.internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor;
     }
 
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse getDefaultInstanceForType() {
-      return com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance();
+    @Override
+    public SaveHisOpenApiPrescriptionResponse getDefaultInstanceForType() {
+      return SaveHisOpenApiPrescriptionResponse.getDefaultInstance();
     }
 
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse build() {
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse result = buildPartial();
+    @Override
+    public SaveHisOpenApiPrescriptionResponse build() {
+      SaveHisOpenApiPrescriptionResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse buildPartial() {
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse result = new com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse(this);
+    @Override
+    public SaveHisOpenApiPrescriptionResponse buildPartial() {
+      SaveHisOpenApiPrescriptionResponse result = new SaveHisOpenApiPrescriptionResponse(this);
       result.code_ = code_;
       result.info_ = info_;
       result.bizNo_ = bizNo_;
@@ -456,43 +496,50 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       return result;
     }
 
+    @Override
     public Builder clone() {
-      return (Builder) super.clone();
+      return super.clone();
     }
+    @Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.setField(field, value);
+      return super.setField(field, value);
     }
+    @Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
+      return super.clearField(field);
     }
+    @Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
+      return super.clearOneof(oneof);
     }
+    @Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
+      return super.setRepeatedField(field, index, value);
     }
+    @Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         Object value) {
-      return (Builder) super.addRepeatedField(field, value);
+      return super.addRepeatedField(field, value);
     }
+    @Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse) {
-        return mergeFrom((com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse)other);
+      if (other instanceof SaveHisOpenApiPrescriptionResponse) {
+        return mergeFrom((SaveHisOpenApiPrescriptionResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse other) {
-      if (other == com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(SaveHisOpenApiPrescriptionResponse other) {
+      if (other == SaveHisOpenApiPrescriptionResponse.getDefaultInstance()) return this;
       if (other.getCode() != 0) {
         setCode(other.getCode());
       }
@@ -508,23 +555,26 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
         data_ = other.data_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
+    @Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse parsedMessage = null;
+      SaveHisOpenApiPrescriptionResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse) e.getUnfinishedMessage();
+        parsedMessage = (SaveHisOpenApiPrescriptionResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -537,12 +587,16 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     private int code_ ;
     /**
      * <code>int32 code = 1;</code>
+     * @return The code.
      */
+    @Override
     public int getCode() {
       return code_;
     }
     /**
      * <code>int32 code = 1;</code>
+     * @param value The code to set.
+     * @return This builder for chaining.
      */
     public Builder setCode(int value) {
       
@@ -552,6 +606,7 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>int32 code = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearCode() {
       
@@ -560,32 +615,34 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private Object info_ = "";
     /**
      * <code>string info = 2;</code>
+     * @return The info.
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getInfo() {
+      Object ref = info_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         info_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string info = 2;</code>
+     * @return The bytes for info.
      */
     public com.google.protobuf.ByteString
         getInfoBytes() {
-      java.lang.Object ref = info_;
+      Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         info_ = b;
         return b;
       } else {
@@ -594,9 +651,11 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -607,6 +666,7 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @return This builder for chaining.
      */
     public Builder clearInfo() {
       
@@ -616,6 +676,8 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string info = 2;</code>
+     * @param value The bytes for info to set.
+     * @return This builder for chaining.
      */
     public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
@@ -629,32 +691,34 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       return this;
     }
 
-    private java.lang.Object bizNo_ = "";
+    private Object bizNo_ = "";
     /**
      * <code>string bizNo = 3;</code>
+     * @return The bizNo.
      */
-    public java.lang.String getBizNo() {
-      java.lang.Object ref = bizNo_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getBizNo() {
+      Object ref = bizNo_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         bizNo_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string bizNo = 3;</code>
+     * @return The bytes for bizNo.
      */
     public com.google.protobuf.ByteString
         getBizNoBytes() {
-      java.lang.Object ref = bizNo_;
+      Object ref = bizNo_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         bizNo_ = b;
         return b;
       } else {
@@ -663,9 +727,11 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string bizNo = 3;</code>
+     * @param value The bizNo to set.
+     * @return This builder for chaining.
      */
     public Builder setBizNo(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -676,6 +742,7 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string bizNo = 3;</code>
+     * @return This builder for chaining.
      */
     public Builder clearBizNo() {
       
@@ -685,6 +752,8 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string bizNo = 3;</code>
+     * @param value The bytes for bizNo to set.
+     * @return This builder for chaining.
      */
     public Builder setBizNoBytes(
         com.google.protobuf.ByteString value) {
@@ -698,32 +767,34 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       return this;
     }
 
-    private java.lang.Object data_ = "";
+    private Object data_ = "";
     /**
      * <code>string data = 4;</code>
+     * @return The data.
      */
-    public java.lang.String getData() {
-      java.lang.Object ref = data_;
-      if (!(ref instanceof java.lang.String)) {
+    public String getData() {
+      Object ref = data_;
+      if (!(ref instanceof String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
+        String s = bs.toStringUtf8();
         data_ = s;
         return s;
       } else {
-        return (java.lang.String) ref;
+        return (String) ref;
       }
     }
     /**
      * <code>string data = 4;</code>
+     * @return The bytes for data.
      */
     public com.google.protobuf.ByteString
         getDataBytes() {
-      java.lang.Object ref = data_;
+      Object ref = data_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+                (String) ref);
         data_ = b;
         return b;
       } else {
@@ -732,9 +803,11 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string data = 4;</code>
+     * @param value The data to set.
+     * @return This builder for chaining.
      */
     public Builder setData(
-        java.lang.String value) {
+        String value) {
       if (value == null) {
     throw new NullPointerException();
   }
@@ -745,6 +818,7 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string data = 4;</code>
+     * @return This builder for chaining.
      */
     public Builder clearData() {
       
@@ -754,6 +828,8 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     }
     /**
      * <code>string data = 4;</code>
+     * @param value The bytes for data to set.
+     * @return This builder for chaining.
      */
     public Builder setDataBytes(
         com.google.protobuf.ByteString value) {
@@ -766,14 +842,16 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       onChanged();
       return this;
     }
+    @Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFields(unknownFields);
     }
 
+    @Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -781,22 +859,23 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse)
-  private static final com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse DEFAULT_INSTANCE;
+  private static final SaveHisOpenApiPrescriptionResponse DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse();
+    DEFAULT_INSTANCE = new SaveHisOpenApiPrescriptionResponse();
   }
 
-  public static com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse getDefaultInstance() {
+  public static SaveHisOpenApiPrescriptionResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
   private static final com.google.protobuf.Parser<SaveHisOpenApiPrescriptionResponse>
       PARSER = new com.google.protobuf.AbstractParser<SaveHisOpenApiPrescriptionResponse>() {
+    @Override
     public SaveHisOpenApiPrescriptionResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SaveHisOpenApiPrescriptionResponse(input, extensionRegistry);
+      return new SaveHisOpenApiPrescriptionResponse(input, extensionRegistry);
     }
   };
 
@@ -804,12 +883,13 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     return PARSER;
   }
 
-  @java.lang.Override
+  @Override
   public com.google.protobuf.Parser<SaveHisOpenApiPrescriptionResponse> getParserForType() {
     return PARSER;
   }
 
-  public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse getDefaultInstanceForType() {
+  @Override
+  public SaveHisOpenApiPrescriptionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 10 - 3
src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionResponseOrBuilder.java

@@ -9,35 +9,42 @@ public interface SaveHisOpenApiPrescriptionResponseOrBuilder extends
 
   /**
    * <code>int32 code = 1;</code>
+   * @return The code.
    */
   int getCode();
 
   /**
    * <code>string info = 2;</code>
+   * @return The info.
    */
-  java.lang.String getInfo();
+  String getInfo();
   /**
    * <code>string info = 2;</code>
+   * @return The bytes for info.
    */
   com.google.protobuf.ByteString
       getInfoBytes();
 
   /**
    * <code>string bizNo = 3;</code>
+   * @return The bizNo.
    */
-  java.lang.String getBizNo();
+  String getBizNo();
   /**
    * <code>string bizNo = 3;</code>
+   * @return The bytes for bizNo.
    */
   com.google.protobuf.ByteString
       getBizNoBytes();
 
   /**
    * <code>string data = 4;</code>
+   * @return The data.
    */
-  java.lang.String getData();
+  String getData();
   /**
    * <code>string data = 4;</code>
+   * @return The bytes for data.
    */
   com.google.protobuf.ByteString
       getDataBytes();

+ 3 - 2
src/main/java/com/ywt/mg/Main.java

@@ -1,20 +1,21 @@
 package com.ywt.mg;
 
 import com.ywt.rpc.core.RestServerStarter;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Configuration
 @EnableAutoConfiguration
+@EnableDubbo
 @ComponentScan(basePackages = "com.ywt.mg")
 public class Main {
 
     public static void main(String[] args) {
         SpringApplication.run(Main.class, args);
-        System.out.println("-------- reg service ------------------");
-        RestServerStarter.build(null).registry("com.ywt.HisEsbApiService", null, "");
     }
 }

+ 0 - 19
src/main/java/com/ywt/mg/configs/GrpcChannelBeans.java

@@ -1,19 +0,0 @@
-package com.ywt.mg.configs;
-
-import io.grpc.Channel;
-import io.grpc.ManagedChannelBuilder;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GrpcChannelBeans {
-    @Value("${service.agent.grpc.addr}")
-    private String agentAddr;
-
-    @Bean(name = "agentChannel")
-    public Channel getAgentChannel() {
-        String[] hostAndPort = agentAddr.split(":");
-        return ManagedChannelBuilder.forAddress(hostAndPort[0], Integer.parseInt(hostAndPort[1])).usePlaintext(true).build();
-    }
-}

+ 0 - 25
src/main/java/com/ywt/mg/configs/ServiceGrpcStubBeans.java

@@ -1,25 +0,0 @@
-package com.ywt.mg.configs;
-
-import com.ywt.gapi.base.log.YWTLogServiceGrpc;
-import com.ywt.gapi.drug.DrugServiceGrpc;
-import io.grpc.Channel;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-@Component
-public class ServiceGrpcStubBeans {
-    @Resource(name = "agentChannel")
-    private Channel agentChannel;
-
-    @Bean(name = "drugServiceBlockingStub")
-    public DrugServiceGrpc.DrugServiceBlockingStub getDrugServiceBlockingStub(){
-        return DrugServiceGrpc.newBlockingStub(agentChannel);
-    }
-
-    @Bean(name = "ywtLogServiceBlockingStub")
-    public YWTLogServiceGrpc.YWTLogServiceBlockingStub getYWTLogServiceBlockingStub(){
-        return YWTLogServiceGrpc.newBlockingStub(agentChannel);
-    }
-}

+ 7 - 8
src/main/java/com/ywt/mg/web/controller/DrugController.java

@@ -3,12 +3,11 @@ package com.ywt.mg.web.controller;
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.base.log.SaveOpenHisPushApiLogRequest;
 import com.ywt.gapi.base.log.SaveOpenHisPushApiLogResponse;
-import com.ywt.gapi.base.log.YWTLogServiceGrpc;
-import com.ywt.gapi.drug.DrugServiceGrpc;
+import com.ywt.gapi.base.log.YWTLogService;
+import com.ywt.gapi.drug.DrugService;
 import com.ywt.gapi.drug.PrescriptionInfo;
 import com.ywt.gapi.drug.SaveHisOpenApiPrescriptionRequest;
 import com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse;
-import com.ywt.mg.core.AppMessageException;
 import com.ywt.mg.core.Checker;
 import com.ywt.mg.core.JsonSerializer;
 import com.ywt.mg.models.BaseResponse;
@@ -18,9 +17,9 @@ import com.ywt.mg.models.PrescriptionPushApiRequest.DrugInfo;
 import com.ywt.mg.models.PrescriptionPushApiRequest.PatientInfo;
 import com.ywt.mg.models.PrescriptionPushApiRequest.PrescriptionPushData;
 import com.ywt.mg.models.enums.PrescriptionInfoSourceEnum;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -43,11 +42,11 @@ public class DrugController {
 
     private static Logger logger = LoggerFactory.getLogger(DrugController.class);
 
-    @Autowired
-    private DrugServiceGrpc.DrugServiceBlockingStub drugServiceBlockingStub;
+    @DubboReference
+    private DrugService drugServiceBlockingStub;
 
-    @Autowired
-    private YWTLogServiceGrpc.YWTLogServiceBlockingStub ywtLogServiceBlockingStub;
+    @DubboReference
+    private YWTLogService ywtLogServiceBlockingStub;
 
     private final int TaiheHospitalId = 12;
     private final int BaiyunHospitalId = 41;

+ 15 - 0
src/main/resources/application.properties

@@ -10,4 +10,19 @@ server.api.url=http://127.0.0.1:13900
 
 com.parm.checkAppIdMap=[{"appId":"ywt-common-push-taihe","appSecret":"ywt-common-push-Ux8$6x0Dz1l-taihe"},{"appId":"hospital_3th_gz_test2", "appSecret":"afe6aaa2-d79b-4e7f-982f-6b19edea59f5dfdf"}]
 
+spring.application.name=com.ywt.HisEsbApiService
 
+dubbo.application.logger=slf4j
+dubbo.application.qos-enable=false
+dubbo.application.register-mode=instance
+dubbo.registry.address=nacos://192.168.3.206:8848
+dubbo.registry.parameters.namespace=158d2091-d8d8-4ef5-81f0-497747cf95a5
+dubbo.protocol.name=tri
+dubbo.protocol.port=10990
+dubbo.consumer.retries=2
+dubbo.consumer.check=false
+
+nacos.discovery.server-addr=127.0.0.1:8848
+nacos.discovery.register.group-name=DEFAULT_GROUP
+nacos.discovery.namespace=
+nacos.discovery.register.ip=127.0.0.1

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä