From 70cba4f293c406fb7fb82ef383cfdc215be55f79 Mon Sep 17 00:00:00 2001 From: shuzheng <469741414@qq.com> Date: Wed, 29 Mar 2017 23:41:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90pay-rpc-service=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationContext-dubbo-provider.xml | 2 +- .../applicationContext-dubbo-provider.xml | 2 +- .../applicationContext-dubbo-provider.xml | 20 +++ .../resources/applicationContext-ehcache.xml | 25 ++++ .../resources/applicationContext-jdbc.xml | 114 ++++++++++++++++++ .../resources/applicationContext-listener.xml | 11 ++ .../src/main/resources/config.properties | 2 + .../src/main/resources/ehcache.xml | 25 ++++ .../src/main/resources/jdbc.properties | 9 ++ .../src/main/resources/log4j.properties | 23 ++++ .../main/resources/profiles/dev.properties | 2 + .../main/resources/profiles/pre.properties | 2 + .../main/resources/profiles/prod.properties | 2 + .../main/resources/profiles/test.properties | 2 + .../src/main/resources/redis.properties | 7 ++ zheng-pay/zheng-pay-web/pom.xml | 19 ++- 16 files changed, 261 insertions(+), 6 deletions(-) create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-ehcache.xml create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-jdbc.xml create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-listener.xml create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/config.properties create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/ehcache.xml create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/log4j.properties create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/pre.properties create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties create mode 100644 zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml b/zheng-api/zheng-api-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml index a981286f..57c72733 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml @@ -11,7 +11,7 @@ - + diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml b/zheng-cms/zheng-cms-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml index 820120f2..4f002c00 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml @@ -11,7 +11,7 @@ - + diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml new file mode 100644 index 00000000..6d82c63c --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-dubbo-provider.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-ehcache.xml b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-ehcache.xml new file mode 100644 index 00000000..8ed03331 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-ehcache.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-jdbc.xml b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-jdbc.xml new file mode 100644 index 00000000..dc3c7aaa --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-jdbc.xml @@ -0,0 +1,114 @@ + + + + + + + + + + classpath:jdbc.properties + classpath:redis.properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-listener.xml b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-listener.xml new file mode 100644 index 00000000..7476e98c --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/applicationContext-listener.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/config.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/config.properties new file mode 100644 index 00000000..e4a835d3 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/config.properties @@ -0,0 +1,2 @@ +app.name=${app.name} +env=${profile.env} \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/ehcache.xml b/zheng-pay/zheng-pay-rpc-service/src/main/resources/ehcache.xml new file mode 100644 index 00000000..46301a73 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/ehcache.xml @@ -0,0 +1,25 @@ + + + + + + + + + + \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties new file mode 100644 index 00000000..1f750b32 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties @@ -0,0 +1,9 @@ +master.jdbc.driver=com.mysql.jdbc.Driver +master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +master.jdbc.username=root +master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== + +slave.jdbc.driver=com.mysql.jdbc.Driver +slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +slave.jdbc.username=root +slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/log4j.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/log4j.properties new file mode 100644 index 00000000..be18ba54 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/log4j.properties @@ -0,0 +1,23 @@ +#off/fatal/error/warn/info/debug/all +log4j.debug=false +log4j.rootLogger=info, stdout + +# Console output +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n + +#Spring logging configuration +log4j.category.org.springframework = warn + +#Druid logging configuration +log4j.logger.druid.sql=warn,stdout +log4j.logger.druid.sql.DataSource=warn,stdout +log4j.logger.druid.sql.Connection=warn,stdout +log4j.logger.druid.sql.Statement=warn,stdout +log4j.logger.druid.sql.ResultSet=warn,stdout + +# MyBatis logging configuration +log4j.logger.com.zheng.pay.dao.mapper=debug +#log4j.logger.com.zheng.pay.dao.mapper.UserMapper=debug +#log4j.logger.com.zheng.pay.dao.mapper.UserMapper.selectUser=debug \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties new file mode 100644 index 00000000..12c86376 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties @@ -0,0 +1,2 @@ +app.name=zheng-pay-rpc-service +profile.env=dev \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/pre.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/pre.properties new file mode 100644 index 00000000..234c0def --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/pre.properties @@ -0,0 +1,2 @@ +app.name=zheng-pay-rpc-service +profile.env=pre \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties new file mode 100644 index 00000000..6657935a --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties @@ -0,0 +1,2 @@ +app.name=zheng-pay-rpc-service +profile.env=prod \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties new file mode 100644 index 00000000..c8afe836 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties @@ -0,0 +1,2 @@ +app.name=zheng-pay-rpc-service +profile.env=test \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties new file mode 100644 index 00000000..2dad97d0 --- /dev/null +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties @@ -0,0 +1,7 @@ +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file diff --git a/zheng-pay/zheng-pay-web/pom.xml b/zheng-pay/zheng-pay-web/pom.xml index 5f743f78..a44b2299 100644 --- a/zheng-pay/zheng-pay-web/pom.xml +++ b/zheng-pay/zheng-pay-web/pom.xml @@ -17,9 +17,13 @@ com.zheng - zheng-pay-service + zheng-pay-rpc-api + 1.0.0 + + + com.zheng + zheng-admin 1.0.0 - jar com.alipay @@ -45,6 +49,12 @@ jstl 1.2 + + + com.zheng + zheng-upms-client + 1.0.0 + @@ -87,11 +97,12 @@ org.eclipse.jetty jetty-maven-plugin - 9.0.0.v20130308 + + 9.2.7.v20150116 3 - /zheng-pay-web + / 3332