@nger/fk-upload 1.0.3 → 1.0.4

package/package.json

@@ -1,21 +1,33 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "dist/core.js",
   "types": "dist/core.d.ts",
   "publishConfig": {
     "access": "public"
   },
+  "files": [
+    "./dist",
+    "./readme.md"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "axios": "^0.26.1",
     "@nger/core": "^1.0.0",
-    "@nger/http": "^4.0.0"
+    "@nger/http": "^4.0.0",
+    "@nger/ws": "^1.0.0",
+    "@types/download": "^8.0.1",
+    "@types/request": "^2.48.8",
+    "axios": "^0.26.1",
+    "download": "^8.0.0",
+    "form-data": "^4.0.0",
+    "md5-file": "^5.0.0",
+    "request": "^2.88.2"
   },
   "scripts": {
     "tsc": "tsc -w",
     "tsc:build": "tsc"
-  }
+  },
+  "readme": "## admin\n\n## account\n\n## test url -- \n\n## \n\nhttp://kaifa2.jidujiaowang.com/web/index.php?c=site&a=entry&eid=8&version_id=0\nadmin888\n12345678"
 }

package/readme.md

@@ -0,0 +1,11 @@
+## admin
+
+## account
+
+## test url -- 
+
+## 
+
+http://kaifa2.jidujiaowang.com/web/index.php?c=site&a=entry&eid=8&version_id=0
+admin888
+12345678

package/dist/core.d.ts

@@ -1 +0,0 @@
-export * from './fk-upload.module';

package/dist/fk-upload.controller.d.ts

@@ -1,21 +0,0 @@
-import { Context } from 'koa';
-import { FkService } from './fk.service';
-export declare class FkAjaxController {
-    private fk;
-    baseUrl: string;
-    indexUrl: string;
-    constructor(fk: FkService);
-    login(ctx: Context): Promise<any>;
-    loginH(cmd: string, ctx: Context, post: any): Promise<any>;
-    index(item: string, ctx: Context): Promise<string | undefined>;
-    statisticsH(query: any, post: any, ctx: Context): Promise<any>;
-    logH(query: any, post: any, ctx: Context): Promise<any>;
-    couponH(query: any, post: any, ctx: Context): Promise<any>;
-    funPanel_h(token: string, post: any, ctx: Context): Promise<any>;
-    portal(query: any, ctx: Context): Promise<any>;
-    get(url: string, ctx: Context): Promise<any>;
-    post(url: string, data: any, ctx: Context): Promise<any>;
-    toUrl(data: any): string;
-    formatBody(data: any): any;
-    private parseCookies;
-}

package/dist/fk-upload.controller.js

