cloudcc-ccdk 0.0.4 → 0.0.7

package/README.md

@@ -1,3 +1,27 @@
+#### 发布版本：0.0.7
+#### 更新日期：2022/8/11
+#### 更新内容：
+  * 修复
+  * 迭代
+    * token存储到cookes的二级域名兼容com.cn/org.cn/net.cn
+  * 优化
+
+#### 发布版本：0.0.6
+#### 更新日期：2022/8/8
+#### 更新内容：
+  * 修复
+  * 迭代
+    * 优化加密库依赖导入
+  * 优化
+
+#### 发布版本：0.0.5
+#### 更新日期：2022/8/8
+#### 更新内容：
+  * 修复
+  * 迭代
+    * 优化加密库依赖导入
+  * 优化
+
 #### 发布版本：0.0.4
 #### 更新日期：2022/8/8
 #### 更新内容：

package/lib/ccdk.js

@@ -1,5 +1,7 @@
 import Cookies from 'js-cookie';
 import CryptoJS from 'crypto-js/aes';
+import UTF8 from 'crypto-js/enc-utf8';
+import PAD from 'crypto-js/pad-pkcs7';
 
 /**
  * 加密
@@ -9,12 +11,11 @@ import CryptoJS from 'crypto-js/aes';
  * @returns 
  */
 function getAesString(data, key, iv) {
-  key = CryptoJS.enc.Utf8.parse(key);
-  iv = CryptoJS.enc.Utf8.parse(iv);
-  let encrypted = CryptoJS.AES.encrypt(data, key, {
+  key = UTF8.parse(key);
+  iv = UTF8.parse(iv);
+  let encrypted = CryptoJS.encrypt(data, key, {
     iv: iv,
-    mode: CryptoJS.mode.CBC,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: PAD,
   });
   return encrypted.toString(); //返回的是base64格式的密文
 }
@@ -27,14 +28,13 @@ function getAesString(data, key, iv) {
  * @returns 
  */
 function getDAesString(encrypted, key, iv) {
-  key = CryptoJS.enc.Utf8.parse(key);
-  iv = CryptoJS.enc.Utf8.parse(iv);
-  let decrypted = CryptoJS.AES.decrypt(encrypted, key, {
+  key = UTF8.parse(key);
+  iv = UTF8.parse(iv);
+  let decrypted = CryptoJS.decrypt(encrypted, key, {
     iv: iv,
-    mode: CryptoJS.mode.CBC,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: PAD,
   });
-  return decrypted.toString(CryptoJS.enc.Utf8);
+  return decrypted.toString(UTF8);
 }
 
 /**
@@ -74,6 +74,21 @@ var Crypto = /*#__PURE__*/Object.freeze({
   decrypt: decrypt
 });
 
+/**
+ * 获得一级域名
+ * 比如：xx.com、xx.cn、xx.com.cn、xx.net.cn、xx.org.cn
+ */
+function getDomain() {
+    // 倒数第二位域名
+    let lastTow = document.domain.split('.').slice(-2, -1)[0];
+    // 如果倒数第二位是这些关键字，那么需要取倒数三位域名
+    if (lastTow == 'com' || lastTow == 'org' || lastTow == 'net') {
+        return "." + document.domain.split('.').slice(-3).join('.')
+    } else {
+        return "." + document.domain.split('.').slice(-2).join('.')
+    }
+}
+
 // cookie存储标识
 const USER_INFO = "cc_user_info";
 
@@ -82,8 +97,8 @@ const USER_INFO = "cc_user_info";
  * @param {String} userInfo 用户信息
  * @param {String} domain 域名
  */
-function setUserInfo(userInfo, domain) {
-    Cookies.set(Crypto.encrypt(USER_INFO), userInfo, { domain: domain || ("." + document.domain.split('.').slice(-2).join('.')), expires: 1 });
+function setUserInfo(userInfo, domain = getDomain()) {
+    Cookies.set(Crypto.encrypt(USER_INFO), Crypto.encrypt(userInfo), { domain: domain, expires: 1 });
 }
 
 /**
@@ -120,7 +135,7 @@ function getUrlQuery(name) {
     return res;
 }
 /**
- * 获取token
+ * 获取token：优先级-url最高，cc_token-cookies第二，binding-cookies第三
  * @param {String} urlName 获取token的url名称 
  * @returns 
  */
@@ -137,17 +152,17 @@ function getToken(urlName = "binding") {
  * @param {String} token token
  * @param {String} domain 域名
  */
-function setToken(token, domain) {
+function setToken(token, domain = getDomain()) {
     // 开发模式不设置domain
-    Cookies.set(Crypto.encrypt(TOKEN), token, { domain: domain || ("." + document.domain.split('.').slice(-2).join('.')), expires: 1 });
+    Cookies.set(Crypto.encrypt(TOKEN), token, { domain: domain, expires: 1 });
 }
 
 /**
  * 清除Token数据
  * @param {String} domain 域名
  */
-function clearToken(domain) {
-    Cookies.remove(Crypto.encrypt(TOKEN), { domain: domain || ("." + document.domain.split('.').slice(-2).join('.')), expires: 1 });
+function clearToken(domain = getDomain()) {
+    Cookies.remove(Crypto.encrypt(TOKEN), { domain: domain, expires: 1 });
 }
 
 var CCToken = /*#__PURE__*/Object.freeze({

package/lib/ccdk.min.js

@@ -1 +1 @@
-import Cookies from"js-cookie";import CryptoJS from"crypto-js/aes";function getAesString(data,key,iv){key=CryptoJS.enc.Utf8.parse(key);iv=CryptoJS.enc.Utf8.parse(iv);let encrypted=CryptoJS.AES.encrypt(data,key,{iv:iv,mode:CryptoJS.mode.CBC,padding:CryptoJS.pad.Pkcs7});return encrypted.toString()}function getDAesString(encrypted,key,iv){key=CryptoJS.enc.Utf8.parse(key);iv=CryptoJS.enc.Utf8.parse(iv);let decrypted=CryptoJS.AES.decrypt(encrypted,key,{iv:iv,mode:CryptoJS.mode.CBC,padding:CryptoJS.pad.Pkcs7});return decrypted.toString(CryptoJS.enc.Utf8)}function encrypt(data,key="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",iv=1){data=JSON.stringify(data);var encrypted=getAesString(data,key,iv);return encrypted}function decrypt(data,key="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",iv=1){try{var decryptedStr=getDAesString(data,key,iv);if(!decryptedStr)return null;return JSON.parse(decryptedStr)}catch(error){console.trace("解密密码错误",error);return null}}var Crypto=Object.freeze({__proto__:null,encrypt:encrypt,decrypt:decrypt});const USER_INFO="cc_user_info";function setUserInfo(userInfo,domain){Cookies.set(Crypto.encrypt(USER_INFO),userInfo,{domain:domain||"."+document.domain.split(".").slice(-2).join("."),expires:1})}function getUserInfo(){let encryptUserInfo=Cookies.get(Crypto.encrypt(USER_INFO));if(encryptUserInfo){return Crypto.decrypt(encryptUserInfo)}else{return""}}var CCUser=Object.freeze({__proto__:null,setUserInfo:setUserInfo,getUserInfo:getUserInfo});const TOKEN="cc_token";function getUrlQuery(name){var reg=new RegExp(name+"=([^&]*)(&|$)");var r=window.location.href.match(reg);let res=null;if(r!=null)res=r[1].trim();return res}function getToken(urlName="binding"){let token=getUrlQuery(urlName)||Cookies.get(Crypto.encrypt(TOKEN))||Cookies.get(urlName);if(token){setToken(token)}return token}function setToken(token,domain){Cookies.set(Crypto.encrypt(TOKEN),token,{domain:domain||"."+document.domain.split(".").slice(-2).join("."),expires:1})}function clearToken(domain){Cookies.remove(Crypto.encrypt(TOKEN),{domain:domain||"."+document.domain.split(".").slice(-2).join("."),expires:1})}var CCToken=Object.freeze({__proto__:null,setToken:setToken,getToken:getToken,clearToken:clearToken});export{Crypto as CCCrypto,CCToken,CCUser};
+import Cookies from"js-cookie";import CryptoJS from"crypto-js/aes";import UTF8 from"crypto-js/enc-utf8";import PAD from"crypto-js/pad-pkcs7";function getAesString(data,key,iv){key=UTF8.parse(key);iv=UTF8.parse(iv);let encrypted=CryptoJS.encrypt(data,key,{iv:iv,padding:PAD});return encrypted.toString()}function getDAesString(encrypted,key,iv){key=UTF8.parse(key);iv=UTF8.parse(iv);let decrypted=CryptoJS.decrypt(encrypted,key,{iv:iv,padding:PAD});return decrypted.toString(UTF8)}function encrypt(data,key="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",iv=1){data=JSON.stringify(data);var encrypted=getAesString(data,key,iv);return encrypted}function decrypt(data,key="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",iv=1){try{var decryptedStr=getDAesString(data,key,iv);if(!decryptedStr)return null;return JSON.parse(decryptedStr)}catch(error){console.trace("解密密码错误",error);return null}}var Crypto=Object.freeze({__proto__:null,encrypt:encrypt,decrypt:decrypt});function getDomain(){let lastTow=document.domain.split(".").slice(-2,-1)[0];if(lastTow=="com"||lastTow=="org"||lastTow=="net"){return"."+document.domain.split(".").slice(-3).join(".")}else{return"."+document.domain.split(".").slice(-2).join(".")}}const USER_INFO="cc_user_info";function setUserInfo(userInfo,domain=getDomain()){Cookies.set(Crypto.encrypt(USER_INFO),Crypto.encrypt(userInfo),{domain:domain,expires:1})}function getUserInfo(){let encryptUserInfo=Cookies.get(Crypto.encrypt(USER_INFO));if(encryptUserInfo){return Crypto.decrypt(encryptUserInfo)}else{return""}}var CCUser=Object.freeze({__proto__:null,setUserInfo:setUserInfo,getUserInfo:getUserInfo});const TOKEN="cc_token";function getUrlQuery(name){var reg=new RegExp(name+"=([^&]*)(&|$)");var r=window.location.href.match(reg);let res=null;if(r!=null)res=r[1].trim();return res}function getToken(urlName="binding"){let token=getUrlQuery(urlName)||Cookies.get(Crypto.encrypt(TOKEN))||Cookies.get(urlName);if(token){setToken(token)}return token}function setToken(token,domain=getDomain()){Cookies.set(Crypto.encrypt(TOKEN),token,{domain:domain,expires:1})}function clearToken(domain=getDomain()){Cookies.remove(Crypto.encrypt(TOKEN),{domain:domain,expires:1})}var CCToken=Object.freeze({__proto__:null,setToken:setToken,getToken:getToken,clearToken:clearToken});export{Crypto as CCCrypto,CCToken,CCUser};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-ccdk",
-  "version": "0.0.4",
+  "version": "0.0.7",
   "description": "",
   "main": "lib/ccdk-min.js",
   "scripts": {