品牌映射处理和打印地址更换

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

@@ -28,7 +28,7 @@ import java.util.Map;
  * @author hulh
  */
 @RestController
-@RequestMapping("/product/brandMap")
+@RequestMapping("/produce/brandMap")
 public class BrandMapController {
 
 	@Autowired

src/main/resources/prod/sys.properties

@@ -23,7 +23,7 @@ returnUrl=https://www.usoftmall.com/api/yesreturn
 paymentPrice=prod
 orderProxyUrl=https://www.usoftmall.com/order/proxy
 #report url
-reportPrintUrl=http://print.ubtob.com/report/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
+reportPrintUrl=https://print.usoftmall.com/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C
 # micro service IP(Swarm Manager IP)
 microServiceIp=10.10.100.23
@@ -31,7 +31,7 @@ newsMicroServiceIp=news.usoftchina.com
 newsRedisRefresh=3600
 floorMicroServiceIp=10.10.0.30
 carouselMicroServiceIp=10.10.0.188
-storecmsMicroServiceIp=10.10.0.30
+storecmsMicroServiceIp=10.10.0.30s
 endpointUri=10.10.100.23
 recommendPort=20100
 # upload file

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -148,8 +148,8 @@
 			<li class="nav-node"><a href="#audit/bankinfo"><i class="fa fa-bank"></i><span> 银行账户信息</span></a></li>
 
 			<li class="nav-header">维护</li>
-			<!--<li class="nav-node"><a href="#/brand/map"><i-->
-					<!--class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>-->
+			<li class="nav-node"><a href="#/brand/map"><i
+					class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>
 			<li class="nav-node"><a href="#/store/company"><i
 					class="fa fa-flag"></i><span> 寄售管理</span></a></li>
 			<li class="nav-node"><a href="#/store/list"><i

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

@@ -32,7 +32,7 @@ define(['app/app'], function(app) {
 		};
 
 		var exportByAjax = function () {
-			var url = 'product/brandMap/export';
+			var url = 'produce/brandMap/export';
 			var strArray = [];
 			if ($scope.keyword && $scope.keyword.length > 0){
 				var wordStr = "keyword=" + $scope.keyword;
@@ -71,7 +71,7 @@ define(['app/app'], function(app) {
 		var getDownLoadStatus = function () {
 			Loading.show();
 			$.ajax({
-				url : 'product/brandMap/export',
+				url : 'produce/brandMap/export',
 				data : {isAjax : true},
 				method : 'POST',
 				dataType : 'json',

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

@@ -208,14 +208,14 @@ define([ 'ngResource' ], function() {
 		});
 	}]).factory('BrandMap', ['$resource', function ($resource) {
 		//品牌映射关系相关操作
-		return $resource('product/brandMap', {}, {
+		return $resource('produce/brandMap', {}, {
 			//分页获取品牌映射关系
 			getPageOfBrandMap : {
-				url: 'product/brandMap/page',
+				url: 'produce/brandMap/page',
 				method: 'GET'
 			},
 			addOneBrandMap : {
-				url: 'product/brandMap/addOne',
+				url: 'produce/brandMap/addOne',
 				method: 'POST'
 			}
 		});