Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-admin/src/test/java/com/fs/task/StoreTaskTest.java

@@ -1,26 +1,26 @@
-package com.fs.task;
-
-
-import com.fs.FSAdminApplication;
-import com.fs.course.service.IFsCourseWatchLogService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@RunWith(value = org.springframework.test.context.junit4.SpringRunner.class)
-@SpringBootTest(classes = FSAdminApplication.class)
-public class StoreTaskTest {
-    @Autowired
-    private IFsCourseWatchLogService fsCourseWatchLogService;
-    @Autowired
-    private FsCourseTask fsCourseTask;
-    @Test
-    public void addQwWatchLog() {
-        fsCourseWatchLogService.addCourseWatchLogDayNew();
-    }
-    @Test
-    public void test() throws Exception {
-        fsCourseTask.hyWorkTask();
-    }
-}
+//package com.fs.task;
+//
+//
+//import com.fs.FSAdminApplication;
+//import com.fs.course.service.IFsCourseWatchLogService;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//@RunWith(value = org.springframework.test.context.junit4.SpringRunner.class)
+//@SpringBootTest(classes = FSAdminApplication.class)
+//public class StoreTaskTest {
+//    @Autowired
+//    private IFsCourseWatchLogService fsCourseWatchLogService;
+//    @Autowired
+//    private FsCourseTask fsCourseTask;
+//    @Test
+//    public void addQwWatchLog() {
+//        fsCourseWatchLogService.addCourseWatchLogDayNew();
+//    }
+//    @Test
+//    public void test() throws Exception {
+//        fsCourseTask.hyWorkTask();
+//    }
+//}

fs-service-system/src/main/java/com/fs/qw/service/impl/QwJsApiServiceImpl.java

@@ -59,9 +59,9 @@ public class QwJsApiServiceImpl implements IQwJsApiService {
             //获取企业微信当前登录人的userId
             QwJsapiTicketResult useridResult=new QwJsapiTicketResult();
 
-            if (qwConfigSignatureParam.getIsGetUserId()==1){
+           // if (qwConfigSignatureParam.getIsGetUserId()==1){
                 useridResult = qwApiService.getQwUserid(qwConfigSignatureParam.getCode(), qwConfigSignatureParam.getCorpId(),appSecret);
-            }
+          //  }
             //获取登录员工的OAuth2 后获取url
             logger.info("获取企业当前登录人的userid"+useridResult);
             if (qwConfigSignatureParam.getIsGetUserId()==1 && useridResult.getErrcode()!=0){

fs-service-system/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -691,6 +691,7 @@ public class QwUserServiceImpl implements IQwUserService
     public R syncQwUser(String corpId) {
         QwUserIdResult userList = qwApiService.getUserList(corpId);
         List<DeptUser> deptUser = userList.getDept_user();
+        System.out.println("企微部门："+deptUser);
         QwCompany qwCompany = iQwCompanyService.selectQwCompanyByCorpId(corpId);
         for (DeptUser user : deptUser) {
             QwUser qw=qwUserMapper.selectQwUserByCorpIdAndUserId(corpId,user.getUserid());
@@ -703,18 +704,21 @@ public class QwUserServiceImpl implements IQwUserService
             QwOpenidByUserParams param=new QwOpenidByUserParams();
             param.setUserid(user.getUserid());
             QwOpenidResult qwOpenidResult = qwApiService.useridToOpenid(param, corpId);
+            System.out.println("企微返回："+qwOpenidResult);
             qwUser.setOpenid(qwOpenidResult.getOpenid());
-             if (qw==null){
-                 qwUserMapper.insertQwUser(qwUser);
-             }else {
-                 qwUser.setId(qw.getId());
-                 qwUser.setIsDel(0);
-                 qwUserMapper.updateQwUser(qwUser);
-             }
+            if (qw==null){
+                qwUserMapper.insertQwUser(qwUser);
+            }else {
+                System.out.println("不等于空");
+                qwUser.setId(qw.getId());
+                qwUser.setIsDel(0);
+                qwUserMapper.updateQwUser(qwUser);
+            }
         }
         return R.ok();
     }
 
+
     public R syncQwUserName(String corpId) {
         QwCompany qwCompany = iQwCompanyService.selectQwCompanyByCorpId(corpId);
         List<QwUser> qwUsers=qwUserMapper.selectQwUserByCorpId(corpId);

fs-service-system/src/main/java/com/fs/qwApi/service/impl/QwApiServiceImpl.java

@@ -1119,6 +1119,8 @@ public class QwApiServiceImpl implements QwApiService {
             HttpGet httpGet = new HttpGet(uri);
             HttpResponse response = httpClient.execute(httpGet);
             String json = EntityUtils.toString(response.getEntity());
+            System.out.println(json);
+            System.out.println();
             qwResult = JSON.parseObject(json, QwJsapiTicketResult.class);
 
         } catch (Exception e) {
@@ -1512,7 +1514,7 @@ public class QwApiServiceImpl implements QwApiService {
             HttpResponse response = httpClient.execute(httpPost);
             String reJson = EntityUtils.toString(response.getEntity());
             QwUserIdResult qwResult = JSON.parseObject(reJson, QwUserIdResult.class);
-
+            System.out.println("qw:"+qwResult);
             return qwResult;
         } catch (Exception e) {
             e.printStackTrace();

fs-user-app/src/main/java/com/fs/app/controller/WxH5MpController.java

@@ -60,8 +60,8 @@ public class WxH5MpController {
 
     @ApiOperation("课程分享链接公众号登录")
     @PostMapping("/loginByMp")
-    public R loginByMp(@Valid @RequestBody FsUserLoginByMpParam param) {
-        try {
+    public R loginByMp(@Valid @RequestBody FsUserLoginByMpParam param) throws WxErrorException {
+//        try {
             //获取微信用户信息
             WxOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(param.getCode());
             WxOAuth2UserInfo wxMpUser = wxMpService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
@@ -100,13 +100,13 @@ public class WxH5MpController {
             map.put("token", token);
             map.put("user", user);
             return R.ok(map);
-        } catch (WxErrorException e) {
-            if (e.getError().getErrorCode() == 40163) {
-                return R.error(40163, e.getError().getErrorMsg());
-            } else {
-                return R.error("授权失败," + e.getMessage());
-            }
-        }
+//        } catch (WxErrorException e) {
+//            if (e.getError().getErrorCode() == 40163) {
+//                return R.error(40163, e.getError().getErrorMsg());
+//            } else {
+//                return R.error("授权失败," + e.getMessage());
+//            }
+//        }
 
     }