Merge branch 'feature/yc-0920-produce' into dev

src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandController.java

@@ -19,7 +19,7 @@ import java.util.Map;
  * 品牌相关接口
  */
 @RestController
-@RequestMapping("/product/brand")
+@RequestMapping("/produce/brand")
 public class BrandController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandSubmitController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * @version 2017年8月2日17:01:38 wangyc 完善注释
  */
 @RestController
-@RequestMapping("/product/brandSubmit")
+@RequestMapping("/produce/brandSubmit")
 public class BrandSubmitController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandVersionController.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @version 2017年8月2日17:01:38 wangyc 完善注释
  */
 @RestController
-@RequestMapping("/product/brandVersion")
+@RequestMapping("/produce/brandVersion")
 public class BrandVersionController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentController.java

@@ -24,7 +24,7 @@ import java.util.Map;
  * 器件接口
  */
 @RestController
-@RequestMapping("/product/component")
+@RequestMapping("/produce/component")
 public class ComponentController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentCrawlTaskController.java

@@ -17,7 +17,7 @@ import javax.transaction.Transactional;
  * 器件爬取任务接口
  */
 @RestController
-@RequestMapping("/product/crawlTask")
+@RequestMapping("/produce/crawlTask")
 public class ComponentCrawlTaskController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentSubmitController.java

@@ -36,7 +36,7 @@ import java.util.List;
  * @version 2017年8月2日17:41:00 wangyc 完善注释
  */
 @RestController
-@RequestMapping("/product/componentSubmit")
+@RequestMapping("/produce/componentSubmit")
 public class ComponentSubmitController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/component/controller/ComponentVersionController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @version 2017年8月2日17:49:02 wangyc 创建
  */
 @RestController
-@RequestMapping("/product/componentVersion")
+@RequestMapping("/produce/componentVersion")
 public class ComponentVersionController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/kind/controller/KindAdviceController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @version  2015年12月21日上午9:54:55 suntg 创建
  */
 @Controller
-@RequestMapping("/product/kindAdvice")
+@RequestMapping("/produce/kindAdvice")
 public class KindAdviceController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/kind/controller/KindContrastController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 2017年8月2日19:12:07 wangyc 创建
  */
 @RestController
-@RequestMapping("/product/kindContrast")
+@RequestMapping("/produce/kindContrast")
 public class KindContrastController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/kind/controller/KindController.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @version 2017年8月2日19:17:14 wangyc 创建
  */
 @RestController("product.KindController")
