@freelog/freelog-cg-collection 1.2.10 → 1.2.12

package/resources/zhaojn.sc

@@ -1,55 +1,4 @@
-// 所有人都可以签该策略，所以身份信息不在签约时判定，下面的echoSubject = echoSubject和echoPolicyId = echoCorePolicyId可以不写，因为它需要和labels一起使用，来判断某用户组是否有某标签
-FOR USER(echoSubject = echoSubject, echoPolicyId = echoCorePolicyId, labels = ["vip1"])
+FOR PUBLIC
 
-labels0 = Query.EchoService.Labels({"subject":echoSubject, "policyId":echoCorePolicyId, "licensee":contract.licensee})
-
-echoSubject <- Echo.<连载小说的会员>
-
-echoCorePolicyId = "xxx连载小说会员的主策略ID"
-
-unitPrice <- 1
-
-setUnlocked = []
-
-setTemp = []
-
-setFree = []
-
-Initial None:
-	let labels = Query.EchoService.Labels({"subject":echoSubject, "licensee":contract.licensee})
-//	Event.Void("vip1" in labels) -> AUTH_VIP1
-//	Event.Void(not ("vip1" in labels)) -> AUTH_MEMBER
-//	Event.Echo.Labels({"subject":echoSubject, "licensee":contract.licensee, "label":"vip1"}) -> AUTH_VIP1
-    Event.Void(not ("vip2" in labels)) -> AUTH_MEMBER{fun.setLabel({"label":"vip2", "ttl":7200})}
-    Event.Time.Relative(1, "minute") -> AUTH_MEMBER{fun.setLabel({"label":"vip1", "ttl":1800})}
-
-AUTH_MEMBER Partial{setUnlocked, setTemp}:
-	Event.Transaction.Pay(amount = unitPrice, elemsNum = 1) -> AUTH_MEMBER{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
-	Event.Transaction.Pay(amount = unitPrice * 10 * 0.8, elemsNum = 10) -> AUTH_MEMBER{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
-	Event.Custom.AcceptEvent({"title":"MembershipChange", "subject":echoSubject, "label":"vip1"}) -> AUTH_VIP1
-
-	Event.Custom.WatchAD(elemsNum = 1) -> AUTH_MEMBER{fun.addElements(setTemp, contract.licenseeSelectedElems, false)}
-//	Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(), "day"), 1, "day")) -> AUTH_MEMBER{fun.clearElems(setTemp)}
-	Event.Time.Relative(2, "minute") -> FINISH
-
-AUTH_VIP1 Partial{setUnlocked, setTemp, setFree}:
-    let a = 1
-    let b = []
-	Event.Transaction.Pay(amount = unitPrice * 0.75, elemsNum = 1) -> AUTH_VIP1{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
-	Event.Transaction.Pay(amount = unitPrice * 10 * 0.6, elemsNum = 10) -> AUTH_VIP1{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
-	Event.Custom.AcceptEvent({"title":"MembershipChange", "subject":echoSubject, "label":"member"}) -> AUTH_MEMBER
-
-	Event.Custom.WatchAD(elemsNum = 1) -> AUTH_VIP1{fun.addElements(setTemp, contract.licenseeSelectedElems, false)}
-	Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(), "day"), 1, "day")) -> AUTH_VIP1{fun.clearElems(setTemp)}
-
-	Event.Transaction.Pay(amount = 0, elemsNum = 1) -> FREE_UNLOCK_ROUTE[elems:contract.licenseeSelectedElems]{a = 2; b = fun.addElements(b, [a], false);Kit.Min(1, 2)}
-	Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(), "month"), 1, "month")) -> AUTH_VIP1{fun.clearElems(setFree)}
-
-// 一个中间态来实现if-else的功能
-FREE_UNLOCK_ROUTE None[elems]:
-	let freeUnlockedSize = Kit.Array.Size(setFree)
-	Event.Void(freeUnlockedSize < 4) -> AUTH_VIP1{fun.addElements(setFree, elems, false)}
-	Event.Void(freeUnlockedSize >= 4) -> AUTH_VIP1
-
-FINISH:
-    terminate
+Initial Full:
+    terminate

package/src/helper/PolicyHelper.ts

@@ -252,6 +252,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
                 eventPath: eventInfo.eventPath,
                 eventName: eventInfo.eventName,
                 eventId: eventInfo.eventId,
+                toState: eventInfo.toState,
                 varLocalAtEventList: varLocalAtEventList
             });
         }

package/test/library/CommonTest.test.ts

@@ -1,3 +1,4 @@
+import * as fs from "fs";
 const lodash = require('lodash');
 
 describe("test/library/CommonTest.test.ts", () => {
@@ -29,8 +30,15 @@ describe("test/library/CommonTest.test.ts", () => {
         console.log(arr.filter(a => a != 1));
     });
 
+    it("encodeURIComponent", async () => {
+        // 普通 FOR%20PUBLIC%0D%0A%0D%0AInitial%20Permit%3A%0D%0A%20%20%20%20terminate
+        // 集合 FOR%20PUBLIC%0D%0A%0D%0AInitial%20Full%3A%0D%0A%20%20%20%20terminate
+        let s = fs.readFileSync("./resources/zhaojn.sc", "utf-8");
+        console.log(encodeURIComponent(s));
+    });
+
     it("decodeURIComponent", async () => {
-        let s = "mongodb%3A%2F%2Fcontract_service%3AQzA4Qzg3QTA3NDRCQTA0NDU1RUQxMjI3MTA4ODQ1MTk%3D%40dds-wz9ff825617df8e41606-pub.mongodb.rds.aliyuncs.com%3A3717%2Cdds-wz9ff825617df8e42773-pub.mongodb.rds.aliyuncs.com%3A3717%2Fcontracts_dev%3FreplicaSet%3Dmgset-82892902";
+        let s = "for%20public%0A%0Ainitial%5Bactive%5D%3A%0A%20%20terminate";
         console.log(decodeURIComponent(s));
     });