b2c / titan · Commits

Commit de9bb9466ed74672d91f1f2240de84aa052b5ff4

Authored by alexyang
1 parent 2164fd1d
build: skipped

ini

Inline Side-by-side
Showing 34 changed files with 1042 additions and 1486 deletions
titan-web/pom.xml
  View file @de9bb94
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  
4 - <modelVersion>4.0.0</modelVersion>  
5 - <parent>  
6 - <groupId>com.dili</groupId>  
7 - <artifactId>titan</artifactId>  
8 - <version>1.0</version>  
9 - </parent> 2 +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
  3 + xmlns="http://maven.apache.org/POM/4.0.0"
  4 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  5 + <modelVersion>4.0.0</modelVersion>
10 6
11 - <artifactId>titan-web</artifactId>  
12 - <packaging>war</packaging>  
13 - <name>titan-web</name> 7 + <groupId>com.dili</groupId>
  8 + <version>1.0</version>
  9 + <artifactId>titan-web</artifactId>
  10 + <packaging>war</packaging>
  11 + <name>titan-web</name>
14 12
15 - <properties>  
16 - <jdk.version>1.7</jdk.version>  
17 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  
18 - <maven.compiler.encoding>UTF-8</maven.compiler.encoding>  
19 - <spring.version>3.2.9.RELEASE</spring.version>  
20 - <aspectj.version>1.6.11</aspectj.version>  
21 - <jackson.version>1.9.2</jackson.version>  
22 - <slf4j.version>1.6.4</slf4j.version>  
23 - </properties> 13 + <properties>
  14 + <jdk.version>1.7</jdk.version>
  15 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  16 + <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
  17 + <spring.version>3.2.9.RELEASE</spring.version>
  18 + <aspectj.version>1.6.11</aspectj.version>
  19 + <jackson.version>1.9.2</jackson.version>
  20 + <slf4j.version>1.6.4</slf4j.version>
  21 + </properties>
24 22
25 <build> 23 <build>
26 - <resources>  
27 - <resource>  
28 - <directory>src/main/resources</directory>  
29 - <filtering>true</filtering>  
30 - </resource>  
31 - </resources>  
32 - <plugins>  
33 - <plugin>  
34 - <!-- war插件 -->  
35 - <groupId>org.apache.maven.plugins</groupId>  
36 - <artifactId>maven-war-plugin</artifactId>  
37 - <version>2.3</version>  
38 - </plugin>  
39 - <plugin>  
40 - <groupId>org.apache.maven.plugins</groupId>  
41 - <artifactId>maven-compiler-plugin</artifactId>  
42 - <version>2.5.1</version>  
43 - <configuration>  
44 - <source>1.7</source>  
45 - <target>1.7</target>  
46 - <encoding>UTF-8</encoding>  
47 - </configuration>  
48 - </plugin>  
49 - <!-- 配置构建时忽略测试用例 -->  
50 - <plugin>  
51 - <groupId>org.apache.maven.plugins</groupId>  
52 - <artifactId>maven-surefire-plugin</artifactId>  
53 - <configuration>  
54 - <skipTests>true</skipTests>  
55 - </configuration>  
56 - </plugin>  
57 - <plugin>  
58 - <groupId>org.mortbay.jetty</groupId>  
59 - <artifactId>maven-jetty-plugin</artifactId>  
60 - <version>6.1.26</version>  
61 - <configuration>  
62 - <scanIntervalSeconds>3</scanIntervalSeconds>  
63 - <contextPath>/</contextPath>  
64 - <connectors>  
65 - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">  
66 - <port>80</port>  
67 - </connector>  
68 - </connectors>  
69 - </configuration>  
70 - </plugin>  
71 - <plugin>  
72 - <groupId>org.apache.tomcat.maven</groupId>  
73 - <artifactId>tomcat7-maven-plugin</artifactId>  
74 - <version>2.2</version>  
75 - <configuration>  
76 - <port>80</port>  
77 - <path>/</path>  
78 - </configuration>  
79 - </plugin>  
80 - <plugin>  
81 - <artifactId>maven-resources-plugin</artifactId>  
82 - <version>2.5</version>  
83 - <executions>  
84 - <execution>  
85 - <id>copy-xmls</id>  
86 - <phase>process-sources</phase>  
87 - <goals>  
88 - <goal>copy-resources</goal>  
89 - </goals>  
90 - <configuration>  
91 - <outputDirectory>${basedir}/target/classes</outputDirectory>  
92 - <resources>  
93 - <resource>  
94 - <directory>${basedir}/src/main/hbase-profiles/${package.env}</directory>  
95 - <includes>  
96 - <include>**/*.xml</include>  
97 - </includes>  
98 - </resource>  
99 - </resources>  
100 - </configuration>  
101 - </execution>  
102 - </executions>  
103 - </plugin>  
104 - </plugins>  
105 - </build> 24 + <resources>
  25 + <resource>
  26 + <directory>src/main/resources</directory>
  27 + <filtering>true</filtering>
  28 + </resource>
  29 + </resources>
  30 + <plugins>
  31 + <plugin>
  32 + <!-- war插件 -->
  33 + <groupId>org.apache.maven.plugins</groupId>
  34 + <artifactId>maven-war-plugin</artifactId>
  35 + <version>2.3</version>
  36 + </plugin>
  37 + <plugin>
  38 + <groupId>org.apache.maven.plugins</groupId>
  39 + <artifactId>maven-compiler-plugin</artifactId>
  40 + <version>2.5.1</version>
  41 + <configuration>
  42 + <source>1.7</source>
  43 + <target>1.7</target>
  44 + <encoding>UTF-8</encoding>
  45 + </configuration>
  46 + </plugin>
  47 + <!-- 配置构建时忽略测试用例 -->
  48 + <plugin>
  49 + <groupId>org.apache.maven.plugins</groupId>
  50 + <artifactId>maven-surefire-plugin</artifactId>
  51 + <configuration>
  52 + <skipTests>true</skipTests>
  53 + </configuration>
  54 + </plugin>
  55 + <plugin>
  56 + <groupId>org.mortbay.jetty</groupId>
  57 + <artifactId>maven-jetty-plugin</artifactId>
  58 + <version>6.1.26</version>
  59 + <configuration>
  60 + <scanIntervalSeconds>3</scanIntervalSeconds>
  61 + <contextPath>/</contextPath>
  62 + <connectors>
  63 + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
  64 + <port>8080</port>
  65 + </connector>
  66 + </connectors>
  67 + </configuration>
  68 + </plugin>
  69 + <plugin>
  70 + <groupId>org.apache.tomcat.maven</groupId>
  71 + <artifactId>tomcat7-maven-plugin</artifactId>
  72 + <version>2.2</version>
  73 + <configuration>
  74 + <port>80</port>
  75 + <path>/</path>
  76 + </configuration>
  77 + </plugin>
  78 + <plugin>
  79 + <artifactId>maven-resources-plugin</artifactId>
  80 + <version>2.5</version>
  81 + <executions>
  82 + <execution>
  83 + <id>copy-xmls</id>
  84 + <phase>process-sources</phase>
  85 + <goals>
  86 + <goal>copy-resources</goal>
  87 + </goals>
  88 + <configuration>
  89 + <outputDirectory>${basedir}/target/classes</outputDirectory>
  90 + <resources>
  91 + <resource>
  92 + <directory>${basedir}/src/main/hbase-profiles/${package.env}</directory>
  93 + <includes>
  94 + <include>**/*.xml</include>
  95 + </includes>
  96 + </resource>
  97 + </resources>
  98 + </configuration>
  99 + </execution>
  100 + </executions>
  101 + </plugin>
  102 + </plugins>
  103 + </build>
106 104
107 - <dependencies>  
108 - <!-- spring -->  
109 - <dependency>  
110 - <groupId>org.springframework</groupId>  
111 - <artifactId>spring-webmvc</artifactId>  
112 - <version>${spring.version}</version>  
113 - <exclusions>  
114 - <exclusion>  
115 - <groupId>commons-logging</groupId>  
116 - <artifactId>commons-logging</artifactId>  
117 - </exclusion>  
118 - </exclusions>  
119 - </dependency>  
120 - <dependency>  
121 - <groupId>org.springframework</groupId>  
122 - <artifactId>spring-jdbc</artifactId>  
123 - <version>${spring.version}</version>  
124 - </dependency>  
125 - <dependency>  
126 - <groupId>org.springframework</groupId>  
127 - <artifactId>spring-tx</artifactId>  
128 - <version>${spring.version}</version>  
129 - </dependency>  
130 - <dependency>  
131 - <groupId>org.springframework</groupId>  
132 - <artifactId>spring-asm</artifactId>  
133 - <version>${spring.version}</version>  
134 - </dependency>  
135 - <dependency>  
136 - <groupId>org.springframework</groupId>  
137 - <artifactId>spring-context-support</artifactId>  
138 - <version>${spring.version}</version>  
139 - </dependency>  
140 - <dependency>  
141 - <groupId>org.springframework</groupId>  
142 - <artifactId>spring-expression</artifactId>  
143 - <version>${spring.version}</version>  
144 - </dependency>  
145 - <dependency>  
146 - <groupId>org.springframework</groupId>  
147 - <artifactId>spring-web</artifactId>  
148 - <version>${spring.version}</version>  
149 - </dependency> 105 + <dependencies>
150 106
151 - <!-- LOG4J日志记录 -->  
152 - <dependency>  
153 - <groupId>org.slf4j</groupId>  
154 - <artifactId>slf4j-api</artifactId>  
155 - <version>1.6.4</version>  
156 - </dependency>  
157 - <dependency>  
158 - <groupId>org.slf4j</groupId>  
159 - <artifactId>slf4j-log4j12</artifactId>  
160 - <version>1.6.4</version>  
161 - </dependency>  
162 - <dependency>  
163 - <groupId>log4j</groupId>  
164 - <artifactId>log4j</artifactId>  
165 - <version>1.2.17</version>  
166 - </dependency> 107 + <dependency>
  108 + <groupId>com.diligrp</groupId>
  109 + <artifactId>diligrp-crm-api</artifactId>
  110 + <!--更换最新的 chenzhiwei-->
  111 + <version>0.0.1-SNAPSHOT</version>
  112 + <exclusions>
  113 + <exclusion>
  114 + <groupId>org.apache.httpcomponents</groupId>
  115 + <artifactId>httpcore</artifactId>
  116 + </exclusion>
  117 + </exclusions>
  118 + </dependency>
  119 + <!-- 团购 -->
  120 + <dependency>
  121 + <groupId>com.diligrp.group-purchase</groupId>
  122 + <artifactId>gpurchase-sdk</artifactId>
  123 + <version>0.0.1-SNAPSHOT</version>
  124 + <exclusions>
  125 + <exclusion>
  126 + <groupId>*</groupId>
  127 + <artifactId>titan-sdk</artifactId>
  128 + </exclusion>
  129 + <exclusion>
  130 + <artifactId>diligrp-website-util</artifactId>
  131 + <groupId>com.diligrp.website</groupId>
  132 + </exclusion>
  133 + </exclusions>
  134 + </dependency>
  135 + <dependency>
  136 + <groupId>com.yqyw.titan</groupId>
  137 + <artifactId>titan-sdk</artifactId>
  138 + <version>0.0.2-SNAPSHOT</version>
  139 + </dependency>
  140 + <dependency>
  141 + <groupId>com.yqyw.website.web</groupId>
  142 + <artifactId>diligrp-website-api</artifactId>
  143 + <version>1.0.3-SNAPSHOT</version>
  144 + <exclusions>
  145 + <exclusion>
  146 + <artifactId>velocity-dep</artifactId>
  147 + <groupId>velocity</groupId>
  148 + </exclusion>
  149 + </exclusions>
  150 + </dependency>
  151 + <dependency>
  152 + <groupId>com.diligrp.store</groupId>
  153 + <artifactId>diligrp-store-sdk</artifactId>
  154 + <version>0.0.1-SNAPSHOT</version>
  155 + <exclusions>
  156 + <exclusion>
  157 + <artifactId>httpcore</artifactId>
  158 + <groupId>org.apache.httpcomponents</groupId>
  159 + </exclusion>
  160 + </exclusions>
  161 + </dependency>
  162 + <dependency>
  163 + <groupId>com.diligrp</groupId>
  164 + <artifactId>image-server-sdk</artifactId>
  165 + <version>0.0.1-SNAPSHOT</version>
  166 + <exclusions>
  167 + <exclusion>
  168 + <artifactId>httpcore</artifactId>
  169 + <groupId>org.apache.httpcomponents</groupId>
  170 + </exclusion>
  171 + </exclusions>
  172 + </dependency>
  173 + <dependency>
  174 + <groupId>com.yqyw.user</groupId>
  175 + <artifactId>diligrp-user-client</artifactId>
  176 + <version>0.0.4-SNAPSHOT</version>
  177 + <exclusions>
  178 + <exclusion>
  179 + <artifactId>diligrp-website-util</artifactId>
  180 + <groupId>com.diligrp.website</groupId>
  181 + </exclusion>
  182 + </exclusions>
  183 + </dependency>
167 184
168 - <dependency>  
169 - <groupId>commons-lang</groupId>  
170 - <artifactId>commons-lang</artifactId>  
171 - <version>2.5</version>  
172 - </dependency> 185 + <dependency>
  186 + <groupId>com.yqyw.shop</groupId>
  187 + <artifactId>shop-sdk</artifactId>
  188 + <version>0.0.1-SNAPSHOT</version>
  189 + <!--<version>1.0.1.RELEASE</version>-->
  190 + </dependency>
  191 + <!-- spring -->
  192 + <dependency>
  193 + <groupId>org.springframework</groupId>
  194 + <artifactId>spring-webmvc</artifactId>
  195 + <version>${spring.version}</version>
  196 + <exclusions>
  197 + <exclusion>
  198 + <groupId>commons-logging</groupId>
  199 + <artifactId>commons-logging</artifactId>
  200 + </exclusion>
  201 + </exclusions>
  202 + </dependency>
  203 + <dependency>
  204 + <groupId>org.springframework</groupId>
  205 + <artifactId>spring-jdbc</artifactId>
  206 + <version>${spring.version}</version>
  207 + </dependency>
  208 + <dependency>
  209 + <groupId>org.springframework</groupId>
  210 + <artifactId>spring-tx</artifactId>
  211 + <version>${spring.version}</version>
  212 + </dependency>
  213 + <dependency>
  214 + <groupId>org.springframework</groupId>
  215 + <artifactId>spring-context-support</artifactId>
  216 + <version>${spring.version}</version>
  217 + </dependency>
  218 + <dependency>
  219 + <groupId>org.springframework</groupId>
  220 + <artifactId>spring-expression</artifactId>
  221 + <version>${spring.version}</version>
  222 + </dependency>
  223 + <dependency>
  224 + <groupId>org.springframework</groupId>
  225 + <artifactId>spring-web</artifactId>
  226 + <version>${spring.version}</version>
  227 + </dependency>
173 228
174 - <dependency>  
175 - <groupId>commons-codec</groupId>  
176 - <artifactId>commons-codec</artifactId>  
177 - <version>1.6</version>  
178 - </dependency>  
179 - <dependency>  
180 - <groupId>org.mybatis</groupId>  
181 - <artifactId>mybatis</artifactId>  
182 - <version>3.2.1</version>  
183 - </dependency>  
184 - <dependency>  
185 - <groupId>org.mybatis</groupId>  
186 - <artifactId>mybatis-spring</artifactId>  
187 - <version>1.2.0</version>  
188 - </dependency>  
189 - <!--<dependency>-->  
190 - <!--<groupId>com.jolbox</groupId>-->  
191 - <!--<artifactId>bonecp</artifactId>-->  
192 - <!--<version>0.7.1.RELEASE</version>-->  
193 - <!--</dependency>-->  
194 - <dependency>  
195 - <groupId>com.alibaba</groupId>  
196 - <artifactId>druid</artifactId>  
197 - <version>1.0.11</version>  
198 - </dependency> 229 + <!-- LOG4J日志记录 -->
  230 + <dependency>
  231 + <groupId>org.slf4j</groupId>
  232 + <artifactId>slf4j-api</artifactId>
  233 + <version>1.6.4</version>
  234 + </dependency>
  235 + <dependency>
  236 + <groupId>org.slf4j</groupId>
  237 + <artifactId>slf4j-log4j12</artifactId>
  238 + <version>1.6.4</version>
  239 + </dependency>
  240 + <dependency>
  241 + <groupId>log4j</groupId>
  242 + <artifactId>log4j</artifactId>
  243 + <version>1.2.17</version>
  244 + </dependency>
199 245
200 - <dependency>  
201 - <groupId>mysql</groupId>  
202 - <artifactId>mysql-connector-java</artifactId>  
203 - <version>5.1.25</version>  
204 - </dependency> 246 + <dependency>
  247 + <groupId>commons-lang</groupId>
  248 + <artifactId>commons-lang</artifactId>
  249 + <version>2.5</version>
  250 + </dependency>
205 251
206 - <!-- 工具类 -->  
207 - <!-- google sets,maps -->  
208 - <dependency>  
209 - <groupId>com.google.guava</groupId>  
210 - <artifactId>guava</artifactId>  
211 - <version>14.0.1</version>  
212 - </dependency>  
213 - <!-- JSON -->  
214 - <dependency>  
215 - <groupId>com.alibaba</groupId>  
216 - <artifactId>fastjson</artifactId>  
217 - <version>1.1.31</version>  
218 - </dependency>  
219 - <dependency>  
220 - <groupId>org.aspectj</groupId>  
221 - <artifactId>aspectjweaver</artifactId>  
222 - <version>1.7.2</version>  
223 - </dependency>  
224 - <dependency>  
225 - <groupId>cglib</groupId>  
226 - <artifactId>cglib-nodep</artifactId>  
227 - <version>2.1_3</version>  
228 - </dependency> 252 + <dependency>
  253 + <groupId>commons-codec</groupId>
  254 + <artifactId>commons-codec</artifactId>
  255 + <version>1.6</version>
  256 + </dependency>
  257 + <dependency>
  258 + <groupId>org.mybatis</groupId>
  259 + <artifactId>mybatis</artifactId>
  260 + <version>3.2.1</version>
  261 + </dependency>
  262 + <dependency>
  263 + <groupId>org.mybatis</groupId>
  264 + <artifactId>mybatis-spring</artifactId>
  265 + <version>1.2.0</version>
  266 + </dependency>
  267 + <!--<dependency>-->
  268 + <!--<groupId>com.jolbox</groupId>-->
  269 + <!--<artifactId>bonecp</artifactId>-->
  270 + <!--<version>0.7.1.RELEASE</version>-->
  271 + <!--</dependency>-->
  272 + <dependency>
  273 + <groupId>com.alibaba</groupId>
  274 + <artifactId>druid</artifactId>
  275 + <version>1.0.11</version>
  276 + </dependency>