@@ -1,212 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FkAjaxController = void 0;
-const core_1 = require("@nger/core");
-const http_1 = require("@nger/http");
-const axios_1 = __importDefault(require("axios"));
-const fk_service_1 = require("./fk.service");
-let FkAjaxController = class FkAjaxController {
-    fk;
-    baseUrl = `https://adm.webportal.top/`;
-    indexUrl = `https://i.vip.webportal.top/`;
-    constructor(fk) {
-        this.fk = fk;
-    }
-    login(ctx) {
-        return this.get(`https://adm.webportal.top`, ctx);
-    }
-    async loginH(cmd, ctx, post) {
-        const data = this.formatBody(post);
-        return this.post(`https://adm.webportal.top/ajax/login_h.jsp?cmd=${cmd}`, data, ctx);
-    }
-    async index(item, ctx) {
-        if (!this.fk.cookies.has('_FSESSIONID')) {
-            ctx.redirect('/login');
-            return;
-        }
-        let res = await this.get(`https://i.vip.webportal.top/?siteId=0&_item=${item}`, ctx);
-        return res;
-    }
-    statisticsH(query, post, ctx) {
-        const data = this.formatBody(post);
-        return this.post(`${this.indexUrl}ajax/log_h.jsp?${this.toUrl(query)}`, data, ctx);
-    }
-    async logH(query, post, ctx) {
-        if (ctx.method.toLowerCase() === 'get') {
-            return this.get(`${this.baseUrl}ajax/log_h.jsp?${this.toUrl(query)}`, ctx);
-        }
-        else {
-            const data = this.formatBody(post);
-            return this.post(`${this.baseUrl}ajax/log_h.jsp?${this.toUrl(query)}`, data, ctx);
-        }
-    }
-    couponH(query, post, ctx) {
-        const data = this.formatBody(post);
-        return this.post(`${this.indexUrl}ajax/coupon_h.jsp?${this.toUrl(query)}`, data, ctx);
-    }
-    async funPanel_h(token, post, ctx) {
-        const url = `https://i.vip.webportal.top/ajax/funPanel_h.jsp?_TOKEN=${token}`;
-        const data = this.formatBody(post);
-        return this.post(url, data, ctx).then(res => res.data);
-    }
-    portal(query, ctx) {
-        return this.get(`${this.baseUrl}portal.jsp?${this.toUrl(query)}`, ctx);
-    }
-    get(url, ctx) {
-        if (ctx.headers.cookie)
-            this.parseCookies([ctx.headers.cookie]);
-        return axios_1.default.get(url, {
-            headers: {
-                Cookie: this.fk.getCookie(),
-                [`Content-Type`]: `application/x-www-form-urlencoded; charset=UTF-8`
-            }
-        }).then(res => {
-            const cookies = res.headers['set-cookie'];
-            this.parseCookies(cookies);
-            this.fk.cookies.forEach((val, key) => {
-                ctx.cookies.set(key, val);
-            });
-            return res.data;
-        });
-    }
-    post(url, data, ctx) {
-        if (ctx.headers.cookie)
-            this.parseCookies([ctx.headers.cookie]);
-        return axios_1.default.post(url, this.toUrl(data), {
-            headers: {
-                Cookie: this.fk.getCookie()
-            }
-        }).then(res => {
-            const cookies = res.headers['set-cookie'];
-            this.parseCookies(cookies);
-            this.fk.cookies.forEach((val, key) => {
-                ctx.cookies.set(key, val);
-            });
-            return res.data;
-        });
-    }
-    toUrl(data) {
-        return Object.keys(data).map(key => {
-            const value = Reflect.get(data, key);
-            return `${key}=${value}`;
-        }).join('&');
-    }
-    formatBody(data) {
-        const res = {};
-        if (typeof data === 'object') {
-            Object.keys(data).map(key => {
-                const value = Reflect.get(data, key);
-                Reflect.set(res, key, this.formatBody(value));
-            });
-            return res;
-        }
-        if (typeof data === 'string') {
-            if (data === 'false')
-                return false;
-            if (data === 'true')
-                return true;
-            return data;
-        }
-        return data;
-    }
-    parseCookies(cookies) {
-        if (cookies) {
-            cookies.map(cookie => {
-                const list = cookie.split(';');
-                list.map(item => {
-                    const [name, value] = item.split('=');
-                    this.fk.cookies.set(name, value);
-                });
-            });
-        }
-    }
-};
-__decorate([
-    (0, http_1.Get)('login'),
-    __param(0, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", void 0)
-], FkAjaxController.prototype, "login", null);
-__decorate([
-    (0, http_1.Post)('ajax/login_h.jsp'),
-    __param(0, (0, http_1.Query)('cmd')),
-    __param(1, (0, core_1.Inject)(http_1.CONTEXT)),
-    __param(2, (0, http_1.Body)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object, Object]),
-    __metadata("design:returntype", Promise)
-], FkAjaxController.prototype, "loginH", null);
-__decorate([
-    (0, http_1.Get)('/'),
-    __param(0, (0, http_1.Query)('_item')),
-    __param(1, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Promise)
-], FkAjaxController.prototype, "index", null);
-__decorate([
-    (0, http_1.Post)('ajax/statistics_h.jsp'),
-    __param(0, (0, http_1.Query)()),
-    __param(1, (0, http_1.Body)()),
-    __param(2, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object]),
-    __metadata("design:returntype", void 0)
-], FkAjaxController.prototype, "statisticsH", null);
-__decorate([
-    (0, http_1.Get)(`ajax/log_h.jsp`),
-    (0, http_1.Post)('ajax/log_h.jsp'),
-    __param(0, (0, http_1.Query)()),
-    __param(1, (0, http_1.Body)()),
-    __param(2, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object]),
-    __metadata("design:returntype", Promise)
-], FkAjaxController.prototype, "logH", null);
-__decorate([
-    (0, http_1.Post)(`ajax/coupon_h.jsp`),
-    __param(0, (0, http_1.Query)()),
-    __param(1, (0, http_1.Body)()),
-    __param(2, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object]),
-    __metadata("design:returntype", void 0)
-], FkAjaxController.prototype, "couponH", null);
-__decorate([
-    (0, http_1.Post)('ajax/funPanel_h.jsp'),
-    __param(0, (0, http_1.Query)('_TOKEN')),
-    __param(1, (0, http_1.Body)()),
-    __param(2, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object, Object]),
-    __metadata("design:returntype", Promise)
-], FkAjaxController.prototype, "funPanel_h", null);
-__decorate([
-    (0, http_1.Get)(`portal.jsp`),
-    __param(0, (0, http_1.Query)()),
-    __param(1, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", void 0)
-], FkAjaxController.prototype, "portal", null);
-FkAjaxController = __decorate([
-    (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [fk_service_1.FkService])
-], FkAjaxController);
-exports.FkAjaxController = FkAjaxController;

package/dist/fk-upload.module.d.ts

@@ -1,2 +0,0 @@
-export declare class FkUploadModule {
-}

package/dist/fk-upload.module.js

@@ -1,25 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FkUploadModule = void 0;
-const core_1 = require("@nger/core");
-const fk_upload_controller_1 = require("./fk-upload.controller");
-const fk_service_1 = require("./fk.service");
-let FkUploadModule = class FkUploadModule {
-};
-FkUploadModule = __decorate([
-    (0, core_1.Module)({
-        providers: [
-            fk_service_1.FkService
-        ],
-        controllers: [
-            fk_upload_controller_1.FkAjaxController
-        ]
-    })
-], FkUploadModule);
-exports.FkUploadModule = FkUploadModule;

package/dist/fk.service.d.ts

@@ -1,4 +0,0 @@
-export declare class FkService {
-    cookies: Map<string, any>;
-    getCookie(): string;
-}

package/dist/fk.service.js

@@ -1,24 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FkService = void 0;
-const core_1 = require("@nger/core");
-let FkService = class FkService {
-    cookies = new Map();
-    getCookie() {
-        let cookies = [];
-        this.cookies.forEach((value, key) => {
-            cookies.push(`${key}=${value}`);
-        });
-        return cookies.join(';');
-    }
-};
-FkService = __decorate([
-    (0, core_1.Injectable)()
-], FkService);
-exports.FkService = FkService;

package/dist/main.d.ts

@@ -1,3 +0,0 @@
-import "reflect-metadata";
-export declare class AppModule {
-}

package/dist/main.js

@@ -1,32 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppModule = void 0;
-require("reflect-metadata");
-require('dotenv').config();
-const core_1 = require("@nger/core");
-const core_2 = require("@nger/core");
-const fk_upload_module_1 = require("./fk-upload.module");
-const http_1 = require("@nger/http");
-let AppModule = class AppModule {
-};
-AppModule = __decorate([
-    (0, core_2.Module)({
-        providers: [{
-                provide: core_1.APP_ROOT,
-                useValue: process.cwd()
-            }],
-        imports: [
-            fk_upload_module_1.FkUploadModule,
-            http_1.HttpModule.forEnv()
-        ],
-        controllers: []
-    })
-], AppModule);
-exports.AppModule = AppModule;
-(0, core_1.platformCore)().bootstrap(AppModule);

package/pnpm-lock.yaml

@@ -1,27 +0,0 @@
-lockfileVersion: 5.3
-
-specifiers:
-  axios: ^0.26.1
-
-dependencies:
-  axios: 0.26.1
-
-packages:
-
-  /axios/0.26.1:
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
-    dependencies:
-      follow-redirects: 1.14.9
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /follow-redirects/1.14.9:
-    resolution: {integrity: sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false

package/src/core.ts

@@ -1 +0,0 @@
-export * from './fk-upload.module';

package/src/fk-upload.controller.ts

@@ -1,135 +0,0 @@
-import { Controller, Inject } from '@nger/core'
-import { Body, CONTEXT, Get, Post, Query } from '@nger/http'
-import axios from 'axios'
-import { Context } from 'koa';
-import { FkService } from './fk.service';
-@Controller()
-export class FkAjaxController {
-    baseUrl: string = `https://adm.webportal.top/`
-    indexUrl: string = `https://i.vip.webportal.top/`
-    constructor(private fk: FkService) { }
-    @Get('login')
-    login(@Inject(CONTEXT) ctx: Context) {
-        return this.get(`https://adm.webportal.top`, ctx)
-    }
-
-    @Post('ajax/login_h.jsp')
-    async loginH(@Query('cmd') cmd: string, @Inject(CONTEXT) ctx: Context, @Body() post: any) {
-        const data = this.formatBody(post);
-        return this.post(`https://adm.webportal.top/ajax/login_h.jsp?cmd=${cmd}`, data, ctx)
-    }
-
-    @Get('/')
-    async index(@Query('_item') item: string, @Inject(CONTEXT) ctx: Context) {
-        if (!this.fk.cookies.has('_FSESSIONID')) {
-            ctx.redirect('/login')
-            return;
-        }
-        let res: string = await this.get(`https://i.vip.webportal.top/?siteId=0&_item=${item}`, ctx)
-        return res;
-    }
-
-    @Post('ajax/statistics_h.jsp')
-    statisticsH(@Query() query: any, @Body() post: any, @Inject(CONTEXT) ctx: Context) {
-        const data = this.formatBody(post);
-        return this.post(`${this.indexUrl}ajax/log_h.jsp?${this.toUrl(query)}`, data, ctx)
-    }
-
-    @Get(`ajax/log_h.jsp`)
-    @Post('ajax/log_h.jsp')
-    async logH(@Query() query: any, @Body() post: any, @Inject(CONTEXT) ctx: Context) {
-        if (ctx.method.toLowerCase() === 'get') {
-            return this.get(`${this.baseUrl}ajax/log_h.jsp?${this.toUrl(query)}`, ctx)
-        } else {
-            const data = this.formatBody(post);
-            return this.post(`${this.baseUrl}ajax/log_h.jsp?${this.toUrl(query)}`, data, ctx)
-        }
-    }
-
-    @Post(`ajax/coupon_h.jsp`)
-    couponH(@Query() query: any, @Body() post: any, @Inject(CONTEXT) ctx: Context) {
-        const data = this.formatBody(post);
-        return this.post(`${this.indexUrl}ajax/coupon_h.jsp?${this.toUrl(query)}`, data, ctx)
-    }
-
-    @Post('ajax/funPanel_h.jsp')
-    async funPanel_h(@Query('_TOKEN') token: string, @Body() post: any, @Inject(CONTEXT) ctx: Context) {
-        const url = `https://i.vip.webportal.top/ajax/funPanel_h.jsp?_TOKEN=${token}`
-        const data = this.formatBody(post)
-        return this.post(url, data, ctx).then(res => res.data)
-    }
-
-    @Get(`portal.jsp`)
-    portal(@Query() query: any, @Inject(CONTEXT) ctx: Context) {
-        return this.get(`${this.baseUrl}portal.jsp?${this.toUrl(query)}`, ctx)
-    }
-
-    get(url: string, ctx: Context) {
-        if (ctx.headers.cookie) this.parseCookies([ctx.headers.cookie])
-        return axios.get(url, {
-            headers: {
-                Cookie: this.fk.getCookie(),
-                [`Content-Type`]: `application/x-www-form-urlencoded; charset=UTF-8`
-            }
-        }).then(res => {
-            const cookies = res.headers['set-cookie'];
-            this.parseCookies(cookies)
-            this.fk.cookies.forEach((val, key) => {
-                ctx.cookies.set(key, val)
-            });
-            return res.data;
-        })
-    }
-
-    post(url: string, data: any, ctx: Context) {
-        if (ctx.headers.cookie) this.parseCookies([ctx.headers.cookie])
-        return axios.post(url, this.toUrl(data), {
-            headers: {
-                Cookie: this.fk.getCookie()
-            }
-        }).then(res => {
-            const cookies = res.headers['set-cookie'];
-            this.parseCookies(cookies)
-            this.fk.cookies.forEach((val, key) => {
-                ctx.cookies.set(key, val)
-            });
-            return res.data
-        })
-    }
-
-    toUrl(data: any) {
-        return Object.keys(data).map(key => {
-            const value = Reflect.get(data, key)
-            return `${key}=${value}`
-        }).join('&')
-    }
-
-    formatBody(data: any) {
-        const res: any = {};
-        if (typeof data === 'object') {
-            Object.keys(data).map(key => {
-                const value = Reflect.get(data, key);
-                Reflect.set(res, key, this.formatBody(value))
-            })
-            return res;
-        }
-        if (typeof data === 'string') {
-            if (data === 'false') return false;
-            if (data === 'true') return true;
-            return data;
-        }
-        return data;
-    }
-
-    private parseCookies(cookies?: string[]) {
-        if (cookies) {
-            cookies.map(cookie => {
-                const list = cookie.split(';');
-                list.map(item => {
-                    const [name, value] = item.split('=')
-                    this.fk.cookies.set(name, value)
-                })
-            })
-        }
-    }
-}

package/src/fk-upload.module.ts

@@ -1,13 +0,0 @@
-import { Module } from '@nger/core'
-import { FkAjaxController } from './fk-upload.controller';
-import { FkService } from './fk.service';
-
-@Module({
-    providers: [
-        FkService
-    ],
-    controllers: [
-        FkAjaxController
-    ]
-})
-export class FkUploadModule { }

package/src/fk.service.ts

@@ -1,14 +0,0 @@
-import { Injectable } from '@nger/core'
-@Injectable()
-export class FkService {
-
-    cookies: Map<string, any> = new Map();
-
-    getCookie(){
-        let cookies: string[] = []
-        this.cookies.forEach((value, key)=>{
-            cookies.push(`${key}=${value}`)
-        })
-        return cookies.join(';')
-    }
-}

package/src/index.html

@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-<script>if(top.window !== window){
-document.domain="127.0.0.1";
-}
-var url ='//adm.127.0.0.1/index.jsp?url=' + encodeURIComponent(top.location.href);top.location.href = url;</script>

package/src/main.ts

@@ -1,20 +0,0 @@
-import "reflect-metadata";
-require('dotenv').config();
-import { APP_ROOT, platformCore } from '@nger/core'
-import { Module } from '@nger/core'
-import { FkUploadModule } from "./fk-upload.module";
-import { HttpModule } from '@nger/http';
-
-@Module({
-    providers: [{
-        provide: APP_ROOT,
-        useValue: process.cwd()
-    }],
-    imports: [
-        FkUploadModule,
-        HttpModule.forEnv()
-    ],
-    controllers: []
-})
-export class AppModule { }
-platformCore().bootstrap(AppModule)

package/tsconfig.json

@@ -1,12 +0,0 @@
-{
-    "extends": "../../tsconfig.json",
-    "compilerOptions": {
-        "declaration": true,
-        "outDir": "dist",
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true
-    },
-    "include": [
-        "src"
-    ]
-}