b2c / titan · Commits

Commit a85423040340c5c552a4d78fbfb1ad5d28394298

Authored by alexyang
1 parent de9bb946

ini

Inline Side-by-side
Showing 11 changed files with 37 additions and 32 deletions
titan-api/pom.xml
  View file @a854230
... ... @@ -4,7 +4,7 @@
4 4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5 5 <modelVersion>4.0.0</modelVersion>
6 6  
7   - <groupId>com.dili</groupId>
  7 + <groupId>com.b2c.titan</groupId>
8 8 <artifactId>titan-api</artifactId>
9 9 <packaging>war</packaging>
10 10 <version>1.0</version>
... ...
titan-cache/pom.xml
  View file @a854230
... ... @@ -2,8 +2,8 @@
2 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 3 <modelVersion>4.0.0</modelVersion>
4 4  
5   - <groupId>com.dili.titan</groupId>
6   - <artifactId>titan-Sync</artifactId>
  5 + <groupId>com.b2c.titan</groupId>
  6 + <artifactId>titan-cache</artifactId>
7 7 <version>1.0</version>
8 8 <packaging>war</packaging>
9 9  
... ...
titan-sdk/pom.xml
  View file @a854230
... ... @@ -2,32 +2,15 @@
2 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 3 <modelVersion>4.0.0</modelVersion>
4 4  
5   -<!-- <groupId>com.yqyw.titan</groupId> -->
6   -<!-- <artifactId>titan-sdk</artifactId> -->
7   -<!-- <version>1.1.1.RELEASE</version> -->
8   -<!-- <packaging>jar</packaging> -->
9 5  
10   - <groupId>com.yqyw.titan</groupId>
  6 + <groupId>com.b2c.titan</groupId>
11 7 <artifactId>titan-sdk</artifactId>
12   - <version>0.0.2-SNAPSHOT</version>
  8 + <version>1.0-SNAPSHOT</version>
13 9 <packaging>jar</packaging>
14 10  
15 11 <name>titan-sdk</name>
16 12 <url>http://maven.apache.org</url>
17 13  
18   - <!--<distributionManagement>-->
19   - <!--<repository>-->
20   - <!--<id>central</id>-->
21   - <!--<name>libs-release</name>-->
22   - <!--<url>http://mvn2.diligrp.com/artifactory/libs-release-local</url>-->
23   - <!--</repository>-->
24   - <!--<snapshotRepository>-->
25   - <!--<id>snapshots</id>-->
26   - <!--<name>libs-snapshot</name>-->
27   - <!--<url>http://mvn2.diligrp.com/artifactory/libs-snapshot-local</url>-->
28   - <!--</snapshotRepository>-->
29   - <!--</distributionManagement>-->
30   -
31 14 <distributionManagement>
32 15 <snapshotRepository>
33 16 <id>nexus</id>
... ...
titan-web/pom.xml
  View file @a854230
... ... @@ -4,7 +4,7 @@
4 4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5 5 <modelVersion>4.0.0</modelVersion>
6 6  
7   - <groupId>com.dili</groupId>
  7 + <groupId>com.b2c.titan</groupId>
8 8 <version>1.0</version>
9 9 <artifactId>titan-web</artifactId>
10 10 <packaging>war</packaging>
... ... @@ -477,12 +477,12 @@
477 477 <!-- 数据库 -->
478 478 <dili_titan.jdbc.driver>com.mysql.jdbc.Driver</dili_titan.jdbc.driver>
479 479 <!-- 主库配置 -->
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>
  480 + <dili_titan.master.jdbc.url>jdbc:MySql://10.28.11.162:3306/titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url>
481 481 <dili_titan.master.jdbc.username>root</dili_titan.master.jdbc.username>
482 482 <dili_titan.master.jdbc.password>123456</dili_titan.master.jdbc.password>
483 483 <!-- 从库配置-->
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>
485   - <dili_titan.slave.jdbc.username>du</dili_titan.slave.jdbc.username>
  484 + <dili_titan.slave.jdbc.url>jdbc:MySql://10.28.11.162:3306/titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url>
  485 + <dili_titan.slave.jdbc.username>root</dili_titan.slave.jdbc.username>
486 486 <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password>
487 487 <!-- crm接口地址 -->
488 488 <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>
... ...
titan-web/src/main/java/com/dili/titan/web/controller/CategoryController.java
  View file @a854230
