Merge branch 'dev_lyp_20220722' into 'test'

fix

See merge request !1

src/main/java/com/chineseall/readingdata/controller/api/ReadingDataApi.java

@@ -61,7 +61,9 @@ public class ReadingDataApi {
         if(readingData==null){
             return new TechMessage(ResultEnum.ReadingDataInvalid);
         }
-        if(readingData.getId()==null||readingData.getActor()==null||readingData.getVerb()==null||readingData.getObject()==null){
+        if (readingData.getId() == null || readingData.getActor() == null
+                || readingData.getVerb() == null || readingData.getObject() == null
+                || readingData.getResult() == null || readingData.getContext() == null) {
             return new TechMessage(ResultEnum.ReadingDataInvalid);
         }
         // 日志
@@ -108,7 +110,9 @@ public class ReadingDataApi {
             return new TechMessage(ResultEnum.ReadingDataInvalid);
         }
         for(ReadingData readingData : readingDatas) {
-            if (readingData.getId() == null || readingData.getActor() == null || readingData.getVerb() == null || readingData.getObject() == null) {
+            if (readingData.getId() == null || readingData.getActor() == null
+                    || readingData.getVerb() == null || readingData.getObject() == null
+                    || readingData.getContext() == null || readingData.getResult() == null) {
                 return new TechMessage(ResultEnum.ReadingDataInvalid);
             }
         }

src/main/java/com/chineseall/readingdata/model/ReadingData.java

@@ -34,6 +34,12 @@ public class ReadingData implements CacheDimensionDocument {
     @DocumentField
     private Map<String, Object> object;
 
+    @DocumentField
+    private Map<String, Object> result;
+
+    @DocumentField
+    private Map<String, Object> context;
+
     @DocumentField
     private Boolean valid;
 

src/main/resources/application.yml

@@ -38,4 +38,7 @@ oauthclient:
     - clientName: 上图
       clientId: shangtuClentId
       clientSecret: shangtuClientSecret
+    - clientName: 电子书
+      clientId: dianzishuClentId
+      clientSecret: dianzishuClientSecret