Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/AdminUtils.java

@@ -81,7 +81,8 @@ public class AdminUtils {
 		Cookie cookie = new Cookie(name, value);
 		// 有效期为(三天减一分钟)
 		cookie.setMaxAge(60 * 60 * 24 * 3 - 60);
-		cookie.setPath("/" + NameUtils.getConfig("ROOT_PATH"));
+//		cookie.setPath("/" + NameUtils.getConfig("ROOT_PATH"));
+		cookie.setPath("/");
 		cookie.setHttpOnly(true);
 		cookie.setDomain(".iamberry.com");
 		response.addCookie(cookie);

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -59,7 +59,8 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
         approvalProduction.setApprovalId(approvalInfo.getApprovalId());
         approvalProduction.setApplicantOrderNo("订单编号");
         approvalProduction.setApplicantName("申请人姓名");
-        approvalProduction.setApplicantId(1);//申请人ID
+        //申请人ID
+        approvalProduction.setApplicantId(1);
         approvalProduction.setProductionState(1);
         int returnValue2 = approvalOrderMapper.insertApprovalProduction(approvalProduction);
         if(returnValue2 < 1){

watero-rst-web/src/main/java/com/iamberry/rst/controllers/wechat/TestController.java

@@ -1,19 +1,24 @@
 package com.iamberry.rst.controllers.wechat;
 
+import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Controller
 @RequestMapping("/wechat/getTest")
 public class TestController {
 
     @ResponseBody
     @RequestMapping(value = "/test")
-    public ResponseJson updateApplyPick(
+    public ResponseJson updateApplyPick(HttpServletRequest request
             ) throws Exception {
-        ResponseJson rj =new ResponseJson(200, "修改成功", 200);
+
+        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        ResponseJson rj =new ResponseJson(200, "测试成功+"+openId, 200);
         return rj;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/wx/home/HomeHandler.java

@@ -0,0 +1,40 @@
+package com.iamberry.rst.controllers.wx.home;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年11月30日
+ * @explain	商城首页
+ */
+@Controller
+@RequestMapping("/wechat")
+public class HomeHandler {
+
+//	@Autowired
+//	private MemberService memberService;
+//
+//	/**
+//	 * 微信商城首页URL
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@RequestMapping(value = "/index", method = RequestMethod.GET)
+//	public void index(HttpServletRequest request, HttpServletResponse response) throws Exception {
+//
+//		//如果是分享 则绑定关系
+//		Member member = WechatUtils.getUserBySession(request);
+//
+//		String shareOpenid = request.getParameter("shareOpenid");
+//		if(StringUtils.isNotEmpty(shareOpenid)){
+//			memberService.buildChildUser(shareOpenid, member,1,1);
+//		}
+//		request.getRequestDispatcher(NameUtils.getConfig("WECHAT_SHOP_INDEX")).forward(request, response);
+//	}
+
+
+}

watero-rst-web/src/main/resources/platform.properties

@@ -64,14 +64,6 @@ ADD_CUSTOMER_SUCCESS_AIBERLE=\u3010\u7231\u8D1D\u6E90\u3011\u5C0A\u656C\u7684\u5
 REMIND_POSTAGE_PENDING=\u3010\u7231\u8D1D\u6E90RST\u3011\u60A8\u6709{0}\u4E2A\u90AE\u8D39\u7533\u8BF7\u5F85\u5904\u7406\uFF0C\u8BF7\u5C3D\u5FEB\u524D\u5F80RST\u7CFB\u7EDF\u5904\u7406
 
 #---SMS end---#
-#weixin
-# pubNo
-#pubNo=gh_c73446c8ce91
-
-# appId-watero
-#appId=wx27c9f825761a861b
-# pubNo-watero\u6C34\u65F6\u4EE3
-pubNo=gh_2674097b2442
 
 # token
 token=weixin
@@ -111,4 +103,9 @@ ReqURL=http://testapi.kdniao.cc:8081/api/EOrderService
 WECHAT_BACK_URL=http://test.iamberry.com/wechatBack
 
 # index redirect url
-redirectUrl_index=redirect:/wechat/index
+redirectUrl_index=redirect:/wechat/index
+
+#ROOT_PATH=rst
+
+# pubNo -- soodo-test
+pubNo=gh_8ddb1d63343c