229 277
230 - <!-- common logging replacer -->  
231 - <dependency>  
232 - <groupId>org.slf4j</groupId>  
233 - <artifactId>jcl-over-slf4j</artifactId>  
234 - <version>${slf4j.version}</version>  
235 - </dependency>  
236 - <!-- if you enable @AspectJ style AOP in spring. -->  
237 - <dependency>  
238 - <groupId>org.aspectj</groupId>  
239 - <artifactId>aspectjrt</artifactId>  
240 - <version>${aspectj.version}</version>  
241 - </dependency>  
242 - <!-- if you enable JSR303 (Bean Validation) in spring. -->  
243 - <dependency>  
244 - <groupId>org.hibernate</groupId>  
245 - <artifactId>hibernate-validator</artifactId>  
246 - <version>4.2.0.Final</version>  
247 - </dependency>  
248 - <!-- if you use velocity view in springmvc -->  
249 - <dependency>  
250 - <groupId>org.apache.velocity</groupId>  
251 - <artifactId>velocity</artifactId>  
252 - <version>1.7</version>  
253 - </dependency>  
254 - <!-- if you use velocity layout view in springmvc -->  
255 - <dependency>  
256 - <groupId>org.apache.velocity</groupId>  
257 - <artifactId>velocity-tools</artifactId>  
258 - <version>2.0</version>  
259 - <exclusions>  
260 - <exclusion>  
261 - <groupId>org.apache.struts</groupId>  
262 - <artifactId>struts-core</artifactId>  
263 - </exclusion>  
264 - <exclusion>  
265 - <groupId>org.apache.struts</groupId>  
266 - <artifactId>struts-taglib</artifactId>  
267 - </exclusion>  
268 - <exclusion>  
269 - <groupId>org.apache.struts</groupId>  
270 - <artifactId>struts-tiles</artifactId>  
271 - </exclusion>  
272 - <exclusion>  
273 - <groupId>sslext</groupId>  
274 - <artifactId>sslext</artifactId>  
275 - </exclusion>  
276 - </exclusions>  
277 - </dependency>  
278 - <!-- if you enable json support in spring mvc. -->  
279 - <dependency>  
280 - <groupId>org.codehaus.jackson</groupId>  
281 - <artifactId>jackson-mapper-asl</artifactId>  
282 - <version>${jackson.version}</version>  
283 - </dependency>  
284 - <!-- if you use fileupload in spring mvc -->  
285 - <dependency>  
286 - <groupId>commons-fileupload</groupId>  
287 - <artifactId>commons-fileupload</artifactId>  
288 - <version>1.2.2</version>  
289 - <optional>true</optional>  
290 - </dependency>  
291 - <!-- test scope -->  
292 - <dependency>  
293 - <groupId>junit</groupId>  
294 - <artifactId>junit</artifactId>  
295 - <version>4.10</version>  
296 - <scope>test</scope>  
297 - </dependency>  
298 - <dependency>  
299 - <groupId>javax.servlet</groupId>  
300 - <artifactId>servlet-api</artifactId>  
301 - <version>2.4</version>  
302 - <scope>provided</scope>  
303 - </dependency>  
304 - <dependency>  
305 - <groupId>redis.clients</groupId>  
306 - <artifactId>jedis</artifactId>  
307 - <version>2.4.2</version>  
308 - </dependency>  
309 - <dependency>  
310 - <groupId>org.springframework.data</groupId>  
311 - <artifactId>spring-data-redis</artifactId>  
312 - <version>1.3.0.RELEASE</version>  
313 - <exclusions>  
314 - <exclusion>  
315 - <groupId>org.springframework</groupId>  
316 - <artifactId>spring-core</artifactId>  
317 - </exclusion>  
318 - <exclusion>  
319 - <groupId>org.springframework</groupId>  
320 - <artifactId>spring-aop</artifactId>  
321 - </exclusion>  
322 - <exclusion>  
323 - <groupId>org.springframework</groupId>  
324 - <artifactId>spring-context</artifactId>  
325 - </exclusion>  
326 - </exclusions>  
327 - </dependency>  
328 - <dependency>  
329 - <artifactId>hbase-client</artifactId>  
330 - <groupId>org.apache.hbase</groupId>  
331 - <version>0.96.1.1-cdh5.0.0</version>  
332 - </dependency>  
333 - <dependency>  
334 - <groupId>org.springframework</groupId>  
335 - <artifactId>spring-test</artifactId>  
336 - <version>${spring.version}</version>  
337 - </dependency>  
338 - <!--<dependency>-->  
339 - <!--<groupId>org.apache.activemq</groupId>-->  
340 - <!--<artifactId>activemq-spring</artifactId>-->  
341 - <!--<version>5.9.1</version>-->  
342 - <!--</dependency>--> 278 + <dependency>
  279 + <groupId>mysql</groupId>
  280 + <artifactId>mysql-connector-java</artifactId>
  281 + <version>5.1.25</version>
  282 + </dependency>
343 283
  284 + <!-- 工具类 -->
  285 + <!-- google sets,maps -->
  286 + <dependency>
  287 + <groupId>com.google.guava</groupId>
  288 + <artifactId>guava</artifactId>
  289 + <version>14.0.1</version>
  290 + </dependency>
  291 + <!-- JSON -->
  292 + <dependency>
  293 + <groupId>com.alibaba</groupId>
  294 + <artifactId>fastjson</artifactId>
  295 + <version>1.1.31</version>
  296 + </dependency>
  297 + <dependency>
  298 + <groupId>org.aspectj</groupId>
  299 + <artifactId>aspectjweaver</artifactId>
  300 + <version>1.7.2</version>
  301 + </dependency>
  302 + <dependency>
  303 + <groupId>cglib</groupId>
  304 + <artifactId>cglib-nodep</artifactId>
  305 + <version>2.1_3</version>
  306 + </dependency>
344 307
  308 + <!-- common logging replacer -->
  309 + <dependency>
  310 + <groupId>org.slf4j</groupId>
  311 + <artifactId>jcl-over-slf4j</artifactId>
  312 + <version>${slf4j.version}</version>
  313 + </dependency>
  314 + <!-- if you enable @AspectJ style AOP in spring. -->
  315 + <dependency>
  316 + <groupId>org.aspectj</groupId>
  317 + <artifactId>aspectjrt</artifactId>
  318 + <version>${aspectj.version}</version>
  319 + </dependency>
  320 + <!-- if you enable JSR303 (Bean Validation) in spring. -->
  321 + <dependency>
  322 + <groupId>org.hibernate</groupId>
  323 + <artifactId>hibernate-validator</artifactId>
  324 + <version>4.2.0.Final</version>
  325 + </dependency>
  326 + <!-- if you use velocity view in springmvc -->
  327 + <dependency>
  328 + <groupId>org.apache.velocity</groupId>
  329 + <artifactId>velocity</artifactId>
  330 + <version>1.7</version>
  331 + </dependency>
  332 + <!-- if you use velocity layout view in springmvc -->
  333 + <dependency>
  334 + <groupId>org.apache.velocity</groupId>
  335 + <artifactId>velocity-tools</artifactId>
  336 + <version>2.0</version>
  337 + <exclusions>
  338 + <exclusion>
  339 + <groupId>org.apache.struts</groupId>
  340 + <artifactId>struts-core</artifactId>
  341 + </exclusion>
  342 + <exclusion>
  343 + <groupId>org.apache.struts</groupId>
  344 + <artifactId>struts-taglib</artifactId>
  345 + </exclusion>
  346 + <exclusion>
  347 + <groupId>org.apache.struts</groupId>
  348 + <artifactId>struts-tiles</artifactId>
  349 + </exclusion>
  350 + <exclusion>
  351 + <groupId>sslext</groupId>
  352 + <artifactId>sslext</artifactId>
  353 + </exclusion>
  354 + </exclusions>
  355 + </dependency>
  356 + <!-- if you enable json support in spring mvc. -->
  357 + <dependency>
  358 + <groupId>org.codehaus.jackson</groupId>
  359 + <artifactId>jackson-mapper-asl</artifactId>
  360 + <version>${jackson.version}</version>
  361 + </dependency>
  362 + <!-- if you use fileupload in spring mvc -->
  363 + <dependency>
  364 + <groupId>commons-fileupload</groupId>
  365 + <artifactId>commons-fileupload</artifactId>
  366 + <version>1.2.2</version>
  367 + <optional>true</optional>
  368 + </dependency>
  369 + <!-- test scope -->
  370 + <dependency>
  371 + <groupId>junit</groupId>
  372 + <artifactId>junit</artifactId>
  373 + <version>4.10</version>
  374 + <scope>test</scope>
  375 + </dependency>
  376 + <dependency>
  377 + <groupId>javax.servlet</groupId>
  378 + <artifactId>servlet-api</artifactId>
  379 + <version>2.4</version>
  380 + <scope>provided</scope>
  381 + </dependency>
  382 + <dependency>
  383 + <groupId>redis.clients</groupId>
  384 + <artifactId>jedis</artifactId>
  385 + <version>2.4.2</version>
  386 + </dependency>
  387 + <dependency>
  388 + <groupId>org.springframework.data</groupId>
  389 + <artifactId>spring-data-redis</artifactId>
  390 + <version>1.3.0.RELEASE</version>
  391 + <exclusions>
  392 + <exclusion>
  393 + <groupId>org.springframework</groupId>
  394 + <artifactId>spring-core</artifactId>
  395 + </exclusion>
  396 + <exclusion>
  397 + <groupId>org.springframework</groupId>
  398 + <artifactId>spring-aop</artifactId>
  399 + </exclusion>
  400 + <exclusion>
  401 + <groupId>org.springframework</groupId>
  402 + <artifactId>spring-context</artifactId>
  403 + </exclusion>
  404 + </exclusions>
  405 + </dependency>
  406 + <dependency>
  407 + <artifactId>hbase-client</artifactId>
  408 + <groupId>org.apache.hbase</groupId>
  409 + <version>0.96.1.1-cdh5.0.0</version>
  410 + </dependency>
  411 + <dependency>
  412 + <groupId>org.springframework</groupId>
  413 + <artifactId>spring-test</artifactId>
  414 + <version>${spring.version}</version>
  415 + </dependency>
  416 + <!--<dependency>-->
  417 + <!--<groupId>org.apache.activemq</groupId>-->
  418 + <!--<artifactId>activemq-spring</artifactId>-->
  419 + <!--<version>5.9.1</version>-->
  420 + <!--</dependency>-->
  421 +
  422 +
  423 + <!--<dependency>-->
  424 + <!--<groupId>org.springframework</groupId>-->
  425 + <!--<artifactId>spring-jms</artifactId>-->
  426 + <!--<version>${spring.version}</version>-->
  427 + <!--</dependency>-->
  428 + <dependency>
  429 + <groupId>org.apache.httpcomponents</groupId>
  430 + <artifactId>httpclient</artifactId>
  431 + <version>4.3.3</version>
  432 + </dependency>
345 433
346 - <!--<dependency>-->  
347 - <!--<groupId>org.springframework</groupId>-->  
348 - <!--<artifactId>spring-jms</artifactId>-->  
349 - <!--<version>${spring.version}</version>-->  
350 - <!--</dependency>-->  
351 - <dependency>  
352 - <groupId>org.apache.httpcomponents</groupId>  
353 - <artifactId>httpclient</artifactId>  
354 - <version>4.3.3</version>  
355 - </dependency>  
356 -  
357 - <dependency>  
358 - <groupId>com.diligrp.log.util</groupId>  
359 - <artifactId>diligrp-log-util</artifactId>  
360 - <version>0.0.1-SNAPSHOT</version>  
361 - </dependency> 434 + <dependency>
  435 + <groupId>com.diligrp.log.util</groupId>
  436 + <artifactId>diligrp-log-util</artifactId>
  437 + <version>0.0.1-SNAPSHOT</version>
  438 + </dependency>
362 <dependency> 439 <dependency>
363 <groupId>edit</groupId> 440 <groupId>edit</groupId>
364 <artifactId>edit</artifactId> 441 <artifactId>edit</artifactId>
@@ -371,23 +448,33 @@ @@ -371,23 +448,33 @@
371 <artifactId>javamelody-core</artifactId> 448 <artifactId>javamelody-core</artifactId>
372 <version>1.37.0</version> 449 <version>1.37.0</version>
373 </dependency> 450 </dependency>
  451 + <dependency>
  452 + <groupId>com.diligrp.manage</groupId>
  453 + <artifactId>diligrp-manage-sdk</artifactId>
  454 + <version>0.0.2-SNAPSHOT</version>
  455 + </dependency>
  456 + <dependency>
  457 + <groupId>com.yqyw.messageCenter.sdk</groupId>
  458 + <artifactId>diligrp-messageCenter-sdk</artifactId>
  459 + <version>0.0.4-SNAPSHOT</version>
  460 + </dependency>
374 461
375 - </dependencies> 462 + </dependencies>
376 463
377 -<!-- 打包配置信息 -->  
378 - <profiles>  
379 - <profile>  
380 - <!-- 开发环境 -->  
381 - <id>develop</id>  
382 - <!-- 默认 -->  
383 - <activation>  
384 - <activeByDefault>true</activeByDefault>  
385 - </activation>  
386 - <properties>  
387 - <package.env>develop</package.env>  
388 - <!--jdbc type -->  
389 - <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>  
390 - <!-- 数据库 --> 464 + <!-- 打包配置信息 -->
  465 + <profiles>
  466 + <profile>
  467 + <!-- 开发环境 -->
  468 + <id>develop</id>
  469 + <!-- 默认 -->
  470 + <activation>
  471 + <activeByDefault>true</activeByDefault>
  472 + </activation>
  473 + <properties>
  474 + <package.env>develop</package.env>
  475 + <!--jdbc type -->
  476 + <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>
  477 + <!-- 数据库 -->
391 <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver> 478 <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver>
392 <!-- 主库配置 --> 479 <!-- 主库配置 -->
393 <dili_titan.master.jdbc.url>jdbc:MySql://10.28.10.188:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url> 480 <dili_titan.master.jdbc.url>jdbc:MySql://10.28.10.188:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url>
@@ -397,14 +484,14 @@ @@ -397,14 +484,14 @@
397 <dili_titan.slave.jdbc.url>jdbc:MySql://10.28.10.188:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url> 484 <dili_titan.slave.jdbc.url>jdbc:MySql://10.28.10.188:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url>
398 <dili_titan.slave.jdbc.username>du</dili_titan.slave.jdbc.username> 485 <dili_titan.slave.jdbc.username>du</dili_titan.slave.jdbc.username>
399 <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password> 486 <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password>
400 - <!-- crm接口地址 -->  
401 - <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>  
402 - <!-- user接口地址 -->  
403 - <dili_titan.user.url>user.1n4j.com</dili_titan.user.url> 487 + <!-- crm接口地址 -->
  488 + <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>
  489 + <!-- user接口地址 -->
  490 + <dili_titan.user.url>user.1n4j.com</dili_titan.user.url>
404 <!--shop接口地址,需要测试自己修改 --> 491 <!--shop接口地址,需要测试自己修改 -->
405 <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url> 492 <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url>
406 - <!-- redis接口地址 -->  
407 - <dili_titan.redis.url>10.28.10.208</dili_titan.redis.url> 493 + <!-- redis接口地址 -->
  494 + <dili_titan.redis.url>10.28.10.208</dili_titan.redis.url>
408 <!--权限管理的redis配置--> 495 <!--权限管理的redis配置-->
409 <manage.redis.url>10.28.10.208</manage.redis.url> 496 <manage.redis.url>10.28.10.208</manage.redis.url>
410 <manage.redis.port>6379</manage.redis.port> 497 <manage.redis.port>6379</manage.redis.port>
@@ -414,24 +501,26 @@ @@ -414,24 +501,26 @@
414 <!--<dili_titan.mq.url>tcp://10.28.6.114:61616</dili_titan.mq.url>--> 501 <!--<dili_titan.mq.url>tcp://10.28.6.114:61616</dili_titan.mq.url>-->
415 <!-- website接口地址 --> 502 <!-- website接口地址 -->
416 <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url> 503 <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url>
417 - <!-- 日志 -->  
418 - <dili_titan.log.level>INFO</dili_titan.log.level>  
419 - <dili_titan.log.path>/export/logs</dili_titan.log.path> 504 + <!-- 日志 -->
  505 + <dili_titan.log.level>INFO</dili_titan.log.level>
  506 + <dili_titan.log.path>/export/logs</dili_titan.log.path>
420 <dili_titan.log.root.appender>CONSOLE</dili_titan.log.root.appender> 507 <dili_titan.log.root.appender>CONSOLE</dili_titan.log.root.appender>
421 - <!--打包编码 -->  
422 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  
423 - <!-- 图片服务器 -->  
424 - <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>  
425 - <project.store.url>http://up.1n4j.com</project.store.url>  
426 - <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>  
427 - <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>  
428 - <!--权限相关配置-->  
429 - <conf.manage.enable>true</conf.manage.enable>  
430 - <conf.manage.spider>true</conf.manage.spider>  
431 - <conf.manage.system>titan</conf.manage.system>  
432 - <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>  
433 - <conf.manage.includes>^/.*</conf.manage.includes>  
434 - <conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData</conf.manage.excludes> 508 + <!--打包编码 -->
  509 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  510 + <!-- 图片服务器 -->
  511 + <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>
  512 + <project.store.url>http://up.1n4j.com</project.store.url>
  513 + <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>
  514 + <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>
  515 + <!--权限相关配置-->
  516 + <conf.manage.enable>true</conf.manage.enable>
  517 + <conf.manage.spider>true</conf.manage.spider>
  518 + <conf.manage.system>titan</conf.manage.system>
  519 + <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
  520 + <conf.manage.includes>^/.*</conf.manage.includes>
  521 + <conf.manage.excludes>
  522 + ^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData
  523 + </conf.manage.excludes>
435 <!--上传视频--> 524 <!--上传视频-->
436 <project.fastdfs.trackercount>2</project.fastdfs.trackercount> 525 <project.fastdfs.trackercount>2</project.fastdfs.trackercount>
437 <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout> 526 <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout>
@@ -445,19 +534,19 @@ @@ -445,19 +534,19 @@
445 <titan.aqy.appkey>e64a09bece964bb484e5decc30c0b950</titan.aqy.appkey> 534 <titan.aqy.appkey>e64a09bece964bb484e5decc30c0b950</titan.aqy.appkey>
446 <titan.aqy.appSecret>f48d2b799f9661acdb6041e4ac7c142f</titan.aqy.appSecret> 535 <titan.aqy.appSecret>f48d2b799f9661acdb6041e4ac7c142f</titan.aqy.appSecret>
447 </properties> 536 </properties>
448 - </profile>  
449 - <profile>  
450 - <!-- 测试环境 -->  
451 - <id>test</id>  
452 - <activation>  
453 - <activeByDefault>false</activeByDefault>  
454 - </activation>  
455 - <properties>  
456 - <package.env>test</package.env>  
457 - <!--jdbc type -->  
458 - <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>  
459 - <!-- 数据库 -->  
460 - <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver> 537 + </profile>
  538 + <profile>
  539 + <!-- 测试环境 -->
  540 + <id>test</id>
  541 + <activation>
  542 + <activeByDefault>false</activeByDefault>
  543 + </activation>
  544 + <properties>
  545 + <package.env>test</package.env>
  546 + <!--jdbc type -->
  547 + <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>
  548 + <!-- 数据库 -->
  549 + <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver>
461 <!-- 主库配置 --> 550 <!-- 主库配置 -->
462 <dili_titan.master.jdbc.url>jdbc:MySql://10.28.6.156:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url> 551 <dili_titan.master.jdbc.url>jdbc:MySql://10.28.6.156:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url>
463 <dili_titan.master.jdbc.username>root</dili_titan.master.jdbc.username> 552 <dili_titan.master.jdbc.username>root</dili_titan.master.jdbc.username>
@@ -466,14 +555,14 @@ @@ -466,14 +555,14 @@
466 <dili_titan.slave.jdbc.url>jdbc:MySql://10.28.6.155:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url> 555 <dili_titan.slave.jdbc.url>jdbc:MySql://10.28.6.155:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url>
467 <dili_titan.slave.jdbc.username>agriez_titan_reader</dili_titan.slave.jdbc.username> 556 <dili_titan.slave.jdbc.username>agriez_titan_reader</dili_titan.slave.jdbc.username>
468 <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password> 557 <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password>
469 - <!-- crm接口地址 -->  
470 - <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>  
471 - <!-- user接口地址,需要测试自己修改 -->  
472 - <dili_titan.user.url>user.1n4j.com</dili_titan.user.url> 558 + <!-- crm接口地址 -->
  559 + <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>
  560 + <!-- user接口地址,需要测试自己修改 -->
  561 + <dili_titan.user.url>user.1n4j.com</dili_titan.user.url>
473 <!--shop接口地址,需要测试自己修改 --> 562 <!--shop接口地址,需要测试自己修改 -->
474 <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url> 563 <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url>
475 - <!-- redis接口地址 -->  
476 - <dili_titan.redis.url>10.28.10.207</dili_titan.redis.url> 564 + <!-- redis接口地址 -->
  565 + <dili_titan.redis.url>10.28.10.207</dili_titan.redis.url>
