Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/pom.xml

@@ -29,5 +29,10 @@
             <groupId>com.ym</groupId>
             <artifactId>mec-client-api</artifactId>
         </dependency>
+
+		<dependency>
+			<groupId>com.ym</groupId>
+			<artifactId>mec-thirdparty</artifactId>
+		</dependency>
     </dependencies>
 </project>

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/UploadFileService.java → mec-biz/src/main/java/com/ym/mec/biz/service/UploadFileService.java

@@ -1,4 +1,4 @@
-package com.ym.mec.common.service.impl;
+package com.ym.mec.biz.service;
 
 import java.io.File;
 import java.io.FileOutputStream;

mec-common/common-core/pom.xml

@@ -38,15 +38,5 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>com.ym</groupId>
-			<artifactId>mec-thirdparty</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>org.springframework.security.oauth</groupId>
-            <artifactId>spring-security-oauth2</artifactId>
-            <version>2.2.1.RELEASE</version>
-        </dependency>
     </dependencies>
 </project>

mec-thirdparty/pom.xml

@@ -26,6 +26,14 @@
 			<artifactId>aliyun-sdk-oss</artifactId>
 			<version>2.8.3</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>com.timevale</groupId>
+			<artifactId>tech-sdk</artifactId>
+			<version>2.1.20</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/libs/tech-sdk-2.1.20.jar</systemPath>
+		</dependency>
 
 	</dependencies>
 

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/ESealPlugin.java

@@ -2,5 +2,60 @@ package com.ym.mec.thirdparty.eseal;
 
 public interface ESealPlugin {
 
-	
+	/**
+	 * 注册客户端
+	 * @return
+	 */
+	public boolean registClient();
+
+	/**
+	 * 创建用户账户(个人)
+	 * @param realName 姓名
+	 * @param idcard 身份证号码
+	 * @param mobile 手机号码
+	 * @return 账户唯一标识
+	 */
+	public String createUserAccount(String realName, String idcard, String mobile);
+
+	/**
+	 * 创建用户账户(企业)
+	 * @param orgName  机构名称
+	 * @param organCode 统一社会信用代码
+	 * @return 账户唯一标识
+	 */
+	public String createOrganAccount(String orgName, String organCode);
+
+	/**
+	 * 创建印章
+	 * @param accountId 账户唯一标识
+	 * @return 电子印章数据
+	 */
+	public String createSeal(String accountId);
+
+	/**
+	 * 平台自身PDF摘要签署（印章标识）
+	 * @param srcPdfPath 源文件
+	 * @param destPdfPath 签名后的目标文件
+	 * @return
+	 */
+	public boolean platformSign(String srcPdfPath, String destPdfPath);
+
+	/**
+	 * 企业PDF摘要签署（印章图片）
+	 * @param sealData 电子印章数据
+	 * @param srcPdfPath 源文件
+	 * @param destPdfPath 签名后的目标文件
+	 * @return
+	 */
+	public boolean organSign(String sealData, String srcPdfPath, String destPdfPath);
+
+	/**
+	 * 用户签名
+	 * @param accountId 账户唯一标识
+	 * @param sealData 电子印章数据
+	 * @param srcPdfPath 平台签名后的源文件
+	 * @param destPdfPath 平台、用户都签名后的文件地址
+	 * @return
+	 */
+	public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath);
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/ESealPluginContext.java

