Ver código fonte

原spring-context-dubbo.xml 配置 替换为 dubbo-spring-boot-starter 2.0.0

小柒2012 6 anos atrás
pai
commit
aa7357ba1f

+ 22 - 5
pom.xml

@@ -107,12 +107,12 @@
 		    <version>1.46</version>
 		</dependency>
 		<!-- DubboX相关 -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>dubbo</artifactId>
-			<!-- 这里使用最新的2.8.4版本,中央仓库不存在,请自行打入本地仓库 -->
-			<!-- 百度网盘:http://pan.baidu.com/s/1gfxiuYZ -->
-		    <!-- 或者使用最新版本 http://mvnrepository.com/artifact/com.alibaba/dubbo-->
+			这里使用最新的2.8.4版本,中央仓库不存在,请自行打入本地仓库
+			百度网盘:http://pan.baidu.com/s/1gfxiuYZ
+		    或者使用最新版本 http://mvnrepository.com/artifact/com.alibaba/dubbo
 			<version>2.8.4</version>
 			<exclusions>
 				<exclusion>
@@ -120,10 +120,21 @@
 					<groupId>org.springframework</groupId>
 				</exclusion>
 			</exclusions>
+		</dependency> -->
+		<!-- dubbo 替换  dubbox-->
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>dubbo</artifactId>
+		    <version>2.6.2</version>
 		</dependency>
+		<dependency>
+	        <groupId>com.alibaba.spring.boot</groupId>
+	        <artifactId>dubbo-spring-boot-starter</artifactId>
+	        <version>2.0.0</version>
+        </dependency>
         <!-- zookeeper 第三方操作工具类 -->
 		<!-- zookeeper 教程: https://blog.52itstyle.com/tag/zookeeper/ -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.101tec</groupId>
 			<artifactId>zkclient</artifactId>
 			<version>0.6</version>
@@ -133,6 +144,12 @@
                      <artifactId>slf4j-log4j12</artifactId>
 				</exclusion>
 			</exclusions>
+		</dependency> -->
+		<!-- curator-recipes 替换  zkclient-->
+		<dependency>
+		    <groupId>org.apache.curator</groupId>
+		    <artifactId>curator-recipes</artifactId>
+		    <version>4.0.1</version>
 		</dependency>
 		<!-- javassist 字节码类库 -->
 		<dependency>

+ 10 - 2
src/main/java/com/itstyle/Application.java

@@ -4,20 +4,28 @@ import java.io.IOException;
 import org.apache.log4j.Logger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ImportResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import com.alibaba.dubbo.spring.boot.annotation.EnableDubboConfiguration;
 /**
  * 支付主控(启动的时候一定要把main方法的注释去掉,配置好支付宝、微信以及银联相关参数)
  * 创建者 科帮网
  * 创建时间 2017年7月27日
  * 启动   java -jar spring-boot-pay.jar --server.port=8886 
  * linux 下 后台启动  nohup java -jar spring-boot-pay.jar --server.port=8886 & 
+ * 
+ * 2018-10-10 更新说明:
+ * 1)原当当 Dubbox 2.8.4 替换为 Dubbo 2.6.2
+ * 2)原spring-context-dubbo.xml 配置 替换为 dubbo-spring-boot-starter 2.0.0
+ * 3)原 zkclient 0.6 替换为 curator-recipes 4.0.1
+ * 4)原 zookeeper 3.4.6 升级为 zookeeper 3.5.3
  */
+@EnableDubboConfiguration
 @SpringBootApplication