477 <!--权限管理的redis配置--> 566 <!--权限管理的redis配置-->
478 <manage.redis.url>10.28.10.207</manage.redis.url> 567 <manage.redis.url>10.28.10.207</manage.redis.url>
479 <manage.redis.port>6379</manage.redis.port> 568 <manage.redis.port>6379</manage.redis.port>
@@ -483,24 +572,26 @@ @@ -483,24 +572,26 @@
483 <!--<dili_titan.mq.url>tcp://10.28.6.54:61616</dili_titan.mq.url>--> 572 <!--<dili_titan.mq.url>tcp://10.28.6.54:61616</dili_titan.mq.url>-->
484 <!-- website接口地址 --> 573 <!-- website接口地址 -->
485 <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url> 574 <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url>
486 - <!-- 日志 -->  
487 - <dili_titan.log.level>INFO</dili_titan.log.level> 575 + <!-- 日志 -->
  576 + <dili_titan.log.level>INFO</dili_titan.log.level>
488 <dili_titan.log.path>/home/tomcat/export</dili_titan.log.path> 577 <dili_titan.log.path>/home/tomcat/export</dili_titan.log.path>
489 <dili_titan.log.root.appender>CONSOLE</dili_titan.log.root.appender> 578 <dili_titan.log.root.appender>CONSOLE</dili_titan.log.root.appender>
490 - <!--打包编码 -->  
491 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  
492 - <!-- 图片服务器前缀 -->  
493 - <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>  
494 - <project.store.url>http://up.1n4j.com</project.store.url>  
495 - <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>  
496 - <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>  
497 - <!--权限相关配置-->  
498 - <conf.manage.enable>true</conf.manage.enable>  
499 - <conf.manage.spider>true</conf.manage.spider>  
500 - <conf.manage.system>titan</conf.manage.system>  
501 - <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>  
502 - <conf.manage.includes>^/.*</conf.manage.includes>  
503 - <conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData</conf.manage.excludes> 579 + <!--打包编码 -->
  580 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  581 + <!-- 图片服务器前缀 -->
  582 + <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>
  583 + <project.store.url>http://up.1n4j.com</project.store.url>
  584 + <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>
  585 + <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>
  586 + <!--权限相关配置-->
  587 + <conf.manage.enable>true</conf.manage.enable>
  588 + <conf.manage.spider>true</conf.manage.spider>
  589 + <conf.manage.system>titan</conf.manage.system>
  590 + <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
  591 + <conf.manage.includes>^/.*</conf.manage.includes>
  592 + <conf.manage.excludes>
  593 + ^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData
  594 + </conf.manage.excludes>
504 <!--上传视频--> 595 <!--上传视频-->
505 <project.fastdfs.trackercount>2</project.fastdfs.trackercount> 596 <project.fastdfs.trackercount>2</project.fastdfs.trackercount>
506 <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout> 597 <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout>
@@ -514,94 +605,96 @@ @@ -514,94 +605,96 @@
514 <titan.aqy.appkey>e64a09bece964bb484e5decc30c0b950</titan.aqy.appkey> 605 <titan.aqy.appkey>e64a09bece964bb484e5decc30c0b950</titan.aqy.appkey>
515 <titan.aqy.appSecret>f48d2b799f9661acdb6041e4ac7c142f</titan.aqy.appSecret> 606 <titan.aqy.appSecret>f48d2b799f9661acdb6041e4ac7c142f</titan.aqy.appSecret>
516 </properties> 607 </properties>
517 - </profile> 608 + </profile>
518 609
519 - <profile>  
520 - <!--预发布环境-->  
521 - <id>pre-online</id>  
522 - <!-- 默认 -->  
523 - <activation>  
524 - <activeByDefault>false</activeByDefault>  
525 - </activation>  
526 - <properties>  
527 - <package.env>pre-online</package.env>  
528 - <!--jdbc type -->  
529 - <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>  
530 - <!-- 数据库 -->  
531 - <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver>  
532 - <!-- 主库配置 -->  
533 - <dili_titan.master.jdbc.url>jdbc:MySql://titan.db.1n4j.com:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url>  
534 - <dili_titan.master.jdbc.username>root</dili_titan.master.jdbc.username>  
535 - <dili_titan.master.jdbc.password>123456</dili_titan.master.jdbc.password>  
536 - <!-- 从库配置 -->  
537 - <dili_titan.slave.jdbc.url>jdbc:MySql://titan.db.1n4j.com:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url>  
538 - <dili_titan.slave.jdbc.username>root</dili_titan.slave.jdbc.username>  
539 - <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password>  
540 - <!-- crm接口地址 -->  
541 - <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>  
542 - <!-- user接口地址 -->  
543 - <dili_titan.user.url>user.1n4j.com</dili_titan.user.url>  
544 - <!--shop接口地址,需要测试自己修改 -->  
545 - <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url>  
546 - <!-- redis接口地址 -->  
547 - <dili_titan.redis.url>redis.1n4j.com</dili_titan.redis.url>  
548 - <!--权限管理的redis配置-->  
549 - <manage.redis.url>redis.1n4j.com</manage.redis.url>  
550 - <manage.redis.port>6379</manage.redis.port>  
551 - <!-- MQ 地址-->  
552 - <conf.mq.namesrvAddr>10.28.6.51:9876</conf.mq.namesrvAddr>  
553 - <conf.mq.producerGroup>titanPNR</conf.mq.producerGroup>  
554 - <!--<dili_titan.mq.url>tcp://192.168.28.28:61616</dili_titan.mq.url>-->  
555 - <!-- website接口地址 -->  
556 - <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url>  
557 - <!-- 日志 -->  
558 - <dili_titan.log.level>INFO</dili_titan.log.level>  
559 - <dili_titan.log.path>/diliapp/servers/logs</dili_titan.log.path>  
560 - <dili_titan.log.root.appender>FILE_ALL</dili_titan.log.root.appender>  
561 - <!--打包编码 -->  
562 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  
563 - <!-- 图片服务器前缀 -->  
564 - <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>  
565 - <project.store.url>http://up.1n4j.com</project.store.url>  
566 - <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>  
567 - <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>  
568 - <!-- hbase -->  
569 - <dili_titan.hbase.url>node2:2181,node3:2181,node4:2181</dili_titan.hbase.url>  
570 - <!--权限相关配置-->  
571 - <conf.manage.enable>true</conf.manage.enable>  
572 - <conf.manage.spider>false</conf.manage.spider>  
573 - <conf.manage.system>titan</conf.manage.system>  
574 - <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>  
575 - <conf.manage.includes>^/.*</conf.manage.includes>  
576 - <conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData</conf.manage.excludes>  
577 - <!--上传视频-->  
578 - <project.fastdfs.trackercount>2</project.fastdfs.trackercount>  
579 - <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout>  
580 - <project.fastdfs.networkTimeout>30000</project.fastdfs.networkTimeout>  
581 - <project.fastdfs.charset>utf-8</project.fastdfs.charset>  
582 - <project.fastdfs.trackers>192.168.28.38:22122,192.168.28.39:22122</project.fastdfs.trackers>  
583 - <!-- 团购 -->  
584 - <project.grouppurchase.url>http://group.1n4j.com</project.grouppurchase.url>  
585 - <project.grouppurchase.token>123</project.grouppurchase.token>  
586 - <!--爱奇艺视频 -->  
587 - <titan.aqy.appkey>f689d13d9dce48039cae27e6e03940c6</titan.aqy.appkey>  
588 - <titan.aqy.appSecret>8633dfebb9f4443d0f1244262bca94f6</titan.aqy.appSecret>  
589 - </properties>  
590 - </profile> 610 + <profile>
  611 + <!--预发布环境-->
  612 + <id>pre-online</id>
  613 + <!-- 默认 -->
  614 + <activation>
  615 + <activeByDefault>false</activeByDefault>
  616 + </activation>
  617 + <properties>
  618 + <package.env>pre-online</package.env>
  619 + <!--jdbc type -->
  620 + <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>
  621 + <!-- 数据库 -->
  622 + <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver>
  623 + <!-- 主库配置 -->
  624 + <dili_titan.master.jdbc.url>jdbc:MySql://titan.db.1n4j.com:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url>
  625 + <dili_titan.master.jdbc.username>root</dili_titan.master.jdbc.username>
  626 + <dili_titan.master.jdbc.password>123456</dili_titan.master.jdbc.password>
  627 + <!-- 从库配置 -->
  628 + <dili_titan.slave.jdbc.url>jdbc:MySql://titan.db.1n4j.com:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url>
  629 + <dili_titan.slave.jdbc.username>root</dili_titan.slave.jdbc.username>
  630 + <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password>
  631 + <!-- crm接口地址 -->
  632 + <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>
  633 + <!-- user接口地址 -->
  634 + <dili_titan.user.url>user.1n4j.com</dili_titan.user.url>
  635 + <!--shop接口地址,需要测试自己修改 -->
  636 + <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url>
  637 + <!-- redis接口地址 -->
  638 + <dili_titan.redis.url>redis.1n4j.com</dili_titan.redis.url>
  639 + <!--权限管理的redis配置-->
  640 + <manage.redis.url>redis.1n4j.com</manage.redis.url>
  641 + <manage.redis.port>6379</manage.redis.port>
  642 + <!-- MQ 地址-->
  643 + <conf.mq.namesrvAddr>10.28.6.51:9876</conf.mq.namesrvAddr>
  644 + <conf.mq.producerGroup>titanPNR</conf.mq.producerGroup>
  645 + <!--<dili_titan.mq.url>tcp://192.168.28.28:61616</dili_titan.mq.url>-->
  646 + <!-- website接口地址 -->
  647 + <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url>
  648 + <!-- 日志 -->
  649 + <dili_titan.log.level>INFO</dili_titan.log.level>
  650 + <dili_titan.log.path>/diliapp/servers/logs</dili_titan.log.path>
  651 + <dili_titan.log.root.appender>FILE_ALL</dili_titan.log.root.appender>
  652 + <!--打包编码 -->
  653 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  654 + <!-- 图片服务器前缀 -->
  655 + <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>
  656 + <project.store.url>http://up.1n4j.com</project.store.url>
  657 + <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>
  658 + <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>
  659 + <!-- hbase -->
  660 + <dili_titan.hbase.url>node2:2181,node3:2181,node4:2181</dili_titan.hbase.url>
  661 + <!--权限相关配置-->
  662 + <conf.manage.enable>true</conf.manage.enable>
  663 + <conf.manage.spider>false</conf.manage.spider>
  664 + <conf.manage.system>titan</conf.manage.system>
  665 + <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
  666 + <conf.manage.includes>^/.*</conf.manage.includes>
  667 + <conf.manage.excludes>
  668 + ^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData
  669 + </conf.manage.excludes>
  670 + <!--上传视频-->
  671 + <project.fastdfs.trackercount>2</project.fastdfs.trackercount>
  672 + <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout>
  673 + <project.fastdfs.networkTimeout>30000</project.fastdfs.networkTimeout>
  674 + <project.fastdfs.charset>utf-8</project.fastdfs.charset>
  675 + <project.fastdfs.trackers>192.168.28.38:22122,192.168.28.39:22122</project.fastdfs.trackers>
  676 + <!-- 团购 -->
  677 + <project.grouppurchase.url>http://group.1n4j.com</project.grouppurchase.url>
  678 + <project.grouppurchase.token>123</project.grouppurchase.token>
  679 + <!--爱奇艺视频 -->
  680 + <titan.aqy.appkey>f689d13d9dce48039cae27e6e03940c6</titan.aqy.appkey>
  681 + <titan.aqy.appSecret>8633dfebb9f4443d0f1244262bca94f6</titan.aqy.appSecret>
  682 + </properties>
  683 + </profile>
591 684
592 - <profile>  
593 - <!--上线环境-->  
594 - <id>online</id>  
595 - <!-- 默认 -->  
596 - <activation>  
597 - <activeByDefault>false</activeByDefault>  
598 - </activation>  
599 - <properties>  
600 - <package.env>online</package.env>  
601 - <!--jdbc type -->  
602 - <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>  
603 - <!-- 数据库 -->  
604 - <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver> 685 + <profile>
  686 + <!--上线环境-->
  687 + <id>online</id>
  688 + <!-- 默认 -->
  689 + <activation>
  690 + <activeByDefault>false</activeByDefault>
  691 + </activation>
  692 + <properties>
  693 + <package.env>online</package.env>
  694 + <!--jdbc type -->
  695 + <dili_titan.jdbc.datasource.type>dbcp</dili_titan.jdbc.datasource.type>
  696 + <!-- 数据库 -->
  697 + <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver>
605 <!-- 主库配置 --> 698 <!-- 主库配置 -->
606 <dili_titan.master.jdbc.url>jdbc:MySql://titan.db.1n4j.com:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url> 699 <dili_titan.master.jdbc.url>jdbc:MySql://titan.db.1n4j.com:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url>
607 <dili_titan.master.jdbc.username>appAccPayor</dili_titan.master.jdbc.username> 700 <dili_titan.master.jdbc.username>appAccPayor</dili_titan.master.jdbc.username>
@@ -610,14 +703,14 @@ @@ -610,14 +703,14 @@
610 <dili_titan.slave.jdbc.url>jdbc:MySql://192.168.60.61:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url> 703 <dili_titan.slave.jdbc.url>jdbc:MySql://192.168.60.61:3306/agriez_titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url>
611 <dili_titan.slave.jdbc.username>appAccPayor</dili_titan.slave.jdbc.username> 704 <dili_titan.slave.jdbc.username>appAccPayor</dili_titan.slave.jdbc.username>
612 <dili_titan.slave.jdbc.password>iTDYVBtI6MX4NQ3Er2Oh</dili_titan.slave.jdbc.password> 705 <dili_titan.slave.jdbc.password>iTDYVBtI6MX4NQ3Er2Oh</dili_titan.slave.jdbc.password>
613 - <!-- crm接口地址 -->  
614 - <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>  
615 - <!-- user接口地址 -->  
616 - <dili_titan.user.url>user.1n4j.com</dili_titan.user.url> 706 + <!-- crm接口地址 -->
  707 + <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>
  708 + <!-- user接口地址 -->
  709 + <dili_titan.user.url>user.1n4j.com</dili_titan.user.url>
617 <!--shop接口地址,需要测试自己修改 --> 710 <!--shop接口地址,需要测试自己修改 -->
618 <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url> 711 <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url>
619 - <!-- redis接口地址 -->  
620 - <dili_titan.redis.url>redis.1n4j.com</dili_titan.redis.url> 712 + <!-- redis接口地址 -->
  713 + <dili_titan.redis.url>redis.1n4j.com</dili_titan.redis.url>
621 <!--权限管理的redis配置--> 714 <!--权限管理的redis配置-->
622 <manage.redis.url>redis.1n4j.com</manage.redis.url> 715 <manage.redis.url>redis.1n4j.com</manage.redis.url>
623 <manage.redis.port>6379</manage.redis.port> 716 <manage.redis.port>6379</manage.redis.port>
@@ -627,24 +720,26 @@ @@ -627,24 +720,26 @@
627 <!--<dili_titan.mq.url>tcp://192.168.28.28:61616</dili_titan.mq.url>--> 720 <!--<dili_titan.mq.url>tcp://192.168.28.28:61616</dili_titan.mq.url>-->
628 <!-- website接口地址 --> 721 <!-- website接口地址 -->
629 <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url> 722 <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url>
630 - <!-- 日志 -->  
631 - <dili_titan.log.level>INFO</dili_titan.log.level>  
632 - <dili_titan.log.path>/diliapp/servers/logs</dili_titan.log.path> 723 + <!-- 日志 -->
  724 + <dili_titan.log.level>INFO</dili_titan.log.level>
  725 + <dili_titan.log.path>/diliapp/servers/logs</dili_titan.log.path>
633 <dili_titan.log.root.appender>FILE_ALL</dili_titan.log.root.appender> 726 <dili_titan.log.root.appender>FILE_ALL</dili_titan.log.root.appender>
634 - <!--打包编码 -->  
635 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  
636 - <!-- 图片服务器前缀 -->  
637 - <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>  
638 - <project.store.url>http://up.1n4j.com</project.store.url>  
639 - <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>  
640 - <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>  
641 - <!--权限相关配置-->  
642 - <conf.manage.enable>true</conf.manage.enable>  
643 - <conf.manage.spider>false</conf.manage.spider>  
644 - <conf.manage.system>titan</conf.manage.system>  
645 - <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>  
646 - <conf.manage.includes>^/.*</conf.manage.includes>  
647 - <conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData</conf.manage.excludes> 727 + <!--打包编码 -->
  728 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  729 + <!-- 图片服务器前缀 -->
  730 + <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>
  731 + <project.store.url>http://up.1n4j.com</project.store.url>
  732 + <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>
  733 + <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>
  734 + <!--权限相关配置-->
  735 + <conf.manage.enable>true</conf.manage.enable>
  736 + <conf.manage.spider>false</conf.manage.spider>
  737 + <conf.manage.system>titan</conf.manage.system>
  738 + <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
  739 + <conf.manage.includes>^/.*</conf.manage.includes>
  740 + <conf.manage.excludes>
  741 + ^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData
  742 + </conf.manage.excludes>
648 <!--上传视频--> 743 <!--上传视频-->
649 <project.fastdfs.trackercount>2</project.fastdfs.trackercount> 744 <project.fastdfs.trackercount>2</project.fastdfs.trackercount>
650 <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout> 745 <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout>
@@ -658,7 +753,7 @@ @@ -658,7 +753,7 @@
658 <titan.aqy.appkey>f689d13d9dce48039cae27e6e03940c6</titan.aqy.appkey> 753 <titan.aqy.appkey>f689d13d9dce48039cae27e6e03940c6</titan.aqy.appkey>
659 <titan.aqy.appSecret>8633dfebb9f4443d0f1244262bca94f6</titan.aqy.appSecret> 754 <titan.aqy.appSecret>8633dfebb9f4443d0f1244262bca94f6</titan.aqy.appSecret>
660 </properties> 755 </properties>
661 - </profile> 756 + </profile>
662 757
663 <profile> 758 <profile>
664 <!-- 测试环境 --> 759 <!-- 测试环境 -->
@@ -704,9 +799,9 @@ @@ -704,9 +799,9 @@
704 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 799 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
705 <!-- 图片服务器前缀 --> 800 <!-- 图片服务器前缀 -->
706 <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix> 801 <project.imageserver.prefix>http://img0.1n4j.com</project.imageserver.prefix>
707 - <project.store.url>http://up.1n4j.com</project.store.url>  
708 - <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>  
709 - <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey> 802 + <project.store.url>http://up.1n4j.com</project.store.url>
  803 + <project.store.accessKey>d6a300418bd6fa2178b3bbb06a421f32</project.store.accessKey>
  804 + <project.store.secretKey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.store.secretKey>
