Browse Source

钉钉第三方企业应用登录

hanzhuoyue 10 months ago
parent
commit
69c4b293ba

+ 0 - 2
ruoyi-admin/pom.xml

@@ -115,8 +115,6 @@
             <groupId>com.hanlp</groupId>
             <artifactId>hanlp</artifactId>
             <version>1.8.3</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/src/main/lib/hanlp-1.8.3.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.taobao.top</groupId>

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dingding/DingThirdAuthController.java

@@ -59,7 +59,7 @@ public class DingThirdAuthController {
     }
 
 
-    @ApiOperation(value = "钉钉用户登录第三方企业应用,显示当前登录用户的userId和名称")
+    @ApiOperation(value = "第三方企业应用用户登录")
     @PostMapping("/authLogin")
     @ResponseBody
     public AjaxResult authLogin(@RequestBody AuthLoginRequest authLoginRequest) {
@@ -89,7 +89,7 @@ public class DingThirdAuthController {
         return AjaxResult.success(token);
     }
 
-    @ApiOperation(value = "钉钉用户登录第三方企业应用,显示当前登录用户的userId和名称")
+    @ApiOperation(value = "第三方企业应用授权")
     @PostMapping("/cropLogin")
     @ResponseBody
     public AjaxResult cropLogin(@RequestBody AuthLoginRequest authLoginRequest) {

+ 20 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dingding/service/DingThirdTokenService.java

@@ -407,4 +407,24 @@ public class DingThirdTokenService {
         }
         return rsp;
     }
+    //查询个人授权记录
+    public GetPersonalAuthRuleResponse getPersonalAuthRule(String xAcsDingtalkAccessToken) {
+        GetPersonalAuthRuleResponse rsp = null;
+        try {
+            GetPersonalAuthRuleHeaders getPersonalAuthRuleHeaders = new GetPersonalAuthRuleHeaders();
+            getPersonalAuthRuleHeaders.xAcsDingtalkAccessToken = xAcsDingtalkAccessToken;
+            rsp = this.createClient2_1_0().getPersonalAuthRuleWithOptions(getPersonalAuthRuleHeaders, new RuntimeOptions());
+        } catch (TeaException err) {
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性,可帮助开发定位问题
+            }
+        } catch (Exception _err) {
+            TeaException err = new TeaException(_err.getMessage(), _err);
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性,可帮助开发定位问题
+            }
+        }
+        return rsp;
+    }
+
 }

+ 20 - 20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/ResumeController.java

@@ -146,26 +146,26 @@ public class ResumeController extends BaseController
                     } else if (suffix.equals(".docx")) {
                         content = FileUtils.readWordDocx(fileUrl);
                     }else if (TYPE_LIST.contains(suffix)){
-//                        String encodeToString = Base64Utils.encodeToString(file.getBytes());
-//                        RestTemplate restTemplate = new RestTemplate();
-//                        Map<String,Object> map = new HashMap<>();
-//                        map.put("base64",encodeToString);
-//                        Map<String,Object> options = new HashMap<>();
-//                        options.put("tbpu.parser","single_line");
-//                        options.put("data.format","text");
-//                        options.put("ocr.angle",false);
-//                        options.put("ocr.language","简体中文");
-//                        options.put("ocr.maxSideLen",1024);
-//                        map.put("options",options);
-//                        ResponseEntity<String> responseEntity = restTemplate.postForEntity(
-//                                "http://127.0.0.1:1224/api/ocr", map, String.class);
-//                        JSONObject parse = JSONObject.parse(responseEntity.getBody());
-//                        if (100 != parse.getInteger("code")) {
-//                            return AjaxResult.error("文件不存在解析失败");
-//                        }
-//                        content=new ArrayList<>();
-//                        String[] split = parse.getString("data").split("\n");
-//                        content.addAll(Arrays.asList(split));
+                        String encodeToString = Base64Utils.encodeToString(file.getBytes());
+                        RestTemplate restTemplate = new RestTemplate();
+                        Map<String,Object> map = new HashMap<>();
+                        map.put("base64",encodeToString);
+                        Map<String,Object> options = new HashMap<>();
+                        options.put("tbpu.parser","single_line");
+                        options.put("data.format","text");
+                        options.put("ocr.angle",false);
+                        options.put("ocr.language","简体中文");
+                        options.put("ocr.maxSideLen",1024);
+                        map.put("options",options);
+                        ResponseEntity<String> responseEntity = restTemplate.postForEntity(
+                                "http://127.0.0.1:1224/api/ocr", map, String.class);
+                        JSONObject parse = JSONObject.parse(responseEntity.getBody());
+                        if (100 != parse.getInteger("code")) {
+                            return AjaxResult.error("文件不存在解析失败");
+                        }
+                        content=new ArrayList<>();
+                        String[] split = parse.getString("data").split("\n");
+                        content.addAll(Arrays.asList(split));
                     }
                 } catch (Exception e) {
                     return AjaxResult.error("文件不存在解析失败");