Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/wexinpackage/access/util/access/WeChatParamsUtil.java

@@ -7,13 +7,13 @@ public class WeChatParamsUtil {
     //token
     public final static String token ="9ZmhR1CRrGIOSMxCcznVccQN8f3XX2w4GMoacioSkovFuJdCwMBvTHsJpGf67bUVtkHEqLzYIyaamn9dEyPJKcVxgIeERJpAwa9uNtW68EXYwOBvR2blpiQ3aM9l7ndqMJThfEWlcUz8oBzOh6XZPQqTcLwb95yHhwQO14KdIXj6Q1nko9rjp-9c-LsrzoS_SNu4TxTqTqoYj5ztp3J9Wg";
     //企业id
-    public final static String corpId ="wwb8c36b4b35675fe9";
+    public final static String corpId ="ww24ca7e7771df9148";
     //应用的凭证密钥
-    public final static String agentSecret = "kekm2UtL_82xFr6tMi4N2cWQFMHNKhLD-0bwIIaUQP0";
+    public final static String agentSecret = "alO4uidZ2hKK3p5HdrWxIKz5YgvT0vvNiMb9r_1vS7s";
     //通讯录秘钥 (获取tokenid)
-    public final static String contactsSecret ="X67oIAoM8_SR9VhW7exd4_JKaeW5st8DKxvNluTZfi4";
+    public final static String contactsSecret ="rXEUF9kGCLZKyWs4WQie_F1Ix3g5dP_e3X2Yls5tiuA";
     //企业应用的id，整型。可在应用的设置页面查看
-    public final static int agentId = 1000002;
+    public final static int agentId =1000005;
     //通讯录token
     public final static String contacts_token = "AT84tGkhkt09pSYTxi3NoCQcn7F6o";
     // encodingAESKey

src/main/java/com/jeeplus/modules/wexintheorder/web/SimpleOAuth2Controller.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.wexintheorder.web;
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.modules.wexinpackage.access.entity.AccessToken;
 import com.jeeplus.modules.wexinpackage.access.util.access.WeChatParamsUtil;
 import org.springframework.stereotype.Controller;
@@ -21,14 +22,14 @@ public class SimpleOAuth2Controller {
      * 此处步骤也可以用页面链接代替
      * @return
      */
-    @RequestMapping(value = { "/oauth2wx.do" })
+    @RequestMapping(value = { "/oauth2wx.do"})
     public String Oauth2API(HttpServletRequest request){
         //获取项目域名
         String requestUrl = request.getServerName();
         String contextPath = request.getContextPath();
         logger.info("domain name: " + requestUrl + " project name: " + contextPath);
-        //拼接微信回调地址Global.getConfig("")
-        String backUrl ="http://total2.viphk.ngrok.org/weXin/theOrder/orderFrom";
+        //拼接微信回调地址
+        String backUrl = Global.getConfig("backUrl");
         String redirect_uri = "";
         try {
             redirect_uri = URLEncoder.encode(backUrl, "utf-8");

src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderController.java

@@ -193,7 +193,7 @@ public class TheOrderController extends BaseController {
                List<TheLeadership> list = theLeadershipService.findListUserId(theLeadership);
                boolean flag = false;
                for (TheLeadership theLeadership1:list){
-                   if (theLeadership1.getName().equals(theOrder.getName())){
+                   if (!theLeadership1.getName().equals(theOrder.getName())){
                        flag = true;
                    }
                    if (!theLeadership1.getTeam().equals(theOrder.getTeam())){
@@ -207,6 +207,7 @@ public class TheOrderController extends BaseController {
                    }
                }
                if (flag){
+                   theLeadership.setName(theOrder.getName());
                    theLeadership.setTeam(theOrder.getTeam());
                    theLeadership.setDepartment(theOrder.getDepartment());
                    theLeadership.setSpecific(theOrder.getSpecific());

src/main/resources/jeeplus.properties

@@ -6,11 +6,11 @@
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
-jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-#jdbc.password=123456
-jdbc.password=root
+jdbc.password=123456
+#jdbc.password=root
 
 #pool settings
 jdbc.pool.init=20
@@ -249,3 +249,6 @@ bos_buck_name=newxgccpm
 
 serverDomain=http://192.168.2.4:18080/total_process
 
+#订餐回调
+backUrl = http://yf.xgccpm.cns/weXin/theOrder/orderFrom
+