710 <!--权限相关配置--> 805 <!--权限相关配置-->
711 <conf.manage.enable>true</conf.manage.enable> 806 <conf.manage.enable>true</conf.manage.enable>
712 <conf.manage.spider>true</conf.manage.spider> 807 <conf.manage.spider>true</conf.manage.spider>
@@ -735,5 +830,5 @@ @@ -735,5 +830,5 @@
735 <titan.aqy.appSecret>f48d2b799f9661acdb6041e4ac7c142f</titan.aqy.appSecret> 830 <titan.aqy.appSecret>f48d2b799f9661acdb6041e4ac7c142f</titan.aqy.appSecret>
736 </properties> 831 </properties>
737 </profile> 832 </profile>
738 - </profiles> 833 + </profiles>
739 </project> 834 </project>
titan-web/src/main/java/com/dili/titan/domain/query/ProductTpQuery.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.domain.query;  
2 -  
3 -import com.dili.titan.domain.base.BaseQuery;  
4 -import com.diligrp.crm.dataInterface.domain.Supplier;  
5 -  
6 -import java.util.List;  
7 -  
8 -/**  
9 - * <p>供应商商品查询类</p>  
10 - * @author gongsz  
11 - */  
12 -//自贸区无此业务  
13 -@Deprecated  
14 -public class ProductTpQuery extends BaseQuery {  
15 -  
16 - /** 供应商商品名称 */  
17 - private String name;  
18 - /** 供应商商品Id */  
19 - private Long pid;  
20 - /** 供应商ID */  
21 - private Integer provider;  
22 - /**供应商名称*/  
23 - private String providerName;  
24 - /** 网站商品ID */  
25 - private Long relatedPid;  
26 - /**分类ID，随便第几级三类*/  
27 -  
28 - private Integer queryCateId;  
29 - /** 分类ID */  
30 - private List<Integer> cateList;  
31 - /** 商品入库状态 */  
32 - private Integer status;  
33 - /** 最低商品价格 */  
34 - private Integer minPrice;  
35 - /** 最高商品价格 */  
36 - private Integer maxPrice;  
37 -  
38 - /**商品所属市场 */  
39 - private List<Long> publishedLocationIDs;  
40 - private Supplier supplier;  
41 -  
42 - public String getName() {  
43 - return name;  
44 - }  
45 -  
46 - public void setName(String name) {  
47 - this.name = name;  
48 - }  
49 -  
50 - public Long getPid() {  
51 - return pid;  
52 - }  
53 -  
54 - public void setPid(Long pid) {  
55 - this.pid = pid;  
56 - }  
57 -  
58 - public Integer getProvider() {  
59 - return provider;  
60 - }  
61 -  
62 - public void setProvider(Integer provider) {  
63 - this.provider = provider;  
64 - }  
65 -  
66 - public Long getRelatedPid() {  
67 - return relatedPid;  
68 - }  
69 -  
70 - public void setRelatedPid(Long relatedPid) {  
71 - this.relatedPid = relatedPid;  
72 - }  
73 -  
74 - public List<Integer> getCateList() {  
75 - return cateList;  
76 - }  
77 -  
78 - public void setCateList(List<Integer> cateList) {  
79 - this.cateList = cateList;  
80 - }  
81 -  
82 - public Integer getStatus() {  
83 - return status;  
84 - }  
85 -  
86 - public void setStatus(Integer status) {  
87 - this.status = status;  
88 - }  
89 -  
90 - public Integer getMinPrice() {  
91 - return minPrice;  
92 - }  
93 -  
94 - public void setMinPrice(Integer minPrice) {  
95 - this.minPrice = minPrice;  
96 - }  
97 -  
98 - public Integer getMaxPrice() {  
99 - return maxPrice;  
100 - }  
101 -  
102 - public void setMaxPrice(Integer maxPrice) {  
103 - this.maxPrice = maxPrice;  
104 - }  
105 -  
106 -  
107 - public Integer getQueryCateId() {  
108 - return queryCateId;  
109 - }  
110 -  
111 - public void setQueryCateId(Integer queryCateId) {  
112 - this.queryCateId = queryCateId;  
113 - }  
114 -  
115 -  
116 -  
117 - public String getProviderName() {  
118 - return providerName;  
119 - }  
120 -  
121 - public void setProviderName(String providerName) {  
122 - this.providerName = providerName;  
123 - }  
124 -  
125 - public List<Long> getPublishedLocationIDs() {  
126 - return publishedLocationIDs;  
127 - }  
128 -  
129 - public void setPublishedLocationIDs(List<Long> publishedLocationIDs) {  
130 - this.publishedLocationIDs = publishedLocationIDs;  
131 - }  
132 -  
133 - public Supplier getSupplier() {  
134 - return supplier;  
135 - }  
136 -  
137 - public void setSupplier(Supplier supplier) {  
138 - this.supplier = supplier;  
139 - }  
140 -}  
titan-web/src/main/java/com/dili/titan/domain/query/RelatedQuery.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.domain.query;  
2 -  
3 -import com.dili.titan.domain.base.BaseQuery;  
4 -  
5 -import java.util.List;  
6 -  
7 -//只与供应商商品和自营商品有关，自贸区无此业务  
8 -@Deprecated  
9 -public class RelatedQuery extends BaseQuery {  
10 -  
11 - private static final long serialVersionUID = 1L;  
12 -  
13 - private Integer cateId;  
14 - private Integer unitId;  
15 - private Integer attrNum;  
16 - private List<Long> attrIds;  
17 - private List<Long> publishedLocationIds;  
18 - private Long publishedLocationId;  
19 -  
20 - public Long getPublishedLocationId() {  
21 - return publishedLocationId;  
22 - }  
23 -  
24 - public void setPublishedLocationId(Long publishedLocationId) {  
25 - this.publishedLocationId = publishedLocationId;  
26 - }  
27 -  
28 - public List<Long> getPublishedLocationIds() {  
29 - return publishedLocationIds;  
30 - }  
31 -  
32 - public void setPublishedLocationIds(List<Long> publishedLocationIds) {  
33 - this.publishedLocationIds = publishedLocationIds;  
34 - }  
35 -  
36 - public Integer getCateId() {  
37 - return cateId;  
38 - }  
39 -  
40 - public void setCateId(Integer cateId) {  
41 - this.cateId = cateId;  
42 - }  
43 -  
44 - public Integer getUnitId() {  
45 - return unitId;  
46 - }  
47 -  
48 - public void setUnitId(Integer unitId) {  
49 - this.unitId = unitId;  
50 - }  
51 -  
52 - public Integer getAttrNum() {  
53 - return attrNum;  
54 - }  
55 -  
56 - public void setAttrNum(Integer attrNum) {  
57 - this.attrNum = attrNum;  
58 - }  
59 -  
60 - public List<Long> getAttrIds() {  
61 - return attrIds;  
62 - }  
63 -  
64 - public void setAttrIds(List<Long> attrIds) {  
65 - this.attrIds = attrIds;  
66 - }  
67 -}  
titan-web/src/main/java/com/dili/titan/domain/views/SupplierProcut.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.domain.views;  
2 -  
3 -import com.diligrp.crm.dataInterface.domain.Supplier;  
4 -  
5 -/**  
6 - * <p>Title: 〈标题〉</p> 以供应商为维度的商品基础信息  
7 - * <p>Description: 〈描述〉</p>  
8 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
9 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
10 - * <B>Company</B> 地利集团  
11 - * <p>CreateTime：2014/6/26</p>  
12 - *  
13 - * @author gongsz  
14 - */  
15 -public class SupplierProcut {  
16 -  
17 - private Supplier supplier;  
18 -  
19 - public Supplier getSupplier() {  
20 - return supplier;  
21 - }  
22 -  
23 - public void setSupplier(Supplier supplier) {  
24 - this.supplier = supplier;  
25 - }  
26 -  
27 -}  
titan-web/src/main/java/com/dili/titan/rpc/SupplierRPC.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.rpc;  
2 -  
3 -import com.diligrp.crm.dataInterface.domain.Supplier;  
4 -  
5 -import java.util.List;  
6 -  
7 -/**  
8 - * <p>Title: 〈标题〉</p>  
9 - * <p>Description: 〈描述〉</p>  
10 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
11 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
12 - * <B>Company</B> 地利集团  
13 - * <p>CreateTime：2014/6/18</p>  
14 - *  
15 - * @author gongsz  
16 - */  
17 -public interface SupplierRPC {  
18 -  
19 - /**  
20 - * 根据供应商ID获取供应商  
21 - * @param supplierId 供应商Id  
22 - * @return  
23 - */  
24 - public Supplier getSupplierById(Long supplierId);  
25 -  
26 - public List<Supplier> find(String keyWord);  
27 -  
28 - /**  
29 - * 根据供应商信息获取供应商  
30 - *  
31 - * @param name  
32 - * @param phone  
33 - * @return  
34 - * @author lifj  
35 - */  
36 - public List<Supplier> find(String name, String phone);  
37 -}  
titan-web/src/main/java/com/dili/titan/rpc/impl/GroupRpcImpl.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.rpc.impl;  
2 -  
3 -import com.dili.titan.rpc.GroupRpc;  
4 -import com.diligrp.group.purchase.sdk.GroupClient;  
5 -import org.springframework.stereotype.Service;  
6 -  
7 -import javax.annotation.Resource;  
8 -  
9 -/**  
10 - * <p>  
11 - * Title: 〈标题〉  
12 - * </p>  
13 - * <p>  
14 - * Description: 〈描述〉  
15 - * </p>  
16 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
17 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
18 - * <B>Company</B> 地利集团  
19 - * <p>  
20 - * CreateTime：2015/1/21  
21 - * </p>  
22 - *  
23 - * @author gongsz  
24 - */  
25 -//自贸区无此功能  
26 -@Deprecated  
27 -@Service  
28 -public class GroupRpcImpl implements GroupRpc {  
29 -  
30 - @Resource  
31 - private GroupClient groupClient;  
32 -  
33 - @Override  
34 - public boolean hasTG(Long pid) {  
35 - //BaseOutput<Integer> output = groupClient.getPromotionProductService()  
36 - // .checkPromotionProductStatus(pid.toString());  
37 - //Integer status = output.getData();  
38 - //if (status>0) {  
39 - // return true;  
40 - //}  
41 - return false;  
42 - }  
43 -}  
titan-web/src/main/java/com/dili/titan/rpc/impl/SupplierRPCImpl.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.rpc.impl;  
2 -  
3 -import com.dili.titan.rpc.SupplierRPC;  
4 -import com.diligrp.crm.dataInterface.domain.CrmResult;  
5 -import com.diligrp.crm.dataInterface.domain.Supplier;  
6 -import com.diligrp.crm.dataInterface.domain.crmEnum.CrmStatus;  
7 -import com.diligrp.crm.dataInterface.domain.crmEnum.ResultLevel;  
8 -import com.diligrp.crm.dataInterface.domain.factor.FindFactor;  
9 -import com.diligrp.crm.dataInterface.service.CrmService;  
10 -import com.diligrp.website.util.web.PageTemplate;  
11 -import org.springframework.stereotype.Service;  
12 -  
13 -import javax.annotation.Resource;  
14 -import java.util.List;  
15 -  
16 -/**  
17 - * <p>  
18 - * Title: 〈标题〉  
19 - * </p>  
20 - * <p>  
21 - * Description: 〈描述〉  
22 - * </p>  
23 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
24 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
25 - * <B>Company</B> 地利集团  
26 - * <p>  
27 - * CreateTime：2014/6/18  
28 - * </p>  
29 - *  
30 - * @author gongsz  
31 - */  
32 -@Service  
33 -public class SupplierRPCImpl implements SupplierRPC {  
34 -  
35 - @Resource  
36 - private CrmService crmClient;  
37 -  
38 - @Override  
39 - public Supplier getSupplierById(Long supplierId) {  
40 - CrmResult cr = crmClient.getSupplierById(supplierId, ResultLevel.BASE);  
41 - if (cr==null || CrmStatus.SUCCESS != cr.getStatus())  
42 - return null;  
43 - return cr.getSupplier();  
44 - }  
45 -  
46 - @Override  
47 - public List<Supplier> find(String keyWord) {  
48 - FindFactor ff = new FindFactor();  
49 - ff.setName(keyWord);  
50 - PageTemplate template = crmClient.find(ff);  
51 - return (List<Supplier>)template.getList();  
52 - }  
53 -  
54 - @Override  
55 - public List<Supplier> find(String name, String phone){  
56 - FindFactor factor = new FindFactor();  
57 - factor.setPhone(phone);  
58 - PageTemplate template = crmClient.find(factor);  
59 - return (List<Supplier>)template.getList();  
60 - }  
61 -}  
titan-web/src/main/java/com/dili/titan/rpc/impl/UserRPCImpl.java
  View file @de9bb94
@@ -11,13 +11,11 @@ import com.yqyw.pnr.sdk.resp.BaseResp; @@ -11,13 +11,11 @@ import com.yqyw.pnr.sdk.resp.BaseResp;
11 import com.yqyw.user.rpc.client.UserClient; 11 import com.yqyw.user.rpc.client.UserClient;
12 import com.yqyw.user.rpc.client.domain.output.BuyQuote; 12 import com.yqyw.user.rpc.client.domain.output.BuyQuote;
13 import com.yqyw.user.rpc.client.domain.output.UserInfoResp; 13 import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
14 -  
15 import org.apache.commons.collections.CollectionUtils; 14 import org.apache.commons.collections.CollectionUtils;
16 import org.slf4j.LoggerFactory; 15 import org.slf4j.LoggerFactory;
17 import org.springframework.stereotype.Service; 16 import org.springframework.stereotype.Service;
18 17
19 import javax.annotation.Resource; 18 import javax.annotation.Resource;
20 -  
21 import java.util.List; 19 import java.util.List;
22 20
23 /** 21 /**
titan-web/src/main/java/com/dili/titan/service/base/BaseValidateProductService.java
  View file @de9bb94
@@ -7,6 +7,7 @@ import com.dili.titan.domain.AttributeValue; @@ -7,6 +7,7 @@ import com.dili.titan.domain.AttributeValue;
7 import com.dili.titan.domain.Category; 7 import com.dili.titan.domain.Category;
8 import com.dili.titan.domain.ProductAuth; 8 import com.dili.titan.domain.ProductAuth;
9 import com.dili.titan.domain.base.Result; 9 import com.dili.titan.domain.base.Result;
  10 +import com.dili.titan.domain.views.*;
10 import com.dili.titan.rpc.ConfigRPC; 11 import com.dili.titan.rpc.ConfigRPC;
11 import com.dili.titan.service.AttributeService; 12 import com.dili.titan.service.AttributeService;
12 import com.dili.titan.service.CategoryService; 13 import com.dili.titan.service.CategoryService;
titan-web/src/main/java/com/dili/titan/service/impl/InitServiceImpl.java
  View file @de9bb94
@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON; @@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON;
4 import com.dili.titan.common.log.LogHelper; 4 import com.dili.titan.common.log.LogHelper;
5 import com.dili.titan.common.log.LogTypeEnum; 5 import com.dili.titan.common.log.LogTypeEnum;
6 import com.dili.titan.domain.ProductPop; 6 import com.dili.titan.domain.ProductPop;
7 -import com.dili.titan.domain.ProductPopQuery;  
8 -import com.dili.titan.domain.common.Page;  
9 import com.dili.titan.rpc.ConfigRPC; 7 import com.dili.titan.rpc.ConfigRPC;
10 import com.dili.titan.rpc.UserRPC; 8 import com.dili.titan.rpc.UserRPC;
11 import com.dili.titan.service.InitService; 9 import com.dili.titan.service.InitService;
@@ -13,13 +11,10 @@ import com.dili.titan.service.ProductPopService; @@ -13,13 +11,10 @@ import com.dili.titan.service.ProductPopService;
13 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp; 11 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp;
14 import com.yqyw.pnr.sdk.domain.SendAddress; 12 import com.yqyw.pnr.sdk.domain.SendAddress;
15 import com.yqyw.pnr.sdk.domain.Shop; 13 import com.yqyw.pnr.sdk.domain.Shop;
16 -  
17 import org.apache.commons.collections.CollectionUtils; 14 import org.apache.commons.collections.CollectionUtils;
18 import org.springframework.stereotype.Service; 15 import org.springframework.stereotype.Service;
19 -import org.springframework.transaction.annotation.Transactional;  
20 16
21 import javax.annotation.Resource; 17 import javax.annotation.Resource;
22 -  
23 import java.util.*; 18 import java.util.*;
24 19
25 /** 20 /**
titan-web/src/main/java/com/dili/titan/service/impl/ProductOfflineServiceImpl.java
  View file @de9bb94
@@ -11,7 +11,6 @@ import com.dili.titan.rpc.UserRPC; @@ -11,7 +11,6 @@ import com.dili.titan.rpc.UserRPC;
11 import com.dili.titan.service.ProductOfflineService; 11 import com.dili.titan.service.ProductOfflineService;
12 import com.dili.titan.service.base.BaseServiceImpl; 12 import com.dili.titan.service.base.BaseServiceImpl;
13 import com.yqyw.user.rpc.client.domain.output.UserInfoResp; 13 import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
14 -  
15 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
16 import org.springframework.transaction.annotation.Transactional; 15 import org.springframework.transaction.annotation.Transactional;
17 16
titan-web/src/main/java/com/dili/titan/service/impl/VideoServiceImpl.java
  View file @de9bb94
@@ -6,7 +6,6 @@ package com.dili.titan.service.impl; @@ -6,7 +6,6 @@ package com.dili.titan.service.impl;
6 6
7 import com.alibaba.fastjson.JSON; 7 import com.alibaba.fastjson.JSON;
8 import com.alibaba.fastjson.JSONObject; 8 import com.alibaba.fastjson.JSONObject;
9 -import com.dili.titan.common.exception.AppException;  
10 import com.dili.titan.dao.CategoryDao; 9 import com.dili.titan.dao.CategoryDao;
11 import com.dili.titan.dao.ProductVideoDao; 10 import com.dili.titan.dao.ProductVideoDao;
12 import com.dili.titan.dao.VideoDao; 11 import com.dili.titan.dao.VideoDao;
titan-web/src/main/java/com/dili/titan/service/validate/AddProductValidateService.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.service.validate;  
2 -  
3 -import com.dili.titan.domain.base.Result;  
4 -import com.dili.titan.domain.views.ProductView;  
5 -import com.dili.titan.rpc.SupplierRPC;  
6 -import com.dili.titan.service.base.BaseValidateProductService;  
7 -import com.diligrp.crm.dataInterface.domain.Supplier;  
8 -import org.springframework.stereotype.Service;  
9 -  
10 -import javax.annotation.Resource;  
11 -  
12 -/**  
13 - * <p>  
14 - * Title: 〈标题〉  
15 - * </p>  
16 - * <p>  
17 - * Description: 〈描述〉  
18 - * </p>  
19 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
20 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
21 - * <B>Company</B> 地利集团  
22 - * <p>  
23 - * CreateTime：2014/6/18  
24 - * </p>  
25 - *  
26 - * @author gongsz  
27 - */  
28 -@Service  
29 -public class AddProductValidateService extends BaseValidateProductService {  
30 -  
31 - @Resource  
32 - private SupplierRPC supplierRPC;  
33 -  
34 - @Override  
35 - public Result validateBase(ProductView pv) {  
36 - Result result = Result.create();  
37 - if(pv.getSupIds()!=null && pv.getSupIds().length>0){  
38 - for(Long sid :pv.getSupIds()){  
39 - Supplier supplier = supplierRPC.getSupplierById(sid);  
40 - if (supplier == null) {  
41 - result.setMsg("供应商编号有误！没有查询到供应商！供应商ID=" + sid);  
42 - result.setSuccess(false);  
43 - return result;  
44 - }  
45 - }  
46 - }else {  
47 -  
48 - Supplier supplier = supplierRPC.getSupplierById(pv.getSupplierId());  
49 - if (supplier == null) {  
50 - result.setMsg("供应商编号有误！没有查询到供应商！供应商ID=" + pv.getSupplierId());  
51 - result.setSuccess(false);  
52 - return result;  
53 - }  
54 - }  
55 - if (!super.validateCate(pv.getCateId())) {  
56 - result.setMsg("主分类有误！没有找到该分类或者该分类已经被删除或者未激活或者分类为三方市场的分类不能添加自营代销商品！分类ID=" + pv.getCateId());  
57 - result.setSuccess(false);  
58 - return result;  
59 - }  
60 - result = super.validateBase(pv);  
61 - return result;  
62 - }  
63 -}  
titan-web/src/main/java/com/dili/titan/service/validate/ProductTpValidateService.java deleted 100644 → 0
  View file @2164fd1