@@ -0,0 +1,65 @@
+package com.ym.mec.thirdparty.eseal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import com.ym.mec.thirdparty.eseal.provider.TsignPlugin;
+import com.ym.mec.thirdparty.exception.ThirdpartyException;
+
+//@Component
+public class ESealPluginContext implements ApplicationContextAware, InitializingBean {
+	
+	@Value("${thirdparty.eSealPluginName:Tsign}")
+	private String eSealPluginName;
+	
+	private ApplicationContext applicationContext;
+
+	private final Map<String, String> mapper = new HashMap<String, String>() {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = -9071481806931421021L;
+
+		{
+			put(TsignPlugin.getName(), StringUtils.uncapitalize(TsignPlugin.class.getSimpleName()));
+		}
+	};
+
+	private ESealPlugin eSealPlugin;
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		if (StringUtils.isBlank(eSealPluginName)) {
+			throw new ThirdpartyException("存储插件变量thirdparty.storagePlugName不能为空");
+		}
+
+		eSealPlugin = getStoragePlugin(eSealPluginName);
+
+		if (eSealPlugin == null) {
+			throw new ThirdpartyException("电子签章插件{}不存在", eSealPluginName);
+		}
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.applicationContext = applicationContext;
+	}
+
+	private ESealPlugin getStoragePlugin(String vendors) {
+		String beanId = mapper.get(vendors);
+
+		if (StringUtils.isBlank(beanId)) {
+			throw new ThirdpartyException("电子签章提供商不存在");
+		}
+
+		return applicationContext.getBean(beanId, ESealPlugin.class);
+	}
+}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -0,0 +1,250 @@
+package com.ym.mec.thirdparty.eseal.provider;
+
+import java.text.MessageFormat;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import com.timevale.esign.sdk.tech.bean.OrganizeBean;
+import com.timevale.esign.sdk.tech.bean.PersonBean;
+import com.timevale.esign.sdk.tech.bean.PosBean;
+import com.timevale.esign.sdk.tech.bean.SignPDFFileBean;
+import com.timevale.esign.sdk.tech.bean.result.AddAccountResult;
+import com.timevale.esign.sdk.tech.bean.result.AddSealResult;
+import com.timevale.esign.sdk.tech.bean.result.FileDigestSignResult;
+import com.timevale.esign.sdk.tech.bean.result.Result;
+import com.timevale.esign.sdk.tech.bean.seal.PersonTemplateType;
+import com.timevale.esign.sdk.tech.bean.seal.SealColor;
+import com.timevale.esign.sdk.tech.impl.constants.LegalAreaType;
+import com.timevale.esign.sdk.tech.impl.constants.OrganRegType;
+import com.timevale.esign.sdk.tech.impl.constants.SignType;
+import com.timevale.esign.sdk.tech.service.AccountService;
+import com.timevale.esign.sdk.tech.service.SealService;
+import com.timevale.esign.sdk.tech.service.SelfSignService;
+import com.timevale.esign.sdk.tech.service.UserSignService;
+import com.timevale.esign.sdk.tech.v3.client.ServiceClient;
+import com.timevale.esign.sdk.tech.v3.client.ServiceClientManager;
+import com.timevale.tech.sdk.bean.ProjectConfig;
+import com.ym.mec.thirdparty.exception.ThirdpartyException;
+
+//@Service
+public class TsignPlugin implements InitializingBean, DisposableBean {
+
+	@Value("${eseal.tsign.projectid:1}")
+	public String projectId; // = "1111563517";
+
+	@Value("${eseal.tsign.projectSecret:1}")
+	public String projectSecret; // = "95439b0863c241c63a861b87d1e647b7";
+
+	@Value("${eseal.tsign.apisUrl:1}")
+	public String apisUrl; // = "http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2";
+
+	private ServiceClient serviceClient;
+
+	public static String getName() {
+		return "Tsign";
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		registClient();
+
+		serviceClient = serviceClient();
+		if (serviceClient == null) {
+			throw new ThirdpartyException("获取e签宝客户端失败");
+		}
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		ServiceClientManager.shutdown(projectId);
+	}
+
+	/**
+	 * 客户端注册
+	 * @return
+	 */
+	public boolean registClient() {
+		ProjectConfig projectconfig = new ProjectConfig();
+		projectconfig.setProjectId(projectId);
+		projectconfig.setProjectSecret(projectSecret);
+		projectconfig.setItsmApiUrl(apisUrl);
+		Result result = ServiceClientManager.registClient(projectconfig, null, null);
+		if (result.getErrCode() == 0) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 获取客户端
+	 * @return
+	 */
+	public ServiceClient serviceClient() {
+		ServiceClient serviceclient = ServiceClientManager.get(projectId);
+		if (serviceclient == null) {
+			throw new ThirdpartyException(MessageFormat.format("ServiceClient为null，获取客户端接口调用失败 ", projectId));
+		}
+		return serviceclient;
+	}
+
+	/**
+	 * 创建用户账户(个人)
+	 * @param realName 姓名
+	 * @param idcard 身份证号码
+	 * @param mobile 手机号码
+	 * @return e签宝账户唯一标识
+	 */
+	public String createUserAccount(String realName, String idcard, String mobile) {
+		PersonBean personbean = new PersonBean();
+		personbean.setName(realName);
+		personbean.setIdNo(idcard);
+		personbean.setMobile(mobile);
+		personbean.setPersonArea(LegalAreaType.MAINLAND);
+		// personbean.setPersonArea(4);
+		AccountService service = serviceClient.accountService();
+		AddAccountResult result = service.addAccount(personbean);
+		if (result.getErrCode() == 0) {
+			return result.getAccountId();
+		}
+		throw new ThirdpartyException("创建个人账户接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
+	}
+
+	/**
+	 * 创建用户账户(企业)
+	 * @param orgName  机构名称
+	 * @param organCode 统一社会信用代码
+	 * @return e签宝账户唯一标识
+	 */
+	public String createOrganAccount(String orgName, String organCode) {
+		OrganizeBean organizeBean = new OrganizeBean();
+		organizeBean.setName(orgName);
+		organizeBean.setOrganCode(organCode);
+		organizeBean.setRegType(OrganRegType.MERGE);
+		organizeBean.setUserType(0);
+
+		AccountService service = serviceClient.accountService();
+		AddAccountResult result = service.addAccount(organizeBean);
+		if (result.getErrCode() == 0) {
+			return result.getAccountId();
+		}
+		throw new ThirdpartyException("创建企业账户接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
+	}
+
+	/**
+	 * 创建印章
+	 * @param accountId e签宝账户唯一标识
+	 * @return 电子印章数据
+	 */
+	public String createSeal(String accountId) {
+		// 创建模板类型
+		PersonTemplateType templateType = PersonTemplateType.RECTANGLE;
+		// 生成模板印章的颜色
+		SealColor color = SealColor.BLUE;
+		SealService service = serviceClient.sealService();
+		AddSealResult result = service.addTemplateSeal(accountId, templateType, color);
+		if (0 == result.getErrCode()) {
+			return result.getSealData();
+		}
+		throw new ThirdpartyException("个人模板印章接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
+	}
+
+	/**
+	 * 平台自身PDF摘要签署（印章标识）
+	 * @param srcPdfPath 源文件
+	 * @param destPdfPath 签名后的目标文件
+	 * @return
+	 */
+	public boolean platformSign(String srcPdfPath, String destPdfPath) {
+		PosBean posBean = new PosBean();
+		// 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
+		SignType signType = SignType.Key;
+		// 接口调用方(平台方)的印章,请在www.tsign.cn官网中设置默认印章其sealId值为0
+		int sealId = 0;
+		// 设置接口调用方(平台方)签章位置信息
+		posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
+		posBean.setKey("甲方（签字）");
+		// 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
+		posBean.setPosX(100);
+		// 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px
+		posBean.setPosY(0);
+		// 印章图片在PDF文件中的等比缩放大小,公章标准大小为4.2厘米即159px
+		posBean.setWidth(100);
+		SignPDFFileBean PDFbean = new SignPDFFileBean();
+		PDFbean.setSrcPdfFile(srcPdfPath);
+		PDFbean.setDstPdfFile(destPdfPath);
+
+		SelfSignService service = serviceClient.selfSignService();
+		FileDigestSignResult result = service.localSignPdf(PDFbean, posBean, sealId, signType);
+		if (0 != result.getErrCode()) {
+			throw new ThirdpartyException("平台自身PDF摘要签署接口调用失败！Code=" + result.getErrCode() + "MSG=" + result.getMsg());
+		}
+		return true;
+	}
+
+	/**
+	 * 企业PDF摘要签署（印章图片）
+	 * @param sealData 电子印章数据
+	 * @param srcPdfPath 源文件
+	 * @param destPdfPath 签名后的目标文件
+	 * @return
+	 */
+	public boolean organSign(String sealData, String srcPdfPath, String destPdfPath) {
+		PosBean posBean = new PosBean();
+		// 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
+		SignType signType = SignType.Key;
+		// 设置接口调用方(平台方)签章位置信息
+		posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
+		posBean.setKey("甲方（签字）");
+		// 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
+		posBean.setPosX(100);
+		// 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px
+		posBean.setPosY(0);
+		// 印章图片在PDF文件中的等比缩放大小,公章标准大小为4.2厘米即159px
+		posBean.setWidth(100);
+		SignPDFFileBean PDFbean = new SignPDFFileBean();
+		PDFbean.setSrcPdfFile(srcPdfPath);
+		PDFbean.setDstPdfFile(destPdfPath);
+
+		SelfSignService service = serviceClient.selfSignService();
+		FileDigestSignResult result = service.localSignPdf(PDFbean, posBean, sealData, signType);
+		if (0 != result.getErrCode()) {
+			throw new ThirdpartyException("平台自身PDF摘要签署接口调用失败！Code=" + result.getErrCode() + "MSG=" + result.getMsg());
+		}
+		return true;
+	}
+
+	/**
+	 * 用户签名
+	 * @param accountId e签宝账户唯一标识
+	 * @param sealData 电子印章数据
+	 * @param srcPdfPath 平台签名后的源文件
+	 * @param destPdfPath 平台、用户都签名后的文件地址
+	 * @return
+	 */
+	public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath) {
+
+		SignPDFFileBean signPDFStreamBean = new SignPDFFileBean();
+		// C:test_signed.pdf为平台自身签署后路径
+		signPDFStreamBean.setSrcPdfFile(srcPdfPath);
+		signPDFStreamBean.setDstPdfFile(destPdfPath);
+		PosBean posBean = new PosBean();
+		posBean.setPosPage("1");
+		posBean.setPosType(1);
+		posBean.setWidth(80);
+		posBean.setKey("乙方（签字）");
+		posBean.setPosX(100);
+		posBean.setPosY(0);
+
+		// 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
+		SignType signtype = SignType.Key;
+		UserSignService service = serviceClient.userSignService();
+		FileDigestSignResult result = service.localSignPDF(accountId, sealData, signPDFStreamBean, posBean, signtype);
+		if (result.getErrCode() == 0) {
+			return true;
+		}
+		throw new ThirdpartyException("平台用户PDF摘要签署接口调用失败" + result.getErrCode() + "msg=" + result.getMsg());
+	}
+}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPluginContext.java

@@ -35,9 +35,9 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 		private static final long serialVersionUID = -3964872523891264522L;
 
 		{
-			put("jiguang", StringUtils.uncapitalize(JiguangPushPlugin.class.getSimpleName()));
-			put("moxingtong", StringUtils.uncapitalize(MOxintongSMSPlugin.class.getSimpleName()));
-			put("shiyuan", StringUtils.uncapitalize(ShiyuanSMSPlugin.class.getSimpleName()));
+			put(JiguangPushPlugin.getName(), StringUtils.uncapitalize(JiguangPushPlugin.class.getSimpleName()));
+			put(MOxintongSMSPlugin.getName(), StringUtils.uncapitalize(MOxintongSMSPlugin.class.getSimpleName()));
+			put(ShiyuanSMSPlugin.getName(), StringUtils.uncapitalize(ShiyuanSMSPlugin.class.getSimpleName()));
 		}
 	};
 
@@ -84,7 +84,7 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 		String beanId = mapper.get(StringUtils.lowerCase(messageSender.name()));
 
 		if (StringUtils.isBlank(beanId)) {
-			throw new ThirdpartyException("消息发送方不存在");
+			throw new ThirdpartyException("消息提供方不存在");
 		}
 
 		return applicationContext.getBean(beanId, MessageSenderPlugin.class);

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -36,6 +36,10 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	@Value("${push.jiguang.reqURL:1}")
 	private String reqURL;// 请求极光地址
 
+	public static String getName() {
+		return "Jiguang";
+	}
+
 	/**
 	 * 组装推送Json串
 	 *

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/MOxintongSMSPlugin.java

@@ -31,6 +31,10 @@ public class MOxintongSMSPlugin implements MessageSenderPlugin, InitializingBean
 	@Value("${Moxintong.reqUrl:1}")
 	private String reqUrl;
 
+	public static String getName() {
+		return "MOxintong";
+	}
+
 	@Override
 	public boolean send(String subject, String content, String receiver, String url) throws IOException {
 		Map<String, Object> reqParams = new HashMap<String, Object>();

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/ShiyuanSMSPlugin.java

@@ -39,6 +39,10 @@ public class ShiyuanSMSPlugin implements MessageSenderPlugin, InitializingBean {
 	// private String product = "";//产品ID(不用填写)
 	// private String extno = "";//扩展码(不用填写)
 
+	public static String getName() {
+		return "Shiyuan";
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		// 参数检查

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/StoragePluginContext.java

@@ -19,7 +19,7 @@ import com.ym.mec.thirdparty.storage.provider.AliyunOssStoragePlugin;
 @Component
 public class StoragePluginContext implements ApplicationContextAware, InitializingBean {
 
-	@Value("${thirdparty.storagePluginName:aliyun}")
+	@Value("${thirdparty.storagePluginName:Aliyun}")
 	private String storagePluginName;
 
 	private ApplicationContext applicationContext;
@@ -31,7 +31,7 @@ public class StoragePluginContext implements ApplicationContextAware, Initializi
 		private static final long serialVersionUID = -9071481806931421021L;
 
 		{
-			put("aliyun", StringUtils.uncapitalize(AliyunOssStoragePlugin.class.getSimpleName()));
+			put(AliyunOssStoragePlugin.getName(), StringUtils.uncapitalize(AliyunOssStoragePlugin.class.getSimpleName()));
 		}
 	};
 
@@ -88,7 +88,7 @@ public class StoragePluginContext implements ApplicationContextAware, Initializi
 		String beanId = mapper.get(vendors);
 
 		if (StringUtils.isBlank(beanId)) {
-			throw new ThirdpartyException("存储供应商不存在");
+			throw new ThirdpartyException("存储提供方不存在");
 		}
 
 		return applicationContext.getBean(beanId, StoragePlugin.class);

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -32,6 +32,10 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 
 	private OSSClient ossClient;
 
+	public static String getName() {
+		return "Aliyun";
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		// 创建ClientConfiguration。ClientConfiguration是OSSClient的配置类，可配置代理、连接超时、最大连接数等参数。

mec-web/src/main/java/com/ym/mec/web/controller/UploadFileController.java

@@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
-import com.ym.mec.common.service.impl.UploadFileService;
 import com.ym.mec.util.upload.UploadUtil;
 
 /** 

pom.xml

@@ -224,52 +224,27 @@
 	</pluginRepositories>
 
 	<dependencies>
-		<!-- SpringBoot����Web��� -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<!--��ʡ�ͼ�صļ��ɹ��� -->
+		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 
-		<!-- SpringBoot����config��� -->
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId> 
-			</dependency> -->
-		<!--ע������ -->
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> 
-			</dependency> -->
-		<!--��·�� -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 		</dependency>
 
-		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> 
-			</dependency> -->
-
-		<!--��Ⱥ�����Ϣ���� -->
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-netflix-hystrix-stream</artifactId> 
-			</dependency> -->
-		<!--��־���� -->
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-zipkin</artifactId> 
-			</dependency> -->
-		<!--��Ϣ���� -->
-		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-bus-amqp</artifactId> 
-			</dependency> -->
-		<!--�ȼ��� -->
-		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
-			<scope>runtime</scope> <optional>true</optional> </dependency> -->
-		<!--���Կ�� -->
-		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> 
-			<scope>test</scope> </dependency> -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>