diff --git a/README.md b/README.md old mode 100644 new mode 100755 index a89ebb8..bb564b4 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# jigsaw-payment +# 关于Jigsaw Payment -jigsaw payment 支付系统,面向互联网商户提供的支付系统。 支付系统几乎是互联网应用必不可少的模块,也是各个互联网应用中少数可以标准化的系统。 +Jigsaw Payment 是一个面向互联网商户的开源支付系统。 支付系统几乎是互联网应用必不可少的基础设施,也是各个互联网应用中少数可以标准化的系统。 本系统是基于[凤凰牌老熊的系列文章](http://blog.lixf.cn) 而设计的,采用微服务架构。 ## 项目起源 @@ -18,15 +18,13 @@ jigsaw payment 支付系统,面向互联网商户提供的支付系统。 支 命名为Jigsaw(七巧板)的目的是让使用者可以像搭积木一样,易于定制、容易扩展。我们希望建立一个开源系统, 使用新的、成熟的微服务架构,合理引入新技术, 以产品需求为主导,实现一个架构合理、代码优雅、易于使用的支付系统。 -项目文档参见 http://jigsaw.lixf.cn。 这里仅是一个简单的入门介绍。 +项目文档参见 http://doc.jigsaw.lixf.cn。 这里仅是一个简单的入门介绍。 ## 入门 - 关于支付的领域知识,请阅读[凤凰牌老熊的系列文章](http://blog.lixf.cn) - 关于微服务架构,请参考[Martin叔叔说微服务](https://martinfowler.com/articles/microservices.html) - - ## 构建 **系统默认输出日志到/var/log/jigsaw目录,请将这个目录设置owner为当前用户。 ** @@ -36,30 +34,6 @@ jigsaw payment 支付系统,面向互联网商户提供的支付系统。 支 mvn clean install ``` -## 模块列表 - -### jigsaw-thrift-protobuf - -这是RPC引擎,使用Apache Thrift 作为容器, Google Protocol Buffer 作为输入输出。相对于dubbo、 纯Apache Thrift等RPC容器,优势在于: - -1. 高性能,Apache Thrift是已知RPC容器中性能最好的。 -2. 传输效率高, Google Protocol Buffer 的压缩率相对Apache Thrift 的strut 结构 可以节省20% 空间。 -3. 可扩展性好,得益于Protobuf优越的兼容性设计,对接口参数进行调整时,对老接口仍然可以保持很好的兼容。 - -这个引擎是对Apache Thrift 的极简轻量级封装,可靠,易于使用。 和Spring 良好集成,易于开发。 - -### jigsaw-rpc-example-server - -RPC引擎服务器端示例。 展示如何通过springframework的@Component标签来实现一个新的 - -### jigsaw-rpc-example-client - -RPC引擎客户端示例,和jigsaw-rpc-example-server配合使用。 - -### jigsaw-rpc-schema - -支付数据规范,使用Google Protocol Buffer格式来定义。 - ## 支持jigsaw payment 项目开发 ### 如果您是开发人员 @@ -69,7 +43,6 @@ RPC引擎客户端示例,和jigsaw-rpc-example-server配合使用。 2. 有Java软件开发经验,熟悉Linux; 3. (或)熟悉微服务系统的基础设施建设; 我们特别期待您的加入。 请微信关注“凤凰牌老熊”的公众号并留言,在留言中说明现在所在的公司、从事的工作、每天可以投入的时间,以及期待从事的开发模块。 -从[这里了解现有模块列表](http://jigsaw.lixf.cn/dev/2017/10/07/github-2/)。 ### 期待您的资金支持 diff --git a/jigsaw-framework/jigsaw-mysql-protobuf/pom.xml b/jigsaw-framework/jigsaw-mysql-protobuf/pom.xml new file mode 100755 index 0000000..950c3e1 --- /dev/null +++ b/jigsaw-framework/jigsaw-mysql-protobuf/pom.xml @@ -0,0 +1,112 @@ + + 4.0.0 + + org.jigsaw.payment + jigsaw-framework + 0.0.1-SNAPSHOT + .. + + jigsaw-mysql-protobuf + jar + + UTF-8 + 1.7 + protoc + 3.3.1 + 1.2 + 2.7.9 + ${basedir}/src/main/resources + + + + mysql + mysql-connector-java + + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-jdbc + + + org.springframework + spring-tx + + + org.apache.commons + commons-lang3 + + + commons-beanutils + commons-beanutils + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.guava + guava + + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-sources + + run + + generate-sources + + + Delete folder : ${basedir}/src/main/gen + + Create folder : ${basedir}/src/main/gen + + Compiling **/*.proto files... + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + src/main/gen + + + + + + + + + diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOption.java b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/ColumnFieldOption.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOption.java rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/ColumnFieldOption.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOptionOrBuilder.java b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/ColumnFieldOptionOrBuilder.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOptionOrBuilder.java rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/ColumnFieldOptionOrBuilder.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/ColumnType.java b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/ColumnType.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/ColumnType.java rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/ColumnType.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOption.java b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/TableMessageOption.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOption.java rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/TableMessageOption.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOptionOrBuilder.java b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/TableMessageOptionOrBuilder.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOptionOrBuilder.java rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/TableMessageOptionOrBuilder.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/Taglib.java b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/Taglib.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/Taglib.java rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/gen/org/jigsaw/payment/model/Taglib.java diff --git a/jigsaw-rpc/jigsaw-mysql-protobuf/src/main/java/org/jigsaw/payment/mysql/JdbcProtobufTemplate.java b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/java/org/jigsaw/payment/mysql/JdbcProtobufTemplate.java similarity index 100% rename from jigsaw-rpc/jigsaw-mysql-protobuf/src/main/java/org/jigsaw/payment/mysql/JdbcProtobufTemplate.java rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/java/org/jigsaw/payment/mysql/JdbcProtobufTemplate.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/resources/google/protobuf/descriptor.proto b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/resources/google/protobuf/descriptor.proto similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/resources/google/protobuf/descriptor.proto rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/resources/google/protobuf/descriptor.proto diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/resources/taglib.proto b/jigsaw-framework/jigsaw-mysql-protobuf/src/main/resources/taglib.proto similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/resources/taglib.proto rename to jigsaw-framework/jigsaw-mysql-protobuf/src/main/resources/taglib.proto diff --git a/jigsaw-framework/jigsaw-payment-algorithm/pom.xml b/jigsaw-framework/jigsaw-payment-algorithm/pom.xml old mode 100644 new mode 100755 index 5e3231c..4e9aec7 --- a/jigsaw-framework/jigsaw-payment-algorithm/pom.xml +++ b/jigsaw-framework/jigsaw-payment-algorithm/pom.xml @@ -3,7 +3,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - jigsaw-payment-parent + jigsaw-framework org.jigsaw.payment 0.0.1-SNAPSHOT .. diff --git a/jigsaw-rpc/jigsaw-protobuf-format/pom.xml b/jigsaw-framework/jigsaw-protobuf-format/pom.xml similarity index 98% rename from jigsaw-rpc/jigsaw-protobuf-format/pom.xml rename to jigsaw-framework/jigsaw-protobuf-format/pom.xml index 706a7dd..46adb13 100644 --- a/jigsaw-rpc/jigsaw-protobuf-format/pom.xml +++ b/jigsaw-framework/jigsaw-protobuf-format/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.jigsaw.payment - jigsaw-rpc + jigsaw-framework 0.0.1-SNAPSHOT .. diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/AbstractCharBasedFormatter.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/AbstractCharBasedFormatter.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/AbstractCharBasedFormatter.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/AbstractCharBasedFormatter.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/CouchDBFormat.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/CouchDBFormat.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/CouchDBFormat.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/CouchDBFormat.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/FormatFactory.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/FormatFactory.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/FormatFactory.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/FormatFactory.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/HtmlFormat.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/HtmlFormat.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/HtmlFormat.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/HtmlFormat.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JavaPropsFormat.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JavaPropsFormat.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JavaPropsFormat.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JavaPropsFormat.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonFormat.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonFormat.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonFormat.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonFormat.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonJacksonFormat.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonJacksonFormat.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonJacksonFormat.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/JsonJacksonFormat.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufConfiguration.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufConfiguration.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufConfiguration.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufConfiguration.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufFormatter.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufFormatter.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufFormatter.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/ProtobufFormatter.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlFormat.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlFormat.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlFormat.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlFormat.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlJavaxFormat.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlJavaxFormat.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlJavaxFormat.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/XmlJavaxFormat.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/HexUtils.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/HexUtils.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/HexUtils.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/HexUtils.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/TextUtils.java b/jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/TextUtils.java similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/TextUtils.java rename to jigsaw-framework/jigsaw-protobuf-format/src/main/java/com/googlecode/protobuf/format/util/TextUtils.java diff --git a/jigsaw-rpc/jigsaw-protobuf-format/src/main/resources/META-INF/spring.factories b/jigsaw-framework/jigsaw-protobuf-format/src/main/resources/META-INF/spring.factories similarity index 100% rename from jigsaw-rpc/jigsaw-protobuf-format/src/main/resources/META-INF/spring.factories rename to jigsaw-framework/jigsaw-protobuf-format/src/main/resources/META-INF/spring.factories diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/pom.xml b/jigsaw-framework/jigsaw-rpc-example-client/pom.xml similarity index 98% rename from jigsaw-rpc/jigsaw-rpc-example-client/pom.xml rename to jigsaw-framework/jigsaw-rpc-example-client/pom.xml index 00d15ac..93f2482 100644 --- a/jigsaw-rpc/jigsaw-rpc-example-client/pom.xml +++ b/jigsaw-framework/jigsaw-rpc-example-client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.jigsaw.payment - jigsaw-rpc + jigsaw-framework 0.0.1-SNAPSHOT jigsaw-rpc-example-client diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/src/test/gen/org/jigsaw/payment/Hello.java b/jigsaw-framework/jigsaw-rpc-example-client/src/test/gen/org/jigsaw/payment/Hello.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-client/src/test/gen/org/jigsaw/payment/Hello.java rename to jigsaw-framework/jigsaw-rpc-example-client/src/test/gen/org/jigsaw/payment/Hello.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClient.java b/jigsaw-framework/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClient.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClient.java rename to jigsaw-framework/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClient.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java b/jigsaw-framework/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java rename to jigsaw-framework/jigsaw-rpc-example-client/src/test/java/org/jigsaw/payment/rpc/hello/HelloClientConfig.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/hello.client.properties b/jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/hello.client.properties similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/hello.client.properties rename to jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/hello.client.properties diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/hello.proto b/jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/hello.proto similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/hello.proto rename to jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/hello.proto diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/log4j.properties b/jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/log4j.properties similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/log4j.properties rename to jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/log4j.properties diff --git a/jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/logback-test.xml b/jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/logback-test.xml similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-client/src/test/resources/logback-test.xml rename to jigsaw-framework/jigsaw-rpc-example-client/src/test/resources/logback-test.xml diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/pom.xml b/jigsaw-framework/jigsaw-rpc-example-server/pom.xml similarity index 98% rename from jigsaw-rpc/jigsaw-rpc-example-server/pom.xml rename to jigsaw-framework/jigsaw-rpc-example-server/pom.xml index 4e2b1e0..02849c8 100644 --- a/jigsaw-rpc/jigsaw-rpc-example-server/pom.xml +++ b/jigsaw-framework/jigsaw-rpc-example-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.jigsaw.payment - jigsaw-rpc + jigsaw-framework 0.0.1-SNAPSHOT jigsaw-rpc-example-server diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/bin/start.cmd b/jigsaw-framework/jigsaw-rpc-example-server/src/main/bin/start.cmd similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/bin/start.cmd rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/bin/start.cmd diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/gen/org/jigsaw/payment/Hello.java b/jigsaw-framework/jigsaw-rpc-example-server/src/main/gen/org/jigsaw/payment/Hello.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/gen/org/jigsaw/payment/Hello.java rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/gen/org/jigsaw/payment/Hello.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/config/HelloClientConfig.java b/jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/config/HelloClientConfig.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/config/HelloClientConfig.java rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/config/HelloClientConfig.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/FooController.java b/jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/FooController.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/FooController.java rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/FooController.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloController.java b/jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloController.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloController.java rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloController.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServer.java b/jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServer.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServer.java rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServer.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServerConfig.java b/jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServerConfig.java similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServerConfig.java rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/java/org/jigsaw/payment/rpc/hello/server/HelloServerConfig.java diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/hello.proto b/jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/hello.proto similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/hello.proto rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/hello.proto diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/hello.server.properties b/jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/hello.server.properties similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/hello.server.properties rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/hello.server.properties diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/log4j.properties b/jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/log4j.properties similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/log4j.properties rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/log4j.properties diff --git a/jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/logback-test.xml b/jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/logback-test.xml similarity index 100% rename from jigsaw-rpc/jigsaw-rpc-example-server/src/main/resources/logback-test.xml rename to jigsaw-framework/jigsaw-rpc-example-server/src/main/resources/logback-test.xml diff --git a/jigsaw-framework/jigsaw-runtime-metrics/pom.xml b/jigsaw-framework/jigsaw-runtime-metrics/pom.xml index 14bbb85..683f544 100644 --- a/jigsaw-framework/jigsaw-runtime-metrics/pom.xml +++ b/jigsaw-framework/jigsaw-runtime-metrics/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.jigsaw.payment - jigsaw-payment-parent + jigsaw-framework 0.0.1-SNAPSHOT 4.0.0 diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/CHANGELOG.md b/jigsaw-framework/jigsaw-thrift-protobuf/CHANGELOG.md similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/CHANGELOG.md rename to jigsaw-framework/jigsaw-thrift-protobuf/CHANGELOG.md diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/README.md b/jigsaw-framework/jigsaw-thrift-protobuf/README.md similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/README.md rename to jigsaw-framework/jigsaw-thrift-protobuf/README.md diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/pom.xml b/jigsaw-framework/jigsaw-thrift-protobuf/pom.xml similarity index 99% rename from jigsaw-rpc/jigsaw-thrift-protobuf/pom.xml rename to jigsaw-framework/jigsaw-thrift-protobuf/pom.xml index 3804dcf..05a220e 100644 --- a/jigsaw-rpc/jigsaw-thrift-protobuf/pom.xml +++ b/jigsaw-framework/jigsaw-thrift-protobuf/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.jigsaw.payment - jigsaw-rpc + jigsaw-framework 0.0.1-SNAPSHOT jigsaw-thrift-protobuf diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/docker/Dockerfile b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/docker/Dockerfile similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/docker/Dockerfile rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/docker/Dockerfile diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/docker/assembly.xml b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/docker/assembly.xml similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/docker/assembly.xml rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/docker/assembly.xml diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/BaseService.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/NotFoundException.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/SystemException.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/gen/org/jigsaw/payment/rpc/UserException.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/DigestAuthInfo.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/DigestAuthInfo.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/DigestAuthInfo.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/DigestAuthInfo.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/JsonSerializer.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/JsonSerializer.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/JsonSerializer.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/JsonSerializer.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/RpcPayload.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/RpcPayload.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/RpcPayload.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/register/RpcPayload.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/BaseController.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/BaseController.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/BaseController.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/BaseController.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/Controller.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/Controller.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/Controller.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/Controller.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/IpPortResolver.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/IpPortResolver.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/IpPortResolver.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/IpPortResolver.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/PidRecorder.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/PidRecorder.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/PidRecorder.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/PidRecorder.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/RpcServerConfiguration.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/RpcServerConfiguration.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/RpcServerConfiguration.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/RpcServerConfiguration.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/ServerRunner.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/ServerRunner.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/ServerRunner.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/ServerRunner.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/TProtobufProcessor.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/TProtobufProcessor.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/TProtobufProcessor.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/server/TProtobufProcessor.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/AbstractTransportPool.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/AbstractTransportPool.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/AbstractTransportPool.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/AbstractTransportPool.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicQosTransportPool.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicQosTransportPool.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicQosTransportPool.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicQosTransportPool.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicTransportPool.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicTransportPool.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicTransportPool.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/BasicTransportPool.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledException.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledException.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledException.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledException.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledTransport.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledTransport.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledTransport.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/PooledTransport.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RefreshableTransportPool.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RefreshableTransportPool.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RefreshableTransportPool.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RefreshableTransportPool.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcAccessException.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcAccessException.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcAccessException.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcAccessException.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcServiceClient.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcServiceClient.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcServiceClient.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/RpcServiceClient.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/StaticQpsTransportPool.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/StaticQpsTransportPool.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/StaticQpsTransportPool.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/StaticQpsTransportPool.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TTransportWrapper.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TTransportWrapper.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TTransportWrapper.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TTransportWrapper.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TransportManager.java b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TransportManager.java similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TransportManager.java rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/java/org/jigsaw/payment/rpc/sharder/TransportManager.java diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/resources/META-INF/spring.factories b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/resources/META-INF/spring.factories similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/resources/META-INF/spring.factories rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/resources/META-INF/spring.factories diff --git a/jigsaw-rpc/jigsaw-thrift-protobuf/src/main/resources/rpc_service.thrift b/jigsaw-framework/jigsaw-thrift-protobuf/src/main/resources/rpc_service.thrift similarity index 100% rename from jigsaw-rpc/jigsaw-thrift-protobuf/src/main/resources/rpc_service.thrift rename to jigsaw-framework/jigsaw-thrift-protobuf/src/main/resources/rpc_service.thrift diff --git a/jigsaw-framework/pom.xml b/jigsaw-framework/pom.xml index 78bc82b..26734d6 100755 --- a/jigsaw-framework/pom.xml +++ b/jigsaw-framework/pom.xml @@ -13,6 +13,11 @@ jigsaw-runtime-metrics jigsaw-payment-algorithm + jigsaw-thrift-protobuf + jigsaw-rpc-example-client + jigsaw-rpc-example-server + jigsaw-protobuf-format + jigsaw-mysql-protobuf diff --git a/jigsaw-rpc/jigsaw-mysql-protobuf/pom.xml b/jigsaw-rpc/jigsaw-mysql-protobuf/pom.xml deleted file mode 100644 index 9b6364b..0000000 --- a/jigsaw-rpc/jigsaw-mysql-protobuf/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - - org.jigsaw.payment - jigsaw-rpc - 0.0.1-SNAPSHOT - .. - - jigsaw-mysql-protobuf - jar - - UTF-8 - 1.7 - 3.3.1 - 1.2 - 2.7.9 - - - - mysql - mysql-connector-java - - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.springframework - spring-jdbc - - - org.springframework - spring-tx - - - org.apache.commons - commons-lang3 - - - commons-beanutils - commons-beanutils - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.guava - guava - - - org.jigsaw.payment - jigsaw-payment-schema - 0.0.1-SNAPSHOT - - - - diff --git a/jigsaw-rpc/pom.xml b/jigsaw-rpc/pom.xml deleted file mode 100644 index 6068848..0000000 --- a/jigsaw-rpc/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - org.jigsaw.payment - jigsaw-payment-parent - 0.0.1-SNAPSHOT - - - 4.0.0 - jigsaw-rpc - pom - Jigsaw RPC Server/Client - - jigsaw-thrift-protobuf - jigsaw-rpc-example-server - jigsaw-rpc-example-client - jigsaw-protobuf-format - jigsaw-mysql-protobuf - - - diff --git a/jigsaw-payment/jigsaw-mode-fastpay/README.md b/jigsaw-service/jigsaw-mode-fastpay/README.md similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/README.md rename to jigsaw-service/jigsaw-mode-fastpay/README.md diff --git a/jigsaw-payment/jigsaw-mode-fastpay/pom.xml b/jigsaw-service/jigsaw-mode-fastpay/pom.xml similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/pom.xml rename to jigsaw-service/jigsaw-mode-fastpay/pom.xml diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserId.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserId.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserId.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserId.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserIdValidator.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserIdValidator.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserIdValidator.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/annotation/UserIdValidator.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/RpcUserRepository.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/RpcUserRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/RpcUserRepository.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/RpcUserRepository.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/UserRepository.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/UserRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/UserRepository.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/bus/UserRepository.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/Application.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/Application.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/Application.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/Application.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractController.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractController.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractController.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractController.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractRequest.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractRequest.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractRequest.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractRequest.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractResponse.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractResponse.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractResponse.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/ContractResponse.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/WebExceptionHandler.java b/jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/WebExceptionHandler.java similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/WebExceptionHandler.java rename to jigsaw-service/jigsaw-mode-fastpay/src/main/java/org/jigsaw/payment/fastpay/WebExceptionHandler.java diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/resources/application.properties b/jigsaw-service/jigsaw-mode-fastpay/src/main/resources/application.properties similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/resources/application.properties rename to jigsaw-service/jigsaw-mode-fastpay/src/main/resources/application.properties diff --git a/jigsaw-payment/jigsaw-mode-fastpay/src/main/resources/logback.xml b/jigsaw-service/jigsaw-mode-fastpay/src/main/resources/logback.xml similarity index 100% rename from jigsaw-payment/jigsaw-mode-fastpay/src/main/resources/logback.xml rename to jigsaw-service/jigsaw-mode-fastpay/src/main/resources/logback.xml diff --git a/jigsaw-payment/jigsaw-payment-facade/LICENSE b/jigsaw-service/jigsaw-service-facade/LICENSE similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/LICENSE rename to jigsaw-service/jigsaw-service-facade/LICENSE diff --git a/jigsaw-payment/jigsaw-payment-facade/README.md b/jigsaw-service/jigsaw-service-facade/README.md similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/README.md rename to jigsaw-service/jigsaw-service-facade/README.md diff --git a/jigsaw-payment/jigsaw-payment-facade/pom.xml b/jigsaw-service/jigsaw-service-facade/pom.xml similarity index 96% rename from jigsaw-payment/jigsaw-payment-facade/pom.xml rename to jigsaw-service/jigsaw-service-facade/pom.xml index 22f5c36..9327a1b 100755 --- a/jigsaw-payment/jigsaw-payment-facade/pom.xml +++ b/jigsaw-service/jigsaw-service-facade/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.jigsaw.payment - jigsaw-payment + jigsaw-service 0.0.1-SNAPSHOT .. - jigsaw-payment-facade + jigsaw-service-facade jar https://github.com/jigsaw-projects/jigsaw-payment/jigsaw-payment-schema/ diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/AccountTitle.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/AccountTitle.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/AccountTitle.java rename to jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/AccountTitle.java diff --git a/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOption.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOption.java new file mode 100644 index 0000000..92784b5 --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOption.java @@ -0,0 +1,806 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: taglib.proto + +package org.jigsaw.payment.model; + +/** + *
+ **
+ * 数据表字段option相关的设置
+ * 
+ * + * Protobuf type {@code ColumnFieldOption} + */ +public final class ColumnFieldOption extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:ColumnFieldOption) + ColumnFieldOptionOrBuilder { +private static final long serialVersionUID = 0L; + // Use ColumnFieldOption.newBuilder() to construct. + private ColumnFieldOption(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ColumnFieldOption() { + columnName_ = ""; + columnType_ = 1; + needEncryptedStore_ = false; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ColumnFieldOption( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.protobuf.ByteString bs = input.readBytes(); + bitField0_ |= 0x00000001; + columnName_ = bs; + break; + } + case 16: { + int rawValue = input.readEnum(); + org.jigsaw.payment.model.ColumnType value = org.jigsaw.payment.model.ColumnType.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(2, rawValue); + } else { + bitField0_ |= 0x00000002; + columnType_ = rawValue; + } + break; + } + case 24: { + bitField0_ |= 0x00000004; + needEncryptedStore_ = input.readBool(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + 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 org.jigsaw.payment.model.Taglib.internal_static_ColumnFieldOption_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jigsaw.payment.model.Taglib.internal_static_ColumnFieldOption_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jigsaw.payment.model.ColumnFieldOption.class, org.jigsaw.payment.model.ColumnFieldOption.Builder.class); + } + + private int bitField0_; + public static final int COLUMN_NAME_FIELD_NUMBER = 1; + private volatile java.lang.Object columnName_; + /** + *
+   *标识字段在数据表中的列,默认使用field name 作为列名
+   * 
+ * + * optional string column_name = 1; + */ + public boolean hasColumnName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *
+   *标识字段在数据表中的列,默认使用field name 作为列名
+   * 
+ * + * optional string column_name = 1; + */ + public java.lang.String getColumnName() { + java.lang.Object ref = columnName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + columnName_ = s; + } + return s; + } + } + /** + *
+   *标识字段在数据表中的列,默认使用field name 作为列名
+   * 
+ * + * optional string column_name = 1; + */ + public com.google.protobuf.ByteString + getColumnNameBytes() { + java.lang.Object ref = columnName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + columnName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int COLUMN_TYPE_FIELD_NUMBER = 2; + private int columnType_; + /** + *
+   *标识字段数据库类型,默认使用field类型作为列类型。
+   * 
+ * + * optional .ColumnType column_type = 2; + */ + public boolean hasColumnType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *
+   *标识字段数据库类型,默认使用field类型作为列类型。
+   * 
+ * + * optional .ColumnType column_type = 2; + */ + public org.jigsaw.payment.model.ColumnType getColumnType() { + org.jigsaw.payment.model.ColumnType result = org.jigsaw.payment.model.ColumnType.valueOf(columnType_); + return result == null ? org.jigsaw.payment.model.ColumnType.VARCHAR : result; + } + + public static final int NEED_ENCRYPTED_STORE_FIELD_NUMBER = 3; + private boolean needEncryptedStore_; + /** + *
+   *是否需要加密
+   * 
+ * + * optional bool need_encrypted_store = 3; + */ + public boolean hasNeedEncryptedStore() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + *
+   *是否需要加密
+   * 
+ * + * optional bool need_encrypted_store = 3; + */ + public boolean getNeedEncryptedStore() { + return needEncryptedStore_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, columnName_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeEnum(2, columnType_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBool(3, needEncryptedStore_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, columnName_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(2, columnType_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, needEncryptedStore_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.jigsaw.payment.model.ColumnFieldOption)) { + return super.equals(obj); + } + org.jigsaw.payment.model.ColumnFieldOption other = (org.jigsaw.payment.model.ColumnFieldOption) obj; + + boolean result = true; + result = result && (hasColumnName() == other.hasColumnName()); + if (hasColumnName()) { + result = result && getColumnName() + .equals(other.getColumnName()); + } + result = result && (hasColumnType() == other.hasColumnType()); + if (hasColumnType()) { + result = result && columnType_ == other.columnType_; + } + result = result && (hasNeedEncryptedStore() == other.hasNeedEncryptedStore()); + if (hasNeedEncryptedStore()) { + result = result && (getNeedEncryptedStore() + == other.getNeedEncryptedStore()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasColumnName()) { + hash = (37 * hash) + COLUMN_NAME_FIELD_NUMBER; + hash = (53 * hash) + getColumnName().hashCode(); + } + if (hasColumnType()) { + hash = (37 * hash) + COLUMN_TYPE_FIELD_NUMBER; + hash = (53 * hash) + columnType_; + } + if (hasNeedEncryptedStore()) { + hash = (37 * hash) + NEED_ENCRYPTED_STORE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getNeedEncryptedStore()); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jigsaw.payment.model.ColumnFieldOption 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 org.jigsaw.payment.model.ColumnFieldOption parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static org.jigsaw.payment.model.ColumnFieldOption 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 org.jigsaw.payment.model.ColumnFieldOption parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jigsaw.payment.model.ColumnFieldOption parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.jigsaw.payment.model.ColumnFieldOption prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+   **
+   * 数据表字段option相关的设置
+   * 
+ * + * Protobuf type {@code ColumnFieldOption} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:ColumnFieldOption) + org.jigsaw.payment.model.ColumnFieldOptionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jigsaw.payment.model.Taglib.internal_static_ColumnFieldOption_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jigsaw.payment.model.Taglib.internal_static_ColumnFieldOption_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jigsaw.payment.model.ColumnFieldOption.class, org.jigsaw.payment.model.ColumnFieldOption.Builder.class); + } + + // Construct using org.jigsaw.payment.model.ColumnFieldOption.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + columnName_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + columnType_ = 1; + bitField0_ = (bitField0_ & ~0x00000002); + needEncryptedStore_ = false; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jigsaw.payment.model.Taglib.internal_static_ColumnFieldOption_descriptor; + } + + public org.jigsaw.payment.model.ColumnFieldOption getDefaultInstanceForType() { + return org.jigsaw.payment.model.ColumnFieldOption.getDefaultInstance(); + } + + public org.jigsaw.payment.model.ColumnFieldOption build() { + org.jigsaw.payment.model.ColumnFieldOption result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jigsaw.payment.model.ColumnFieldOption buildPartial() { + org.jigsaw.payment.model.ColumnFieldOption result = new org.jigsaw.payment.model.ColumnFieldOption(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.columnName_ = columnName_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.columnType_ = columnType_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.needEncryptedStore_ = needEncryptedStore_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jigsaw.payment.model.ColumnFieldOption) { + return mergeFrom((org.jigsaw.payment.model.ColumnFieldOption)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jigsaw.payment.model.ColumnFieldOption other) { + if (other == org.jigsaw.payment.model.ColumnFieldOption.getDefaultInstance()) return this; + if (other.hasColumnName()) { + bitField0_ |= 0x00000001; + columnName_ = other.columnName_; + onChanged(); + } + if (other.hasColumnType()) { + setColumnType(other.getColumnType()); + } + if (other.hasNeedEncryptedStore()) { + setNeedEncryptedStore(other.getNeedEncryptedStore()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jigsaw.payment.model.ColumnFieldOption parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jigsaw.payment.model.ColumnFieldOption) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.lang.Object columnName_ = ""; + /** + *
+     *标识字段在数据表中的列,默认使用field name 作为列名
+     * 
+ * + * optional string column_name = 1; + */ + public boolean hasColumnName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *
+     *标识字段在数据表中的列,默认使用field name 作为列名
+     * 
+ * + * optional string column_name = 1; + */ + public java.lang.String getColumnName() { + java.lang.Object ref = columnName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + columnName_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
+     *标识字段在数据表中的列,默认使用field name 作为列名
+     * 
+ * + * optional string column_name = 1; + */ + public com.google.protobuf.ByteString + getColumnNameBytes() { + java.lang.Object ref = columnName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + columnName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
+     *标识字段在数据表中的列,默认使用field name 作为列名
+     * 
+ * + * optional string column_name = 1; + */ + public Builder setColumnName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + columnName_ = value; + onChanged(); + return this; + } + /** + *
+     *标识字段在数据表中的列,默认使用field name 作为列名
+     * 
+ * + * optional string column_name = 1; + */ + public Builder clearColumnName() { + bitField0_ = (bitField0_ & ~0x00000001); + columnName_ = getDefaultInstance().getColumnName(); + onChanged(); + return this; + } + /** + *
+     *标识字段在数据表中的列,默认使用field name 作为列名
+     * 
+ * + * optional string column_name = 1; + */ + public Builder setColumnNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + columnName_ = value; + onChanged(); + return this; + } + + private int columnType_ = 1; + /** + *
+     *标识字段数据库类型,默认使用field类型作为列类型。
+     * 
+ * + * optional .ColumnType column_type = 2; + */ + public boolean hasColumnType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *
+     *标识字段数据库类型,默认使用field类型作为列类型。
+     * 
+ * + * optional .ColumnType column_type = 2; + */ + public org.jigsaw.payment.model.ColumnType getColumnType() { + org.jigsaw.payment.model.ColumnType result = org.jigsaw.payment.model.ColumnType.valueOf(columnType_); + return result == null ? org.jigsaw.payment.model.ColumnType.VARCHAR : result; + } + /** + *
+     *标识字段数据库类型,默认使用field类型作为列类型。
+     * 
+ * + * optional .ColumnType column_type = 2; + */ + public Builder setColumnType(org.jigsaw.payment.model.ColumnType value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + columnType_ = value.getNumber(); + onChanged(); + return this; + } + /** + *
+     *标识字段数据库类型,默认使用field类型作为列类型。
+     * 
+ * + * optional .ColumnType column_type = 2; + */ + public Builder clearColumnType() { + bitField0_ = (bitField0_ & ~0x00000002); + columnType_ = 1; + onChanged(); + return this; + } + + private boolean needEncryptedStore_ ; + /** + *
+     *是否需要加密
+     * 
+ * + * optional bool need_encrypted_store = 3; + */ + public boolean hasNeedEncryptedStore() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + *
+     *是否需要加密
+     * 
+ * + * optional bool need_encrypted_store = 3; + */ + public boolean getNeedEncryptedStore() { + return needEncryptedStore_; + } + /** + *
+     *是否需要加密
+     * 
+ * + * optional bool need_encrypted_store = 3; + */ + public Builder setNeedEncryptedStore(boolean value) { + bitField0_ |= 0x00000004; + needEncryptedStore_ = value; + onChanged(); + return this; + } + /** + *
+     *是否需要加密
+     * 
+ * + * optional bool need_encrypted_store = 3; + */ + public Builder clearNeedEncryptedStore() { + bitField0_ = (bitField0_ & ~0x00000004); + needEncryptedStore_ = false; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:ColumnFieldOption) + } + + // @@protoc_insertion_point(class_scope:ColumnFieldOption) + private static final org.jigsaw.payment.model.ColumnFieldOption DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jigsaw.payment.model.ColumnFieldOption(); + } + + public static org.jigsaw.payment.model.ColumnFieldOption getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + @java.lang.Deprecated public static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public ColumnFieldOption parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ColumnFieldOption(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public org.jigsaw.payment.model.ColumnFieldOption getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOptionOrBuilder.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOptionOrBuilder.java new file mode 100644 index 0000000..09eb8ca --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnFieldOptionOrBuilder.java @@ -0,0 +1,69 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: taglib.proto + +package org.jigsaw.payment.model; + +public interface ColumnFieldOptionOrBuilder extends + // @@protoc_insertion_point(interface_extends:ColumnFieldOption) + com.google.protobuf.MessageOrBuilder { + + /** + *
+   *标识字段在数据表中的列,默认使用field name 作为列名
+   * 
+ * + * optional string column_name = 1; + */ + boolean hasColumnName(); + /** + *
+   *标识字段在数据表中的列,默认使用field name 作为列名
+   * 
+ * + * optional string column_name = 1; + */ + java.lang.String getColumnName(); + /** + *
+   *标识字段在数据表中的列,默认使用field name 作为列名
+   * 
+ * + * optional string column_name = 1; + */ + com.google.protobuf.ByteString + getColumnNameBytes(); + + /** + *
+   *标识字段数据库类型,默认使用field类型作为列类型。
+   * 
+ * + * optional .ColumnType column_type = 2; + */ + boolean hasColumnType(); + /** + *
+   *标识字段数据库类型,默认使用field类型作为列类型。
+   * 
+ * + * optional .ColumnType column_type = 2; + */ + org.jigsaw.payment.model.ColumnType getColumnType(); + + /** + *
+   *是否需要加密
+   * 
+ * + * optional bool need_encrypted_store = 3; + */ + boolean hasNeedEncryptedStore(); + /** + *
+   *是否需要加密
+   * 
+ * + * optional bool need_encrypted_store = 3; + */ + boolean getNeedEncryptedStore(); +} diff --git a/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnType.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnType.java new file mode 100644 index 0000000..06d5f85 --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/ColumnType.java @@ -0,0 +1,154 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: taglib.proto + +package org.jigsaw.payment.model; + +/** + *
+ **
+ * mysql表字段常用类型
+ * 
+ * + * Protobuf enum {@code ColumnType} + */ +public enum ColumnType + implements com.google.protobuf.ProtocolMessageEnum { + /** + * VARCHAR = 1; + */ + VARCHAR(1), + /** + * INT = 2; + */ + INT(2), + /** + * BIGINT = 3; + */ + BIGINT(3), + /** + * DOUBLE = 4; + */ + DOUBLE(4), + /** + * FLOAT = 5; + */ + FLOAT(5), + /** + * DECIMAL = 6; + */ + DECIMAL(6), + /** + * DATETIME = 7; + */ + DATETIME(7), + /** + * TIMESTAMP = 8; + */ + TIMESTAMP(8), + ; + + /** + * VARCHAR = 1; + */ + public static final int VARCHAR_VALUE = 1; + /** + * INT = 2; + */ + public static final int INT_VALUE = 2; + /** + * BIGINT = 3; + */ + public static final int BIGINT_VALUE = 3; + /** + * DOUBLE = 4; + */ + public static final int DOUBLE_VALUE = 4; + /** + * FLOAT = 5; + */ + public static final int FLOAT_VALUE = 5; + /** + * DECIMAL = 6; + */ + public static final int DECIMAL_VALUE = 6; + /** + * DATETIME = 7; + */ + public static final int DATETIME_VALUE = 7; + /** + * TIMESTAMP = 8; + */ + public static final int TIMESTAMP_VALUE = 8; + + + public final int getNumber() { + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ColumnType valueOf(int value) { + return forNumber(value); + } + + public static ColumnType forNumber(int value) { + switch (value) { + case 1: return VARCHAR; + case 2: return INT; + case 3: return BIGINT; + case 4: return DOUBLE; + case 5: return FLOAT; + case 6: return DECIMAL; + case 7: return DATETIME; + case 8: return TIMESTAMP; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + ColumnType> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ColumnType findValueByNumber(int number) { + return ColumnType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jigsaw.payment.model.Taglib.getDescriptor().getEnumTypes().get(0); + } + + private static final ColumnType[] VALUES = values(); + + public static ColumnType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ColumnType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:ColumnType) +} + diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/EntityType.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/EntityType.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/EntityType.java rename to jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/EntityType.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/Enums.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/Enums.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/Enums.java rename to jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/Enums.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/FeeUnit.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/FeeUnit.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/FeeUnit.java rename to jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/FeeUnit.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/StatusCode.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/StatusCode.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/gen/org/jigsaw/payment/model/StatusCode.java rename to jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/StatusCode.java diff --git a/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOption.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOption.java new file mode 100644 index 0000000..958e0df --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOption.java @@ -0,0 +1,700 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: taglib.proto + +package org.jigsaw.payment.model; + +/** + *
+ **
+ * 存储配置支持,标识对应的表
+ * 
+ * + * Protobuf type {@code TableMessageOption} + */ +public final class TableMessageOption extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:TableMessageOption) + TableMessageOptionOrBuilder { +private static final long serialVersionUID = 0L; + // Use TableMessageOption.newBuilder() to construct. + private TableMessageOption(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private TableMessageOption() { + tableName_ = ""; + idNo_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private TableMessageOption( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + com.google.protobuf.ByteString bs = input.readBytes(); + bitField0_ |= 0x00000001; + tableName_ = bs; + break; + } + case 16: { + bitField0_ |= 0x00000002; + idNo_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + 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 org.jigsaw.payment.model.Taglib.internal_static_TableMessageOption_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jigsaw.payment.model.Taglib.internal_static_TableMessageOption_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jigsaw.payment.model.TableMessageOption.class, org.jigsaw.payment.model.TableMessageOption.Builder.class); + } + + private int bitField0_; + public static final int TABLE_NAME_FIELD_NUMBER = 1; + private volatile java.lang.Object tableName_; + /** + *
+   *标识数据库中的表名
+   * 
+ * + * required string table_name = 1; + */ + public boolean hasTableName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *
+   *标识数据库中的表名
+   * 
+ * + * required string table_name = 1; + */ + public java.lang.String getTableName() { + java.lang.Object ref = tableName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + tableName_ = s; + } + return s; + } + } + /** + *
+   *标识数据库中的表名
+   * 
+ * + * required string table_name = 1; + */ + public com.google.protobuf.ByteString + getTableNameBytes() { + java.lang.Object ref = tableName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + tableName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int ID_NO_FIELD_NUMBER = 2; + private int idNo_; + /** + *
+   *标识id的后缀,三位后缀,从001开始。
+   * 
+ * + * optional int32 id_no = 2; + */ + public boolean hasIdNo() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *
+   *标识id的后缀,三位后缀,从001开始。
+   * 
+ * + * optional int32 id_no = 2; + */ + public int getIdNo() { + return idNo_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + if (!hasTableName()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tableName_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, idNo_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, tableName_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, idNo_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.jigsaw.payment.model.TableMessageOption)) { + return super.equals(obj); + } + org.jigsaw.payment.model.TableMessageOption other = (org.jigsaw.payment.model.TableMessageOption) obj; + + boolean result = true; + result = result && (hasTableName() == other.hasTableName()); + if (hasTableName()) { + result = result && getTableName() + .equals(other.getTableName()); + } + result = result && (hasIdNo() == other.hasIdNo()); + if (hasIdNo()) { + result = result && (getIdNo() + == other.getIdNo()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasTableName()) { + hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER; + hash = (53 * hash) + getTableName().hashCode(); + } + if (hasIdNo()) { + hash = (37 * hash) + ID_NO_FIELD_NUMBER; + hash = (53 * hash) + getIdNo(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jigsaw.payment.model.TableMessageOption parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jigsaw.payment.model.TableMessageOption parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jigsaw.payment.model.TableMessageOption parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jigsaw.payment.model.TableMessageOption parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jigsaw.payment.model.TableMessageOption parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jigsaw.payment.model.TableMessageOption parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jigsaw.payment.model.TableMessageOption parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jigsaw.payment.model.TableMessageOption 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 org.jigsaw.payment.model.TableMessageOption parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static org.jigsaw.payment.model.TableMessageOption 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 org.jigsaw.payment.model.TableMessageOption parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jigsaw.payment.model.TableMessageOption parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.jigsaw.payment.model.TableMessageOption prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+   **
+   * 存储配置支持,标识对应的表
+   * 
+ * + * Protobuf type {@code TableMessageOption} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:TableMessageOption) + org.jigsaw.payment.model.TableMessageOptionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jigsaw.payment.model.Taglib.internal_static_TableMessageOption_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jigsaw.payment.model.Taglib.internal_static_TableMessageOption_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jigsaw.payment.model.TableMessageOption.class, org.jigsaw.payment.model.TableMessageOption.Builder.class); + } + + // Construct using org.jigsaw.payment.model.TableMessageOption.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + tableName_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + idNo_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jigsaw.payment.model.Taglib.internal_static_TableMessageOption_descriptor; + } + + public org.jigsaw.payment.model.TableMessageOption getDefaultInstanceForType() { + return org.jigsaw.payment.model.TableMessageOption.getDefaultInstance(); + } + + public org.jigsaw.payment.model.TableMessageOption build() { + org.jigsaw.payment.model.TableMessageOption result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jigsaw.payment.model.TableMessageOption buildPartial() { + org.jigsaw.payment.model.TableMessageOption result = new org.jigsaw.payment.model.TableMessageOption(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.tableName_ = tableName_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.idNo_ = idNo_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jigsaw.payment.model.TableMessageOption) { + return mergeFrom((org.jigsaw.payment.model.TableMessageOption)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jigsaw.payment.model.TableMessageOption other) { + if (other == org.jigsaw.payment.model.TableMessageOption.getDefaultInstance()) return this; + if (other.hasTableName()) { + bitField0_ |= 0x00000001; + tableName_ = other.tableName_; + onChanged(); + } + if (other.hasIdNo()) { + setIdNo(other.getIdNo()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + if (!hasTableName()) { + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jigsaw.payment.model.TableMessageOption parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jigsaw.payment.model.TableMessageOption) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.lang.Object tableName_ = ""; + /** + *
+     *标识数据库中的表名
+     * 
+ * + * required string table_name = 1; + */ + public boolean hasTableName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + *
+     *标识数据库中的表名
+     * 
+ * + * required string table_name = 1; + */ + public java.lang.String getTableName() { + java.lang.Object ref = tableName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + tableName_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
+     *标识数据库中的表名
+     * 
+ * + * required string table_name = 1; + */ + public com.google.protobuf.ByteString + getTableNameBytes() { + java.lang.Object ref = tableName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + tableName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
+     *标识数据库中的表名
+     * 
+ * + * required string table_name = 1; + */ + public Builder setTableName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + tableName_ = value; + onChanged(); + return this; + } + /** + *
+     *标识数据库中的表名
+     * 
+ * + * required string table_name = 1; + */ + public Builder clearTableName() { + bitField0_ = (bitField0_ & ~0x00000001); + tableName_ = getDefaultInstance().getTableName(); + onChanged(); + return this; + } + /** + *
+     *标识数据库中的表名
+     * 
+ * + * required string table_name = 1; + */ + public Builder setTableNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + tableName_ = value; + onChanged(); + return this; + } + + private int idNo_ ; + /** + *
+     *标识id的后缀,三位后缀,从001开始。
+     * 
+ * + * optional int32 id_no = 2; + */ + public boolean hasIdNo() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + *
+     *标识id的后缀,三位后缀,从001开始。
+     * 
+ * + * optional int32 id_no = 2; + */ + public int getIdNo() { + return idNo_; + } + /** + *
+     *标识id的后缀,三位后缀,从001开始。
+     * 
+ * + * optional int32 id_no = 2; + */ + public Builder setIdNo(int value) { + bitField0_ |= 0x00000002; + idNo_ = value; + onChanged(); + return this; + } + /** + *
+     *标识id的后缀,三位后缀,从001开始。
+     * 
+ * + * optional int32 id_no = 2; + */ + public Builder clearIdNo() { + bitField0_ = (bitField0_ & ~0x00000002); + idNo_ = 0; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:TableMessageOption) + } + + // @@protoc_insertion_point(class_scope:TableMessageOption) + private static final org.jigsaw.payment.model.TableMessageOption DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jigsaw.payment.model.TableMessageOption(); + } + + public static org.jigsaw.payment.model.TableMessageOption getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + @java.lang.Deprecated public static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public TableMessageOption parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TableMessageOption(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public org.jigsaw.payment.model.TableMessageOption getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOptionOrBuilder.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOptionOrBuilder.java new file mode 100644 index 0000000..21283d5 --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/TableMessageOptionOrBuilder.java @@ -0,0 +1,52 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: taglib.proto + +package org.jigsaw.payment.model; + +public interface TableMessageOptionOrBuilder extends + // @@protoc_insertion_point(interface_extends:TableMessageOption) + com.google.protobuf.MessageOrBuilder { + + /** + *
+   *标识数据库中的表名
+   * 
+ * + * required string table_name = 1; + */ + boolean hasTableName(); + /** + *
+   *标识数据库中的表名
+   * 
+ * + * required string table_name = 1; + */ + java.lang.String getTableName(); + /** + *
+   *标识数据库中的表名
+   * 
+ * + * required string table_name = 1; + */ + com.google.protobuf.ByteString + getTableNameBytes(); + + /** + *
+   *标识id的后缀,三位后缀,从001开始。
+   * 
+ * + * optional int32 id_no = 2; + */ + boolean hasIdNo(); + /** + *
+   *标识id的后缀,三位后缀,从001开始。
+   * 
+ * + * optional int32 id_no = 2; + */ + int getIdNo(); +} diff --git a/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/Taglib.java b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/Taglib.java new file mode 100644 index 0000000..c1e8565 --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/gen/org/jigsaw/payment/model/Taglib.java @@ -0,0 +1,119 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: taglib.proto + +package org.jigsaw.payment.model; + +public final class Taglib { + private Taglib() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + registry.add(org.jigsaw.payment.model.Taglib.tableOption); + registry.add(org.jigsaw.payment.model.Taglib.columnOption); + registry.add(org.jigsaw.payment.model.Taglib.alias); + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public static final int TABLE_OPTION_FIELD_NUMBER = 60000; + /** + * extend .google.protobuf.MessageOptions { ... } + */ + public static final + com.google.protobuf.GeneratedMessage.GeneratedExtension< + com.google.protobuf.DescriptorProtos.MessageOptions, + org.jigsaw.payment.model.TableMessageOption> tableOption = com.google.protobuf.GeneratedMessage + .newFileScopedGeneratedExtension( + org.jigsaw.payment.model.TableMessageOption.class, + org.jigsaw.payment.model.TableMessageOption.getDefaultInstance()); + public static final int COLUMN_OPTION_FIELD_NUMBER = 60001; + /** + * extend .google.protobuf.FieldOptions { ... } + */ + public static final + com.google.protobuf.GeneratedMessage.GeneratedExtension< + com.google.protobuf.DescriptorProtos.FieldOptions, + org.jigsaw.payment.model.ColumnFieldOption> columnOption = com.google.protobuf.GeneratedMessage + .newFileScopedGeneratedExtension( + org.jigsaw.payment.model.ColumnFieldOption.class, + org.jigsaw.payment.model.ColumnFieldOption.getDefaultInstance()); + public static final int ALIAS_FIELD_NUMBER = 60002; + /** + * extend .google.protobuf.EnumValueOptions { ... } + */ + public static final + com.google.protobuf.GeneratedMessage.GeneratedExtension< + com.google.protobuf.DescriptorProtos.EnumValueOptions, + java.lang.String> alias = com.google.protobuf.GeneratedMessage + .newFileScopedGeneratedExtension( + java.lang.String.class, + null); + static final com.google.protobuf.Descriptors.Descriptor + internal_static_TableMessageOption_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_TableMessageOption_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_ColumnFieldOption_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_ColumnFieldOption_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\014taglib.proto\032 google/protobuf/descript" + + "or.proto\"7\n\022TableMessageOption\022\022\n\ntable_" + + "name\030\001 \002(\t\022\r\n\005id_no\030\002 \001(\005\"h\n\021ColumnField" + + "Option\022\023\n\013column_name\030\001 \001(\t\022 \n\013column_ty" + + "pe\030\002 \001(\0162\013.ColumnType\022\034\n\024need_encrypted_" + + "store\030\003 \001(\010*o\n\nColumnType\022\013\n\007VARCHAR\020\001\022\007" + + "\n\003INT\020\002\022\n\n\006BIGINT\020\003\022\n\n\006DOUBLE\020\004\022\t\n\005FLOAT" + + "\020\005\022\013\n\007DECIMAL\020\006\022\014\n\010DATETIME\020\007\022\r\n\tTIMESTA" + + "MP\020\010:L\n\014table_option\022\037.google.protobuf.M" + + "essageOptions\030\340\324\003 \001(\0132\023.TableMessageOpti" + + "on:J\n\rcolumn_option\022\035.google.protobuf.Fi" + + "eldOptions\030\341\324\003 \001(\0132\022.ColumnFieldOption:2" + + "\n\005alias\022!.google.protobuf.EnumValueOptio" + + "ns\030\342\324\003 \001(\tB\034\n\030org.jigsaw.payment.modelP\001" + }; + 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 + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + com.google.protobuf.DescriptorProtos.getDescriptor(), + }, assigner); + internal_static_TableMessageOption_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_TableMessageOption_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_TableMessageOption_descriptor, + new java.lang.String[] { "TableName", "IdNo", }); + internal_static_ColumnFieldOption_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_ColumnFieldOption_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_ColumnFieldOption_descriptor, + new java.lang.String[] { "ColumnName", "ColumnType", "NeedEncryptedStore", }); + tableOption.internalInit(descriptor.getExtensions().get(0)); + columnOption.internalInit(descriptor.getExtensions().get(1)); + alias.internalInit(descriptor.getExtensions().get(2)); + com.google.protobuf.DescriptorProtos.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/java/org/jigsaw/payment/model/IllegalParameterException.java b/jigsaw-service/jigsaw-service-facade/src/main/java/org/jigsaw/payment/model/IllegalParameterException.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/java/org/jigsaw/payment/model/IllegalParameterException.java rename to jigsaw-service/jigsaw-service-facade/src/main/java/org/jigsaw/payment/model/IllegalParameterException.java diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/resources/entity.proto b/jigsaw-service/jigsaw-service-facade/src/main/resources/entity.proto similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/resources/entity.proto rename to jigsaw-service/jigsaw-service-facade/src/main/resources/entity.proto diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/resources/enums.proto b/jigsaw-service/jigsaw-service-facade/src/main/resources/enums.proto similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/resources/enums.proto rename to jigsaw-service/jigsaw-service-facade/src/main/resources/enums.proto diff --git a/jigsaw-service/jigsaw-service-facade/src/main/resources/google/protobuf/descriptor.proto b/jigsaw-service/jigsaw-service-facade/src/main/resources/google/protobuf/descriptor.proto new file mode 100644 index 0000000..7099135 --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/resources/google/protobuf/descriptor.proto @@ -0,0 +1,732 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Author: kenton@google.com (Kenton Varda) +// Based on original Protocol Buffers design by +// Sanjay Ghemawat, Jeff Dean, and others. +// +// The messages in this file describe the definitions found in .proto files. +// A valid .proto file can be translated directly to a FileDescriptorProto +// without any other information (e.g. without reading its imports). + + +syntax = "proto2"; + +package google.protobuf; +option java_package = "com.google.protobuf"; +option java_outer_classname = "DescriptorProtos"; +option csharp_namespace = "Google.ProtocolBuffers.DescriptorProtos"; +option objc_class_prefix = "GPB"; + +// descriptor.proto must be optimized for speed because reflection-based +// algorithms don't work during bootstrapping. +option optimize_for = SPEED; + +// The protocol compiler can output a FileDescriptorSet containing the .proto +// files it parses. +message FileDescriptorSet { + repeated FileDescriptorProto file = 1; +} + +// Describes a complete .proto file. +message FileDescriptorProto { + optional string name = 1; // file name, relative to root of source tree + optional string package = 2; // e.g. "foo", "foo.bar", etc. + + // Names of files imported by this file. + repeated string dependency = 3; + // Indexes of the public imported files in the dependency list above. + repeated int32 public_dependency = 10; + // Indexes of the weak imported files in the dependency list. + // For Google-internal migration only. Do not use. + repeated int32 weak_dependency = 11; + + // All top-level definitions in this file. + repeated DescriptorProto message_type = 4; + repeated EnumDescriptorProto enum_type = 5; + repeated ServiceDescriptorProto service = 6; + repeated FieldDescriptorProto extension = 7; + + optional FileOptions options = 8; + + // This field contains optional information about the original source code. + // You may safely remove this entire field without harming runtime + // functionality of the descriptors -- the information is needed only by + // development tools. + optional SourceCodeInfo source_code_info = 9; + + // The syntax of the proto file. + // The supported values are "proto2" and "proto3". + optional string syntax = 12; +} + +// Describes a message type. +message DescriptorProto { + optional string name = 1; + + repeated FieldDescriptorProto field = 2; + repeated FieldDescriptorProto extension = 6; + + repeated DescriptorProto nested_type = 3; + repeated EnumDescriptorProto enum_type = 4; + + message ExtensionRange { + optional int32 start = 1; + optional int32 end = 2; + } + repeated ExtensionRange extension_range = 5; + + repeated OneofDescriptorProto oneof_decl = 8; + + optional MessageOptions options = 7; +} + +// Describes a field within a message. +message FieldDescriptorProto { + enum Type { + // 0 is reserved for errors. + // Order is weird for historical reasons. + TYPE_DOUBLE = 1; + TYPE_FLOAT = 2; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if + // negative values are likely. + TYPE_INT64 = 3; + TYPE_UINT64 = 4; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if + // negative values are likely. + TYPE_INT32 = 5; + TYPE_FIXED64 = 6; + TYPE_FIXED32 = 7; + TYPE_BOOL = 8; + TYPE_STRING = 9; + TYPE_GROUP = 10; // Tag-delimited aggregate. + TYPE_MESSAGE = 11; // Length-delimited aggregate. + + // New in version 2. + TYPE_BYTES = 12; + TYPE_UINT32 = 13; + TYPE_ENUM = 14; + TYPE_SFIXED32 = 15; + TYPE_SFIXED64 = 16; + TYPE_SINT32 = 17; // Uses ZigZag encoding. + TYPE_SINT64 = 18; // Uses ZigZag encoding. + }; + + enum Label { + // 0 is reserved for errors + LABEL_OPTIONAL = 1; + LABEL_REQUIRED = 2; + LABEL_REPEATED = 3; + // TODO(sanjay): Should we add LABEL_MAP? + }; + + optional string name = 1; + optional int32 number = 3; + optional Label label = 4; + + // If type_name is set, this need not be set. If both this and type_name + // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. + optional Type type = 5; + + // For message and enum types, this is the name of the type. If the name + // starts with a '.', it is fully-qualified. Otherwise, C++-like scoping + // rules are used to find the type (i.e. first the nested types within this + // message are searched, then within the parent, on up to the root + // namespace). + optional string type_name = 6; + + // For extensions, this is the name of the type being extended. It is + // resolved in the same manner as type_name. + optional string extendee = 2; + + // For numeric types, contains the original text representation of the value. + // For booleans, "true" or "false". + // For strings, contains the default text contents (not escaped in any way). + // For bytes, contains the C escaped value. All bytes >= 128 are escaped. + // TODO(kenton): Base-64 encode? + optional string default_value = 7; + + // If set, gives the index of a oneof in the containing type's oneof_decl + // list. This field is a member of that oneof. + optional int32 oneof_index = 9; + + optional FieldOptions options = 8; +} + +// Describes a oneof. +message OneofDescriptorProto { + optional string name = 1; +} + +// Describes an enum type. +message EnumDescriptorProto { + optional string name = 1; + + repeated EnumValueDescriptorProto value = 2; + + optional EnumOptions options = 3; +} + +// Describes a value within an enum. +message EnumValueDescriptorProto { + optional string name = 1; + optional int32 number = 2; + + optional EnumValueOptions options = 3; +} + +// Describes a service. +message ServiceDescriptorProto { + optional string name = 1; + repeated MethodDescriptorProto method = 2; + + optional ServiceOptions options = 3; +} + +// Describes a method of a service. +message MethodDescriptorProto { + optional string name = 1; + + // Input and output type names. These are resolved in the same way as + // FieldDescriptorProto.type_name, but must refer to a message type. + optional string input_type = 2; + optional string output_type = 3; + + optional MethodOptions options = 4; + + // Identifies if client streams multiple client messages + optional bool client_streaming = 5 [default=false]; + // Identifies if server streams multiple server messages + optional bool server_streaming = 6 [default=false]; +} + + +// =================================================================== +// Options + +// Each of the definitions above may have "options" attached. These are +// just annotations which may cause code to be generated slightly differently +// or may contain hints for code that manipulates protocol messages. +// +// Clients may define custom options as extensions of the *Options messages. +// These extensions may not yet be known at parsing time, so the parser cannot +// store the values in them. Instead it stores them in a field in the *Options +// message called uninterpreted_option. This field must have the same name +// across all *Options messages. We then use this field to populate the +// extensions when we build a descriptor, at which point all protos have been +// parsed and so all extensions are known. +// +// Extension numbers for custom options may be chosen as follows: +// * For options which will only be used within a single application or +// organization, or for experimental options, use field numbers 50000 +// through 99999. It is up to you to ensure that you do not use the +// same number for multiple options. +// * For options which will be published and used publicly by multiple +// independent entities, e-mail protobuf-global-extension-registry@google.com +// to reserve extension numbers. Simply provide your project name (e.g. +// Object-C plugin) and your porject website (if available) -- there's no need +// to explain how you intend to use them. Usually you only need one extension +// number. You can declare multiple options with only one extension number by +// putting them in a sub-message. See the Custom Options section of the docs +// for examples: +// https://developers.google.com/protocol-buffers/docs/proto#options +// If this turns out to be popular, a web service will be set up +// to automatically assign option numbers. + + +message FileOptions { + + // Sets the Java package where classes generated from this .proto will be + // placed. By default, the proto package is used, but this is often + // inappropriate because proto packages do not normally start with backwards + // domain names. + optional string java_package = 1; + + + // If set, all the classes from the .proto file are wrapped in a single + // outer class with the given name. This applies to both Proto1 + // (equivalent to the old "--one_java_file" option) and Proto2 (where + // a .proto always translates to a single class, but you may want to + // explicitly choose the class name). + optional string java_outer_classname = 8; + + // If set true, then the Java code generator will generate a separate .java + // file for each top-level message, enum, and service defined in the .proto + // file. Thus, these types will *not* be nested inside the outer class + // named by java_outer_classname. However, the outer class will still be + // generated to contain the file's getDescriptor() method as well as any + // top-level extensions defined in the file. + optional bool java_multiple_files = 10 [default=false]; + + // If set true, then the Java code generator will generate equals() and + // hashCode() methods for all messages defined in the .proto file. + // - In the full runtime, this is purely a speed optimization, as the + // AbstractMessage base class includes reflection-based implementations of + // these methods. + //- In the lite runtime, setting this option changes the semantics of + // equals() and hashCode() to more closely match those of the full runtime; + // the generated methods compute their results based on field values rather + // than object identity. (Implementations should not assume that hashcodes + // will be consistent across runtimes or versions of the protocol compiler.) + optional bool java_generate_equals_and_hash = 20 [default=false]; + + // If set true, then the Java2 code generator will generate code that + // throws an exception whenever an attempt is made to assign a non-UTF-8 + // byte sequence to a string field. + // Message reflection will do the same. + // However, an extension field still accepts non-UTF-8 byte sequences. + // This option has no effect on when used with the lite runtime. + optional bool java_string_check_utf8 = 27 [default=false]; + + + // Generated classes can be optimized for speed or code size. + enum OptimizeMode { + SPEED = 1; // Generate complete code for parsing, serialization, + // etc. + CODE_SIZE = 2; // Use ReflectionOps to implement these methods. + LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. + } + optional OptimizeMode optimize_for = 9 [default=SPEED]; + + // Sets the Go package where structs generated from this .proto will be + // placed. If omitted, the Go package will be derived from the following: + // - The basename of the package import path, if provided. + // - Otherwise, the package statement in the .proto file, if present. + // - Otherwise, the basename of the .proto file, without extension. + optional string go_package = 11; + + + + // Should generic services be generated in each language? "Generic" services + // are not specific to any particular RPC system. They are generated by the + // main code generators in each language (without additional plugins). + // Generic services were the only kind of service generation supported by + // early versions of google.protobuf. + // + // Generic services are now considered deprecated in favor of using plugins + // that generate code specific to your particular RPC system. Therefore, + // these default to false. Old code which depends on generic services should + // explicitly set them to true. + optional bool cc_generic_services = 16 [default=false]; + optional bool java_generic_services = 17 [default=false]; + optional bool py_generic_services = 18 [default=false]; + + // Is this file deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for everything in the file, or it will be completely ignored; in the very + // least, this is a formalization for deprecating files. + optional bool deprecated = 23 [default=false]; + + // Enables the use of arenas for the proto messages in this file. This applies + // only to generated classes for C++. + optional bool cc_enable_arenas = 31 [default=false]; + + + // Sets the objective c class prefix which is prepended to all objective c + // generated classes from this .proto. There is no default. + optional string objc_class_prefix = 36; + + // Namespace for generated classes; defaults to the package. + optional string csharp_namespace = 37; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message MessageOptions { + // Set true to use the old proto1 MessageSet wire format for extensions. + // This is provided for backwards-compatibility with the MessageSet wire + // format. You should not use this for any other reason: It's less + // efficient, has fewer features, and is more complicated. + // + // The message must be defined exactly as follows: + // message Foo { + // option message_set_wire_format = true; + // extensions 4 to max; + // } + // Note that the message cannot have any defined fields; MessageSets only + // have extensions. + // + // All extensions of your type must be singular messages; e.g. they cannot + // be int32s, enums, or repeated messages. + // + // Because this is an option, the above two restrictions are not enforced by + // the protocol compiler. + optional bool message_set_wire_format = 1 [default=false]; + + // Disables the generation of the standard "descriptor()" accessor, which can + // conflict with a field of the same name. This is meant to make migration + // from proto1 easier; new code should avoid fields named "descriptor". + optional bool no_standard_descriptor_accessor = 2 [default=false]; + + // Is this message deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the message, or it will be completely ignored; in the very least, + // this is a formalization for deprecating messages. + optional bool deprecated = 3 [default=false]; + + // Whether the message is an automatically generated map entry type for the + // maps field. + // + // For maps fields: + // map map_field = 1; + // The parsed descriptor looks like: + // message MapFieldEntry { + // option map_entry = true; + // optional KeyType key = 1; + // optional ValueType value = 2; + // } + // repeated MapFieldEntry map_field = 1; + // + // Implementations may choose not to generate the map_entry=true message, but + // use a native map in the target language to hold the keys and values. + // The reflection APIs in such implementions still need to work as + // if the field is a repeated message field. + // + // NOTE: Do not set the option in .proto files. Always use the maps syntax + // instead. The option should only be implicitly set by the proto compiler + // parser. + optional bool map_entry = 7; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message FieldOptions { + // The ctype option instructs the C++ code generator to use a different + // representation of the field than it normally would. See the specific + // options below. This option is not yet implemented in the open source + // release -- sorry, we'll try to include it in a future version! + optional CType ctype = 1 [default = STRING]; + enum CType { + // Default mode. + STRING = 0; + + CORD = 1; + + STRING_PIECE = 2; + } + // The packed option can be enabled for repeated primitive fields to enable + // a more efficient representation on the wire. Rather than repeatedly + // writing the tag and type for each element, the entire array is encoded as + // a single length-delimited blob. + optional bool packed = 2; + + + + // Should this field be parsed lazily? Lazy applies only to message-type + // fields. It means that when the outer message is initially parsed, the + // inner message's contents will not be parsed but instead stored in encoded + // form. The inner message will actually be parsed when it is first accessed. + // + // This is only a hint. Implementations are free to choose whether to use + // eager or lazy parsing regardless of the value of this option. However, + // setting this option true suggests that the protocol author believes that + // using lazy parsing on this field is worth the additional bookkeeping + // overhead typically needed to implement it. + // + // This option does not affect the public interface of any generated code; + // all method signatures remain the same. Furthermore, thread-safety of the + // interface is not affected by this option; const methods remain safe to + // call from multiple threads concurrently, while non-const methods continue + // to require exclusive access. + // + // + // Note that implementations may choose not to check required fields within + // a lazy sub-message. That is, calling IsInitialized() on the outher message + // may return true even if the inner message has missing required fields. + // This is necessary because otherwise the inner message would have to be + // parsed in order to perform the check, defeating the purpose of lazy + // parsing. An implementation which chooses not to check required fields + // must be consistent about it. That is, for any particular sub-message, the + // implementation must either *always* check its required fields, or *never* + // check its required fields, regardless of whether or not the message has + // been parsed. + optional bool lazy = 5 [default=false]; + + // Is this field deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for accessors, or it will be completely ignored; in the very least, this + // is a formalization for deprecating fields. + optional bool deprecated = 3 [default=false]; + + // For Google-internal migration only. Do not use. + optional bool weak = 10 [default=false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumOptions { + + // Set this option to true to allow mapping different tag names to the same + // value. + optional bool allow_alias = 2; + + // Is this enum deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum, or it will be completely ignored; in the very least, this + // is a formalization for deprecating enums. + optional bool deprecated = 3 [default=false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumValueOptions { + // Is this enum value deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum value, or it will be completely ignored; in the very least, + // this is a formalization for deprecating enum values. + optional bool deprecated = 1 [default=false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message ServiceOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this service deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the service, or it will be completely ignored; in the very least, + // this is a formalization for deprecating services. + optional bool deprecated = 33 [default=false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message MethodOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this method deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the method, or it will be completely ignored; in the very least, + // this is a formalization for deprecating methods. + optional bool deprecated = 33 [default=false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + + +// A message representing a option the parser does not recognize. This only +// appears in options protos created by the compiler::Parser class. +// DescriptorPool resolves these when building Descriptor objects. Therefore, +// options protos in descriptor objects (e.g. returned by Descriptor::options(), +// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions +// in them. +message UninterpretedOption { + // The name of the uninterpreted option. Each string represents a segment in + // a dot-separated name. is_extension is true iff a segment represents an + // extension (denoted with parentheses in options specs in .proto files). + // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents + // "foo.(bar.baz).qux". + message NamePart { + required string name_part = 1; + required bool is_extension = 2; + } + repeated NamePart name = 2; + + // The value of the uninterpreted option, in whatever type the tokenizer + // identified it as during parsing. Exactly one of these should be set. + optional string identifier_value = 3; + optional uint64 positive_int_value = 4; + optional int64 negative_int_value = 5; + optional double double_value = 6; + optional bytes string_value = 7; + optional string aggregate_value = 8; +} + +// =================================================================== +// Optional source code info + +// Encapsulates information about the original source file from which a +// FileDescriptorProto was generated. +message SourceCodeInfo { + // A Location identifies a piece of source code in a .proto file which + // corresponds to a particular definition. This information is intended + // to be useful to IDEs, code indexers, documentation generators, and similar + // tools. + // + // For example, say we have a file like: + // message Foo { + // optional string foo = 1; + // } + // Let's look at just the field definition: + // optional string foo = 1; + // ^ ^^ ^^ ^ ^^^ + // a bc de f ghi + // We have the following locations: + // span path represents + // [a,i) [ 4, 0, 2, 0 ] The whole field definition. + // [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). + // [c,d) [ 4, 0, 2, 0, 5 ] The type (string). + // [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). + // [g,h) [ 4, 0, 2, 0, 3 ] The number (1). + // + // Notes: + // - A location may refer to a repeated field itself (i.e. not to any + // particular index within it). This is used whenever a set of elements are + // logically enclosed in a single code segment. For example, an entire + // extend block (possibly containing multiple extension definitions) will + // have an outer location whose path refers to the "extensions" repeated + // field without an index. + // - Multiple locations may have the same path. This happens when a single + // logical declaration is spread out across multiple places. The most + // obvious example is the "extend" block again -- there may be multiple + // extend blocks in the same scope, each of which will have the same path. + // - A location's span is not always a subset of its parent's span. For + // example, the "extendee" of an extension declaration appears at the + // beginning of the "extend" block and is shared by all extensions within + // the block. + // - Just because a location's span is a subset of some other location's span + // does not mean that it is a descendent. For example, a "group" defines + // both a type and a field in a single declaration. Thus, the locations + // corresponding to the type and field and their components will overlap. + // - Code which tries to interpret locations should probably be designed to + // ignore those that it doesn't understand, as more types of locations could + // be recorded in the future. + repeated Location location = 1; + message Location { + // Identifies which part of the FileDescriptorProto was defined at this + // location. + // + // Each element is a field number or an index. They form a path from + // the root FileDescriptorProto to the place where the definition. For + // example, this path: + // [ 4, 3, 2, 7, 1 ] + // refers to: + // file.message_type(3) // 4, 3 + // .field(7) // 2, 7 + // .name() // 1 + // This is because FileDescriptorProto.message_type has field number 4: + // repeated DescriptorProto message_type = 4; + // and DescriptorProto.field has field number 2: + // repeated FieldDescriptorProto field = 2; + // and FieldDescriptorProto.name has field number 1: + // optional string name = 1; + // + // Thus, the above path gives the location of a field name. If we removed + // the last element: + // [ 4, 3, 2, 7 ] + // this path refers to the whole field declaration (from the beginning + // of the label to the terminating semicolon). + repeated int32 path = 1 [packed=true]; + + // Always has exactly three or four elements: start line, start column, + // end line (optional, otherwise assumed same as start line), end column. + // These are packed into a single field for efficiency. Note that line + // and column numbers are zero-based -- typically you will want to add + // 1 to each before displaying to a user. + repeated int32 span = 2 [packed=true]; + + // If this SourceCodeInfo represents a complete declaration, these are any + // comments appearing before and after the declaration which appear to be + // attached to the declaration. + // + // A series of line comments appearing on consecutive lines, with no other + // tokens appearing on those lines, will be treated as a single comment. + // + // leading_detached_comments will keep paragraphs of comments that appear + // before (but not connected to) the current element. Each paragraph, + // separated by empty lines, will be one comment element in the repeated + // field. + // + // Only the comment content is provided; comment markers (e.g. //) are + // stripped out. For block comments, leading whitespace and an asterisk + // will be stripped from the beginning of each line other than the first. + // Newlines are included in the output. + // + // Examples: + // + // optional int32 foo = 1; // Comment attached to foo. + // // Comment attached to bar. + // optional int32 bar = 2; + // + // optional string baz = 3; + // // Comment attached to baz. + // // Another line attached to baz. + // + // // Comment attached to qux. + // // + // // Another line attached to qux. + // optional double qux = 4; + // + // // Detached comment for corge. This is not leading or trailing comments + // // to qux or corge because there are blank lines separating it from + // // both. + // + // // Detached comment for corge paragraph 2. + // + // optional string corge = 5; + // /* Block comment attached + // * to corge. Leading asterisks + // * will be removed. */ + // /* Block comment attached to + // * grault. */ + // optional int32 grault = 6; + // + // // ignored detached comments. + optional string leading_comments = 3; + optional string trailing_comments = 4; + repeated string leading_detached_comments = 6; + } +} diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/resources/id_service.proto b/jigsaw-service/jigsaw-service-facade/src/main/resources/id_service.proto similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/resources/id_service.proto rename to jigsaw-service/jigsaw-service-facade/src/main/resources/id_service.proto diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/resources/pay_order_service.proto b/jigsaw-service/jigsaw-service-facade/src/main/resources/pay_order_service.proto similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/resources/pay_order_service.proto rename to jigsaw-service/jigsaw-service-facade/src/main/resources/pay_order_service.proto diff --git a/jigsaw-service/jigsaw-service-facade/src/main/resources/taglib.proto b/jigsaw-service/jigsaw-service-facade/src/main/resources/taglib.proto new file mode 100644 index 0000000..8cb8434 --- /dev/null +++ b/jigsaw-service/jigsaw-service-facade/src/main/resources/taglib.proto @@ -0,0 +1,56 @@ +syntax = "proto2"; +option java_package = "org.jigsaw.payment.model"; +option java_multiple_files = true;//指定生成多个类 +import "google/protobuf/descriptor.proto"; + + +/** + * 存储配置支持,标识对应的表 + **/ +message TableMessageOption { + //标识数据库中的表名 + required string table_name = 1; + //标识id的后缀,三位后缀,从001开始。 + optional int32 id_no = 2; +} + +extend google.protobuf.MessageOptions { + optional TableMessageOption table_option = 60000; +} + +/** + * 数据表字段option相关的设置 + **/ +message ColumnFieldOption { + //标识字段在数据表中的列,默认使用field name 作为列名 + optional string column_name = 1; + //标识字段数据库类型,默认使用field类型作为列类型。 + optional ColumnType column_type = 2; + //是否需要加密 + optional bool need_encrypted_store = 3; +} + +extend google.protobuf.FieldOptions { + optional ColumnFieldOption column_option = 60001; +} + +/** + * mysql表字段常用类型 + **/ +enum ColumnType { + VARCHAR = 1; + INT = 2; + BIGINT = 3; + DOUBLE = 4; + FLOAT = 5; + DECIMAL = 6; + DATETIME = 7; + TIMESTAMP = 8; +} + +/** + * 平台终端代码历史版本 + **/ +extend google.protobuf.EnumValueOptions { + optional string alias = 60002; +} \ No newline at end of file diff --git a/jigsaw-payment/jigsaw-payment-facade/src/main/resources/user_service.proto b/jigsaw-service/jigsaw-service-facade/src/main/resources/user_service.proto similarity index 100% rename from jigsaw-payment/jigsaw-payment-facade/src/main/resources/user_service.proto rename to jigsaw-service/jigsaw-service-facade/src/main/resources/user_service.proto diff --git a/jigsaw-payment/jigsaw-payment-rpc/CHANGELOG.md b/jigsaw-service/jigsaw-service-rpc/CHANGELOG.md similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/CHANGELOG.md rename to jigsaw-service/jigsaw-service-rpc/CHANGELOG.md diff --git a/jigsaw-payment/jigsaw-payment-rpc/README.md b/jigsaw-service/jigsaw-service-rpc/README.md similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/README.md rename to jigsaw-service/jigsaw-service-rpc/README.md diff --git a/jigsaw-payment/jigsaw-payment-rpc/pom.xml b/jigsaw-service/jigsaw-service-rpc/pom.xml similarity index 96% rename from jigsaw-payment/jigsaw-payment-rpc/pom.xml rename to jigsaw-service/jigsaw-service-rpc/pom.xml index caf07ee..5908457 100755 --- a/jigsaw-payment/jigsaw-payment-rpc/pom.xml +++ b/jigsaw-service/jigsaw-service-rpc/pom.xml @@ -6,9 +6,9 @@ 0.0.1-SNAPSHOT
4.0.0 - jigsaw-payment-rpc + jigsaw-service-rpc jar - jigsaw-rpc-payment + Jigsaw Payment Service RPC 3.3.1 1.2 diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/bin/start.cmd b/jigsaw-service/jigsaw-service-rpc/src/bin/start.cmd similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/bin/start.cmd rename to jigsaw-service/jigsaw-service-rpc/src/bin/start.cmd diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/conf/pay_account.sql b/jigsaw-service/jigsaw-service-rpc/src/conf/pay_account.sql similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/conf/pay_account.sql rename to jigsaw-service/jigsaw-service-rpc/src/conf/pay_account.sql diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/conf/pay_contract_account.sql b/jigsaw-service/jigsaw-service-rpc/src/conf/pay_contract_account.sql similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/conf/pay_contract_account.sql rename to jigsaw-service/jigsaw-service-rpc/src/conf/pay_contract_account.sql diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/conf/pay_order.sql b/jigsaw-service/jigsaw-service-rpc/src/conf/pay_order.sql similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/conf/pay_order.sql rename to jigsaw-service/jigsaw-service-rpc/src/conf/pay_order.sql diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/assembly/package.xml b/jigsaw-service/jigsaw-service-rpc/src/main/assembly/package.xml similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/assembly/package.xml rename to jigsaw-service/jigsaw-service-rpc/src/main/assembly/package.xml diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/AccountRepository.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/AccountRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/AccountRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/AccountRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/ContractAccountRepository.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/ContractAccountRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/ContractAccountRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/ContractAccountRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/PayOrderRepository.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/PayOrderRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/PayOrderRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/PayOrderRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/PaymentSharder.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/PaymentSharder.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/PaymentSharder.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/PaymentSharder.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLPaymentSharder.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLPaymentSharder.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLPaymentSharder.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLPaymentSharder.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingAccountRepository.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingAccountRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingAccountRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingAccountRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingContractAccountRepository.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingContractAccountRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingContractAccountRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingContractAccountRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingPayOrderRepository.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingPayOrderRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingPayOrderRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/mysql/MySQLShardingPayOrderRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/rpc/GetTradeController.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/rpc/GetTradeController.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/rpc/GetTradeController.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/rpc/GetTradeController.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/rpc/Server.java b/jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/rpc/Server.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/java/org/jigsaw/payment/core/rpc/Server.java rename to jigsaw-service/jigsaw-service-rpc/src/main/java/org/jigsaw/payment/core/rpc/Server.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/resources/datasource.xml b/jigsaw-service/jigsaw-service-rpc/src/main/resources/datasource.xml similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/resources/datasource.xml rename to jigsaw-service/jigsaw-service-rpc/src/main/resources/datasource.xml diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/main/resources/logback.xml b/jigsaw-service/jigsaw-service-rpc/src/main/resources/logback.xml similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/main/resources/logback.xml rename to jigsaw-service/jigsaw-service-rpc/src/main/resources/logback.xml diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestAccountRepository.java b/jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestAccountRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestAccountRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestAccountRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestConfiguration.java b/jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestConfiguration.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestConfiguration.java rename to jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestConfiguration.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestJdbcSharder.java b/jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestJdbcSharder.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestJdbcSharder.java rename to jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestJdbcSharder.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestPayOrderRepository.java b/jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestPayOrderRepository.java similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/test/java/org/jigsaw/payment/order/TestPayOrderRepository.java rename to jigsaw-service/jigsaw-service-rpc/src/test/java/org/jigsaw/payment/order/TestPayOrderRepository.java diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/test/resources/application-dev.properties b/jigsaw-service/jigsaw-service-rpc/src/test/resources/application-dev.properties similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/test/resources/application-dev.properties rename to jigsaw-service/jigsaw-service-rpc/src/test/resources/application-dev.properties diff --git a/jigsaw-payment/jigsaw-payment-rpc/src/test/resources/logback.xml b/jigsaw-service/jigsaw-service-rpc/src/test/resources/logback.xml similarity index 100% rename from jigsaw-payment/jigsaw-payment-rpc/src/test/resources/logback.xml rename to jigsaw-service/jigsaw-service-rpc/src/test/resources/logback.xml diff --git a/jigsaw-payment/pom.xml b/jigsaw-service/pom.xml similarity index 76% rename from jigsaw-payment/pom.xml rename to jigsaw-service/pom.xml index e8d0853..0748dc0 100755 --- a/jigsaw-payment/pom.xml +++ b/jigsaw-service/pom.xml @@ -7,12 +7,12 @@ .. 4.0.0 - jigsaw-payment + jigsaw-service pom - Jigsaw Framework Components + Jigsaw Payment Services - jigsaw-payment-facade - jigsaw-payment-rpc + jigsaw-service-facade + jigsaw-service-rpc jigsaw-mode-fastpay diff --git a/pom.xml b/pom.xml index 3f9432b..9f55f73 100755 --- a/pom.xml +++ b/pom.xml @@ -19,12 +19,11 @@ jigsaw-infra - jigsaw-framework - jigsaw-rpc + jigsaw-framework jigsaw-id jigsaw-member jigsaw-channel - jigsaw-payment + jigsaw-service UTF-8