... ... @@ -676,13 +676,16 @@ public class CategoryController extends BaseController {
676 676 Category parent = null;
677 677 if(cat.getParent() == 0){
678 678 temp.put("isLast", false);
  679 + temp.put("level","1");
679 680 }else{
680 681 parent = categoryService
681 682 .selectEntry(cat.getParent());
682 683 if(parent.getParent() == 0){
  684 + temp.put("level","2");
683 685 temp.put("isLast", false);
684 686 }else{
685 687 temp.put("isLast", true);
  688 + temp.put("level","3");
686 689 }
687 690 }
688 691 if(cat.getActivate()==Category.SHOW_STATUS_ACTIVE){
... ...
titan-web/src/main/resources/sqlmap/Attribute.xml
  View file @a854230
1 1 <?xml version="1.0" encoding="UTF-8" ?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3 3 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4   -<mapper namespace="AttributeDao">
  4 +<mapper namespace="com.dili.titan.dao.AttributeDao">
5 5 <resultMap type="Attribute" id="attrResultMap">
6 6 <id property="id" column="id" />
7 7 <result property="name" column="name" />
... ... @@ -48,7 +48,7 @@
48 48 <!--<result property="scopeId" column="scope_id" />-->
49 49 <!--</collection>-->
50 50  
51   - <collection property="attrValue" ofType="attributeValue" javaType="ArrayList" column="{attrId=id}" select="AttributeValueDao.findByAttrId">
  51 + <collection property="attrValue" ofType="attributeValue" javaType="ArrayList" column="{attrId=id}" select="com.dili.titan.dao.AttributeValueDao.findByAttrId">
52 52 <id property="id" column="v_id" />
53 53 <result property="attrId" column="attr_id" />
54 54 <result property="value" column="value" />
... ...
titan-web/src/main/resources/sqlmap/AttributeValue.xml
  View file @a854230
1 1 <?xml version="1.0" encoding="UTF-8" ?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3 3 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4   -<mapper namespace="AttributeValueDao">
  4 +<mapper namespace="com.dili.titan.dao.AttributeValueDao">
5 5  
6 6 <!-- attribute_value 所有查询列 -->
7 7 <sql id="QUERY_COLUMN_LIST">
... ...
titan-web/src/main/resources/sqlmap/CategoryAttr.xml
  View file @a854230
... ... @@ -10,7 +10,7 @@
10 10 <result property="searchable" column="searchable" />
11 11 <result property="dealType" column="deal_type"/>
12 12 <result property="order" column="order" />
13   - <association property="attribute" column="{attrId=attrId}" javaType="attribute" select="AttributeDao.selectByAttrId"/>
  13 + <association property="attribute" column="{attrId=attrId}" javaType="attribute" select="com.dili.titan.dao.AttributeDao.selectByAttrId"/>
14 14 </resultMap>
15 15  
16 16 <!-- category_attr 所有查询列 -->
... ...
titan-web/src/main/resources/sqlmap/CategorySearchAttr.xml
  View file @a854230
... ... @@ -8,7 +8,7 @@
8 8 <result property="catId" column="cate_id" />
9 9 <result property="attrId" column="attr_id" />
10 10 <result property="order" column="order" />
11   - <association property="attribute" column="{attrId=attrId}" javaType="attribute" select="AttributeDao.selectByAttrId"/>
  11 + <association property="attribute" column="{attrId=attrId}" javaType="attribute" select="com.dili.titan.dao.AttributeDao.selectByAttrId"/>
12 12 </resultMap>
13 13  
14 14 <!-- category_search_attr 所有查询列 -->
... ...
titan-web/src/main/resources/sqlmap/Video.xml
  View file @a854230
1 1 <?xml version="1.0" encoding="UTF-8" ?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3 3 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4   -<mapper namespace="VideoDao">
  4 +<mapper namespace="com.dili.titan.dao.VideoDao">
5 5  
6 6 <!-- video 所有查询列 -->
7 7 <sql id="QUERY_COLUMN_LIST">
... ...
titan-web/src/main/webapp/WEB-INF/views/category/main.vm
  View file @a854230
... ... @@ -192,6 +192,18 @@
192 192 </span>
193 193 </li>
194 194 <li>
  195 + <span class="ar">分类图标：</span>
  196 + <span class="iupld">
  197 + <input name="image" type="file" id="uploadAddCategoryImg"
  198 + value="上传图片"
  199 + accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp"
  200 + class="uploadFile uploadBtn"/>
  201 + <!-- 使用标签请放置在 input 标签之后 -->
  202 + <img src="" id="addCategoryIcon" width="90" height="90"/>
  203 + <p id="error-add-category"></p>
  204 + </span>
  205 + </li>
  206 + <li>
195 207 <span class="ar">分类名称：</span>
196 208 <span>
197 209 <input type="text" class="itxt" value="" name="add-cate-name">
... ... @@ -209,6 +221,13 @@
209 221 <input type="text" class="itxt" value="" name="add-cate-parent" disabled="true">
210 222 </span>
211 223 </li>
  224 + </li>
  225 + <li>
  226 + <span class="ar">商品描述：</span>
  227 + <span>
  228 + <textarea cols="10" rows="10"></textarea>
  229 + </span>
  230 + </li>
212 231 </ul>
213 232 </div>
214 233 <div class="fancyft">
... ...