1 -package com.dili.titan.service.validate;  
2 -  
3 -import com.dili.titan.domain.Attribute;  
4 -import com.dili.titan.domain.base.Result;  
5 -import com.dili.titan.domain.views.ProductTpView;  
6 -import com.dili.titan.rpc.ConfigRPC;  
7 -import com.dili.titan.rpc.SupplierRPC;  
8 -import com.dili.titan.service.base.BaseValidateProductService;  
9 -import com.diligrp.crm.dataInterface.domain.Supplier;  
10 -import com.diligrp.website.web.interfaces.domain.output.DataDictionaryValueResp;  
11 -import org.springframework.stereotype.Service;  
12 -  
13 -import javax.annotation.Resource;  
14 -import java.util.List;  
15 -  
16 -/**  
17 - * <p>  
18 - * Title: 〈标题〉  
19 - * </p>  
20 - * <p>  
21 - * Description: 〈描述〉  
22 - * </p>  
23 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
24 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
25 - * <B>Company</B> 地利集团  
26 - * <p>  
27 - * CreateTime：2014/6/18  
28 - * </p>  
29 - *  
30 - * @author gongsz  
31 - */  
32 -@Service  
33 -public class ProductTpValidateService extends BaseValidateProductService{  
34 -  
35 - @Resource  
36 - private SupplierRPC supplierRPC;  
37 - @Resource  
38 - private ConfigRPC configRPC;  
39 -  
40 - public Result validateTp(ProductTpView pv, List<Attribute> cateSaleAttrList,  
41 - List<Attribute> productAttrList) {  
42 - Result result = Result.create();  
43 - Supplier supplier = supplierRPC.getSupplierById(pv.getSupplierId());  
44 - if (supplier == null) {  
45 - result.setMsg("供应商编号有误！没有查询到供应商！供应商ID=" + pv.getSupplierId());  
46 - result.setSuccess(false);  
47 - return result;  
48 - }  
49 - if (!super.validateCate(pv.getCateId())) {  
50 - result.setMsg("主分类有误！没有找到该分类或者该分类已经被删除或者未激活或者分类为三方市场的分类不能添加自营代销商品！分类ID=" + pv.getCateId());  
51 - result.setSuccess(false);  
52 - return result;  
53 - }  
54 - // 验证销售单位  
55 - DataDictionaryValueResp unit = configRPC.getMeasuringUnitById(pv  
56 - .getUnitId());  
57 - if (unit == null) {  
58 - result.setMsg("销售单位有误！没有找销售单位或者销售单位没有选择！销售单位ID=" + pv.getUnitId());  
59 - result.setSuccess(false);  
60 - return result;  
61 - }  
62 - if (!validateSaleAttr(pv.getSaleAttrJson(), cateSaleAttrList)) {  
63 - result.setSuccess(false);  
64 - result.setMsg("销售属性发生变化，验证不通过！请重新操作！");  
65 - return result;  
66 - }  
67 - result = validateAttribute(pv.getSaleAttrJson(), Attribute.TYPE_SALE,  
68 - false, productAttrList);  
69 - if (!result.isSuccess())  
70 - return result;  
71 - if (!validateSku(pv.getSkuJson(), cateSaleAttrList, productAttrList)) {  
72 - result.setSuccess(false);  
73 - result.setMsg("sku验证不通过！");  
74 - return result;  
75 - }  
76 - return result;  
77 - }  
78 -  
79 - public Result validateTpFromUpdate(ProductTpView pv, List<Attribute> cateSaleAttrList,  
80 - List<Attribute> productAttrList) {  
81 - Result result = Result.create();  
82 - if (!validateSaleAttr(pv.getSaleAttrJson(), cateSaleAttrList)) {  
83 - result.setSuccess(false);  
84 - result.setMsg("销售属性发生变化，验证不通过！请重新操作！");  
85 - return result;  
86 - }  
87 - result = validateAttribute(pv.getSaleAttrJson(), Attribute.TYPE_SALE,  
88 - false, productAttrList);  
89 - if (!result.isSuccess())  
90 - return result;  
91 - if (!validateSku(pv.getSkuJson(), cateSaleAttrList, productAttrList)) {  
92 - result.setSuccess(false);  
93 - result.setMsg("sku验证不通过！");  
94 - return result;  
95 - }  
96 - return result;  
97 - }  
98 -}  
titan-web/src/main/java/com/dili/titan/web/IndexController.java
  View file @de9bb94
@@ -9,7 +9,6 @@ import com.dili.titan.mq.TopicProducer; @@ -9,7 +9,6 @@ import com.dili.titan.mq.TopicProducer;
9 import com.dili.titan.service.InitService; 9 import com.dili.titan.service.InitService;
10 import io.netty.handler.codec.serialization.ClassResolvers; 10 import io.netty.handler.codec.serialization.ClassResolvers;
11 import io.netty.handler.codec.serialization.ObjectDecoder; 11 import io.netty.handler.codec.serialization.ObjectDecoder;
12 -import io.netty.handler.codec.serialization.ObjectEncoder;  
13 import org.apache.commons.collections.CollectionUtils; 12 import org.apache.commons.collections.CollectionUtils;
14 import org.springframework.stereotype.Controller; 13 import org.springframework.stereotype.Controller;
15 import org.springframework.ui.Model; 14 import org.springframework.ui.Model;
titan-web/src/main/java/com/dili/titan/web/controller/AttributeController.java
  View file @de9bb94
@@ -6,8 +6,16 @@ import com.dili.titan.common.enums.SourceType; @@ -6,8 +6,16 @@ import com.dili.titan.common.enums.SourceType;
6 import com.dili.titan.common.log.LogHelper; 6 import com.dili.titan.common.log.LogHelper;
7 import com.dili.titan.common.log.LogTypeEnum; 7 import com.dili.titan.common.log.LogTypeEnum;
8 import com.dili.titan.common.utils.web.BaseController; 8 import com.dili.titan.common.utils.web.BaseController;
  9 +import com.dili.titan.domain.Attribute;
  10 +import com.dili.titan.domain.AttributeValue;
  11 +import com.dili.titan.domain.CategoryAttr;
  12 +import com.dili.titan.domain.SystemConfigure;
9 import com.dili.titan.domain.common.Page; 13 import com.dili.titan.domain.common.Page;
10 import com.dili.titan.mq.TopicProducer; 14 import com.dili.titan.mq.TopicProducer;
  15 +import com.dili.titan.service.AttributeService;
  16 +import com.dili.titan.service.AttributeValueService;
  17 +import com.dili.titan.service.CategoryAttrService;
  18 +import com.dili.titan.service.SystemConfigureService;
11 import com.dili.titan.service.base.PassportService; 19 import com.dili.titan.service.base.PassportService;
12 import com.diligrp.log.util.LogData; 20 import com.diligrp.log.util.LogData;
13 import com.diligrp.log.util.LogUtils; 21 import com.diligrp.log.util.LogUtils;
titan-web/src/main/java/com/dili/titan/web/controller/CategoryController.java
  View file @de9bb94
@@ -7,7 +7,9 @@ import com.dili.titan.common.enums.SourceType; @@ -7,7 +7,9 @@ import com.dili.titan.common.enums.SourceType;
7 import com.dili.titan.common.log.LogHelper; 7 import com.dili.titan.common.log.LogHelper;
8 import com.dili.titan.common.log.LogTypeEnum; 8 import com.dili.titan.common.log.LogTypeEnum;
9 import com.dili.titan.common.utils.web.BaseController; 9 import com.dili.titan.common.utils.web.BaseController;
  10 +import com.dili.titan.domain.*;
10 import com.dili.titan.mq.TopicProducer; 11 import com.dili.titan.mq.TopicProducer;
  12 +import com.dili.titan.service.*;
11 import com.dili.titan.service.base.PassportService; 13 import com.dili.titan.service.base.PassportService;
12 import com.dili.titan.web.CustomDateEditor; 14 import com.dili.titan.web.CustomDateEditor;
13 import com.diligrp.log.util.LogData; 15 import com.diligrp.log.util.LogData;
titan-web/src/main/java/com/dili/titan/web/controller/CommonController.java
  View file @de9bb94
