@freelog/tools-lib 0.1.113 → 0.1.116

package/dist/service-API/resources.d.ts

@@ -65,6 +65,8 @@ interface ListParamsType {
     isLoadLatestVersionInfo?: 0 | 1;
     projection?: string;
     sort?: string;
+    userId?: number;
+    isLoadFreezeReason?: 0 | 1;
 }
 interface ListReturnType extends CommonReturn {
     data: IResourceInfo[];
@@ -76,6 +78,7 @@ interface InfoParamsType {
     isTranslate?: 0 | 1;
     isLoadLatestVersionInfo?: 0 | 1;
     projection?: string;
+    isLoadFreezeReason?: 0 | 1;
 }
 interface InfoReturnType extends CommonReturn {
     data: IResourceInfo;
@@ -88,6 +91,7 @@ interface BatchInfoParamsType {
     isTranslate?: 0 | 1;
     isLoadLatestVersionInfo?: 0 | 1;
     projection?: string;
+    isLoadFreezeReason?: 0 | 1;
 }
 interface BatchInfoReturnType extends CommonReturn {
     data: IResourceInfo[];
@@ -247,6 +251,11 @@ interface RelationTreeAuthParamsType {
     versionRange?: string;
 }
 export declare function relationTreeAuth({ resourceId, ...params }: RelationTreeAuthParamsType): Promise<any>;
+interface ResourcesCountParamsType {
+    userIds: string;
+    status?: 0 | 1 | 2 | 3;
+}
+export declare function resourcesCount({ ...params }: ResourcesCountParamsType): Promise<any>;
 interface BatchAuthParamsType {
     resourceIds: string;
     versions?: string;

package/dist/service-API/user.d.ts

@@ -11,7 +11,23 @@ interface LogoutParamsType {
     returnUrl?: string;
 }
 export declare function logout({ ...params }?: LogoutParamsType): Promise<any>;
-export declare function currentUserInfo(): Promise<any>;
+interface UsersParamsType {
+    skip?: number;
+    limit?: number;
+    keywords?: string;
+    userId?: number;
+    tagIds?: string;
+    startRegisteredDate?: string;
+    endRegisteredDate?: string;
+}
+export declare function users(params: UsersParamsType): Promise<any>;
+interface BatchUserListParamsType {
+    userIds: string;
+}
+export declare function batchUserList(params: BatchUserListParamsType): Promise<any>;
+interface CurrentUserInfoParamsType {
+}
+export declare function currentUserInfo({}?: CurrentUserInfoParamsType): Promise<any>;
 interface UserDetailsParamsType {
     mobile?: string;
     username?: string;

package/dist/tools-lib.cjs.development.js

@@ -1195,55 +1195,70 @@ function exception403(_temp12) {
     from: fromUrl
   });
 }
+function nodeFreeze(_ref27) {
+  var nodeID = _ref27.nodeID;
+  return "/result/node/freeze/" + nodeID;
+}
+function resourceFreeze(_ref28) {
+  var resourceID = _ref28.resourceID;
+  return "/result/resource/freeze/" + resourceID;
+}
 function login(_temp13) {
-  var _ref27 = _temp13 === void 0 ? {} : _temp13,
-      goTo = _ref27.goTo;
+  var _ref29 = _temp13 === void 0 ? {} : _temp13,
+      goTo = _ref29.goTo;
 
   return "/login" + handleQuery({
     goTo: goTo ? encodeURIComponent(goTo) : undefined
   });
 }
 function logon(_temp14) {
-  var _ref28 = _temp14 === void 0 ? {} : _temp14,
-      goTo = _ref28.goTo;
+  var _ref30 = _temp14 === void 0 ? {} : _temp14,
+      goTo = _ref30.goTo;
 
   return "/logon" + handleQuery({
     goTo: goTo ? encodeURIComponent(goTo) : undefined
   });
 }
 function retrieveUserPassword(_temp15) {
-  var _ref29 = _temp15 === void 0 ? {} : _temp15,
-      goTo = _ref29.goTo;
+  var _ref31 = _temp15 === void 0 ? {} : _temp15,
+      goTo = _ref31.goTo;
 
   return "/retrieve" + handleQuery({
     goTo: goTo ? encodeURIComponent(goTo) : undefined
   });
 }
 function retrievePayPassword(_temp16) {
-  var _ref30 = _temp16 === void 0 ? {} : _temp16;
+  var _ref32 = _temp16 === void 0 ? {} : _temp16;
 
-  _objectDestructuringEmpty(_ref30);
+  _objectDestructuringEmpty(_ref32);
 
   return "/retrievePayPassword";
 }
-function wallet(_temp17) {
-  var _ref31 = _temp17 === void 0 ? {} : _temp17;
+function userFreeze(_temp17) {
+  var _ref33 = _temp17 === void 0 ? {} : _temp17;
 
-  _objectDestructuringEmpty(_ref31);
+  _objectDestructuringEmpty(_ref33);
+
+  return "/freeze";
+}
+function wallet(_temp18) {
+  var _ref34 = _temp18 === void 0 ? {} : _temp18;
+
+  _objectDestructuringEmpty(_ref34);
 
   return "/logged/wallet";
 }
-function contract(_temp18) {
-  var _ref32 = _temp18 === void 0 ? {} : _temp18;
+function contract(_temp19) {
+  var _ref35 = _temp19 === void 0 ? {} : _temp19;
 
-  _objectDestructuringEmpty(_ref32);
+  _objectDestructuringEmpty(_ref35);
 
   return "/logged/contract";
 }
-function setting(_temp19) {
-  var _ref33 = _temp19 === void 0 ? {} : _temp19;
+function setting(_temp20) {
+  var _ref36 = _temp20 === void 0 ? {} : _temp20;
 
-  _objectDestructuringEmpty(_ref33);
+  _objectDestructuringEmpty(_ref36);
 
   return "/logged/setting";
 }
@@ -1294,10 +1309,13 @@ var LinkTo = {
   nodeCreateSuccess: nodeCreateSuccess,
   invitation: invitation,
   exception403: exception403,
+  nodeFreeze: nodeFreeze,
+  resourceFreeze: resourceFreeze,
   login: login,
   logon: logon,
   retrieveUserPassword: retrieveUserPassword,
   retrievePayPassword: retrievePayPassword,
+  userFreeze: userFreeze,
   wallet: wallet,
   contract: contract,
   setting: setting
@@ -2107,18 +2125,27 @@ function relationTreeAuth(_ref12) {
     params: params
   });
 }
-function batchAuth$1(_ref13) {
+function resourcesCount(_ref13) {
   var params = _extends({}, _ref13);
 
   return FUtil.Request({
     method: 'GET',
-    url: "/v2/auths/resources/batchAuth/results",
+    url: "/v2/resources/count",
     params: params
   });
 }
-function resourcesRecommend(_ref14) {
+function batchAuth$1(_ref14) {
   var params = _extends({}, _ref14);
 
+  return FUtil.Request({
+    method: 'GET',
+    url: "/v2/auths/resources/batchAuth/results",
+    params: params
+  });
+}
+function resourcesRecommend(_ref15) {
+  var params = _extends({}, _ref15);
+
   return FUtil.Request({
     method: 'GET',
     url: "/v2/resources/recommend",
@@ -2151,6 +2178,7 @@ var Resource = {
   cycleDependencyCheck: cycleDependencyCheck$1,
   relationTree: relationTree$1,
   relationTreeAuth: relationTreeAuth,
+  resourcesCount: resourcesCount,
   batchAuth: batchAuth$1,
   resourcesRecommend: resourcesRecommend
 };
@@ -2172,9 +2200,6 @@ function logout(_temp) {
   var _ref2 = _temp === void 0 ? {} : _temp,
       params = _extends({}, _ref2);
 
-  // return FUtil.Axios.get(`/passport/logout`, {
-  //   params,
-  // });
   return FUtil.Request({
     method: 'GET',
     url: '/v2/passport/logout',
@@ -2182,11 +2207,26 @@ function logout(_temp) {
   }, {
     noRedirect: true
   });
-} // 获取当前登录用户信息
-// interface CurrentUserInfoParamsType {
-// }
+}
+function users(params) {
+  return FUtil.Request({
+    method: 'GET',
+    url: "/v2/users",
+    params: params
+  });
+}
+function batchUserList(params) {
+  return FUtil.Request({
+    method: 'GET',
+    url: "/v2/users/list",
+    params: params
+  });
+}
+function currentUserInfo(_temp2) {
+  var _ref3 = _temp2 === void 0 ? {} : _temp2;
+
+  _objectDestructuringEmpty(_ref3);
 
-function currentUserInfo() {
   // return FUtil.Axios.get(`/v1/userinfos/current`);
   return FUtil.Request({
     method: 'GET',
@@ -2207,9 +2247,9 @@ function logon$1(params) {
     data: params
   });
 }
-function resetPassword(_ref3) {
-  var loginName = _ref3.loginName,
-      params = _objectWithoutPropertiesLoose(_ref3, _excluded$4);
+function resetPassword(_ref4) {
+  var loginName = _ref4.loginName,
+      params = _objectWithoutPropertiesLoose(_ref4, _excluded$4);
 
   return FUtil.Request({
     method: 'PUT',
@@ -2307,6 +2347,8 @@ var User = {
   __proto__: null,
   login: login$1,
   logout: logout,
+  users: users,
+  batchUserList: batchUserList,
   currentUserInfo: currentUserInfo,
   userDetails: userDetails,
   logon: logon$1,
@@ -2895,7 +2937,7 @@ function getFilesSha1Info(_x, _x2) {
 
 function _getFilesSha1Info() {
   _getFilesSha1Info = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(_ref, cdPartially) {
-    var sha1, needHandleSha1, allData, _yield$Storage$filesL, data, finishedInfo;
+    var sha1, delay, needHandleSha1, allData, _yield$Storage$filesL, data, finishedInfo;
 
     return runtime_1.wrap(function _callee$(_context) {
       while (1) {
@@ -2917,12 +2959,12 @@ function _getFilesSha1Info() {
             return _context.abrupt("return", []);
 
           case 4:
+            delay = 500;
             needHandleSha1 = [].concat(sha1);
             allData = [];
 
-          case 6:
+          case 7:
 
-            console.log(needHandleSha1.join(','), 'needHandleSha1.join()90ojlskdfjsdlk');
             _context.next = 10;
             return filesListInfo({
               sha1: needHandleSha1.join(',')
@@ -2965,10 +3007,10 @@ function _getFilesSha1Info() {
 
           case 18:
             _context.next = 20;
-            return promiseSleep(3000);
+            return promiseSleep(delay);
 
           case 20:
-            _context.next = 6;
+            _context.next = 7;
             break;
 
           case 22:
@@ -3136,7 +3178,7 @@ function _request() {
           case 3:
             result = _context.sent;
 
-            if (!((result.errCode === 30 || result.errCode === 30) && !noRedirect)) {
+            if (!(result.ret === 0 && result.errCode === 30 && !noRedirect)) {
               _context.next = 8;
               break;
             }
@@ -3150,10 +3192,15 @@ function _request() {
             }));
 
           case 8:
+            if (result.ret === 4 && result.errCode === 10 && !noRedirect) {
+              window.location.replace("" + completeUrlByDomain('user') + userFreeze({
+                goTo: window.location.href
+              }));
+            }
 
             return _context.abrupt("return", result);
 
-          case 10:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -3337,7 +3384,9 @@ var I18nNext = /*#__PURE__*/function () {
                 lng: lng,
                 fallbackLng: 'zh_CN',
                 interpolation: {
-                  escapeValue: false
+                  escapeValue: false,
+                  prefix: '{',
+                  suffix: '}'
                 }
               });