-@RequestMapping("/product/kind")
+@RequestMapping("/produce/kind")
 public class KindController {
 	@Autowired
 	private KindService kindService;

src/main/java/com/uas/platform/b2c/prod/product/property/controller/PropertyController.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @version 2017年8月2日19:39:19 wangyc 完善注释
  */
 @Controller
-@RequestMapping("/product/property")
+@RequestMapping("/produce/property")
 public class PropertyController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/property/controller/PropertySubmitController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @version 2017年8月2日19:40:12 wangyc 完善注释
  */
 @RestController
-@RequestMapping("/product/propertySubmit")
+@RequestMapping("/produce/propertySubmit")
 public class PropertySubmitController {
 
 	@Autowired

src/main/webapp/resources/js/admin/controllers/product/KindContrastDetailCtrl.js

@@ -127,7 +127,7 @@ define(['app/app'], function(app) {
 		$scope.upload = function() {
 			var file = $scope.myFiles[0];
 			$upload.upload({
-				url: 'product/componentSubmit/upload/componentCrawlsWithSame/' + $scope.kindContrast.id,
+				url: 'produce/componentSubmit/upload/componentCrawlsWithSame/' + $scope.kindContrast.id,
 				file: file,
 				method: 'POST'
 			}).success(function(data) {

src/main/webapp/resources/js/admin/controllers/product/UploadComponentCrawlCtrl.js

@@ -91,7 +91,7 @@ define(['app/app'], function(app) {
 		$scope.upload = function() {
 			var file = $scope.myFiles[0];
 			$upload.upload({
-				url: 'product/componentSubmit/upload/componentCrawls',
+				url: 'produce/componentSubmit/upload/componentCrawls',
 				file: file,
 				method: 'POST'
 			}).success(function(data) {
@@ -126,7 +126,7 @@ define(['app/app'], function(app) {
 		// 确认继续上传数据
 		var uploadToSame = function(myFile, kindContrastId) {
 			$upload.upload({
-				url: 'product/componentSubmit/upload/componentCrawlsWithSame/' + kindContrastId,
+				url: 'produce/componentSubmit/upload/componentCrawlsWithSame/' + kindContrastId,
 				file: myFile,
 				method: 'POST'
 			}).success(function(data) {

src/main/webapp/resources/js/common/query/brand.js

@@ -1,7 +1,7 @@
 define([ 'ngResource' ], function() {
 	angular.module('brandServices', [ 'ngResource' ]).factory('BrandsSubmit', ['$resource', function($resource) {
 		//获取BrandSubmit的分页数据
-		return $resource('product/brandSubmit', {}, {
+		return $resource('produce/brandSubmit', {}, {
 			//未审核
 			getUnAudited : {
 				params : { _state : 'unAudited'}
@@ -17,15 +17,15 @@ define([ 'ngResource' ], function() {
 		});
 	}]).factory('BrandSubmit', ['$resource', function($resource) {
 		//对单个BrandSubmit的操作
-		return $resource('product/brandSubmit/:id', {}, {
+		return $resource('produce/brandSubmit/:id', {}, {
 			//提交（保存）
 			submit : {
-				url : 'product/brandSubmit/saveBrandSubmit',
+				url : 'produce/brandSubmit/saveBrandSubmit',
 				method : 'POST'
 			},
 			//审核通过
 			valid : {
-				url : 'product/brandSubmit/audit',
+				url : 'produce/brandSubmit/audit',
 				method : 'PUT',
 				params : {
 					valid : true
@@ -33,7 +33,7 @@ define([ 'ngResource' ], function() {
 			},
 			//审核不通过
 			invalid : {
-				url : 'product/brandSubmit/audit/:id',
+				url : 'produce/brandSubmit/audit/:id',
 				method : 'PUT',
 				params : {
 					valid : false
@@ -41,34 +41,34 @@ define([ 'ngResource' ], function() {
 			},
 			// 审核通过信息冲突的更新申请
 			validUpdate : {
-				url : 'product/brandSubmit/audituUpdate',
+				url : 'produce/brandSubmit/audituUpdate',
 				method : 'PUT'
 			}
 		});
 	}]).factory('BrandVersion', ['$resource', function($resource) {
 		//获取根据uuid获取BrandVersion列表
-		return $resource('product/brandVersion/:uuid', {}, {
+		return $resource('produce/brandVersion/:uuid', {}, {
 			/*
 			 * get,根据uuid,version获取BrandVersion对象
 			 */
 			//根据uuid获取BrandVersion列表
 			getList : {
-				url : 'product/brandVersion/list/:uuid',
+				url : 'produce/brandVersion/list/:uuid',
 				method : 'GET',
 				isArray : true
 			},
 			//根据uuid获取BrandVersion名称
 			getCount : {
-				url : 'product/brandVersion/count/:uuid',
+				url : 'produce/brandVersion/count/:uuid',
 				method : 'GET'
 			}
 		});
 	}]).factory('BrandActive', ['$resource', function($resource) {
 		//对单个BrandActive对象操作
-		return $resource('product/brand/:uuid', {}, {
+		return $resource('produce/brand/:uuid', {}, {
 			//禁用BrandActive
 			disable : {
-				url : 'product/brand/disable/:uuid',
+				url : 'produce/brand/disable/:uuid',
 				method : 'PUT',
 				isArray : true
 			},
@@ -96,18 +96,18 @@ define([ 'ngResource' ], function() {
 			},
 			// 验证品牌名是否存在
 			nameExist : {
-				url: 'product/brand/nameExist',
+				url: 'produce/brand/nameExist',
 				method: 'GET',
 				isArray: true
 			},
 			// 更新与修改
 			update : {
-				url: 'product/brand/saveBrandActive',
+				url: 'produce/brand/saveBrandActive',
 				method: 'POST'
 			},
 			// 获取各月新增品牌数量
 			getIncreaseCount : {
-				url: 'product/brand/increaseCount',
+				url: 'produce/brand/increaseCount',
 				method: 'GET',
 				isArray: true
 			}
@@ -185,19 +185,19 @@ define([ 'ngResource' ], function() {
 		})
 	}]).factory('BrandDisable', ['$resource', function($resource) {
 		//对BrandDisable禁用品牌的操作
-		return $resource('product/brandDisable/:uuid', {}, {
+		return $resource('produce/brandDisable/:uuid', {}, {
 			/**
 			 * get, 根据uuid获取BrandDisable
 			 */
 			// 获取全部已禁用品牌的简要信息
 			getSimpleInfo : {
-				url: 'product/brandDisable/info',
+				url: 'produce/brandDisable/info',
 				method: 'GET',
 				isArray: true
 			},
 			// 分页获取全部已禁用品牌的简要信息
 			getSimpleInfoPage : {
-				url: 'product/brandDisable/info/ByPage',
+				url: 'produce/brandDisable/info/ByPage',
 				method: 'GET'
 			}
 		});

src/main/webapp/resources/js/common/query/component.js

@@ -1,7 +1,7 @@
 define([ 'ngResource' ], function() {
 	angular.module('componentServices', [ 'ngResource' ]).factory('ComponentsSubmit', ['$resource', function($resource) {
 		//获取ComponentSubmit的分页数据
-		return $resource('product/componentSubmit', {}, {
+		return $resource('produce/componentSubmit', {}, {
 			//未审核
 			getUnAudited : {
 				params : { _state : 'unAudited'}
@@ -17,13 +17,13 @@ define([ 'ngResource' ], function() {
 		});
 	}]).factory('ComponentSubmit', ['$resource', function($resource) {
 		//对单个ComponentSubmit的操作
-		return $resource('product/componentSubmit/:id', {}, {
+		return $resource('produce/componentSubmit/:id', {}, {
 			/**
 			 * get,根据uuid查找ComponentSubmit详细信息
 			 */
 			//审核通过
 			valid : {
-				url : 'product/componentSubmit/audit',
+				url : 'produce/componentSubmit/audit',
 				method : 'PUT',
 				params : {
 					valid : true
@@ -31,7 +31,7 @@ define([ 'ngResource' ], function() {
 			},
 			//审核不通过
 			invalid : {
-				url : 'product/componentSubmit/audit/:id',
+				url : 'produce/componentSubmit/audit/:id',
 				method : 'PUT',
 				params : {
 					valid : false
@@ -39,122 +39,122 @@ define([ 'ngResource' ], function() {
 			},
 			// 下载批量器件建档模板
 			downloadExcel : {
-				url : 'product/componentSubmit/template',
+				url : 'produce/componentSubmit/template',
 				method : 'POST'
 			},
 			// 未审核批量申请（用户）
 			unAuditedBatch : {
-				url : 'product/componentSubmit/batch',
+				url : 'produce/componentSubmit/batch',
 				method : 'GET',
 				params : { _status : 'unAudited'}
 			},
 			// 已通过批量申请（用户）
 			passBatch : {
-				url : 'product/componentSubmit/batch',
+				url : 'produce/componentSubmit/batch',
 				method : 'GET',
 				params : { _status : 'pass'}
 			},
 			// 全部批量申请（用户）
 			allBatch : {
-				url : 'product/componentSubmit/batch',
+				url : 'produce/componentSubmit/batch',
 				method : 'GET',
 				params : { _status : 'all'}
 			},
 			// 未通过批量申请（用户）
 			forbiddenBatch : {
-				url : 'product/componentSubmit/batch',
+				url : 'produce/componentSubmit/batch',
 				method : 'GET',
 				params : { _status : 'forbidden'}
 			},
 			// 全部批量申请（后台）
 			allBatchManage : {
-				url : 'product/componentSubmit/manage/batch',
+				url : 'produce/componentSubmit/manage/batch',
 				method : 'GET',
 				params : { _status : 'all'}
 			},
 			// 未审核批量申请（后台）
 			unAuditedBatchManage : {
-				url : 'product/componentSubmit/manage/batch',
+				url : 'produce/componentSubmit/manage/batch',
 				method : 'GET',
 				params : { _status : 'unAudited'}
 			},
 			// 已通过批量申请（后台）
 			passBatchManage : {
-				url : 'product/componentSubmit/manage/batch',
+				url : 'produce/componentSubmit/manage/batch',
 				method : 'GET',
 				params : { _status : 'pass'}
 			},
 			// 未通过批量申请（后台）
 			forbiddenBatchManage : {
-				url : 'product/componentSubmit/manage/batch',
+				url : 'produce/componentSubmit/manage/batch',
 				method : 'GET',
 				params : { _status : 'forbidden'}
 			},
 			// 获取批量申请详情
 			getBatchDetails : {
-				url : 'product/componentSubmit/batch/:submitId',
+				url : 'produce/componentSubmit/batch/:submitId',
 				method : 'GET'
 			},
 			// 批量器件建档审核通过
 			auditBatch : {
-				url : 'product/componentSubmit/audit/batch',
+				url : 'produce/componentSubmit/audit/batch',
 				method : 'PUT'
 			},
 			// 批量器件建档审核不通过
 			unAuditBatch : {
-				url : 'product/componentSubmit/unAudit/batch',
+				url : 'produce/componentSubmit/unAudit/batch',
 				method : 'PUT'
 			},
 			// 获取尚未处理的建档申请
 			tobe_handleTask : {
-				url : 'product/componentSubmit/getDetail/batch',
+				url : 'produce/componentSubmit/getDetail/batch',
 				method : 'GET',
 				params : {_status : 'tobe_handle'}
 			},
 			// 获取任务中的建档申请
 			pendingTask : {
-				url : 'product/componentSubmit/getDetail/batch',
+				url : 'produce/componentSubmit/getDetail/batch',
 				method : 'GET',
 				params : {_status : 'pending'}
 			},
 			// 获取已完成的建档申请
 			completeTask : {
-				url : 'product/componentSubmit/getDetail/batch',
+				url : 'produce/componentSubmit/getDetail/batch',
 				method : 'GET',
 				params : {_status : 'complete'}
 			},
 			// 获取爬取失败的建档申请
 			failedTask : {
-				url : 'product/componentSubmit/getDetail/batch',
+				url : 'produce/componentSubmit/getDetail/batch',
 				method : 'GET',
 				params : {_status : 'failed'}
 			},
 			// 选取用户申请发起任务
 			saveTask : {
-				url : 'product/componentSubmit/task',
+				url : 'produce/componentSubmit/task',
 				method : 'POST'
 			},
 			// 用户直接提交批量建档申请
 			saveSubmits : {
-				url : 'product/componentSubmit/submitBatch',
+				url : 'produce/componentSubmit/submitBatch',
 				method : 'POST'
 			}
 		});
 	}]).factory('ComponentVersion', ['$resource', function($resource) {
 		//获取根据uuid获取ComponentVersion列表
-		return $resource('product/componentVersion/:uuid', {}, {
+		return $resource('produce/componentVersion/:uuid', {}, {
 			/**
 			 * get,根据uuid,version获取ComponentVersion对象
 			 */
 			//根据uuid获取ComponentVersion列表
 			getList : {
-				url : 'product/componentVersion/list/:uuid',
+				url : 'produce/componentVersion/list/:uuid',
 				method : 'GET',
 				isArray : true
 			},
 			//根据uuid获取ComponentVersion数量
 			getCount : {
-				url : 'product/componentVersion/count/:uuid',
+				url : 'produce/componentVersion/count/:uuid',
 				method : 'GET'
 			}
 		});
@@ -171,7 +171,7 @@ define([ 'ngResource' ], function() {
 			},
 			//获取ComponentInfo的分页数据
 			getInfoPage: {
-				url: 'product/component/list',
+				url: 'produce/component/list',
 				method: 'GET'
 			},
 			// 根据UUid获取单个器件的简要信息
@@ -193,7 +193,7 @@ define([ 'ngResource' ], function() {
 			},
 			// 禁用ComponentActive
 			disable : {
-				url : 'product/component/:uuid/disable',
+				url : 'produce/component/:uuid/disable',
 				method : 'PUT'
 			},
 			// 根据UUid 获取列表
@@ -204,16 +204,16 @@ define([ 'ngResource' ], function() {
 			},
 			//根据批次号获取器件信息
 			getByBatchCode: {
-				url : 'product/component/:batchCode/detail',
+				url : 'produce/component/:batchCode/detail',
 				method : 'GET'
 			},//根据原厂型号和品牌获取器件信息
 			getByCodeAndBrandId: {
-				url: 'product/component/codeAndBrandId/:code',
+				url: 'produce/component/codeAndBrandId/:code',
 				method: 'GET',
 				isArray: true
 			},//根据原厂型号和类目获取器件信息
 			getByCodeAndKindId: {
-				url: 'product/component/codeAndKindId/:code',
+				url: 'produce/component/codeAndKindId/:code',
 				method: 'GET',
 				isArray: true
 			},
@@ -243,31 +243,31 @@ define([ 'ngResource' ], function() {
 			},
 			// 根据类目id获取封装规格
 			getPackagingByKindid: {
-				url: 'product/component/packaging/:kindid',
+				url: 'produce/component/packaging/:kindid',
 				method: 'GET',
 				isArray: true
 			},
 			// 批量修改器件类目
 			moveCmp: {
-				url: 'product/component/moveCmp',
+				url: 'produce/component/moveCmp',
 				method: 'PUT',
 				isArray : true
 			},
 			// 获取每月器件增长数量
 			getIncreaseCount: {
-				url: 'product/component/increaseCount',
+				url: 'produce/component/increaseCount',
 				method: 'GET',
 				isArray: true
 			}
 		});
 	}]).factory('ComponentDisable', ['$resource', function($resource) {
-		return $resource('product/componentDisable/:uuid', {}, {
+		return $resource('produce/componentDisable/:uuid', {}, {
 			/*
 			 * get 根据uuid获得ComponentDisable
 			 */
 			// 分页获取全部已禁用器件的简要信息
 			getSimpleInfoPage : {
-				url: 'product/componentDisable/info/ByPage',
+				url: 'produce/componentDisable/info/ByPage',
 				method: 'GET'
 			}
 		})
@@ -296,13 +296,13 @@ define([ 'ngResource' ], function() {
 			}
 		});
 	}]).factory('ComponentTest', ['$resource', function($resource) {
-		return $resource('product/component/:uuid', {}, {
+		return $resource('produce/component/:uuid', {}, {
 			/*
 			 * get 获ComponentsActive的分页数据，根据uuid获得ComponentActive
 			 */
 			//获取ComponentActive的分页数据
 			getInfoPage: {
-				url: 'product/component/info',
+				url: 'produce/component/info',
 				method: 'GET'
 			}
 		});

src/main/webapp/resources/js/common/query/crawlTask.js

@@ -1,67 +1,67 @@
 define([ 'ngResource' ], function() {
 	angular.module('crawlTaskServices', [ 'ngResource' ]).factory('CrawlTask', ['$resource', function($resource) {
 		//获取数据爬取的分页数据
-		return $resource('product/crawlTask', {}, {
+		return $resource('produce/crawlTask', {}, {
 			// 获取未完成的任务
 			to_crawl : {
-				url : 'product/crawlTask',
+				url : 'produce/crawlTask',
 				method : 'GET',
 				params : {_status : 'to_crawl'}
 			},
 			// 获取进行中的任务
 			running : {
-				url : 'product/crawlTask',
+				url : 'produce/crawlTask',
 				method : 'GET',
 				params : {_status : 'running'}
 			},
 			// 获取已完成的任务
 			crawled : {
-				url : 'product/crawlTask',
+				url : 'produce/crawlTask',
 				method : 'GET',
 				params : {_status : 'crawled'}
 			},
 			// 获取失败的任务
 			failed : {
-				url : 'product/crawlTask',
+				url : 'produce/crawlTask',
 				method : 'GET',
 				params : {_status : 'failed'}
 			},
 			// 新增任务（来自参数对应关系）
 			save : {
-				url : 'product/crawlTask/:id',
+				url : 'produce/crawlTask/:id',
 				method : 'POST'
 			},
 			// 新增任务（来自用户申请列表）
 			saveBySubmit : {
-				url : 'product/crawlTask/saveBySubmit/:ids',
+				url : 'produce/crawlTask/saveBySubmit/:ids',
 				method : 'POST'
 			},
 			// 根据id获取任务详情
 			getOne : {
-				url : 'product/crawlTask/:id',
+				url : 'produce/crawlTask/:id',
 				method : 'GET'
 			},
 			// 任务开启
 			crawlStart : {
-				url : 'product/crawlTask/crawl',
+				url : 'produce/crawlTask/crawl',
 				params : { _status : 'start'},
 				method : 'PUT'
 			},
 			// 任务完成
 			crawlSuccess : {
-				url : 'product/crawlTask/crawl',
+				url : 'produce/crawlTask/crawl',
 				params : { _status : 'success'},
 				method : 'PUT'
 			},
 			// 任务异常
 			crawlFail : {
-				url : 'product/crawlTask/crawl',
+				url : 'produce/crawlTask/crawl',
 				params : { _status : 'fail'},
 				method : 'PUT'
 			},
 			// 获取已完成任务的维护器件列表
 			getCmpList : {
-				url : 'product/crawlTask/cmpList',
+				url : 'produce/crawlTask/cmpList',
 				method : 'GET'
 			}
 		});

src/main/webapp/resources/js/common/query/kind.js

@@ -1,31 +1,31 @@
 define([ 'ngResource'], function() {
 	angular.module('common.query.kind', [ 'ngResource' ]).factory('Kind', ['$resource', '$cacheFactory', function($resource, $cacheFactory) {
 		var cache = $cacheFactory('Kind');
-		return $resource('product/kind/:kindIds', {}, {
+		return $resource('produce/kind/:kindIds', {}, {
 			// 修改分类的属性
 			updateProperties: {
-				url: 'product/kind/:kindId/properties',
+				url: 'produce/kind/:kindId/properties',
 				method: 'POST',
 				isArray: true
 			},
 			//重置类属性值
 			resetKindPropertyValues: {
-				url: 'product/kind/kindPropertyValues/reset',
+				url: 'produce/kind/kindPropertyValues/reset',
 				method:  'GET'
 			},
 			// 编辑修改
 			update: {
-				url: 'product/kind/:kindId',
+				url: 'produce/kind/:kindId',
 				method: 'POST'
 			},
 			// 新增保存
 			save: {
-				url: 'product/kind',
+				url: 'produce/kind',
 				method: 'POST'
 			},
 			// 交换序号
 			exchangeNumber: {
-				url: 'product/kind/number',
+				url: 'produce/kind/number',
 				method: 'POST',
 				params: {
 					operate: 'exchange'
@@ -33,28 +33,28 @@ define([ 'ngResource'], function() {
 			},
 			// 删除类目属性
 			deleteKindProperty: {
-				url: 'product/kind/kindProperty/:kindPropertyId',
+				url: 'produce/kind/kindProperty/:kindPropertyId',
 				method: 'DELETE',
 			},
 			// 添加类目属性
 			addKindProperty: {
-				url: 'product/kind/kindProperty/add',
+				url: 'produce/kind/kindProperty/add',
 				method: 'PUT'
 			},
 			// 修改类目属性具体值
 			updateKindProperty: {
-				url: 'product/kind/kindProperty/update',
+				url: 'produce/kind/kindProperty/update',
 				method: 'PUT'
 			},
 			// 改变类目属性顺序
 			changeDetno: {
-				url: 'product/kind/kindProperty/changeDetno',
+				url: 'produce/kind/kindProperty/changeDetno',
 				method: 'PUT',
 				isArray: true
 			},
 			// 更换类目属性
 			changeKindProperty: {
-				url: 'product/kind/kindProperty/changeKindProperty',
+				url: 'produce/kind/kindProperty/changeKindProperty',
 				method: 'PUT'
 			}
 		});

src/main/webapp/resources/js/common/query/kindAdvice.js

@@ -5,7 +5,7 @@ define([ 'ngResource'], function() {
 	angular.module('common.query.kindAdvice', [ 'ngResource'
 	]).factory('KindAdvice', ['$resource', '$cacheFactory', function($resource, $cacheFactory) {
 		var cache = $cacheFactory('KindAdvice');
-		return $resource('product/kindAdvice/:id', {}, {
+		return $resource('produce/kindAdvice/:id', {}, {
 			
 		});
 	}]);

src/main/webapp/resources/js/common/query/kindContrast.js

@@ -1,66 +1,66 @@
 define([ 'ngResource' ], function() {
 	angular.module('kindContrastServices', [ 'ngResource' ]).factory('KindContrast', ['$resource', function($resource) {
 		//获取属性对应关系的分页数据
-		return $resource('product/kindContrast', {}, {
+		return $resource('produce/kindContrast', {}, {
 			// 获取全部参数对照规则
 			all: {
-				url : 'product/kindContrast',
+				url : 'produce/kindContrast',
 				method : 'GET',
 				params : {_status : 'all'}
 			},
 			// 获取待发起参数对照规则
 			outTask: {
-				url : 'product/kindContrast',
+				url : 'produce/kindContrast',
 				method : 'GET',
 				params : {_status : 'outTask'}
 			},
 			// 获取全部参数对照规则
 			inTask: {
-				url : 'product/kindContrast',
+				url : 'produce/kindContrast',
 				method : 'GET',
 				params : {_status : 'inTask'}
 			},
 			// 获取任务进行中的参数对应规则
 			running : {
-				url : 'product/kindContrast',
+				url : 'produce/kindContrast',
 				method : 'GET',
 				params : {_status : 'running'}
 			},
 			// 获取已结案的参数对应规则
 			concluded : {
-				url : 'product/kindContrast',
+				url : 'produce/kindContrast',
 				method : 'GET',
 				params : {_status : 'concluded'}
 			},
 			// 获取异常参数对应关系规则
 			failed : {
-				url : 'product/kindContrast',
+				url : 'produce/kindContrast',
 				method : 'GET',
 				params : {_status : 'failed'}
 			},
  			// 获取参数对照规则详情
 			getOne : {
-				url : 'product/kindContrast/:id',
+				url : 'produce/kindContrast/:id',
 				method : 'GET'
 			},
 			// 更新基础属性
 			updateBasic : {
-				url : 'product/kindContrast/update/basic',
+				url : 'produce/kindContrast/update/basic',
 				method : 'PUT'
 			},
 			// 更新参数对照
 			updateProperty : {
-				url : 'product/kindContrast/update/property',
+				url : 'produce/kindContrast/update/property',
 				method : 'PUT'
 			},
 			// 新增参数对照明细
 			newProperty : {
-				url : 'product/kindContrast/create/property',
+				url : 'produce/kindContrast/create/property',
 				method : 'PUT'
 			},
 			// 删除参数对照
 			deleteOne : {
-				url : 'product/kindContrast/:id',
+				url : 'produce/kindContrast/:id',
 				method : 'DELETE'
 			}
 		});

src/main/webapp/resources/js/common/query/property.js

@@ -1,53 +1,53 @@
 define([ 'ngResource' ], function() {
 	angular.module('propertyServices', [ 'ngResource' ]).factory('Property', ['$resource', function($resource) {
-		return $resource('product/property/:id', {}, {
+		return $resource('produce/property/:id', {}, {
 			// 根据id获取属性信息
 			get : {
-				url : 'product/property/:id',
+				url : 'produce/property/:id',
 				method : 'GET'
 			},
 			//获得所有属性数据
 			getProperties : {
-				url : 'product/property',
+				url : 'produce/property',
 				method : 'GET',
 				isArray: true
 			},
 			// 分页获取所有属性
 			getPropertiesPage : {
-				url : 'product/property/pageInfo',
+				url : 'produce/property/pageInfo',
 				method : 'GET'
 			},
 			// 添加属性
 			add : {
-				url : 'product/property',
+				url : 'produce/property',
 				method : 'POST'
 			},
 			// 更新属性
 			update : {
-				url : 'product/property/update',
+				url : 'produce/property/update',
 				method : 'POST'
 			}
 		});
 	}]).factory('propertiesSubmit', ['$resource', function($resource) {
 		//获取ComponentSubmit的数据
-		return $resource('product/propertySubmit', {}, {
+		return $resource('produce/propertySubmit', {}, {
 			//根据ComponentSubmit.id查找对应的propertiesSubmit
 			getList : {
-				url : 'product/propertySubmit/:id',
+				url : 'produce/propertySubmit/:id',
 				method : 'GET',
 				isArray : true
 			},
 			getPropertySubmit : {
-				url : 'product/propertySubmit/property',
+				url : 'produce/propertySubmit/property',
 				method : 'GET'
 			}
 		});
 	}]).factory('propertiesActive', ['$resource', function($resource) {
 		//获取propertiesActive的数据
-		return $resource('product/propertyActive', {}, {
+		return $resource('produce/propertyActive', {}, {
 			//根据ComponentActive.id查找对应的propertiesActive
 			getList : {
-				url : 'product/propertyActive/:id',
+				url : 'produce/propertyActive/:id',
 				method : 'GET',
 				isArray : true
 			}

src/main/webapp/resources/js/common/query/propertyAdvice.js

@@ -5,7 +5,7 @@ define([ 'ngResource'], function() {
 	angular.module('common.query.propertyAdvice', [ 'ngResource'
 	]).factory('PropertyAdvice', ['$resource', '$cacheFactory', function($resource, $cacheFactory) {
 		var cache = $cacheFactory('PropertyAdvice');
-		return $resource('product/propertyAdvice/:id', {}, {
+		return $resource('produce/propertyAdvice/:id', {}, {
 			
 		});
 	}]);

src/main/webapp/resources/js/prod/controllers/InfoCtrl.js

@@ -80,7 +80,7 @@ define([ 'app/app', 'jquery-summernote' ], function(app) {
 				
 				// 不是通过路由过来的，再检查地址栏的参数kindIds
 				if($location.search().kindIds && /^(\d{1,}_)*(\d){1,}$/.test($location.search().kindIds)) {
-					$http.get('product/kinds/' + $location.search().kindIds.replace(/_/g, ','), {
+					$http.get('produce/kinds/' + $location.search().kindIds.replace(/_/g, ','), {
 						cache: $templateCache
 					}).success(function(kinds){
 						if(kinds.length > 0 && kinds.last().isLeaf) {

src/main/webapp/resources/js/prod/controllers/MgrCtrl.js

@@ -6,7 +6,7 @@ define(['app/app'], function(app) {
 		// 不是通过路由过来的，再检查地址栏的参数kindIds
 		if(!$scope.productKinds && $stateParams.kindIds && 
 				/^(\d{1,}_)*(\d){1,}$/.test($stateParams.kindIds)) {
-			$http.get('product/kinds/' + $stateParams.kindIds.replace(/_/g, ','), {
+			$http.get('produce/kinds/' + $stateParams.kindIds.replace(/_/g, ','), {
 				cache: $templateCache
 			}).success(function(kinds){
 				if(kinds.length > 0 && kinds.last().isLeaf) {
@@ -33,7 +33,7 @@ define(['app/app'], function(app) {
 		 */
 		var getKindProperties = function(kindId) {
 			setLoading(true);
-			$http.get('product/kinds/' + kindId + '/properties').success(function(response){
+			$http.get('produce/kinds/' + kindId + '/properties').success(function(response){
 				$scope.properties = response;
 				setLoading(false);
 			});
@@ -140,7 +140,7 @@ define(['app/app'], function(app) {
 					data.push(_p);
 				});
 				setLoading(true);
-				$http.post('product/kinds/' + kindId + '/properties', data).success(function(response){
+				$http.post('produce/kinds/' + kindId + '/properties', data).success(function(response){
 					setLoading(false);
 					toaster.pop('success', '提示', '保存成功！');
 					$scope.properties = response;
@@ -237,7 +237,7 @@ define(['app/app'], function(app) {
 			} ]
 		} ];
 		var getCategories = function(parentId) {
-			return $http.get('product/kinds/' + parentId + '/children_all');
+			return $http.get('produce/kinds/' + parentId + '/children_all');
 		};
 		getCategories(0).success(function(response) {
 			var cates = [];

src/main/webapp/resources/js/vendor/controllers/ComponentBatchCreateCtrl.js

@@ -282,14 +282,14 @@ define(['app/app'], function(app) {
 					return;
 				}
 			}
-			downloadByJs('product/componentSubmit/template', $scope.submits);
+			downloadByJs('produce/componentSubmit/template', $scope.submits);
 		};
 		
 		// 上传Excel批量发布（大量）
 		$scope.upload = function() {
 			var file = $scope.myFiles[0];
 			$upload.upload({
-				url: 'product/componentSubmit/upload/excel',
+				url: 'produce/componentSubmit/upload/excel',
 				file: file,
 				method: 'POST'
 			}).success(function(data) {

src/main/webapp/resources/js/vendor/controllers/PutOnCtrl.js

@@ -134,7 +134,7 @@ define([ 'app/app'], function(app) {
 			}).result.then(function(data){
 				$scope.active = data.active;
 				/*$scope.actives = data.actives;*/
-				window.location.href = 'product/kind/' + $scope.active.id + '/putOn';
+				window.location.href = 'produce/kind/' + $scope.active.id + '/putOn';
 			}, function(){
 
 			});

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_component_batchapply_ctrl.js

@@ -280,14 +280,14 @@ define(['app/app'], function(app) {
                     return;
                 }
             }
-            downloadByJs('product/componentSubmit/template', $scope.submits);
+            downloadByJs('produce/componentSubmit/template', $scope.submits);
         };
 
         // 上传Excel批量发布（大量）
         $scope.upload = function() {
             var file = $scope.myFiles[0];
             $upload.upload({
-                url: 'product/componentSubmit/upload/excel',
+                url: 'produce/componentSubmit/upload/excel',
                 file: file,
                 method: 'POST'
             }).success(function(data) {