@@ -7,8 +7,6 @@ import com.dili.titan.common.utils.web.BaseController; @@ -7,8 +7,6 @@ import com.dili.titan.common.utils.web.BaseController;
7 import com.dili.titan.domain.base.Result; 7 import com.dili.titan.domain.base.Result;
8 import com.dili.titan.rpc.ConfigRPC; 8 import com.dili.titan.rpc.ConfigRPC;
9 import com.dili.titan.rpc.ImageRPC; 9 import com.dili.titan.rpc.ImageRPC;
10 -import com.dili.titan.rpc.SupplierRPC;  
11 -import com.diligrp.crm.dataInterface.domain.Supplier;  
12 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp; 10 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp;
13 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Controller; 12 import org.springframework.stereotype.Controller;
@@ -40,8 +38,7 @@ public class CommonController extends BaseController { @@ -40,8 +38,7 @@ public class CommonController extends BaseController {
40 38
41 @Autowired 39 @Autowired
42 private ImageRPC imageRPC; 40 private ImageRPC imageRPC;
43 - @Autowired  
44 - private SupplierRPC supplierRPC; 41 +
45 @Autowired 42 @Autowired
46 private ConfigRPC configRPC; 43 private ConfigRPC configRPC;
47 44
@@ -59,7 +56,7 @@ public class CommonController extends BaseController { @@ -59,7 +56,7 @@ public class CommonController extends BaseController {
59 result.addResult("json", json); 56 result.addResult("json", json);
60 return toVMSkipLayout("common/uploadImgForUE", result.getAllResult()); 57 return toVMSkipLayout("common/uploadImgForUE", result.getAllResult());
61 } 58 }
62 - 59 +
63 /** 60 /**
64 * 供应图片 61 * 供应图片
65 * @return 62 * @return
@@ -76,7 +73,7 @@ public class CommonController extends BaseController { @@ -76,7 +73,7 @@ public class CommonController extends BaseController {
76 } 73 }
77 return upload; 74 return upload;
78 } 75 }
79 - 76 +
80 77
81 /** 78 /**
82 * 富文本编辑框上传图片 79 * 富文本编辑框上传图片
@@ -154,8 +151,7 @@ public class CommonController extends BaseController { @@ -154,8 +151,7 @@ public class CommonController extends BaseController {
154 @RequestMapping(value = "/searchSupplier", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json;charset=UTF-8") 151 @RequestMapping(value = "/searchSupplier", method = { RequestMethod.POST, RequestMethod.GET }, produces = "application/json;charset=UTF-8")
155 public @ResponseBody 152 public @ResponseBody
156 String searchAttrbute(String keyword, Model view){ 153 String searchAttrbute(String keyword, Model view){
157 - List<Supplier> list = supplierRPC.find(keyword);  
158 - return JSON.toJSONString(list); 154 + return "";
159 } 155 }
160 156
161 /** 157 /**
@@ -180,7 +176,7 @@ public class CommonController extends BaseController { @@ -180,7 +176,7 @@ public class CommonController extends BaseController {
180 e.printStackTrace(); 176 e.printStackTrace();
181 } 177 }
182 } 178 }
183 - 179 +
184 @RequestMapping(value="/uploadCategoryIcon",method=RequestMethod.POST) 180 @RequestMapping(value="/uploadCategoryIcon",method=RequestMethod.POST)
185 @ResponseBody 181 @ResponseBody
186 public String uploadAuthIcon(@RequestParam MultipartFile image) throws Exception{ 182 public String uploadAuthIcon(@RequestParam MultipartFile image) throws Exception{
titan-web/src/main/java/com/dili/titan/web/controller/IndexCategoryController.java
  View file @de9bb94
@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.*; @@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
28 import org.springframework.web.context.request.WebRequest; 28 import org.springframework.web.context.request.WebRequest;
29 29
30 import javax.annotation.Resource; 30 import javax.annotation.Resource;
31 -import java.util.ArrayList;  
32 import java.util.Date; 31 import java.util.Date;
33 import java.util.List; 32 import java.util.List;
34 33
titan-web/src/main/java/com/dili/titan/web/controller/ProductOfflineController.java
  View file @de9bb94
@@ -14,7 +14,6 @@ import com.dili.titan.service.ProductOfflineService; @@ -14,7 +14,6 @@ import com.dili.titan.service.ProductOfflineService;
14 import com.dili.titan.utils.WebUtils; 14 import com.dili.titan.utils.WebUtils;
15 import com.dili.titan.web.CustomDateEditor; 15 import com.dili.titan.web.CustomDateEditor;
16 import com.yqyw.user.rpc.client.domain.output.UserInfoResp; 16 import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
17 -  
18 import org.apache.commons.collections.CollectionUtils; 17 import org.apache.commons.collections.CollectionUtils;
19 import org.apache.commons.lang.StringUtils; 18 import org.apache.commons.lang.StringUtils;
20 import org.slf4j.Logger; 19 import org.slf4j.Logger;
@@ -26,8 +25,6 @@ import org.springframework.web.bind.annotation.*; @@ -26,8 +25,6 @@ import org.springframework.web.bind.annotation.*;
26 import org.springframework.web.context.request.WebRequest; 25 import org.springframework.web.context.request.WebRequest;
27 26
28 import javax.annotation.Resource; 27 import javax.annotation.Resource;
29 -  
30 -import java.util.ArrayList;  
31 import java.util.Date; 28 import java.util.Date;
32 import java.util.List; 29 import java.util.List;
33 import java.util.Map; 30 import java.util.Map;
titan-web/src/main/java/com/dili/titan/web/controller/ProductPopController.java
  View file @de9bb94
@@ -13,6 +13,7 @@ import com.dili.titan.common.log.LogTypeEnum; @@ -13,6 +13,7 @@ import com.dili.titan.common.log.LogTypeEnum;
13 import com.dili.titan.common.utils.SkuUtil; 13 import com.dili.titan.common.utils.SkuUtil;
14 import com.dili.titan.common.utils.web.BaseController; 14 import com.dili.titan.common.utils.web.BaseController;
15 import com.dili.titan.dao.ProductDescDao; 15 import com.dili.titan.dao.ProductDescDao;
  16 +import com.dili.titan.domain.*;
16 import com.dili.titan.domain.base.Result; 17 import com.dili.titan.domain.base.Result;
17 import com.dili.titan.domain.common.Message; 18 import com.dili.titan.domain.common.Message;
18 import com.dili.titan.domain.common.Page; 19 import com.dili.titan.domain.common.Page;
titan-web/src/main/java/com/dili/titan/web/controller/ProductSearchCateController.java
  View file @de9bb94
@@ -12,7 +12,6 @@ import com.dili.titan.domain.common.Page; @@ -12,7 +12,6 @@ import com.dili.titan.domain.common.Page;
12 import com.dili.titan.mq.TopicProducer; 12 import com.dili.titan.mq.TopicProducer;
13 import com.dili.titan.service.CategoryService; 13 import com.dili.titan.service.CategoryService;
14 import com.dili.titan.service.ProductSearchCateService; 14 import com.dili.titan.service.ProductSearchCateService;
15 -import com.dili.titan.service.ProductSearchSortService;  
16 import com.dili.titan.utils.WebUtils; 15 import com.dili.titan.utils.WebUtils;
17 import com.dili.titan.web.CustomDateEditor; 16 import com.dili.titan.web.CustomDateEditor;
18 import org.apache.commons.collections.CollectionUtils; 17 import org.apache.commons.collections.CollectionUtils;
@@ -26,7 +25,6 @@ import org.springframework.web.context.request.WebRequest; @@ -26,7 +25,6 @@ import org.springframework.web.context.request.WebRequest;
26 import org.springframework.web.servlet.ModelAndView; 25 import org.springframework.web.servlet.ModelAndView;
27 26
28 import javax.annotation.Resource; 27 import javax.annotation.Resource;
29 -import java.util.ArrayList;  
30 import java.util.Date; 28 import java.util.Date;
31 import java.util.List; 29 import java.util.List;
32 30
titan-web/src/main/java/com/dili/titan/web/controller/ProductSearchSortController.java
  View file @de9bb94
@@ -4,30 +4,14 @@ @@ -4,30 +4,14 @@
4 */ 4 */
5 package com.dili.titan.web.controller; 5 package com.dili.titan.web.controller;
6 6
7 -import java.util.ArrayList;  
8 -import java.util.Date;  
9 -import java.util.List;  
10 -  
11 -import javax.annotation.Resource;  
12 -import javax.servlet.http.HttpServletRequest;  
13 -  
14 -import org.apache.commons.collections.CollectionUtils;  
15 -import org.apache.commons.lang3.StringUtils;  
16 -import org.slf4j.Logger;  
17 -import org.slf4j.LoggerFactory;  
18 -import org.springframework.stereotype.Controller;  
19 -import org.springframework.ui.Model;  
20 -import org.springframework.web.bind.WebDataBinder;  
21 -import org.springframework.web.bind.annotation.InitBinder;  
22 -import org.springframework.web.bind.annotation.RequestMapping;  
23 -import org.springframework.web.bind.annotation.RequestMethod;  
24 -import org.springframework.web.bind.annotation.ResponseBody;  
25 -import org.springframework.web.context.request.WebRequest;  
26 -  
27 import com.alibaba.fastjson.JSON; 7 import com.alibaba.fastjson.JSON;
28 import com.dili.titan.common.enums.SourceType; 8 import com.dili.titan.common.enums.SourceType;
29 import com.dili.titan.common.utils.web.BaseController; 9 import com.dili.titan.common.utils.web.BaseController;
30 import com.dili.titan.common.utils.web.DateFormatUtils; 10 import com.dili.titan.common.utils.web.DateFormatUtils;
  11 +import com.dili.titan.domain.Category;
  12 +import com.dili.titan.domain.ProductPop;
  13 +import com.dili.titan.domain.ProductPopQuery;
  14 +import com.dili.titan.domain.ProductSearchSort;
31 import com.dili.titan.domain.base.Result; 15 import com.dili.titan.domain.base.Result;
32 import com.dili.titan.domain.common.Message; 16 import com.dili.titan.domain.common.Message;
33 import com.dili.titan.domain.common.Page; 17 import com.dili.titan.domain.common.Page;
@@ -40,10 +24,28 @@ import com.dili.titan.utils.WebUtils; @@ -40,10 +24,28 @@ import com.dili.titan.utils.WebUtils;
40 import com.dili.titan.web.CustomDateEditor; 24 import com.dili.titan.web.CustomDateEditor;
41 import com.diligrp.log.util.LogData; 25 import com.diligrp.log.util.LogData;
42 import com.diligrp.log.util.LogUtils; 26 import com.diligrp.log.util.LogUtils;
  27 +import org.apache.commons.collections.CollectionUtils;
  28 +import org.apache.commons.lang3.StringUtils;
  29 +import org.slf4j.Logger;
  30 +import org.slf4j.LoggerFactory;
  31 +import org.springframework.stereotype.Controller;
  32 +import org.springframework.ui.Model;
  33 +import org.springframework.web.bind.WebDataBinder;
  34 +import org.springframework.web.bind.annotation.InitBinder;
  35 +import org.springframework.web.bind.annotation.RequestMapping;
  36 +import org.springframework.web.bind.annotation.RequestMethod;
  37 +import org.springframework.web.bind.annotation.ResponseBody;
  38 +import org.springframework.web.context.request.WebRequest;
43 import org.springframework.web.servlet.ModelAndView; 39 import org.springframework.web.servlet.ModelAndView;
44 40
  41 +import javax.annotation.Resource;
  42 +import javax.servlet.http.HttpServletRequest;
  43 +import java.util.ArrayList;
  44 +import java.util.Date;
  45 +import java.util.List;
  46 +
45 /** 47 /**
46 - * 48 + *
47 * <B>Description</B> 商品搜索排序功能<br /> 49 * <B>Description</B> 商品搜索排序功能<br />
48 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 50 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
49 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> 51 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
@@ -55,29 +57,29 @@ import org.springframework.web.servlet.ModelAndView; @@ -55,29 +57,29 @@ import org.springframework.web.servlet.ModelAndView;
55 @RequestMapping(value = "/titan/productSearchSort") 57 @RequestMapping(value = "/titan/productSearchSort")
56 public class ProductSearchSortController extends BaseController { 58 public class ProductSearchSortController extends BaseController {
57 private static final Logger LOGGER = LoggerFactory.getLogger(ProductSearchSortController.class); 59 private static final Logger LOGGER = LoggerFactory.getLogger(ProductSearchSortController.class);
58 - @Resource 60 + @Resource
59 private ProductSearchSortService productSearchSortService; 61 private ProductSearchSortService productSearchSortService;
60 - 62 +
61 @Resource 63 @Resource
62 private CategoryService categoryService; 64 private CategoryService categoryService;
63 - 65 +
64 @Resource 66 @Resource
65 DateFormatUtils dateFormatUtils; 67 DateFormatUtils dateFormatUtils;
66 - 68 +
67 @Resource 69 @Resource
68 WebUtils webUtils; 70 WebUtils webUtils;
69 - 71 +
70 @Resource 72 @Resource
71 private ProductPopService productPopService; 73 private ProductPopService productPopService;
72 - 74 +
73 @Resource 75 @Resource
74 private TopicProducer topicProducer;//注入MQ推送消息 76 private TopicProducer topicProducer;//注入MQ推送消息
75 - 77 +
76 @InitBinder 78 @InitBinder
77 public void initBinder(WebDataBinder binder, WebRequest request) { 79 public void initBinder(WebDataBinder binder, WebRequest request) {
78 binder.registerCustomEditor(Date.class, new CustomDateEditor(true)); 80 binder.registerCustomEditor(Date.class, new CustomDateEditor(true));
79 } 81 }
80 - 82 +
81 /** 83 /**
82 * 列表展示 84 * 列表展示
83 * @param page 分页对象 85 * @param page 分页对象
@@ -94,7 +96,7 @@ public class ProductSearchSortController extends BaseController { @@ -94,7 +96,7 @@ public class ProductSearchSortController extends BaseController {
94 if (pageId == null) { 96 if (pageId == null) {
95 pageId = 1; 97 pageId = 1;
96 } 98 }
97 - 99 +
98 page.setCurrentPage(pageId); 100 page.setCurrentPage(pageId);
99 ProductSearchSort productSearchSort = new ProductSearchSort(); 101 ProductSearchSort productSearchSort = new ProductSearchSort();
100 productSearchSort.setCateId(cateId); 102 productSearchSort.setCateId(cateId);
@@ -113,18 +115,18 @@ public class ProductSearchSortController extends BaseController { @@ -113,18 +115,18 @@ public class ProductSearchSortController extends BaseController {
113 view.addAttribute("dateFormatUtils",dateFormatUtils); 115 view.addAttribute("dateFormatUtils",dateFormatUtils);
114 view.addAttribute("webUtils",webUtils); 116 view.addAttribute("webUtils",webUtils);
115 view.addAttribute("productSearchSort",productSearchSort); 117 view.addAttribute("productSearchSort",productSearchSort);
116 - view.addAttribute("page",pageProductSearchSort); 118 + view.addAttribute("page",pageProductSearchSort);
117 } catch (Exception e) { 119 } catch (Exception e) {
118 LOGGER.error("失败:"+e.getMessage(),e); 120 LOGGER.error("失败:"+e.getMessage(),e);
119 throw e; 121 throw e;
120 }finally{ 122 }finally{
121 - } 123 + }
122 return toVMSkipLayout("productSearchSort/list"); 124 return toVMSkipLayout("productSearchSort/list");
123 } 125 }
124 - 126 +
125 @RequestMapping(value="/queryProductPopData",method = {RequestMethod.POST,RequestMethod.GET}) 127 @RequestMapping(value="/queryProductPopData",method = {RequestMethod.POST,RequestMethod.GET})
126 @ResponseBody 128 @ResponseBody
127 - public Result queryProductPopData(ProductPopQuery query, Long cateId,Integer pageId, Model view) throws Exception { 129 + public Result queryProductPopData(ProductPopQuery query, Long cateId, Integer pageId, Model view) throws Exception {
128 Result result = Result.create(); 130 Result result = Result.create();
129 if(cateId == null){ 131 if(cateId == null){
130 return result.setSuccess(false); 132 return result.setSuccess(false);
@@ -177,7 +179,7 @@ public class ProductSearchSortController extends BaseController { @@ -177,7 +179,7 @@ public class ProductSearchSortController extends BaseController {
177 } 179 }
178 return result; 180 return result;
179 } 181 }
180 - 182 +
181 /** 183 /**
182 * 通过编号删除对象 184 * 通过编号删除对象
183 * @param id 对象编号 185 * @param id 对象编号
@@ -200,7 +202,7 @@ public class ProductSearchSortController extends BaseController { @@ -200,7 +202,7 @@ public class ProductSearchSortController extends BaseController {
200 } 202 }
201 return msg; 203 return msg;
202 } 204 }
203 - 205 +
204 @RequestMapping(value="/save",method=RequestMethod.POST) 206 @RequestMapping(value="/save",method=RequestMethod.POST)
205 public @ResponseBody Message save(Long cateId, String pids, Model view) throws Exception{ 207 public @ResponseBody Message save(Long cateId, String pids, Model view) throws Exception{
206 Message msg = Message.success(); 208 Message msg = Message.success();
@@ -212,14 +214,14 @@ public class ProductSearchSortController extends BaseController { @@ -212,14 +214,14 @@ public class ProductSearchSortController extends BaseController {
212 msg = productSearchSortService.save(cateId,ProductSearchSort.TYPE_CATE,pidsList); 214 msg = productSearchSortService.save(cateId,ProductSearchSort.TYPE_CATE,pidsList);
213 if("success".equals(msg.getCode())){ 215 if("success".equals(msg.getCode())){
214 topicProducer.sendMQProductSearchCate(cateId,ProductSearchSort.TYPE_CATE,2); 216 topicProducer.sendMQProductSearchCate(cateId,ProductSearchSort.TYPE_CATE,2);
215 - } 217 + }
216 } catch (Exception e) { 218 } catch (Exception e) {
217 LOGGER.error("失败:"+e.getMessage(),e); 219 LOGGER.error("失败:"+e.getMessage(),e);
218 msg = Message.failure(); 220 msg = Message.failure();
219 } 221 }
220 return msg; 222 return msg;
221 } 223 }
222 - 224 +
223 @RequestMapping(value="/changeSearchSort",method=RequestMethod.POST) 225 @RequestMapping(value="/changeSearchSort",method=RequestMethod.POST)
224 public @ResponseBody Message changeSearchSort(Long id, Long cateId, Integer searchSort, Model view) throws Exception{ 226 public @ResponseBody Message changeSearchSort(Long id, Long cateId, Integer searchSort, Model view) throws Exception{
225 Message msg = Message.success(); 227 Message msg = Message.success();
titan-web/src/main/java/com/dili/titan/web/controller/VideoController.java
  View file @de9bb94
@@ -13,7 +13,6 @@ import com.dili.titan.domain.ProductVideo; @@ -13,7 +13,6 @@ import com.dili.titan.domain.ProductVideo;
13 import com.dili.titan.domain.Video; 13 import com.dili.titan.domain.Video;
14 import com.dili.titan.domain.common.Message; 14 import com.dili.titan.domain.common.Message;
15 import com.dili.titan.domain.common.Page; 15 import com.dili.titan.domain.common.Page;
16 -import com.dili.titan.gq.domain.Presale;  
17 import com.dili.titan.mq.TopicProducer; 16 import com.dili.titan.mq.TopicProducer;
18 import com.dili.titan.rpc.ConfigRPC; 17 import com.dili.titan.rpc.ConfigRPC;
19 import com.dili.titan.service.CategoryService; 18 import com.dili.titan.service.CategoryService;
@@ -36,7 +35,6 @@ import org.springframework.web.bind.annotation.*; @@ -36,7 +35,6 @@ import org.springframework.web.bind.annotation.*;
36 import org.springframework.web.context.request.WebRequest; 35 import org.springframework.web.context.request.WebRequest;
37 36
38 import javax.annotation.Resource; 37 import javax.annotation.Resource;
39 -import java.util.ArrayList;  
40 import java.util.Date; 38 import java.util.Date;
41 import java.util.List; 39 import java.util.List;
42 40
titan-web/src/main/java/com/dili/titan/web/controller/gq/PresaleController.java
  View file @de9bb94
@@ -31,7 +31,6 @@ import com.diligrp.manage.sdk.session.SessionContext; @@ -31,7 +31,6 @@ import com.diligrp.manage.sdk.session.SessionContext;
31 import com.diligrp.website.web.interfaces.domain.output.BaseResp; 31 import com.diligrp.website.web.interfaces.domain.output.BaseResp;
32 import com.diligrp.website.web.interfaces.domain.output.DataDictionaryValueResp; 32 import com.diligrp.website.web.interfaces.domain.output.DataDictionaryValueResp;
33 import com.yqyw.user.rpc.client.domain.output.UserInfoResp; 33 import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
34 -  
35 import org.apache.commons.collections.CollectionUtils; 34 import org.apache.commons.collections.CollectionUtils;
36 import org.apache.commons.lang.StringUtils; 35 import org.apache.commons.lang.StringUtils;
37 import org.springframework.stereotype.Controller; 36 import org.springframework.stereotype.Controller;
@@ -42,7 +41,6 @@ import org.springframework.web.context.request.WebRequest; @@ -42,7 +41,6 @@ import org.springframework.web.context.request.WebRequest;
42 import org.springframework.web.servlet.ModelAndView; 41 import org.springframework.web.servlet.ModelAndView;
43 42
44 import javax.annotation.Resource; 43 import javax.annotation.Resource;
45 -  
46 import java.util.ArrayList; 44 import java.util.ArrayList;
47 import java.util.Date; 45 import java.util.Date;
48 import java.util.List; 46 import java.util.List;
titan-web/src/main/java/com/dili/titan/web/controller/gq/PurchaseController.java
  View file @de9bb94
@@ -31,7 +31,6 @@ import com.diligrp.manage.sdk.session.SessionContext; @@ -31,7 +31,6 @@ import com.diligrp.manage.sdk.session.SessionContext;
31 import com.diligrp.website.web.interfaces.domain.output.BaseResp; 31 import com.diligrp.website.web.interfaces.domain.output.BaseResp;
32 import com.diligrp.website.web.interfaces.domain.output.DataDictionaryValueResp; 32 import com.diligrp.website.web.interfaces.domain.output.DataDictionaryValueResp;
33 import com.yqyw.user.rpc.client.domain.output.UserInfoResp; 33 import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
34 -  
35 import org.apache.commons.collections.CollectionUtils; 34 import org.apache.commons.collections.CollectionUtils;
36 import org.apache.commons.lang.StringUtils; 35 import org.apache.commons.lang.StringUtils;
37 import org.springframework.stereotype.Controller; 36 import org.springframework.stereotype.Controller;
@@ -42,7 +41,6 @@ import org.springframework.web.context.request.WebRequest; @@ -42,7 +41,6 @@ import org.springframework.web.context.request.WebRequest;
42 import org.springframework.web.servlet.ModelAndView; 41 import org.springframework.web.servlet.ModelAndView;
43 42
44 import javax.annotation.Resource; 43 import javax.annotation.Resource;
45 -  
46 import java.util.ArrayList; 44 import java.util.ArrayList;
47 import java.util.Date; 45 import java.util.Date;
48 import java.util.List; 46 import java.util.List;
titan-web/src/main/java/com/dili/titan/web/controller/gq/SupplyController.java
  View file @de9bb94
@@ -31,7 +31,6 @@ import com.diligrp.manage.sdk.session.SessionContext; @@ -31,7 +31,6 @@ import com.diligrp.manage.sdk.session.SessionContext;
31 import com.diligrp.website.web.interfaces.domain.output.BaseResp; 31 import com.diligrp.website.web.interfaces.domain.output.BaseResp;
32 import com.diligrp.website.web.interfaces.domain.output.DataDictionaryValueResp; 32 import com.diligrp.website.web.interfaces.domain.output.DataDictionaryValueResp;
33 import com.yqyw.user.rpc.client.domain.output.UserInfoResp; 33 import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
34 -  
35 import org.apache.commons.collections.CollectionUtils; 34 import org.apache.commons.collections.CollectionUtils;
36 import org.apache.commons.lang.StringUtils; 35 import org.apache.commons.lang.StringUtils;
37 import org.springframework.stereotype.Controller; 36 import org.springframework.stereotype.Controller;
@@ -42,7 +41,6 @@ import org.springframework.web.context.request.WebRequest; @@ -42,7 +41,6 @@ import org.springframework.web.context.request.WebRequest;
42 import org.springframework.web.servlet.ModelAndView; 41 import org.springframework.web.servlet.ModelAndView;
43 42
44 import javax.annotation.Resource; 43 import javax.annotation.Resource;
45 -  
46 import java.util.ArrayList; 44 import java.util.ArrayList;
47 import java.util.Date; 45 import java.util.Date;
48 import java.util.List; 46 import java.util.List;
titan-web/src/main/java/com/dili/titan/web/controller/top/CdtopController.java
  View file @de9bb94
@@ -7,6 +7,7 @@ package com.dili.titan.web.controller.top; @@ -7,6 +7,7 @@ package com.dili.titan.web.controller.top;
7 import com.alibaba.fastjson.JSON; 7 import com.alibaba.fastjson.JSON;
8 import com.dili.titan.common.enums.SourceType; 8 import com.dili.titan.common.enums.SourceType;
9 import com.dili.titan.common.utils.web.BaseController; 9 import com.dili.titan.common.utils.web.BaseController;
  10 +import com.dili.titan.domain.*;
10 import com.dili.titan.domain.base.Result; 11 import com.dili.titan.domain.base.Result;
11 import com.dili.titan.domain.common.Message; 12 import com.dili.titan.domain.common.Message;
12 import com.dili.titan.domain.common.Page; 13 import com.dili.titan.domain.common.Page;
@@ -17,12 +18,10 @@ import com.dili.titan.service.ProductPopService; @@ -17,12 +18,10 @@ import com.dili.titan.service.ProductPopService;
17 import com.dili.titan.service.ProductSearchCateService; 18 import com.dili.titan.service.ProductSearchCateService;
18 import com.dili.titan.service.ProductSearchSortService; 19 import com.dili.titan.service.ProductSearchSortService;
19 import com.dili.titan.service.base.PassportService; 20 import com.dili.titan.service.base.PassportService;
20 -import com.dili.titan.utils.WebUtils;  
21 import com.dili.titan.web.CustomDateEditor; 21 import com.dili.titan.web.CustomDateEditor;
22 import com.diligrp.log.util.LogData; 22 import com.diligrp.log.util.LogData;
23 import com.diligrp.log.util.LogUtils; 23 import com.diligrp.log.util.LogUtils;
24 import com.diligrp.website.web.interfaces.domain.output.BaseResp; 24 import com.diligrp.website.web.interfaces.domain.output.BaseResp;
25 -import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp;  
26 import org.apache.commons.collections.CollectionUtils; 25 import org.apache.commons.collections.CollectionUtils;
27 import org.slf4j.Logger; 26 import org.slf4j.Logger;
28 import org.slf4j.LoggerFactory; 27 import org.slf4j.LoggerFactory;
@@ -43,300 +42,314 @@ import java.util.Date; @@ -43,300 +42,314 @@ import java.util.Date;
43 import java.util.List; 42 import java.util.List;
44 43
45 /** 44 /**
46 - *productSearchCate controller层 45 + * productSearchCate controller层
  46 + *
47 * @author dev-center 47 * @author dev-center
48 * @since 2015-07-27 48 * @since 2015-07-27
49 */ 49 */
50 @Controller 50 @Controller
51 @RequestMapping(value = "/titan/cdtop") 51 @RequestMapping(value = "/titan/cdtop")
52 -public class CdtopController extends BaseController{  
53 - private static final Logger LOGGER = LoggerFactory.getLogger(CdtopController.class);  
54 -  
55 - @Resource private ProductSearchCateService productSearchCateService;  
56 -  
57 - @Resource  
58 - private ProductSearchSortService productSearchSortService;  
59 -  
60 - @Resource  
61 - private ProductPopService productPopService;  
62 - 52 +public class CdtopController extends BaseController {
  53 + private static final Logger LOGGER = LoggerFactory.getLogger(CdtopController.class);
  54 +
  55 + @Resource
  56 + private ProductSearchCateService productSearchCateService;
  57 +
63 @Resource 58 @Resource
64 - private TopicProducer topicProducer;//注入MQ推送消息  
65 - @Resource  
66 - private ConfigRPC configRPC;  
67 - @Resource  
68 - private CategoryService categoryService; 59 + private ProductSearchSortService productSearchSortService;
69 60
70 - @InitBinder  
71 - public void initBinder(WebDataBinder binder, WebRequest request) {  
72 - binder.registerCustomEditor(Date.class, new CustomDateEditor(true));  
73 - }  
74 -  
75 - /**  
76 - * 列表展示  
77 - * @param productSearchCate 实体对象  
78 - * @param page 分页对象  
79 - * @return  
80 - */  
81 - @RequestMapping(method = {RequestMethod.GET,RequestMethod.POST})  
82 - public ModelAndView list(ProductSearchCate productSearchCate, Integer pageId, Page<ProductSearchCate> page, Model view) throws Exception{  
83 - try {  
84 - if (pageId == null) {  
85 - pageId = 1;  
86 - }  
87 - if(productSearchCate.getCid()==null || productSearchCate.getCid()==-1){  
88 - productSearchCate.setCid(null);  
89 - }  
90 - view.addAttribute("cid",productSearchCate.getCid());  
91 - page.setCurrentPage(pageId);  
92 - productSearchCate.setType(ProductSearchCate.TYPE_CD);  
93 - Page<ProductSearchCate> pageProductSearchCate = productSearchCateService.selectAllList(productSearchCate,page); 61 + @Resource
  62 + private ProductPopService productPopService;
  63 +
  64 + @Resource
  65 + private TopicProducer topicProducer;//注入MQ推送消息
  66 + @Resource
  67 + private ConfigRPC configRPC;
  68 + @Resource
  69 + private CategoryService categoryService;
  70 +
  71 + @InitBinder
  72 + public void initBinder(WebDataBinder binder, WebRequest request) {
  73 + binder.registerCustomEditor(Date.class, new CustomDateEditor(true));
  74 + }
  75 +
  76 + /**
  77 + * 列表展示
  78 + *
  79 + * @param productSearchCate 实体对象
  80 + * @param page 分页对象
  81 + * @return
  82 + */
  83 + @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST})
  84 + public ModelAndView list(ProductSearchCate productSearchCate, Integer pageId, Page<ProductSearchCate> page, Model view) throws Exception {
  85 + try {
  86 + if (pageId == null) {
  87 + pageId = 1;
  88 + }
  89 + if (productSearchCate.getCid() == null || productSearchCate.getCid() == -1) {
  90 + productSearchCate.setCid(null);
  91 + }
  92 + view.addAttribute("cid", productSearchCate.getCid());
  93 + page.setCurrentPage(pageId);
  94 + productSearchCate.setType(ProductSearchCate.TYPE_CD);
  95 + Page<ProductSearchCate> pageProductSearchCate = productSearchCateService.selectAllList(productSearchCate, page);
94 List<ProductSearchCate> listProductSearchCate = pageProductSearchCate.getResult(); 96 List<ProductSearchCate> listProductSearchCate = pageProductSearchCate.getResult();
95 - if(CollectionUtils.isEmpty(listProductSearchCate)){  
96 - view.addAttribute("page",pageProductSearchCate);  
97 - return toVMSkipLayout("top/cdtop/add");  
98 - }  
99 - for(ProductSearchCate vo : listProductSearchCate){  
100 - BaseResp baseResp = configRPC.getAllParentByALLCityId(vo.getCid().intValue());  
101 - if(baseResp != null){  
102 - vo.setName(baseResp.getMsg());  
103 - }  
104 - }  
105 - view.addAttribute("productSearchCate",productSearchCate);  
106 - view.addAttribute("page",pageProductSearchCate);  
107 - } catch (Exception e) {  
108 - LOGGER.error("失败:"+e.getMessage(),e);  
109 - throw e;  
110 - }  
111 - return toVMSkipLayout("top/cdtop/add");  
112 - } 97 + if (CollectionUtils.isEmpty(listProductSearchCate)) {
  98 + view.addAttribute("page", pageProductSearchCate);
  99 + return toVMSkipLayout("top/cdtop/add");
  100 + }
  101 + for (ProductSearchCate vo : listProductSearchCate) {
  102 + BaseResp baseResp = configRPC.getAllParentByALLCityId(vo.getCid().intValue());
  103 + if (baseResp != null) {
  104 + vo.setName(baseResp.getMsg());
  105 + }
  106 + }
  107 + view.addAttribute("productSearchCate", productSearchCate);
  108 + view.addAttribute("page", pageProductSearchCate);
  109 + } catch (Exception e) {
  110 + LOGGER.error("失败:" + e.getMessage(), e);
  111 + throw e;
  112 + }
  113 + return toVMSkipLayout("top/cdtop/add");
  114 + }
  115 +
  116 + /**
  117 + * 通过编号删除对象
  118 + *
  119 + * @return
  120 + */
  121 + @RequestMapping(value = "/delete", method = RequestMethod.POST)
  122 + public
  123 + @ResponseBody
  124 + Message del(Long cateId, Model view) throws Exception {
  125 + Message msg = null;
  126 + try {
  127 + ProductSearchCate productSearchCate = new ProductSearchCate();
  128 + productSearchCate.setCid(cateId);
  129 + productSearchCate.setType(ProductSearchCate.TYPE_CD);
  130 + msg = productSearchCateService.deleteSearchCate(productSearchCate);
  131 + if ("success".equals(msg.getCode())) {
  132 + LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), cateId.toString()).model("产地置顶排序").operation("删除").dataName("区域ID为:" + cateId.toString()).build());
  133 + topicProducer.sendMQProductSearchCate(cateId, ProductSearchCate.TYPE_CD, 2);
  134 + }
  135 + } catch (Exception e) {
  136 + LOGGER.error("失败:" + e.getMessage(), e);
  137 + msg = Message.failure();
  138 + }
  139 + return msg;
  140 + }
