Merge remote-tracking branch 'origin/developerB' into developerB

src/main/java/com/caimei/modules/weisha/web/CmOrganizeProductController.java

@@ -132,7 +132,7 @@ public class CmOrganizeProductController extends BaseController {
 	 */
 	@RequestMapping(value = "updateStatus")
 	@ResponseBody
-	public Map<String,Object> addProducts(Integer organizeId, Integer id, Integer status, RedirectAttributes redirectAttributes) {
+	public Map<String,Object> updateStatus(Integer id, Integer status) {
 		cmOrganizeProductService.updateStatus(id, status);
 		HashMap<String, Object> map = new HashMap<>();
 		map.put("success", true);

src/main/resources/config/beta/caimei.properties

@@ -32,10 +32,10 @@ jdbc.pool.maxActive=20
 jdbc.testSql=SELECT 'x' FROM DUAL
 
 #redis settings
-redis.keyPrefix=caimei
-redis.host=10.104.50.235
+#redis.keyPrefix=caimei
+redis.host=47.119.112.46
 redis.port=6379
-redis.pass=123456
+redis.pass=6#xsI%b4o@5c3RoE
 redis.timeout=100000
 #\u6700\u5927\u8FDE\u63A5\u6570
 redis.pool.maxActive=300

src/main/webapp/WEB-INF/views/modules/weisha/cmOrganizeProductList.jsp

@@ -96,11 +96,11 @@
 
 
 		// 商品下架、下架
-		function updateStatus(organizeId,id,status) {
+		function updateStatus(id,status) {
+			debugger
 			var submit = function (v, h, f) {
 				if (v == true) {
 					$.post("${ctx}/weisha/cmOrganizeProduct/updateStatus", {
-						'organizeId': organizeId,
 						'id': id,
 						'status': status
 					}, function (data) {
@@ -215,7 +215,7 @@
 				</td>
 				<td>
     				<a href="${ctx}/weisha/cmOrganizeProduct/form?id=${cmOrganizeProduct.id}">编辑</a>
-    				<a href="javascript:;" onclick=updateStatus(${organizeId},${cmOrganizeProduct.id},${cmOrganizeProduct.status eq 1?0:1})>${cmOrganizeProduct.status eq 1?'下架':'上架'}</a>
+    				<a href="javascript:;" onclick=updateStatus('${cmOrganizeProduct.id}',${cmOrganizeProduct.status eq 1?0:1})>${cmOrganizeProduct.status eq 1?'下架':'上架'}</a>
 					<a href="${ctx}/weisha/cmOrganizeProduct/delete?id=${cmOrganizeProduct.id}" onclick="return confirmx('确认要删除该商品吗？删除后需要重新添加', this.href)">删除</a>
 				</td>
 			</tr>