-@ImportResource({"classpath:spring-context-dubbo.xml"})
+//@ImportResource({"classpath:spring-context-dubbo.xml"})
 @Controller
 public class Application extends WebMvcConfigurerAdapter {
 	private static final Logger logger = Logger.getLogger(Application.class);

+ 3 - 2
src/main/java/com/itstyle/modules/alipay/service/impl/AliPayServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import com.alibaba.dubbo.config.annotation.Service;
 import com.alipay.api.AlipayApiException;
@@ -36,12 +37,12 @@ import com.itstyle.common.utils.CommonUtil;
 import com.itstyle.modules.alipay.service.IAliPayService;
 import com.itstyle.modules.alipay.util.AliPayConfig;
 /**
- * TODO
+ * 支付宝
  * 创建者 科帮网
  * 创建时间	2018年1月15日
- *
  */
 @Service
+@Component
 public class AliPayServiceImpl implements IAliPayService {
 	private static final Logger logger = LoggerFactory.getLogger(AliPayServiceImpl.class);
 	

+ 2 - 0
src/main/java/com/itstyle/modules/unionpay/service/impl/UnionPayServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import com.alibaba.dubbo.config.annotation.Service;
 import com.itstyle.common.constants.Constants;
@@ -17,6 +18,7 @@ import com.itstyle.modules.unionpay.util.AcpService;
 import com.itstyle.modules.unionpay.util.SDKConfig;
 import com.itstyle.modules.unionpay.util.UnionConfig;
 @Service
+@Component
 public class UnionPayServiceImpl implements IUnionPayService{
 	private static final Logger logger = LoggerFactory.getLogger(UnionPayServiceImpl.class);
 	

+ 2 - 0
src/main/java/com/itstyle/modules/weixinpay/service/impl/WeixinPayServiceImpl.java

@@ -9,6 +9,7 @@ import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import weixin.popular.api.SnsAPI;
 
@@ -24,6 +25,7 @@ import com.itstyle.modules.weixinpay.util.HttpUtil;
 import com.itstyle.modules.weixinpay.util.PayCommonUtil;
 import com.itstyle.modules.weixinpay.util.XMLUtil;
 @Service
+@Component
 public class WeixinPayServiceImpl implements IWeixinPayService {
 	private static final Logger logger = LoggerFactory.getLogger(WeixinPayServiceImpl.class);
 	

Diferenças do arquivo suprimidas por serem muito extensas
+ 51 - 35
src/main/resources/acp_sdk.properties


+ 26 - 15
src/main/resources/application-dev.properties

@@ -1,23 +1,23 @@
-#项目contextPath
+#\u9879\u76eecontextPath
 server.context-path=/springboot_pay
-#服务端口
+#\u670d\u52a1\u7aef\u53e3
 server.port=8080
-#session最大超时时间(分钟),默认为30
+#session\u6700\u5927\u8d85\u65f6\u65f6\u95f4(\u5206\u949f)\uff0c\u9ed8\u8ba4\u4e3a30
 server.session-timeout=60
-#该服务绑定IP地址,启动服务器时如本机不是该IP地址则抛出异常启动失败,只有特殊需求的情况下才配置
+#\u8be5\u670d\u52a1\u7ed1\u5b9aIP\u5730\u5740\uff0c\u542f\u52a8\u670d\u52a1\u5668\u65f6\u5982\u672c\u673a\u4e0d\u662f\u8be5IP\u5730\u5740\u5219\u629b\u51fa\u5f02\u5e38\u542f\u52a8\u5931\u8d25\uff0c\u53ea\u6709\u7279\u6b8a\u9700\u6c42\u7684\u60c5\u51b5\u4e0b\u624d\u914d\u7f6e
 # server.address=192.168.16.11
 
-#tomcat最大线程数,默认为200
+#tomcat\u6700\u5927\u7ebf\u7a0b\u6570\uff0c\u9ed8\u8ba4\u4e3a200
 server.tomcat.max-threads=100
-#tomcat的URI编码
+#tomcat\u7684URI\u7f16\u7801
 server.tomcat.uri-encoding=UTF-8
 
-#HTTPS证书  如果不需要 https访问 注释掉即可 由于某些浏览器访问不支持
+#HTTPS\u8bc1\u4e66  \u5982\u679c\u4e0d\u9700\u8981 https\u8bbf\u95ee \u6ce8\u91ca\u6389\u5373\u53ef \u7531\u4e8e\u67d0\u4e9b\u6d4f\u89c8\u5668\u8bbf\u95ee\u4e0d\u652f\u6301
 #server.ssl.key-store: classpath:keystore.p12
 #server.ssl.key-store-password: 123456
 #server.ssl.keyStoreType: PKCS12
 
-#spring boot从控制台打印出来的日志级别只有ERROR, WARN 还有INFO,如果你想要打印debug级别的日志
+#spring boot\u4ece\u63a7\u5236\u53f0\u6253\u5370\u51fa\u6765\u7684\u65e5\u5fd7\u7ea7\u522b\u53ea\u6709ERROR, WARN \u8fd8\u6709INFO\uff0c\u5982\u679c\u4f60\u60f3\u8981\u6253\u5370debug\u7ea7\u522b\u7684\u65e5\u5fd7
 #debug=true
 logging.level.root=INFO
 
@@ -28,23 +28,34 @@ spring.devtools.livereload.enabled=true
 spring.thymeleaf.cache=false
 spring.thymeleaf.cache-period=0
 spring.thymeleaf.template.cache=false
-# 静态文件请求匹配方式
+# \u9759\u6001\u6587\u4ef6\u8bf7\u6c42\u5339\u914d\u65b9\u5f0f
 spring.mvc.static-path-pattern=/**
 
-# 修改默认的静态寻址资源目录 多个使用逗号分隔
+# \u4fee\u6539\u9ed8\u8ba4\u7684\u9759\u6001\u5bfb\u5740\u8d44\u6e90\u76ee\u5f55 \u591a\u4e2a\u4f7f\u7528\u9017\u53f7\u5206\u9694
 spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,classpath:/templates/
 
 #============================#
 #===== zookeeper sttings ====#
 #============================#
-#zookeeper集群配置
+#zookeeper\u96c6\u7fa4\u914d\u7f6e
 dubbo.registry.address=192.168.1.66:2181
 
-#项目地址
+#\u9879\u76ee\u5730\u5740
 server.context.url = http://192.168.1.66:8080/springboot_pay/
-#支付宝后台回调
+#\u652f\u4ed8\u5b9d\u540e\u53f0\u56de\u8c03
 alipay.notify.url=https://blog.52itstyle.com/alipay/pay
-#微信后台回调
+#\u5fae\u4fe1\u540e\u53f0\u56de\u8c03
 wexinpay.notify.url=https://blog.52itstyle.com/weixin/pay
-#银联后台回调
+#\u94f6\u8054\u540e\u53f0\u56de\u8c03
 unionpay.notify.url=https://blog.52itstyle.com/union/pay
+
+
+## dubbo springboot \u914d\u7f6e
+spring.dubbo.application.id=springboot_pay
+spring.dubbo.application.name=springboot_pay
+spring.dubbo.registry.address=zookeeper://192.168.1.127:2181
+spring.dubbo.provider.threads=10
+spring.dubbo.provider.threadpool=fixed
+spring.dubbo.provider.loadbalance=roundrobin
+spring.dubbo.server=true
+spring.dubbo.protocol.name=dubbo