113 141
114 - /**  
115 - * 通过编号删除对象  
116 - * @return  
117 - */  
118 - @RequestMapping(value="/delete",method=RequestMethod.POST)  
119 - public @ResponseBody Message del(Long cateId,Model view) throws Exception{  
120 - Message msg = null;  
121 - try {  
122 - ProductSearchCate productSearchCate = new ProductSearchCate();  
123 - productSearchCate.setCid(cateId);  
124 - productSearchCate.setType(ProductSearchCate.TYPE_CD);  
125 - msg = productSearchCateService.deleteSearchCate(productSearchCate);  
126 - if("success".equals(msg.getCode())){  
127 - LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), cateId.toString()).model("产地置顶排序").operation("删除").dataName("区域ID为:"+cateId.toString()).build());  
128 - topicProducer.sendMQProductSearchCate(cateId,ProductSearchCate.TYPE_CD,2);  
129 - }  
130 - } catch (Exception e) {  
131 - LOGGER.error("失败:"+e.getMessage(),e);  
132 - msg = Message.failure();  
133 - }  
134 - return msg;  
135 - }  
136 -  
137 142
138 - /**  
139 - * 保存方法  
140 - * @return  
141 - */  
142 - @RequestMapping(value="/save",method = {RequestMethod.POST,RequestMethod.GET})  
143 - @ResponseBody  
144 - public Message save(Long cid,Model view) throws Exception{  
145 - Message msg= null;  
146 - try {  
147 - if(cid==null){  
148 - msg = Message.failure();  
149 - msg.setResult("请选择需要添加的区域！！");  
150 - return msg;  
151 - }  
152 - ProductSearchCate productSearchCate = new ProductSearchCate();  
153 - productSearchCate.setCid(cid);  
154 - productSearchCate.setType(ProductSearchCate.TYPE_CD);  
155 - msg = productSearchCateService.saveSearchCate(productSearchCate);  
156 - if("success".equals(msg.getCode())){  
157 - LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), cid.toString()).model("产地置顶排序").operation("添加").dataName("区域ID为:"+cid.toString()).build());  
158 - topicProducer.sendMQProductSearchCate(cid,ProductSearchCate.TYPE_CD,2);  
159 - }  
160 - } catch (Exception e) {  
161 - LOGGER.error("失败:"+e.getMessage(),e);  
162 - msg = Message.failure();  
163 - }finally{  
164 - }  
165 - return msg;  
166 - } 143 + /**
  144 + * 保存方法
  145 + *
  146 + * @return
  147 + */
  148 + @RequestMapping(value = "/save", method = {RequestMethod.POST, RequestMethod.GET})
  149 + @ResponseBody
  150 + public Message save(Long cid, Model view) throws Exception {
  151 + Message msg = null;
  152 + try {
  153 + if (cid == null) {
  154 + msg = Message.failure();
  155 + msg.setResult("请选择需要添加的区域！！");
  156 + return msg;
  157 + }
  158 + ProductSearchCate productSearchCate = new ProductSearchCate();
  159 + productSearchCate.setCid(cid);
  160 + productSearchCate.setType(ProductSearchCate.TYPE_CD);
  161 + msg = productSearchCateService.saveSearchCate(productSearchCate);
  162 + if ("success".equals(msg.getCode())) {
  163 + LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), cid.toString()).model("产地置顶排序").operation("添加").dataName("区域ID为:" + cid.toString()).build());
  164 + topicProducer.sendMQProductSearchCate(cid, ProductSearchCate.TYPE_CD, 2);
  165 + }
  166 + } catch (Exception e) {
  167 + LOGGER.error("失败:" + e.getMessage(), e);
  168 + msg = Message.failure();
  169 + } finally {
  170 + }
  171 + return msg;
  172 + }
167 173
168 - /**  
169 - * 列表展示  
170 - * @param page 分页对象  
171 - * @return  
172 - */  
173 - @RequestMapping(value="/sortlist",method = {RequestMethod.GET,RequestMethod.POST})  
174 - public ModelAndView sortlist(Long cateId, Page<ProductSearchSort> page, Integer pageId, Model view, HttpServletRequest request) throws Exception{  
175 - try {  
176 - if (pageId == null) {  
177 - pageId = 1;  
178 - }  
179 - if (cateId == null) {  
180 - Result result = Result.create();  
181 - result.setMsg("异常访问，请联系管理员" );  
182 - return toVMSkipLayout("common/error", result.getAllResult());  
183 - }  
184 - page.setCurrentPage(pageId);  
185 - page.setPageSize(1000);  
186 - ProductSearchSort productSearchSort = new ProductSearchSort();  
187 - productSearchSort.setCateId(cateId);  
188 - productSearchSort.setType(ProductSearchSort.TYPE_CD);  
189 - Page<ProductSearchSort> pageProductSearchSort = productSearchSortService.selectGroupPage(productSearchSort, page);  
190 - List<ProductSearchSort> listProductSearchSort = pageProductSearchSort.getResult();  
191 - view.addAttribute("cateId",cateId);  
192 - if(CollectionUtils.isEmpty(listProductSearchSort)){  
193 - view.addAttribute("page",pageProductSearchSort);  
194 - return toVMSkipLayout("top/cdtop/addtop");  
195 - }  
196 - for(ProductSearchSort ps : listProductSearchSort){  
197 - Category allLevelCategoryById = categoryService.findAllLevelCategoryById(ps.getCategoryId().intValue());  
198 - ps.setCategoryName(allLevelCategoryById.getCateAllName("-"));  
199 - } 174 + /**
  175 + * 列表展示
  176 + *
  177 + * @param page 分页对象
  178 + * @return
  179 + */
  180 + @RequestMapping(value = "/sortlist", method = {RequestMethod.GET, RequestMethod.POST})
  181 + public ModelAndView sortlist(Long cateId, Page<ProductSearchSort> page, Integer pageId, Model view, HttpServletRequest request) throws Exception {
  182 + try {
  183 + if (pageId == null) {
  184 + pageId = 1;
  185 + }
  186 + if (cateId == null) {
  187 + Result result = Result.create();
  188 + result.setMsg("异常访问，请联系管理员");
  189 + return toVMSkipLayout("common/error", result.getAllResult());
  190 + }
  191 + page.setCurrentPage(pageId);
  192 + page.setPageSize(1000);
  193 + ProductSearchSort productSearchSort = new ProductSearchSort();
  194 + productSearchSort.setCateId(cateId);
  195 + productSearchSort.setType(ProductSearchSort.TYPE_CD);
  196 + Page<ProductSearchSort> pageProductSearchSort = productSearchSortService.selectGroupPage(productSearchSort, page);
  197 + List<ProductSearchSort> listProductSearchSort = pageProductSearchSort.getResult();
  198 + view.addAttribute("cateId", cateId);
  199 + if (CollectionUtils.isEmpty(listProductSearchSort)) {
  200 + view.addAttribute("page", pageProductSearchSort);
  201 + return toVMSkipLayout("top/cdtop/addtop");
  202 + }
  203 + for (ProductSearchSort ps : listProductSearchSort) {
  204 + Category allLevelCategoryById = categoryService.findAllLevelCategoryById(ps.getCategoryId().intValue());
  205 + ps.setCategoryName(allLevelCategoryById.getCateAllName("-"));
  206 + }
200 207
201 - view.addAttribute("productSearchSort",productSearchSort);  
202 - view.addAttribute("page",pageProductSearchSort);  
203 - } catch (Exception e) {  
204 - LOGGER.error("失败:"+e.getMessage(),e);  
205 - throw e;  
206 - }finally{  
207 - }  
208 - return toVMSkipLayout("top/cdtop/addtop");  
209 - } 208 + view.addAttribute("productSearchSort", productSearchSort);
  209 + view.addAttribute("page", pageProductSearchSort);
  210 + } catch (Exception e) {
  211 + LOGGER.error("失败:" + e.getMessage(), e);
  212 + throw e;
  213 + } finally {
  214 + }
  215 + return toVMSkipLayout("top/cdtop/addtop");
  216 + }
210 217
211 - @RequestMapping(value="/queryProductPopData",method = {RequestMethod.POST,RequestMethod.GET})  
212 - @ResponseBody  
213 - public Result queryProductPopData(ProductPopQuery query, Long cateId, Integer pageId, Model view) throws Exception {  
214 - Result result = Result.create();  
215 - if(cateId == null){  
216 - return result.setSuccess(false);  
217 - }  
218 - if(query == null){  
219 - query = new ProductPopQuery();  
220 - }  
221 - List<Integer> cityIds = PassportService.getCityIds();  
222 - List<Integer> shopTypes = PassportService.getShopTypes();  
223 - if(CollectionUtils.isNotEmpty(cityIds) && CollectionUtils.isNotEmpty(shopTypes)) {  
224 - //-1表示有全部权限  
225 - if(!cityIds.contains(-1)) {  
226 - query.setShopCityIds(cityIds);  
227 - }  
228 - if(!shopTypes.contains(-1)) {  
229 - query.setShopTypes(shopTypes);  
230 - }  
231 - }else{  
232 - return result;  
233 - }  
234 - Page<ProductPop> page = new Page<ProductPop>();  
235 - if (pageId == null || pageId==0) {  
236 - if(page.getCurrentPage()<1){  
237 - page.setCurrentPage(1);  
238 - }  
239 - }else {  
240 - page.setCurrentPage(pageId);  
241 - }  
242 - page.setPageSize(10);  
243 - if(query.getStatus()==null || query.getStatus()==0){  
244 - query.setStatus(-1);  
245 - }  
246 - if(org.apache.commons.lang3.StringUtils.isEmpty(query.getName()))  
247 - query.setName(null);  
248 - if(org.apache.commons.lang3.StringUtils.isEmpty(query.getSellerName()))  
249 - query.setSellerName(null);  
250 - if (query.getPid() == null || query.getPid() <= 0)  
251 - query.setPid(null);  
252 - //查询已经绑定的商品该类目下  
253 - ProductSearchSort ps = new ProductSearchSort();  
254 - ps.setCateId(cateId);  
255 - ps.setType(ProductSearchSort.TYPE_CD);  
256 - List<ProductSearchSort> listSearchSort = productSearchSortService.selectEntryList(ps); 218 + @RequestMapping(value = "/queryProductPopData", method = {RequestMethod.POST, RequestMethod.GET})
  219 + @ResponseBody
  220 + public Result queryProductPopData(ProductPopQuery query, Long cateId, Integer pageId, Model view) throws Exception {
  221 + Result result = Result.create();
  222 + if (cateId == null) {
  223 + return result.setSuccess(false);
  224 + }
  225 + if (query == null) {
  226 + query = new ProductPopQuery();
  227 + }
  228 + List<Integer> cityIds = PassportService.getCityIds();
  229 + List<Integer> shopTypes = PassportService.getShopTypes();
  230 + if (CollectionUtils.isNotEmpty(cityIds) && CollectionUtils.isNotEmpty(shopTypes)) {
  231 + //-1表示有全部权限
  232 + if (!cityIds.contains(-1)) {
  233 + query.setShopCityIds(cityIds);
  234 + }
  235 + if (!shopTypes.contains(-1)) {
  236 + query.setShopTypes(shopTypes);
  237 + }
  238 + } else {
  239 + return result;
  240 + }
  241 + Page<ProductPop> page = new Page<ProductPop>();
  242 + if (pageId == null || pageId == 0) {
  243 + if (page.getCurrentPage() < 1) {
  244 + page.setCurrentPage(1);
  245 + }
  246 + } else {
  247 + page.setCurrentPage(pageId);
  248 + }
  249 + page.setPageSize(10);
  250 + if (query.getStatus() == null || query.getStatus() == 0) {
  251 + query.setStatus(-1);
  252 + }
  253 + if (org.apache.commons.lang3.StringUtils.isEmpty(query.getName()))
  254 + query.setName(null);
  255 + if (org.apache.commons.lang3.StringUtils.isEmpty(query.getSellerName()))
  256 + query.setSellerName(null);
  257 + if (query.getPid() == null || query.getPid() <= 0)
  258 + query.setPid(null);
  259 + //查询已经绑定的商品该类目下
  260 + ProductSearchSort ps = new ProductSearchSort();
  261 + ps.setCateId(cateId);
  262 + ps.setType(ProductSearchSort.TYPE_CD);
  263 + List<ProductSearchSort> listSearchSort = productSearchSortService.selectEntryList(ps);
257 264
258 - List<Long> exitPids = null;  
259 - if(CollectionUtils.isNotEmpty(listSearchSort)){  
260 - exitPids = new ArrayList<Long>(listSearchSort.size());  
261 - for(ProductSearchSort sort : listSearchSort){  
262 - exitPids.add(sort.getPid());  
263 - }  
264 - }  
265 - query.setPids(exitPids);  
266 - //查询该类目下还有没有绑定的是商品  
267 - Page<ProductPop> pageTmp = productPopService.searchPopPage(query,  
268 - page);  
269 - List<ProductPop> productPopList = pageTmp.getResult();  
270 - result.addResult("query", query);  
271 - result.addResult("page", pageTmp);  
272 - if(CollectionUtils.isEmpty(productPopList)){  
273 - return result;  
274 - }  
275 - return result;  
276 - } 265 + List<Long> exitPids = null;
  266 + if (CollectionUtils.isNotEmpty(listSearchSort)) {
  267 + exitPids = new ArrayList<Long>(listSearchSort.size());
  268 + for (ProductSearchSort sort : listSearchSort) {
  269 + exitPids.add(sort.getPid());
  270 + }
  271 + }
  272 + query.setPids(exitPids);
  273 + //查询该类目下还有没有绑定的是商品
  274 + Page<ProductPop> pageTmp = productPopService.searchPopPage(query,
  275 + page);
  276 + List<ProductPop> productPopList = pageTmp.getResult();
  277 + result.addResult("query", query);
  278 + result.addResult("page", pageTmp);
  279 + if (CollectionUtils.isEmpty(productPopList)) {
  280 + return result;
  281 + }
  282 + return result;
  283 + }
277 284
278 - @RequestMapping(value="/savesort",method=RequestMethod.POST)  
279 - public @ResponseBody Message savesort(Long cateId, String pids, Model view) throws Exception{  
280 - Message msg = Message.success();  
281 - try {  
282 - if(org.apache.commons.lang3.StringUtils.isEmpty(pids)){  
283 - return msg;  
284 - }  
285 - List<Long> pidsList = JSON.parseArray(pids, Long.class);  
286 - msg = productSearchSortService.save(cateId,ProductSearchSort.TYPE_CD,pidsList);  
287 - if("success".equals(msg.getCode())){  
288 - LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), pids).model("产地置顶排序商品").operation("添加").dataName("区域ID为"+cateId.toString()+" 商品为:"+pids).build());  
289 - topicProducer.sendMQProductSearchCate(cateId,ProductSearchSort.TYPE_CD,2);  
290 - }  
291 - } catch (Exception e) {  
292 - LOGGER.error("失败:"+e.getMessage(),e);  
293 - msg = Message.failure();  
294 - }  
295 - return msg;  
296 - } 285 + @RequestMapping(value = "/savesort", method = RequestMethod.POST)
  286 + public
  287 + @ResponseBody
  288 + Message savesort(Long cateId, String pids, Model view) throws Exception {
  289 + Message msg = Message.success();
  290 + try {
  291 + if (org.apache.commons.lang3.StringUtils.isEmpty(pids)) {
  292 + return msg;
  293 + }
  294 + List<Long> pidsList = JSON.parseArray(pids, Long.class);
  295 + msg = productSearchSortService.save(cateId, ProductSearchSort.TYPE_CD, pidsList);
  296 + if ("success".equals(msg.getCode())) {
  297 + LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), pids).model("产地置顶排序商品").operation("添加").dataName("区域ID为" + cateId.toString() + " 商品为:" + pids).build());
  298 + topicProducer.sendMQProductSearchCate(cateId, ProductSearchSort.TYPE_CD, 2);
  299 + }
  300 + } catch (Exception e) {
  301 + LOGGER.error("失败:" + e.getMessage(), e);
  302 + msg = Message.failure();
  303 + }
  304 + return msg;
  305 + }
297 306
298 - @RequestMapping(value="/deletesort",method=RequestMethod.POST)  
299 - public @ResponseBody Message deletesort(Integer id, Long cateId, Model view) throws Exception{  
300 - Message msg = Message.success();  
301 - try {  
302 - ProductSearchSort productSearchSort = productSearchSortService.selectEntry(id);  
303 - if(productSearchSort==null){  
304 - return Message.failure("删除ID不存在！刷新后重新删除");  
305 - }  
306 - int result = productSearchSortService.deleteByKey(id);  
307 - if(result <= 0){  
308 - msg = Message.failure();  
309 - }else{  
310 - LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), id.toString()).model("产地置顶排序商品").operation("删除").dataName("区域ID为:"+id.toString()+" 商品为:"+ productSearchSort.getPid()).build());  
311 - topicProducer.sendMQProductSearchCate(cateId, ProductSearchSort.TYPE_CD,2);  
312 - }  
313 - } catch (Exception e) {  
314 - LOGGER.error("失败:"+e.getMessage(),e);  
315 - msg = Message.failure();  
316 - }  
317 - return msg;  
318 - } 307 + @RequestMapping(value = "/deletesort", method = RequestMethod.POST)
  308 + public
  309 + @ResponseBody
  310 + Message deletesort(Integer id, Long cateId, Model view) throws Exception {
  311 + Message msg = Message.success();
  312 + try {
  313 + ProductSearchSort productSearchSort = productSearchSortService.selectEntry(id);
  314 + if (productSearchSort == null) {
  315 + return Message.failure("删除ID不存在！刷新后重新删除");
  316 + }
  317 + int result = productSearchSortService.deleteByKey(id);
  318 + if (result <= 0) {
  319 + msg = Message.failure();
  320 + } else {
  321 + LogUtils.log(LogData.builder(PassportService.getCurrentUserName(), SourceType.Titan_Web.getName(), id.toString()).model("产地置顶排序商品").operation("删除").dataName("区域ID为:" + id.toString() + " 商品为:" + productSearchSort.getPid()).build());
  322 + topicProducer.sendMQProductSearchCate(cateId, ProductSearchSort.TYPE_CD, 2);
  323 + }
  324 + } catch (Exception e) {
  325 + LOGGER.error("失败:" + e.getMessage(), e);
  326 + msg = Message.failure();
  327 + }
  328 + return msg;
  329 + }
319 330
320 - @RequestMapping(value="/changesort",method=RequestMethod.POST)  
321 - public @ResponseBody Message changesort(Long id, Long cateId, Integer searchSort, Model view) throws Exception{  
322 - Message msg = Message.success();  
323 - try {  
324 - if(id == null || searchSort == null){  
325 - return Message.failure();  
326 - }  
327 - ProductSearchSort productSearchSort = new ProductSearchSort();  
328 - productSearchSort.setId(id);  
329 - productSearchSort.setSearchSort(searchSort);  
330 - int res = productSearchSortService.updateByKey(productSearchSort);  
331 - if(res <=0){  
332 - msg = Message.failure();  
333 - }else{  
334 - topicProducer.sendMQProductSearchCate(cateId,ProductSearchSort.TYPE_CD,2);  
335 - }  
336 - } catch (Exception e) {  
337 - LOGGER.error("失败:"+e.getMessage(),e);  
338 - msg = Message.failure();  
339 - }  
340 - return msg;  
341 - } 331 + @RequestMapping(value = "/changesort", method = RequestMethod.POST)
  332 + public
  333 + @ResponseBody
  334 + Message changesort(Long id, Long cateId, Integer searchSort, Model view) throws Exception {
  335 + Message msg = Message.success();
  336 + try {
  337 + if (id == null || searchSort == null) {
  338 + return Message.failure();
  339 + }
  340 + ProductSearchSort productSearchSort = new ProductSearchSort();
  341 + productSearchSort.setId(id);
  342 + productSearchSort.setSearchSort(searchSort);
  343 + int res = productSearchSortService.updateByKey(productSearchSort);
  344 + if (res <= 0) {
  345 + msg = Message.failure();
  346 + } else {
  347 + topicProducer.sendMQProductSearchCate(cateId, ProductSearchSort.TYPE_CD, 2);
  348 + }
  349 + } catch (Exception e) {
  350 + LOGGER.error("失败:" + e.getMessage(), e);
  351 + msg = Message.failure();
  352 + }
  353 + return msg;
  354 + }
