重命名配置文件名

Jiang
1 parent 620febd3
Showing 15 changed files with 99 additions and 91 deletions
dtms-client/src/main/java/com/b2c/dtms/client/DtmsClient.java
dtms-client/src/main/java/com/b2c/dtms/client/service/DtmsService.java
dtms-client/src/main/java/com/b2c/dtms/client/service/DtmsServiceBean.java
dtms-client/src/test/java/com/b2c/dtms/client/DtmsClientTestCase.java
dtms-dao/src/main/resources/spring-config-dao.xml → dtms-dao/src/main/resources/spring-dao.xml
dtms-dao/src/main/resources/sqlmap-config.xml
dtms-dao/src/main/resources/sqlmap/OrderMaxid.xml → dtms-dao/src/main/resources/sqlmap/Maxid.xml
dtms-web/pom.xml
dtms-web/src/main/resources/conf/orders-production.properties → dtms-web/src/main/resources/conf/config.properties
dtms-web/src/main/resources/conf/important.properties → dtms-web/src/main/resources/conf/jdbc.properties
dtms-web/src/main/resources/spring-config-dtms.xml → dtms-web/src/main/resources/spring-dtms.xml
dtms-web/src/main/resources/spring-config-servlet.xml → dtms-web/src/main/resources/spring-mvc.xml
dtms-web/src/main/resources/spring-config.xml → dtms-web/src/main/resources/spring.xml
dtms-web/src/main/webapp/WEB-INF/web.xml
pom.xml
 package com.b2c.dtms.client;
  
-import org.apache.commons.lang.StringUtils;
-
-import com.alibaba.fastjson.JSON;
-import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
-import com.b2c.dtms.client.domain.dto.response.DtmsResponseDto;
-import com.b2c.dtms.common.http.HttpRequester;
-import com.b2c.dtms.common.http.HttpResponse;
+import com.b2c.dtms.client.service.DtmsService;
+import com.b2c.dtms.client.service.DtmsServiceBean;
  
 public class DtmsClient {
  
-	public static final String DTMS_URL = "http://dtms.zandeapp.com";
+	private DtmsService dtmsService;
  
-	public DtmsResponseDto produceMessage(DtmsProduceRequestDto message) {
-		HttpResponse httpResponse;
-		try {
-			httpResponse = HttpRequester.sendPost(DTMS_URL + "/api/rest/produce", null, JSON.toJSONString(message));
-			if (httpResponse == null) {
-				return null;
-			}
-			if (httpResponse.getStatusCode() != 200) {
-				DtmsResponseDto response = new DtmsResponseDto();
-				response.setMessage(String.format("无法完成请求，响应码%d", httpResponse.getStatusCode()));
-				return response;
-			}
-			if (StringUtils.isBlank(httpResponse.getBody())) {
-				return null;
-			}
-			return JSON.parseObject(httpResponse.getBody(), DtmsResponseDto.class);
-		} catch (Exception e) {
-			DtmsResponseDto response = new DtmsResponseDto();
-			response.setMessage(e.getMessage());
-			return response;
-		}
+	public DtmsClient(String baseUrl, String token) {
+		this.dtmsService = new DtmsServiceBean(baseUrl, token);
+	}
  
+	public DtmsService getDtmsService() {
+		return dtmsService;
 	}
+
 }
+package com.b2c.dtms.client.service;
+
+import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
+import com.b2c.dtms.client.domain.dto.response.DtmsResponseDto;
+
+public interface DtmsService {
+
+	DtmsResponseDto produceMessage(DtmsProduceRequestDto message);
+}
+package com.b2c.dtms.client.service;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
+import com.b2c.dtms.client.domain.dto.response.DtmsResponseDto;
+import com.b2c.dtms.common.http.HttpRequester;
+import com.b2c.dtms.common.http.HttpResponse;
+
+public class DtmsServiceBean implements DtmsService {
+
+	private String baseUrl;
+	private String token;
+
+	public DtmsServiceBean(String baseUrl, String token) {
+		super();
+		this.baseUrl = baseUrl;
+		this.token = token;
+	}
+
+	@Override
+	public DtmsResponseDto produceMessage(DtmsProduceRequestDto message) {
+		HttpResponse httpResponse;
+		try {
+			httpResponse = HttpRequester.sendPost(this.baseUrl + "/api/rest/produce", null, JSON.toJSONString(message));
+			if (httpResponse == null) {
+				return null;
+			}
+			if (httpResponse.getStatusCode() != 200) {
+				DtmsResponseDto response = new DtmsResponseDto();
+				response.setMessage(String.format("无法完成请求，响应码%d", httpResponse.getStatusCode()));
+				return response;
+			}
+			if (StringUtils.isBlank(httpResponse.getBody())) {
+				return null;
+			}
+			return JSON.parseObject(httpResponse.getBody(), DtmsResponseDto.class);
+		} catch (Exception e) {
+			DtmsResponseDto response = new DtmsResponseDto();
+			response.setMessage(e.getMessage());
+			return response;
+		}
+	}
+
+}
-package com.b2c.dtms.client;
-
-import org.junit.Test;
-
-import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
-import com.b2c.dtms.client.domain.dto.response.DtmsResponseDto;
-import com.b2c.dtms.common.enums.dtms.DtmsMessageType;
-
-public class DtmsClientTestCase {
-
-	@Test
-	public void test() {
-		DtmsClient client = new DtmsClient();
-		DtmsProduceRequestDto message = new DtmsProduceRequestDto();
-		message.setBizId("123456");
-		message.setCallUrl("http://orders.zandeapp.com");
-		message.setContent("abcdefg");
-		message.setDelaySeconds(10);
-		message.setType(DtmsMessageType.Timer.code());
-		DtmsResponseDto response = client.produceMessage(message);
-		System.out.println(response);
-	}
-
-}
@@ -11,12 +11,12 @@
 		<setting name="useColumnLabel" value="true" />
 		<!-- 数据库超过25000秒仍未响应则超时 -->
 		<setting name="defaultStatementTimeout" value="25000" />
-		<setting name="logImpl" value="STDOUT_LOGGING" />
+		<!-- <setting name="logImpl" value="STDOUT_LOGGING" /> -->
 	</settings>
  
 	<!-- 全局别名设置，在映射文件中只需写别名，而不必写出整个类路径 -->
 	<typeAliases>
-		<typeAlias type="com.b2c.dtms.domain.OrderMaxid" alias="orderMaxid" />
+		<typeAlias type="com.b2c.dtms.domain.Maxid" alias="Maxid" />
 		<typeAlias type="com.b2c.dtms.domain.DtmsMessage" alias="dtmsMessage" />
 		<typeAlias type="com.b2c.dtms.domain.DtmsMessageException"
 			alias="dtmsMessageException" />
@@ -33,7 +33,7 @@
  
 	<!-- 映射文件路径 -->
 	<mappers>
-		<mapper resource="sqlmap/OrderMaxid.xml" />
+		<mapper resource="sqlmap/Maxid.xml" />
 		<mapper resource="sqlmap/dtms/DtmsMessage.xml" />
 		<mapper resource="sqlmap/dtms/DtmsMessageException.xml" />
 		<mapper resource="sqlmap/dtms/DtmsMessageConfig.xml" />
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.b2c.dtms.dao.OrderMaxidDao">
+<mapper namespace="com.b2c.dtms.dao.MaxidDao">
  
 	<!-- order_maxid 所有查询列 -->
 	<sql id="QUERY_COLUMN_LIST">
@@ -54,7 +54,7 @@
 	</sql>
  
 	<!-- 插入order_maxid记录 -->
-	<insert id="insertEntry" parameterType="orderMaxid" >
+	<insert id="insertEntry" parameterType="Maxid" >
 		<![CDATA[
 			INSERT INTO order_maxid (id,id_type,id_value,memo,version_num)
 			VALUES (#{id},#{idType},#{idValue},#{memo},#{versionNum})
@@ -73,20 +73,20 @@
 	</delete>
  
 	<!-- 删除,通过条件 -->
-	<update id="deleteByCondtion" parameterType="orderMaxid" >
+	<update id="deleteByCondtion" parameterType="Maxid" >
 		<![CDATA[DELETE FROM order_maxid]]>
 		<include refid="QUERY_WHERE_CLAUSE"/>
 	</update>
  
 	<!-- 修改记录通过主键 -->
-	<update id="updateByKey" parameterType="orderMaxid" >
+	<update id="updateByKey" parameterType="Maxid" >
 		<![CDATA[UPDATE order_maxid]]>
 		<include refid="UPDATE_COLUMN_SET"/>
 		<![CDATA[WHERE id = #{id} AND  version_num = #{versionNum}]]>
 	</update>
  
 	<!-- 查询,通过主键IN(array) -->
-	<select id="selectEntryArray" parameterType="java.lang.reflect.Array" resultType="orderMaxid">
+	<select id="selectEntryArray" parameterType="java.lang.reflect.Array" resultType="Maxid">
 		<![CDATA[SELECT]]>
 		<include refid="QUERY_COLUMN_LIST"/>
 		<include refid="QUERY_FROM_TABLE"/>
@@ -97,7 +97,7 @@
 	</select>
  
 	<!-- 查询,通过条件 -->
-	<select id="selectEntryList" parameterType="orderMaxid" resultType="orderMaxid">
+	<select id="selectEntryList" parameterType="Maxid" resultType="Maxid">
 		<![CDATA[SELECT]]>
 		<include refid="QUERY_COLUMN_LIST"/>
 		<include refid="QUERY_FROM_TABLE"/>
@@ -106,7 +106,7 @@
 	</select>
  
 	<!-- 总数查询,通过条件 -->
-	<select id="selectEntryListCount" parameterType="orderMaxid" resultType="int">
+	<select id="selectEntryListCount" parameterType="Maxid" resultType="int">
 		<![CDATA[SELECT COUNT(id) AS dataCount]]>
 		<include refid="QUERY_FROM_TABLE"/>
 		<include refid="QUERY_WHERE_CLAUSE"/>
@@ -168,4 +168,5 @@
 			<version>1.6.1</version>
 		</dependency>
 	</dependencies>
+
 </project>
 \ No newline at end of file
@@ -25,8 +25,8 @@
 		<property name="ignoreResourceNotFound" value="true" />
 		<property name="locations">
 			<list>
-				<value>classpath:conf/important.properties</value>
-				<value>classpath:conf/orders-production.properties</value>
+				<value>classpath:conf/jdbc.properties</value>
+				<value>classpath:conf/config.properties</value>
 				<value>classpath:conf/manage.properties</value>
 			</list>
 		</property>
@@ -53,8 +53,8 @@
 		<property name="cacheSeconds" value="60" />
 	</bean>
  
-	<import resource="classpath*:spring-config-service.xml" />
-	<import resource="classpath*:spring-config-dao.xml" />
+	<import resource="classpath*:spring-service.xml" />
+	<import resource="classpath*:spring-dao.xml" />
 	<import resource="classpath*:spring-redis.xml" />
-	<import resource="classpath*:spring-config-dtms.xml" />
+	<import resource="classpath*:spring-dtms.xml" />
 </beans>
 \ No newline at end of file
@@ -7,7 +7,7 @@
  
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath:spring-config.xml</param-value>
+		<param-value>classpath:spring.xml</param-value>
 	</context-param>
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
@@ -21,7 +21,7 @@
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>classpath:spring-config-servlet.xml</param-value>
+			<param-value>classpath:spring-mvc.xml</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
@@ -27,25 +27,25 @@
 		<pnr-shop-develop.version>0.0.1-SNAPSHOT</pnr-shop-develop.version>
 		<pnr-shop-product.version>0.0.1-SNAPSHOT</pnr-shop-product.version>
 		<lombox.version>1.16.10</lombox.version>
-		<orders.cache.main.key>1n4j_orders:data</orders.cache.main.key>
+		<orders.cache.main.key>zandeapp_dtms:data</orders.cache.main.key>
 		<!--订单获系统缓存开关 -->
 		<orders.cache.enabled>true</orders.cache.enabled>
 		<!--统一管理平台配置 -->
 		<conf.manage.enable>true</conf.manage.enable>
 		<conf.manage.spider>true</conf.manage.spider>
-		<conf.manage.system>orders</conf.manage.system>
-		<conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
+		<conf.manage.system>dtms</conf.manage.system>
+		<conf.manage.domain>http://manage.zandeapp.com/</conf.manage.domain>
 		<!--系统url并未以.do结尾，因此需要使用如下方式的正则表达式 -->
 		<conf.manage.includes>^/.*</conf.manage.includes>
 		<!--打包编码 -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<orders.contextPath>http://dtms.1n4j.com</orders.contextPath>
+		<orders.contextPath>http://dtms.zandeapp.com</orders.contextPath>
 		<!--权限拦截器在处理导出文件时会出错，导致文件打不开，比如Excel，因此对于导出，跳过拦截 -->
 		<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/cleanCache$,^/assets/.*,^/orderSelf/export/.*,^/monitor,^/druid/*,^/orderPrint/export/*</conf.manage.excludes>
 		<!-- 域名信息 -->
-		<conf.domain.name>1n4j.com</conf.domain.name>
+		<conf.domain.name>zandeapp.com</conf.domain.name>
 		<!-- 静态资源地址 -->
-		<project.static.path>http://static.1n4j.com/static</project.static.path>
+		<project.static.path>http://static.zandeapp.com/static</project.static.path>
 		<!-- 订单请求和响应参数 -->
 		<orders.paramLog.enabled>true</orders.paramLog.enabled>
 	</properties>
@@ -63,11 +63,6 @@
 				<artifactId>commons-lang3</artifactId>
 				<version>3.5</version>
 			</dependency>
-			<dependency>
-				<groupId>com.yqyw</groupId>
-				<artifactId>orders-client</artifactId>
-				<version>${orders.client.sdk.version}</version>
-			</dependency>
 			<!-- 需求中心SDK -->
 			<dependency>
 				<groupId>com.diligrp</groupId>
@@ -91,7 +86,7 @@
 				<version>${user.client.devlop.version}</version> </dependency> -->
 			<!-- 数据字典 -->
 			<dependency>
-				<groupId>com.yqyw.website.web</groupId>
+				<groupId>com.b2c.website.web</groupId>
 				<artifactId>diligrp-website-api</artifactId>
 				<version>1.0.3-SNAPSHOT</version>
 				<exclusions>
@@ -102,9 +97,9 @@
 				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>com.diligrp.website</groupId>
+				<groupId>com.b2c.website</groupId>
 				<artifactId>diligrp-website-util</artifactId>
-				<version>0.0.1-SNAPSHOT</version>
+				<version>0.0.2-SNAPSHOT</version>
 				<exclusions>
 					<exclusion>
 						<groupId>velocity</groupId>
@@ -118,7 +113,7 @@
 			</dependency>
 			<!--后台user -->
 			<dependency>
-				<groupId>com.yqyw.manage</groupId>
+				<groupId>com.b2c.manage</groupId>
 				<artifactId>diligrp-manage-sdk</artifactId>
 				<version>0.0.3-SNAPSHOT</version>
 				<exclusions>
@@ -410,14 +405,14 @@
 			<properties>
 				<!-- 数据库 -->
 				<orders.jdbc.driver>com.mysql.jdbc.Driver</orders.jdbc.driver>
-				<orders.jdbc.url>jdbc:mysql://127.0.0.1:3306/dtms?characterEncoding=UTF-8</orders.jdbc.url>
+				<orders.jdbc.url>jdbc:mysql://10.28.11.162:3306/dtms?characterEncoding=UTF-8</orders.jdbc.url>
 				<orders.jdbc.username>root</orders.jdbc.username>
 				<orders.jdbc.password>123456</orders.jdbc.password>
 				<!-- 日志 -->
 				<orders.log.level>INFO</orders.log.level>
 				<orders.log.dtms.level>INFO</orders.log.dtms.level>
 				<!--redis -->
-				<project.redis.host1>10.28.10.208</project.redis.host1>
+				<project.redis.host1>10.28.11.205</project.redis.host1>
 				<project.redis.port1>6379</project.redis.port1>
 				<!--订单系统短信通知开关 -->
 				<orders.sms.enabled>true</orders.sms.enabled>
@@ -427,7 +422,7 @@
 				<!-- 店铺接口签名 -->
 				<orders.rpc.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</orders.rpc.shopClient.sign>
 				<!-- 消息中心配置 -->
-				<mq.namesrvAddr>10.28.10.209:9876;10.28.10.149:9876</mq.namesrvAddr>
+				<mq.namesrvAddr>10.28.11.158:9876</mq.namesrvAddr>
 				<mq.producerGroup>orders</mq.producerGroup>
 			</properties>
 		</profile>
@@ -467,10 +462,11 @@
 					<version>2.2</version>
 					<configuration>
 						<path>/</path>
-						<port>80</port>
+						<port>8080</port>
 						<uriEncoding>UTF-8</uriEncoding>
-						<server>order_dev_server</server>
-						<url>http://10.28.10.182/manager</url>
+						<username>admin</username>
+						<password>123456</password>
+						<url>http://10.28.11.197:8080/manager/text</url>
 					</configuration>
 				</plugin>
 				<plugin>