342 } 355 }
343 \ No newline at end of file 356 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/web/controller/top/NhtopController.java
  View file @de9bb94
@@ -7,6 +7,7 @@ package com.dili.titan.web.controller.top; @@ -7,6 +7,7 @@ package com.dili.titan.web.controller.top;
7 import com.alibaba.fastjson.JSON; 7 import com.alibaba.fastjson.JSON;
8 import com.dili.titan.common.enums.SourceType; 8 import com.dili.titan.common.enums.SourceType;
9 import com.dili.titan.common.utils.web.BaseController; 9 import com.dili.titan.common.utils.web.BaseController;
  10 +import com.dili.titan.domain.*;
10 import com.dili.titan.domain.base.Result; 11 import com.dili.titan.domain.base.Result;
11 import com.dili.titan.domain.common.Message; 12 import com.dili.titan.domain.common.Message;
12 import com.dili.titan.domain.common.Page; 13 import com.dili.titan.domain.common.Page;
titan-web/src/main/java/com/dili/titan/web/controller/top/SctopController.java
  View file @de9bb94
@@ -6,9 +6,8 @@ package com.dili.titan.web.controller.top; @@ -6,9 +6,8 @@ package com.dili.titan.web.controller.top;
6 6
7 import com.alibaba.fastjson.JSON; 7 import com.alibaba.fastjson.JSON;
8 import com.dili.titan.common.enums.SourceType; 8 import com.dili.titan.common.enums.SourceType;
9 -import com.dili.titan.common.log.LogHelper;  
10 -import com.dili.titan.common.log.LogTypeEnum;  
11 import com.dili.titan.common.utils.web.BaseController; 9 import com.dili.titan.common.utils.web.BaseController;
  10 +import com.dili.titan.domain.*;
12 import com.dili.titan.domain.base.Result; 11 import com.dili.titan.domain.base.Result;
13 import com.dili.titan.domain.common.Message; 12 import com.dili.titan.domain.common.Message;
14 import com.dili.titan.domain.common.Page; 13 import com.dili.titan.domain.common.Page;
@@ -19,19 +18,20 @@ import com.dili.titan.service.ProductPopService; @@ -19,19 +18,20 @@ import com.dili.titan.service.ProductPopService;
19 import com.dili.titan.service.ProductSearchCateService; 18 import com.dili.titan.service.ProductSearchCateService;
20 import com.dili.titan.service.ProductSearchSortService; 19 import com.dili.titan.service.ProductSearchSortService;
21 import com.dili.titan.service.base.PassportService; 20 import com.dili.titan.service.base.PassportService;
22 -import com.dili.titan.utils.WebUtils;  
23 import com.dili.titan.web.CustomDateEditor; 21 import com.dili.titan.web.CustomDateEditor;
24 import com.diligrp.log.util.LogData; 22 import com.diligrp.log.util.LogData;
25 import com.diligrp.log.util.LogUtils; 23 import com.diligrp.log.util.LogUtils;
26 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp; 24 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp;
27 import org.apache.commons.collections.CollectionUtils; 25 import org.apache.commons.collections.CollectionUtils;
28 -import org.apache.commons.lang.StringUtils;  
29 import org.slf4j.Logger; 26 import org.slf4j.Logger;
30 import org.slf4j.LoggerFactory; 27 import org.slf4j.LoggerFactory;
31 import org.springframework.stereotype.Controller; 28 import org.springframework.stereotype.Controller;
32 import org.springframework.ui.Model; 29 import org.springframework.ui.Model;
33 import org.springframework.web.bind.WebDataBinder; 30 import org.springframework.web.bind.WebDataBinder;
34 -import org.springframework.web.bind.annotation.*; 31 +import org.springframework.web.bind.annotation.InitBinder;
  32 +import org.springframework.web.bind.annotation.RequestMapping;
  33 +import org.springframework.web.bind.annotation.RequestMethod;
  34 +import org.springframework.web.bind.annotation.ResponseBody;
35 import org.springframework.web.context.request.WebRequest; 35 import org.springframework.web.context.request.WebRequest;
36 import org.springframework.web.servlet.ModelAndView; 36 import org.springframework.web.servlet.ModelAndView;
37 37
@@ -355,7 +355,7 @@ public class SctopController extends BaseController{ @@ -355,7 +355,7 @@ public class SctopController extends BaseController{
355 if(res <=0){ 355 if(res <=0){
356 msg = Message.failure(); 356 msg = Message.failure();
357 }else{ 357 }else{
358 - topicProducer.sendMQProductSearchCate(cateId,ProductSearchSort.TYPE_SC,2); 358 + topicProducer.sendMQProductSearchCate(cateId, ProductSearchSort.TYPE_SC,2);
359 } 359 }
360 } catch (Exception e) { 360 } catch (Exception e) {
361 LOGGER.error("失败:"+e.getMessage(),e); 361 LOGGER.error("失败:"+e.getMessage(),e);
titan-web/src/main/resources/spring-config-dao.xml
  View file @de9bb94
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <property name="password" value="${slave.jdbc.password}"/> 44 <property name="password" value="${slave.jdbc.password}"/>
45 </bean> 45 </bean>
46 46
47 - <bean id="dynamicDataSource" class="DynamicDataSource"> 47 + <bean id="dynamicDataSource" class="com.dili.titan.common.datasource.DynamicDataSource">
48 <property name="masterDataSources"> 48 <property name="masterDataSources">
49 <map key-type="java.lang.String"> 49 <map key-type="java.lang.String">
50 <!-- write key从1,2,3...按顺序开始命名--> 50 <!-- write key从1,2,3...按顺序开始命名-->
@@ -62,12 +62,12 @@ @@ -62,12 +62,12 @@
62 <property name="defaultTargetDataSource" ref="masterDataSource"/> 62 <property name="defaultTargetDataSource" ref="masterDataSource"/>
63 </bean> 63 </bean>
64 64
65 - <bean id="manyDataSourceAspect" class="DataSourceAspect"> 65 + <bean id="manyDataSourceAspect" class="com.dili.titan.common.datasource.DataSourceAspect">
66 <property name="mastersCount" value="1"/> 66 <property name="mastersCount" value="1"/>
67 </bean> 67 </bean>
68 <aop:config> 68 <aop:config>
69 <aop:aspect id="c" ref="manyDataSourceAspect"> 69 <aop:aspect id="c" ref="manyDataSourceAspect">
70 - <aop:pointcut id="tx" expression="@within(DynamicSource)"/> 70 + <aop:pointcut id="tx" expression="@within(com.dili.titan.common.datasource.DynamicSource)"/>
71 <!--<aop:before pointcut-ref="tx" method="before"/>--> 71 <!--<aop:before pointcut-ref="tx" method="before"/>-->
72 <!--<aop:before pointcut-ref="tx" method="after"/>--> 72 <!--<aop:before pointcut-ref="tx" method="after"/>-->
73 <aop:around pointcut-ref="tx" method="around"/> 73 <aop:around pointcut-ref="tx" method="around"/>
titan-web/src/main/resources/spring-config-rpc.xml
  View file @de9bb94
@@ -16,10 +16,7 @@ @@ -16,10 +16,7 @@
16 <constructor-arg name="baseUrl" value="http://${dili_titan.website.url}/"></constructor-arg> 16 <constructor-arg name="baseUrl" value="http://${dili_titan.website.url}/"></constructor-arg>
17 </bean> 17 </bean>
18 18
19 - <bean id="crmClient" class="com.diligrp.crm.dataInterface.service.impl.CrmServiceImpl">  
20 - <constructor-arg name="token" value="123121"></constructor-arg>  
21 - <constructor-arg name="baseUrl" value="http://${crm.url}/"></constructor-arg>  
22 - </bean> 19 +
23 <bean id="userClient" class="com.yqyw.user.rpc.client.UserClient"> 20 <bean id="userClient" class="com.yqyw.user.rpc.client.UserClient">
24 <constructor-arg name="token" value="123121"></constructor-arg> 21 <constructor-arg name="token" value="123121"></constructor-arg>
25 <constructor-arg name="baseUrl" value="http://${user.url}/"></constructor-arg> 22 <constructor-arg name="baseUrl" value="http://${user.url}/"></constructor-arg>
titan-web/src/main/resources/spring-config-servlet.xml
  View file @de9bb94
@@ -94,11 +94,11 @@ @@ -94,11 +94,11 @@
94 <property name="assetsPath" value="http://titan.dili.com/assets" /> 94 <property name="assetsPath" value="http://titan.dili.com/assets" />
95 </bean> 95 </bean>
96 96
97 - <bean id="nullTool" class="NullTool" /> 97 + <bean id="nullTool" class="com.dili.titan.common.tools.NullTool" />
98 98
99 - <bean id="moneyUtils" class="com.diligrp.website.util.format.MoneyUtils" />  
100 -  
101 - <bean id="dateFormatUtils" class="DateFormatUtils" /> 99 + <bean id="moneyUtils" class="com.diligrp.website.util.format.MoneyUtils" />
  100 +
  101 + <bean id="dateFormatUtils" class="com.dili.titan.common.utils.web.DateFormatUtils" />
102 102
103 <bean id="velocityTools" class="java.util.HashMap"> 103 <bean id="velocityTools" class="java.util.HashMap">
104 <constructor-arg> 104 <constructor-arg>
titan-web/src/main/resources/sqlmap-config.xml
  View file @de9bb94
1 -<?xml version="1.0" encoding="UTF-8" ?> 1 +<?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE configuration PUBLIC "-//ibatis.apache.org//DTD Config 3.0//EN" "http://ibatis.apache.org/dtd/ibatis-3-config.dtd"> 2 <!DOCTYPE configuration PUBLIC "-//ibatis.apache.org//DTD Config 3.0//EN" "http://ibatis.apache.org/dtd/ibatis-3-config.dtd">
3 3
4 <configuration> 4 <configuration>
@@ -15,43 +15,43 @@ @@ -15,43 +15,43 @@
15 15
16 <!-- 全局别名设置，在映射文件中只需写别名，而不必写出整个类路径 --> 16 <!-- 全局别名设置，在映射文件中只需写别名，而不必写出整个类路径 -->
17 <typeAliases> 17 <typeAliases>
18 - <typeAlias type="Attribute" alias="attribute" />  
19 - <typeAlias type="AttributeValue" alias="attributeValue" />  
20 - <typeAlias type="Category" alias="category" />  
21 - <typeAlias type="CategoryAttr" alias="categoryAttr" /> 18 + <typeAlias type="com.dili.titan.domain.Attribute" alias="attribute" />
  19 + <typeAlias type="com.dili.titan.domain.AttributeValue" alias="attributeValue" />
  20 + <typeAlias type="com.dili.titan.domain.Category" alias="category" />
  21 + <typeAlias type="com.dili.titan.domain.CategoryAttr" alias="categoryAttr" />
22 <typeAlias type="com.dili.titan.domain.CategorySeo" alias="categorySeo" /> 22 <typeAlias type="com.dili.titan.domain.CategorySeo" alias="categorySeo" />
23 <typeAlias type="com.dili.titan.domain.ProductTemplete" alias="productTemplete" /> 23 <typeAlias type="com.dili.titan.domain.ProductTemplete" alias="productTemplete" />
24 - <typeAlias type="ProductAttr" alias="productAttr" />  
25 - <typeAlias type="ProductAttrValue" alias="productAttrValue" />  
26 - <typeAlias type="ProductImg" alias="productImg" /> 24 + <typeAlias type="com.dili.titan.domain.ProductAttr" alias="productAttr" />
  25 + <typeAlias type="com.dili.titan.domain.ProductAttrValue" alias="productAttrValue" />
  26 + <typeAlias type="com.dili.titan.domain.ProductImg" alias="productImg" />
27 <typeAlias type="com.dili.titan.domain.ProductPop" alias="productPop" /> 27 <typeAlias type="com.dili.titan.domain.ProductPop" alias="productPop" />
28 <typeAlias type="com.dili.titan.domain.ProductSkuPop" alias="productSkuPop" /> 28 <typeAlias type="com.dili.titan.domain.ProductSkuPop" alias="productSkuPop" />
29 <typeAlias type="com.dili.titan.domain.Templete" alias="templete" /> 29 <typeAlias type="com.dili.titan.domain.Templete" alias="templete" />
30 <typeAlias type="com.dili.titan.domain.SystemConfigure" alias="systemConfigure" /> 30 <typeAlias type="com.dili.titan.domain.SystemConfigure" alias="systemConfigure" />
31 - <typeAlias type="TitanSequence" alias="titanSequence" /> 31 + <typeAlias type="com.dili.titan.domain.common.TitanSequence" alias="titanSequence" />
32 <typeAlias type="com.dili.titan.domain.ProductPopAudit" alias="productPopAudit" /> 32 <typeAlias type="com.dili.titan.domain.ProductPopAudit" alias="productPopAudit" />
33 - <typeAlias type="ProductSku" alias="productSku" />  
34 - <typeAlias type="com.dili.titan.domain.ProductPopAttr" alias="productPopAttr" />  
35 - <typeAlias type="com.dili.titan.domain.ProductPopAttrValue" alias="productPopAttrValue" />  
36 - <typeAlias type="com.dili.titan.domain.CategoryTemplete" alias="categoryTemplete" />  
37 - <typeAlias type="com.dili.titan.domain.Image" alias="image" />  
38 - <typeAlias type="com.dili.titan.domain.ProductPopPriceRange" alias="productPopPriceRange" />  
39 - <typeAlias type="ProductSearchSort" alias="productSearchSort" />  
40 - <typeAlias type="com.dili.titan.domain.ProductSearchCate" alias="productSearchCate" />  
41 -  
42 - <typeAlias type="Auth" alias="auth" />  
43 - <typeAlias type="AuthScope" alias="authScope" />  
44 - <typeAlias type="ProductAuth" alias="productAuth" />  
45 - <typeAlias type="ProductVideo" alias="productVideo" />  
46 - <typeAlias type="com.dili.titan.domain.ProductOffline" alias="productOffline" />  
47 - <typeAlias type="com.dili.titan.domain.ProductOfflineAttrValue" alias="productOfflineAttrValue" />  
48 - <typeAlias type="Video" alias="video" /> 33 + <typeAlias type="com.dili.titan.domain.ProductSku" alias="productSku" />
  34 + <typeAlias type="com.dili.titan.domain.ProductPopAttr" alias="productPopAttr" />
  35 + <typeAlias type="com.dili.titan.domain.ProductPopAttrValue" alias="productPopAttrValue" />
  36 + <typeAlias type="com.dili.titan.domain.CategoryTemplete" alias="categoryTemplete" />
  37 + <typeAlias type="com.dili.titan.domain.Image" alias="image" />
  38 + <typeAlias type="com.dili.titan.domain.ProductPopPriceRange" alias="productPopPriceRange" />
  39 + <typeAlias type="com.dili.titan.domain.ProductSearchSort" alias="productSearchSort" />
  40 + <typeAlias type="com.dili.titan.domain.ProductSearchCate" alias="productSearchCate" />
49 41
50 - <typeAlias type="IndexCategory" alias="indexCategory" />  
51 - <!--供求需求-->  
52 - <typeAlias type="com.dili.titan.gq.domain.Purchase" alias="purchase" />  
53 - <typeAlias type="com.dili.titan.gq.domain.Supply" alias="supply" />  
54 - <typeAlias type="com.dili.titan.gq.domain.Presale" alias="presale" /> 42 + <typeAlias type="com.dili.titan.domain.Auth" alias="auth" />
  43 + <typeAlias type="com.dili.titan.domain.AuthScope" alias="authScope" />
  44 + <typeAlias type="com.dili.titan.domain.ProductAuth" alias="productAuth" />
  45 + <typeAlias type="com.dili.titan.domain.ProductVideo" alias="productVideo" />
  46 + <typeAlias type="com.dili.titan.domain.ProductOffline" alias="productOffline" />
  47 + <typeAlias type="com.dili.titan.domain.ProductOfflineAttrValue" alias="productOfflineAttrValue" />
  48 + <typeAlias type="com.dili.titan.domain.Video" alias="video" />
  49 +
  50 + <typeAlias type="com.dili.titan.domain.IndexCategory" alias="indexCategory" />
  51 + <!--供求需求-->
  52 + <typeAlias type="com.dili.titan.gq.domain.Purchase" alias="purchase" />
  53 + <typeAlias type="com.dili.titan.gq.domain.Supply" alias="supply" />
  54 + <typeAlias type="com.dili.titan.gq.domain.Presale" alias="presale" />
55 </typeAliases> 55 </typeAliases>
56 56
57 <!-- 映射文件路径 --> 57 <!-- 映射文件路径 -->
@@ -73,25 +73,25 @@ @@ -73,25 +73,25 @@
73 <mapper resource="sqlmap/SystemConfigure.xml" /> 73 <mapper resource="sqlmap/SystemConfigure.xml" />
74 <mapper resource="sqlmap/TitanSequence.xml" /> 74 <mapper resource="sqlmap/TitanSequence.xml" />
75 <mapper resource="sqlmap/SnapshotSku.xml" /> 75 <mapper resource="sqlmap/SnapshotSku.xml" />
76 - <mapper resource="sqlmap/CategoryTemplete.xml" />  
77 - <mapper resource="sqlmap/Image.xml" />  
78 - <mapper resource="sqlmap/ProductPopPriceRange.xml" />  
79 - <mapper resource="sqlmap/ProductSearchSort.xml"/>  
80 - <mapper resource="sqlmap/ProductSearchCate.xml"/>  
81 -  
82 - <mapper resource="sqlmap/Auth.xml"/>  
83 - <mapper resource="sqlmap/AuthScope.xml"/>  
84 - <mapper resource="sqlmap/ProductAuth.xml"/>  
85 - <mapper resource="sqlmap/ProductVideo.xml"/>  
86 - <mapper resource="sqlmap/ProductOffline.xml"/>  
87 - <mapper resource="sqlmap/ProductOfflineAttrValue.xml"/>  
88 - <mapper resource="sqlmap/Video.xml"/> 76 + <mapper resource="sqlmap/CategoryTemplete.xml" />
  77 + <mapper resource="sqlmap/Image.xml" />
  78 + <mapper resource="sqlmap/ProductPopPriceRange.xml" />
  79 + <mapper resource="sqlmap/ProductSearchSort.xml"/>
  80 + <mapper resource="sqlmap/ProductSearchCate.xml"/>
  81 +
  82 + <mapper resource="sqlmap/Auth.xml"/>
  83 + <mapper resource="sqlmap/AuthScope.xml"/>
  84 + <mapper resource="sqlmap/ProductAuth.xml"/>
  85 + <mapper resource="sqlmap/ProductVideo.xml"/>
  86 + <mapper resource="sqlmap/ProductOffline.xml"/>
  87 + <mapper resource="sqlmap/ProductOfflineAttrValue.xml"/>
  88 + <mapper resource="sqlmap/Video.xml"/>
89 89
90 - <mapper resource="sqlmap/IndexCategory.xml"/> 90 + <mapper resource="sqlmap/IndexCategory.xml"/>
91 91
92 - <!--供求需求-->  
93 - <mapper resource="sqlmap/gq/Purchase.xml"/>  
94 - <mapper resource="sqlmap/gq/Supply.xml"/>  
95 - <mapper resource="sqlmap/gq/Presale.xml"/> 92 + <!--供求需求-->
  93 + <mapper resource="sqlmap/gq/Purchase.xml"/>
  94 + <mapper resource="sqlmap/gq/Supply.xml"/>
  95 + <mapper resource="sqlmap/gq/Presale.xml"/>
96 </mappers> 96 </mappers>
97 </configuration> 97 </configuration>
98 \ No newline at end of file 98 \ No newline at end of file