v0.9.8

feat: add .editorconfig
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-10-02 18:59:52 +08:00 · 2020-10-02 18:54:28 +08:00 · 2020-10-02 18:54:10 +08:00 · 2020-10-02 18:53:31 +08:00 · 2020-10-02 18:48:37 +08:00 · 2020-10-02 16:43:18 +08:00
49 changed files with 952 additions and 1238 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.9.7",
+    "version": "0.9.8",
    "useWorkspaces": true,
    "npmClient": "yarn",
    "packages": [
--- a/packages/amqp/package.json
+++ b/packages/amqp/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/amqp",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript amqp package",
    "keywords": [
        "miaoscript",
@@ -19,15 +19,15 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
-        "@javatypes/amqp-client": "^0.0.2",
-        "@javatypes/spring-amqp": "^0.0.2",
-        "@javatypes/spring-rabbit": "^0.0.2",
+        "@ccms/nashorn": "^0.9.8",
+        "@javatypes/amqp-client": "^0.0.3",
+        "@javatypes/spring-amqp": "^0.0.3",
+        "@javatypes/spring-rabbit": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
--- a/packages/amqp/src/adapter/container.ts
+++ b/packages/amqp/src/adapter/container.ts
@@ -2,7 +2,7 @@ import { ConnectionFactoryAdapter, ConnectionFactory } from "./connection"
 import { ChannelAwareMessageListenerAdapter, ChannelAwareMessageListener } from "./listener"

 export const SimpleMessageListenerContainer = org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
-export const AcknowledgeMode: org.springframework.amqp.core.AcknowledgeMode = Java.type('org.springframework.amqp.core.AcknowledgeMode')
+export const AcknowledgeMode = org.springframework.amqp.core.AcknowledgeMode
 interface ContainerConfig {
    connectionFactory: ConnectionFactoryAdapter | typeof ConnectionFactory
    queueNames: string[]
--- a/packages/amqp/src/admin.ts
+++ b/packages/amqp/src/admin.ts
@@ -46,7 +46,7 @@ export class AmqpAdmin {
    }

    declareBinding(queue: string, exchange: string, routerKey: string, argument: any = null) {
-        let binding = new this.Binding(queue, this.DestinationType.QUEUE, exchange, routerKey, argument)
+        let binding = new this.Binding(queue, org.springframework.amqp.core.Binding.DestinationType.QUEUE, exchange, routerKey, argument)
        this.amqpAdmin.declareBinding(binding)
        return this
    }
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/api",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -19,9 +19,9 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4",
-        "@ccms/ployfill": "^0.9.4",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8",
+        "@ccms/ployfill": "^0.9.8",
        "base64-js": "^1.3.1",
        "source-map-builder": "^0.0.7"
    },
--- a/packages/api/src/task.ts
+++ b/packages/api/src/task.ts
@@ -29,7 +29,6 @@ export namespace task {
            if (plugin) { return this.pluginCreate(plugin, task) }
            return task
        }
-        abstract create0(func: Function): task.Task
        /**
         * 在主线程执行代码
         * @param func 执行内容
@@ -42,7 +41,8 @@ export namespace task {
            if (plugin) { return this.pluginDisable(plugin) }
            this.disable0()
        }
-        abstract disable0()
+        protected abstract create0(func: Function): task.Task
+        protected abstract disable0()
    }
    /**
     * 任务抽象
@@ -116,7 +116,7 @@ export namespace task {
         * 提交任务
         * @param args 任务参数
         */
-        abstract submit0(...args: any[]): Cancelable
+        protected abstract submit0(...args: any[]): Cancelable
    }
    /**
     * 返可取消的对象
--- a/packages/bukkit/package.json
+++ b/packages/bukkit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/bukkit",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript bukkit package",
    "keywords": [
        "miaoscript",
@@ -19,14 +19,14 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@javatypes/spigot-api": "^0.0.2",
+        "@javatypes/spigot-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    }
 }
--- a/packages/bukkit/src/server.ts
+++ b/packages/bukkit/src/server.ts
@@ -16,13 +16,13 @@ export class BukkitServer extends server.ReflectServer {
    }

    getPlayer(name: string) {
-        return Bukkit.getPlayer(name)
+        return Bukkit.getPlayerExact(name)
    }
    getVersion(): string {
        return Bukkit.getVersion()
    }
    getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers() as unknown as any[]
+        return Bukkit.getOnlinePlayers()
    }
    getConsoleSender() {
        return Bukkit.getConsoleSender()
--- a/packages/bungee/package.json
+++ b/packages/bungee/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/bungee",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript bungee package",
    "keywords": [
        "miaoscript",
@@ -19,14 +19,14 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@javatypes/bungee-api": "^0.0.2",
+        "@javatypes/bungee-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    }
 }
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/common",
-    "version": "0.9.4",
+    "version": "0.9.8",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -19,8 +19,8 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
-        "@javatypes/jdk": "^0.0.2",
+        "@ccms/nashorn": "^0.9.8",
+        "@javatypes/jdk": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
--- a/packages/container/package.json
+++ b/packages/container/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/container",
-    "version": "0.9.4",
+    "version": "0.9.8",
    "description": "MiaoScript container package",
    "keywords": [
        "miaoscript",
@@ -19,7 +19,7 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
+        "@ccms/nashorn": "^0.9.8",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
--- a/packages/container/src/index.ts
+++ b/packages/container/src/index.ts
@@ -62,14 +62,15 @@ export const JSClass = (className: string) => {
 export const Autowired = (className?: any) => {
    return function (target: any, propertyKey: string, index?: number) {
        let container = getContainer()
-        if (className instanceof Symbol || className instanceof Function) {
+        if (className && (className instanceof Symbol || className instanceof Function)) {
            return inject(className)(target, propertyKey, index)
        }
        let type = Reflect.getMetadata('design:type', target, propertyKey)
-        if (type && type !== Object) {
+        if (type && type !== Object && Java.isJavaObject(type)) {
            inject(type)(target, propertyKey, index)
            named(className || propertyKey)(target, propertyKey, index)
        } else if (container.isBound(ioc.Autowired)) {
+            console.debug('Autowired', 'ioc.Autowired', 'named', className || propertyKey)
            target[propertyKey] = container.getNamed(ioc.Autowired, className || propertyKey)
        } else {
            throw new Error(`No matching bindings found for target: ${target.constructor.name} type: ${type} named: ${className || propertyKey}`)
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/core",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -24,8 +24,8 @@
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    },
    "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/database",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript database package",
    "keywords": [
        "miaoscript",
@@ -19,13 +19,13 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@javatypes/spring-jdbc": "^0.0.2",
+        "@javatypes/spring-jdbc": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    }
 }
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/i18n",
-    "version": "0.9.4",
+    "version": "0.9.8",
    "description": "MiaoScript i18n package",
    "keywords": [
        "miaoscript",
@@ -19,7 +19,7 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
+        "@ccms/nashorn": "^0.9.8",
        "@types/js-yaml": "^3.12.5",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
--- a/packages/keyvalue/package.json
+++ b/packages/keyvalue/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/keyvalue",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript keyvalue package",
    "keywords": [
        "miaoscript",
@@ -19,15 +19,15 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
-        "@javatypes/amqp-client": "^0.0.2",
-        "@javatypes/spring-amqp": "^0.0.2",
-        "@javatypes/spring-rabbit": "^0.0.2",
+        "@ccms/nashorn": "^0.9.8",
+        "@javatypes/amqp-client": "^0.0.3",
+        "@javatypes/spring-amqp": "^0.0.3",
+        "@javatypes/spring-rabbit": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
--- a/packages/keyvalue/src/adapter/admin.ts
+++ b/packages/keyvalue/src/adapter/admin.ts
@@ -1,17 +0,0 @@
-import { ConnectionFactoryAdapter } from "./connection"
-import { RabbitTemplateAdapter } from "./template"
-import { JSClass } from "@ccms/container"
-
-export const RabbitAdmin = Java.type('org.springframework.amqp.rabbit.core.RabbitAdmin')
-
-export class RabbitAdminAdapter {
-    @JSClass('org.springframework.amqp.rabbit.core.RabbitAdmin')
-    private RabbitAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitAdmin
-    constructor(config: RabbitTemplateAdapter | org.springframework.amqp.rabbit.core.RabbitTemplate | ConnectionFactoryAdapter | org.springframework.amqp.rabbit.connection.ConnectionFactory) {
-        this._Handler = new RabbitAdmin((config instanceof RabbitTemplateAdapter || config instanceof ConnectionFactoryAdapter) ? config.getHandler() : config)
-    }
-    getHandler(): org.springframework.amqp.rabbit.core.RabbitAdmin {
-        return this._Handler
-    }
-}
--- a/packages/keyvalue/src/adapter/callback.ts
+++ b/packages/keyvalue/src/adapter/callback.ts
@@ -1,30 +0,0 @@
-export const ConfirmCallback = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback')
-export const ReturnCallback = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate.ReturnCallback')
-
-export abstract class ConfirmCallbackAdapter {
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback
-    constructor() {
-        let ConfirmCallbackImpl = Java.extend(ReturnCallback, {
-            confirm: (correlationData: org.springframework.amqp.rabbit.connection.CorrelationData, ack: boolean, cause: string) => this.confirm(correlationData, ack, cause)
-        })
-        this._Handler = new ConfirmCallbackImpl()
-    }
-    abstract confirm(correlationData: org.springframework.amqp.rabbit.connection.CorrelationData, ack: boolean, cause: string)
-    getHandler() {
-        return this._Handler
-    }
-}
-
-export abstract class ReturnCallbackAdapter {
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate.ReturnCallback
-    constructor() {
-        let ReturnCallbackImpl = Java.extend(ReturnCallback, {
-            returnedMessage: (message: org.springframework.amqp.core.Message, replyCode: number, replyText: string, exchange: string, routingKey: string) => this.returnedMessage(message, replyCode, replyText, exchange, routingKey)
-        })
-        this._Handler = new ReturnCallbackImpl()
-    }
-    abstract returnedMessage(message: org.springframework.amqp.core.Message, replyCode: number, replyText: string, exchange: string, routingKey: string)
-    getHandler() {
-        return this._Handler
-    }
-}
--- a/packages/keyvalue/src/adapter/connection.ts
+++ b/packages/keyvalue/src/adapter/connection.ts
@@ -1,31 +0,0 @@
-import threadPool from '@ccms/common/dist/thread-pool'
-
-export const ConnectionFactory = Java.type('org.springframework.amqp.rabbit.connection.ConnectionFactory')
-const CachingConnectionFactory = Java.type('org.springframework.amqp.rabbit.connection.CachingConnectionFactory')
-interface ConnectionConfig {
-    url: string,
-    username?: string,
-    password?: string,
-    publisherConfirms?: boolean
-    cacheSize?: number
-}
-
-export class ConnectionFactoryAdapter {
-    private _Handler: org.springframework.amqp.rabbit.connection.CachingConnectionFactory
-
-    constructor(config: ConnectionConfig) {
-        if (!config.url) { throw new Error('Connection UrI Can\'t be undefiend!') }
-        config = { publisherConfirms: true, cacheSize: 50, ...config }
-        this._Handler = new CachingConnectionFactory(new java.net.URI(config.url))
-        config.username && this._Handler.setUsername(config.username)
-        config.password && this._Handler.setPassword(config.password)
-        this._Handler.setPublisherConfirms(config.publisherConfirms)
-        this._Handler.setExecutor(threadPool.create({
-            groupName: '@ccms/amqp-rabbit'
-        }))
-        this._Handler.setChannelCacheSize(config.cacheSize)
-    }
-    getHandler() {
-        return this._Handler
-    }
-}
--- a/packages/keyvalue/src/adapter/container.ts
+++ b/packages/keyvalue/src/adapter/container.ts
@@ -1,30 +0,0 @@
-import { ConnectionFactoryAdapter, ConnectionFactory } from "./connection"
-import { ChannelAwareMessageListenerAdapter, ChannelAwareMessageListener } from "./listener"
-
-export const SimpleMessageListenerContainer = org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
-export const AcknowledgeMode: org.springframework.amqp.core.AcknowledgeMode = Java.type('org.springframework.amqp.core.AcknowledgeMode')
-interface ContainerConfig {
-    connectionFactory: ConnectionFactoryAdapter | typeof ConnectionFactory
-    queueNames: string[]
-    messageListener: ChannelAwareMessageListenerAdapter | typeof ChannelAwareMessageListener
-    maxConcurrentConsumers?: number
-    concurrentConsumers?: number
-    acknowledgeMode?: org.springframework.amqp.core.AcknowledgeMode
-}
-
-export class MessageListenerContainerAdapter {
-    private _Handler: org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
-    constructor(config: ContainerConfig) {
-        config = { concurrentConsumers: 5, maxConcurrentConsumers: 10, acknowledgeMode: AcknowledgeMode.AUTO, ...config }
-        this._Handler = new SimpleMessageListenerContainer(config.connectionFactory instanceof ConnectionFactoryAdapter ? config.connectionFactory.getHandler() : config.connectionFactory)
-        //@ts-ignore
-        this._Handler.setQueueNames(config.queueNames)
-        this._Handler.setMaxConcurrentConsumers(config.maxConcurrentConsumers)
-        this._Handler.setConcurrentConsumers(config.concurrentConsumers)
-        this._Handler.setAcknowledgeMode(config.acknowledgeMode)
-        this._Handler.setMessageListener(config.messageListener instanceof ChannelAwareMessageListenerAdapter ? config.messageListener.getHandler() : config.messageListener)
-    }
-    getHandler() {
-        return this._Handler
-    }
-}
--- a/packages/keyvalue/src/adapter/converter.ts
+++ b/packages/keyvalue/src/adapter/converter.ts
@@ -1,37 +0,0 @@
-const JavaString = Java.type('java.lang.String')
-const MessageProperties = org.springframework.amqp.core.MessageProperties
-const Message = org.springframework.amqp.core.Message
-
-export const MessageConverter = Java.type('org.springframework.amqp.support.converter.MessageConverter')
-
-export class MessageConverterAdapter {
-    private _Handler: org.springframework.amqp.support.converter.MessageConverter
-    constructor() {
-        var MessageConverterImpl = Java.extend(MessageConverter, {
-            toMessage: (object: any, messageProperties: org.springframework.amqp.core.MessageProperties) => this.toMessage(object, messageProperties),
-            fromMessage: (message: org.springframework.amqp.core.Message) => this.fromMessage(message)
-        })
-        this._Handler = new MessageConverterImpl()
-    }
-    toMessage(object: any, messageProperties: org.springframework.amqp.core.MessageProperties) {
-        if (typeof object == "string") {
-            messageProperties.setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN)
-            return new Message(new JavaString(object).getBytes(), messageProperties)
-        } else {
-            messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON)
-            return new Message(new JavaString(JSON.stringify(object)).getBytes(), messageProperties)
-        }
-    }
-    fromMessage(message: org.springframework.amqp.core.Message) {
-        if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_TEXT_PLAIN) {
-            return new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding())
-        }
-        if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_JSON) {
-            return JSON.parse(new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding()))
-        }
-        return message
-    }
-    getHandler() {
-        return this._Handler
-    }
-}
--- a/packages/keyvalue/src/adapter/index.ts
+++ b/packages/keyvalue/src/adapter/index.ts
@@ -1,7 +0,0 @@
-export * from './admin'
-export * from './callback'
-export * from './connection'
-export * from './container'
-export * from './converter'
-export * from './listener'
-export * from './template'
--- a/packages/keyvalue/src/adapter/listener.ts
+++ b/packages/keyvalue/src/adapter/listener.ts
@@ -1,49 +0,0 @@
-const JavaString = Java.type('java.lang.String')
-export const MessageProperties = org.springframework.amqp.core.MessageProperties
-export const ChannelAwareMessageListener = Java.type('org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener')
-export const AmqpRejectAndDontRequeueException = org.springframework.amqp.AmqpRejectAndDontRequeueException
-export const Channel: com.rabbitmq.client.Channel = Java.type('com.rabbitmq.client.Channel')
-export const Message = org.springframework.amqp.core.Message
-export type MessageHandler<T> = (content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) => any
-export abstract class ChannelAwareMessageListenerAdapter<T = any> {
-    private _Handler: org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener
-    constructor(manual: boolean = false) {
-        let ChannelAwareMessageListenerImpl = Java.extend(ChannelAwareMessageListener, {
-            onMessage: (message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) => {
-                let content = new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding() || "UTF-8")
-                try {
-                    if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_JSON) {
-                        content = JSON.parse(content)
-                    }
-                } catch (error) {
-                    if (manual) {
-                        channel.basicReject(message.getMessageProperties().getDeliveryTag(), true)
-                    } else {
-                        throw new AmqpRejectAndDontRequeueException(`${error}`, error)
-                    }
-                }
-                manual ? this.manualOnMessage(content, message, channel) : this.onMessage(content, message, channel)
-            }
-        })
-        this._Handler = new ChannelAwareMessageListenerImpl()
-    }
-    abstract onMessage(content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel): any
-    onError(error: Error, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel): any { }
-    getHandler() {
-        return this._Handler
-    }
-    private manualOnMessage(content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) {
-        let deliveryTag = message.getMessageProperties().getDeliveryTag()
-        try {
-            if (this.onMessage(content, message, channel)) {
-                channel.basicAck(deliveryTag, false)
-            } else if (message.getMessageProperties().getRedelivered()) {
-                channel.basicReject(deliveryTag, true)
-            } else {
-                channel.basicNack(deliveryTag, false, true)
-            }
-        } catch (error) {
-            channel.basicReject(deliveryTag, this.onError(error, message, channel))
-        }
-    }
-}
--- a/packages/keyvalue/src/adapter/template.ts
+++ b/packages/keyvalue/src/adapter/template.ts
@@ -1,27 +0,0 @@
-import { MessageConverterAdapter } from "./converter"
-import { ConnectionFactoryAdapter } from "./connection"
-import { ConfirmCallbackAdapter, ReturnCallbackAdapter } from "./callback"
-
-export const RabbitTemplate = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate')
-
-interface TemplateConfig {
-    connectionFactory: ConnectionFactoryAdapter | org.springframework.amqp.rabbit.connection.ConnectionFactory
-    confirmCallback?: ConfirmCallbackAdapter
-    returnCallback?: ReturnCallbackAdapter
-    messageConverter?: MessageConverterAdapter
-}
-export class RabbitTemplateAdapter {
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate
-    constructor(config: TemplateConfig) {
-        config = { messageConverter: new MessageConverterAdapter(), ...config }
-        console.debug(JSON.stringify(config))
-        this._Handler = new RabbitTemplate(config.connectionFactory instanceof ConnectionFactoryAdapter ? config.connectionFactory.getHandler() : config.connectionFactory)
-        config.returnCallback && this._Handler.setReturnCallback(config.returnCallback.getHandler())
-        config.confirmCallback && this._Handler.setConfirmCallback(config.confirmCallback.getHandler())
-        config.messageConverter && this._Handler.setMessageConverter(config.messageConverter.getHandler())
-    }
-
-    getHandler() {
-        return this._Handler
-    }
-}
--- a/packages/keyvalue/src/admin.ts
+++ b/packages/keyvalue/src/admin.ts
@@ -1,89 +0,0 @@
-import { JSClass } from "@ccms/container"
-import { RabbitAdminAdapter, MessageListenerContainerAdapter, AcknowledgeMode, MessageHandler, ChannelAwareMessageListenerAdapter } from "./adapter"
-
-export class AmqpAdmin {
-    @JSClass('org.springframework.amqp.core.TopicExchange')
-    private TopicExchange: typeof org.springframework.amqp.core.TopicExchange
-    @JSClass('org.springframework.amqp.core.Queue')
-    private Queue: typeof org.springframework.amqp.core.Queue
-    @JSClass('org.springframework.amqp.core.Binding')
-    private Binding: typeof org.springframework.amqp.core.Binding
-    @JSClass('org.springframework.amqp.rabbit.core.RabbitAdmin')
-    private RabbitAdmin: typeof org.springframework.amqp.rabbit.core.RabbitAdmin
-    @JSClass('org.springframework.amqp.core.Binding.DestinationType')
-    private DestinationType: org.springframework.amqp.core.Binding.DestinationType
-
-    private amqpAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin
-
-    constructor(amqpAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin | any) {
-        if (amqpAdmin instanceof this.RabbitAdmin) {
-            this.amqpAdmin = amqpAdmin
-        } else if (amqpAdmin instanceof RabbitAdminAdapter) {
-            this.amqpAdmin = amqpAdmin.getHandler()
-        } else {
-            this.amqpAdmin = new RabbitAdminAdapter(amqpAdmin).getHandler()
-        }
-    }
-
-    getHandler() {
-        return this.amqpAdmin
-    }
-
-    getQueueProperties(name: string) {
-        return this.amqpAdmin.getQueueProperties(name)
-    }
-
-    declareExchange(name: string) {
-        let exchange = new this.TopicExchange(name, true, false)
-        this.amqpAdmin.declareExchange(exchange)
-        return this
-    }
-
-    declareQueue(name: string) {
-        let queue = new this.Queue(name, true)
-        this.amqpAdmin.declareQueue(queue)
-        return this
-    }
-
-    declareBinding(queue: string, exchange: string, routerKey: string, argument: any = null) {
-        let binding = new this.Binding(queue, this.DestinationType.QUEUE, exchange, routerKey, argument)
-        this.amqpAdmin.declareBinding(binding)
-        return this
-    }
-
-    declareQueueAndBindExchange(queue: string, exchange: string, routerKey: string) {
-        return this.declareQueue(queue).declareExchange(exchange).declareBinding(queue, exchange, routerKey)
-    }
-
-    createContainer<T>(queue: string, listener: MessageHandler<T>, acknowledgeMode = AcknowledgeMode.AUTO) {
-        let connection = this.amqpAdmin.getRabbitTemplate().getConnectionFactory()
-        return new MessageListenerContainerAdapter({
-            connectionFactory: connection,
-            queueNames: [queue],
-            messageListener: new SimpleMessageHandler(listener),
-            acknowledgeMode: acknowledgeMode
-        }).getHandler()
-    }
-
-    send()
-    send() {
-
-    }
-
-    getTemplate() {
-        return this.amqpAdmin.getRabbitTemplate()
-    }
-
-    close() {
-        this.getTemplate().stop()
-    }
-}
-
-export class SimpleMessageHandler extends ChannelAwareMessageListenerAdapter {
-    constructor(private handler: MessageHandler<any>) {
-        super()
-    }
-    onMessage(content: any, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) {
-        return this.handler(content, message, channel)
-    }
-}
--- a/packages/keyvalue/src/constants.ts
+++ b/packages/keyvalue/src/constants.ts
@@ -1,3 +0,0 @@
-export const METADATA_KEY = {
-
-}
--- a/packages/keyvalue/src/index.ts
+++ b/packages/keyvalue/src/index.ts
@@ -1,34 +1,3 @@
 /// <reference types="@ccms/nashorn" />
 /// <reference types="@javatypes/jdk" />
-/// <reference types="@javatypes/spring-amqp" />
-/// <reference types="@javatypes/spring-rabbit" />
-/// <reference types="@javatypes/amqp-client" />
-
-import { amqp } from '@ccms/api'
-import { getContainer, reduceMetadata } from '@ccms/container'
-
-function init() {
-    const beanFactory = base.getInstance().getAutowireCapableBeanFactory()
-    getContainer().bind(amqp.rabbit.Template).toDynamicValue((ctx) => {
-        let metadata = reduceMetadata(ctx)
-        if (!metadata.named) {
-            return beanFactory.getBean('rabbitTemplate')
-        } else {
-            return beanFactory.getBean(`${metadata.named}-rabbitTemplate`)
-        }
-    })
-    getContainer().bind(amqp.rabbit.Admin).toDynamicValue((ctx) => {
-        let metadata = reduceMetadata(ctx)
-        if (!metadata.named) {
-            return beanFactory.getBean('rabbitAdmin')
-        } else {
-            return beanFactory.getBean(`${metadata.named}-rabbitAdmin`)
-        }
-    })
-}
-init()
-
-export * from './admin'
-export * from './adapter'
-export * from './manager'
-export * from './constants'
+export { }
--- a/packages/keyvalue/src/listener.ts
+++ b/packages/keyvalue/src/listener.ts
@@ -1,5 +0,0 @@
-export class AmqpListener {
-    constructor() {
-
-    }
-}
--- a/packages/keyvalue/src/manager.ts
+++ b/packages/keyvalue/src/manager.ts
@@ -1,18 +0,0 @@
-import { amqp } from "@ccms/api"
-import { provideSingleton } from "@ccms/container"
-
-import { ConnectionFactoryAdapter, RabbitTemplateAdapter, RabbitAdminAdapter } from "./adapter"
-import { AmqpAdmin } from "./admin"
-
-@provideSingleton(amqp.Manager)
-export class AmqpManager {
-    createConnection(url: string, username: string, password: string) {
-        return new ConnectionFactoryAdapter({ url, username, password })
-    }
-    createTemplate(adapter: ConnectionFactoryAdapter) {
-        return new RabbitTemplateAdapter({ connectionFactory: adapter })
-    }
-    createAdmin(adapter: RabbitTemplateAdapter | ConnectionFactoryAdapter) {
-        return new AmqpAdmin(new RabbitAdminAdapter(adapter))
-    }
-}
--- a/packages/nashorn/package.json
+++ b/packages/nashorn/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/nashorn",
-    "version": "0.9.4",
+    "version": "0.9.8",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
--- a/packages/nashorn/src/index.ts
+++ b/packages/nashorn/src/index.ts
@@ -17,6 +17,7 @@ declare global {
        function to<T = any>(array: T[], type?: T): T[]
        function extend(...parentTypes: any[]): any
        function synchronized(func: () => void, lock: any): Function
+        function isJavaObject(obj: any): boolean
        function asJSONCompatible<T = any>(obj: T): T
        //@ts-ignore
        // function super(type: any);
--- a/packages/nodejs/package.json
+++ b/packages/nodejs/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/nodejs",
-    "version": "0.9.4",
+    "version": "0.9.8",
    "description": "MiaoScript nodejs package",
    "keywords": [
        "miaoscript",
@@ -19,7 +19,7 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
+        "@ccms/nashorn": "^0.9.8",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
--- a/packages/nukkit/package.json
+++ b/packages/nukkit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/nukkit",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript nukkit package",
    "keywords": [
        "miaoscript",
@@ -19,14 +19,14 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@javatypes/nukkit-api": "^0.0.2",
+        "@javatypes/nukkit-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    }
 }
--- a/packages/nukkit/src/server.ts
+++ b/packages/nukkit/src/server.ts
@@ -1,25 +1,25 @@
 import { server } from '@ccms/api'
-import { provideSingleton } from '@ccms/container';
+import { provideSingleton } from '@ccms/container'

-let Nukkit: cn.nukkit.Server = base.getInstance().getServer();
-const File = Java.type("java.io.File");
+let Nukkit: cn.nukkit.Server = base.getInstance().getServer()
+const File = Java.type("java.io.File")

@provideSingleton(server.Server)
 export class NukkitServer implements server.Server {
-    private pluginsFolder: string;
+    private pluginsFolder: string

    constructor() {
        this.pluginsFolder = new File(base.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation().getPath()).getParentFile().getCanonicalPath()
    }

    getPlayer(name: string) {
-        return Nukkit.getPlayer(name)
+        return Nukkit.getPlayerExact(name)
    }
    getVersion(): string {
        return Nukkit.getVersion()
    }
    getOnlinePlayers() {
-        return Nukkit.getOnlinePlayers() as unknown as any[]
+        return Nukkit.getOnlinePlayers().values()
    }
    getConsoleSender() {
        return Nukkit.getConsoleSender()
@@ -37,18 +37,15 @@ export class NukkitServer implements server.Server {
        return Nukkit.dispatchCommand(Nukkit.getConsoleSender(), command)
    }
    getPluginsFolder(): string {
-        return this.pluginsFolder;
+        return this.pluginsFolder
    }
    getNativePluginManager() {
-        return Nukkit.getPluginManager() as any;
+        return Nukkit.getPluginManager() as any
    }
    getNettyPipeline() {
-        throw new Error("Method not implemented.");
+        throw new Error("Method not implemented.")
    }
    getRootLogger() {
        return Packages.org.apache.logging.log4j.LogManager.getRootLogger()
    }
-    sendJson(sender: string | any, json: object | string): void {
-        throw new Error("Method not implemented.");
-    }
 }
--- a/packages/ployfill/package.json
+++ b/packages/ployfill/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/ployfill",
-    "version": "0.9.4",
+    "version": "0.9.8",
    "description": "MiaoScript ployfill package",
    "author": "MiaoWoo <admin@yumc.pw>",
    "homepage": "https://github.com/circlecloud/ms.git",
@@ -14,12 +14,12 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/i18n": "^0.9.4",
-        "@ccms/nodejs": "^0.9.4",
+        "@ccms/i18n": "^0.9.8",
+        "@ccms/nodejs": "^0.9.8",
        "core-js": "^3.6.5"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
+        "@ccms/nashorn": "^0.9.8",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/plugin",
-    "version": "0.9.7",
+    "version": "0.9.8",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -25,10 +25,10 @@
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4",
-        "@ccms/i18n": "^0.9.4",
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8",
+        "@ccms/i18n": "^0.9.8",
        "js-yaml": "^3.14.0"
    }
 }
--- a/packages/plugin/src/config.ts
+++ b/packages/plugin/src/config.ts
@@ -29,6 +29,18 @@ export class JsonPluginConfig implements PluginConfigLoader {
    }
 }

+export interface PluginConfig {
+    /**
+     * Save Config to File
+     */
+    readonly save?: () => void
+    /**
+     * Reload Config from File
+     */
+    readonly reload?: () => void
+    [key: string]: any
+}
+
@provideSingleton(PluginConfigManager)
 export class PluginConfigManager {
    private configLoaderMap = new Map<string, PluginConfigLoader>()
@@ -50,21 +62,7 @@ export class PluginConfigManager {
    loadConfig(plugin: plugin.Plugin) {
        let configs = getPluginConfigMetadata(plugin)
        for (let [_, config] of configs) {
-            try {
-                config.file = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, config.filename)
-                let configLoader = this.getConfigLoader(config.format)
-                if (!fs.exists(config.file)) {
-                    base.save(config.file, configLoader.dump(plugin[config.variable]))
-                    console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: config.name, format: config.format })
-                } else {
-                    Object.defineProperty(plugin, config.variable, { value: configLoader.load(base.read(config.file)) })
-                    plugin[config.variable].save = () => this.saveConfig0(plugin, config)
-                    console.debug(`[${plugin.description.name}] Load Config ${config.variable} from file ${config.file} =>\n${JSON.stringify(plugin[config.variable], undefined, 4)}`)
-                }
-            } catch (error) {
-                console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: config.name, format: config.format, error })
-                console.ex(error)
-            }
+            this.loadConfig0(plugin, config)
        }
    }

@@ -75,6 +73,33 @@ export class PluginConfigManager {
        }
    }

+    private defienConfigProp(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata, value: any) {
+        Object.defineProperties(value, {
+            'save': { value: () => this.saveConfig0(plugin, metadata) },
+            'reload': { value: () => this.loadConfig0(plugin, metadata) }
+        })
+        Object.defineProperty(plugin, metadata.variable, { value })
+    }
+
+    private loadConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
+        try {
+            metadata.file = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, metadata.filename)
+            let configLoader = this.getConfigLoader(metadata.format)
+            let value = plugin[metadata.variable]
+            if (!fs.exists(metadata.file)) {
+                base.save(metadata.file, configLoader.dump(value))
+                console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: metadata.name, format: metadata.format })
+            } else {
+                value = configLoader.load(base.read(metadata.file))
+                console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file} =>\n${JSON.stringify(value, undefined, 4)}`)
+            }
+            this.defienConfigProp(plugin, metadata, value)
+        } catch (error) {
+            console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: metadata.name, format: metadata.format, error })
+            console.ex(error)
+        }
+    }
+
    private saveConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
        try {
            if (metadata.readonly) { console.debug(`[${plugin.description.name}] Skip Save Config ${metadata.variable} Because it's readonly!`) }
--- a/packages/plugin/src/index.ts
+++ b/packages/plugin/src/index.ts
@@ -6,6 +6,8 @@ export * from './manager'
 export * from './decorators'
 export * from './interfaces'

+export { PluginConfig } from './config'
+
 export {
    plugin as JSPlugin,
    cmd as Cmd,
--- a/packages/plugins/docs/MiaoReward.md
+++ b/packages/plugins/docs/MiaoReward.md
@@ -42,15 +42,21 @@

 ### 基础准备工作
 - QQ搜索小程序 `圈云盒子` 并登录
- 申请内测服务器账号 个人中心 => 配置面板 => 圈云盒子客服群 加群申请
+- 申请内测服务器账号
+  - 个人中心 => 配置面板 => 圈云盒子客服群
+  - 打开群详情 加群
+
+### 接下来就是赚钱的操作

 ### 服务器准备工作
- 先安装 `MiaoScript` [站内地址]()
+- 打开 [圈云盒子管理后台](https://reward.yumc.pw)
+- 先安装 `MiaoScript` [站内地址](https://www.mcbbs.net/thread-774401-1-1.html)
  - 可以通过 Yum 快速安装 `/yum install MiaoScript`
 - 等待 MiaoScript 引擎启动完成(首次启动可能需要10-20秒 依赖于您的网络环境)
 - 执行 `/mspm install MiaoReward`

 ### 绑定服务器
+- 由于当前框架存在BUG 请先执行 `/mspm reload MiaoReward` 生成配置文件
 - 执行 `/mrd bind server`
 - 使用QQ扫码
 - 选择需要绑定的服务器
@@ -59,7 +65,11 @@
 - 执行 `/mrd ratio 0.001` (最低为 1:0.0001)
 - 执行兑换比例确认指令
 - 执行 `/mrd server` 查看服务器信息
- 如需绑定多台 可以直接复制绑定之后的 `MiaoScript/plugins/MiaoReward/config.yml` 文件到多台服务器上 然后 `/mrd reload` 重载插件
+- 如果群组服需要绑定多台服务器(前提是每个服务器都有玩家在)
+  - 执行 `/gmspm install MiaoReward` 批量安装
+  - 可以直接复制绑定之后的 `MiaoScript/plugins/MiaoReward/config.yml`
+  - 黏贴配置文件到所有需要绑定的服务器上
+  - 然后 `/gmspm reload MiaoReward` 批量重载插件

 ### QQ群配置
 - 打开小程序
@@ -72,6 +82,7 @@
 - 执行 `/mrd bind`
 - 使用QQ扫码
 - 完成绑定
+- 执行 `/mrd query` 查询信息

 ## 使用说明
 - 玩家可以通过下列方式获取喵币
@@ -82,13 +93,21 @@
 - 腐竹可以在平台将喵币兑换成RMB(兑换比例请加群联系客服详谈)
 - 登录小程序后 个人中心 => 配置面板 => 圈云盒子客服群

+## PAPI兼容
+- 目前已经兼容 PAPI 变量
+  - `%mrd_balance%` 玩家喵币
+  - `%mrd_sign%` 玩家签到(*/1)
+  - `%mrd_video%` 玩家视频观看次数(*/300)
+  - `%mrd_box%` 玩家盒子观看次数(*/300)
+- 如果玩家变量没有及时更新 执行 `/mrd query` 或 `重新登录游戏` 即可
+
 ## 配置文件

-``` yaml
+```yml
 # 服务器ID
-serverId: '16'
+serverId: 16
 # 服务器Token
-serverToken: d50d3f6e-2a59-460a-2b29-82b66c4bbf52
+serverToken: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
 # 兑换指令
 drawCommand: 'p give %player_name% %amount%'
 # 冷却时间
@@ -97,6 +116,10 @@ drawCooldown: 300
 prefix: '§6[§b广告系统§6]§r'
 ```

+## 插件源码
+
+- [MiaoScript包管理中心](http://ms.yumc.pw/api/plugin/download/name/MiaoReward)
+
 ## Roadmap
 - 绑定服务器(已完成)
 - 绑定玩家(已完成)
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "@ccms/plugins",
-    "version": "0.9.7",
+    "version": "0.9.8",
    "description": "MiaoScript plugins package",
    "keywords": [
        "miaoscript",
@@ -20,16 +20,16 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@javatypes/spring-data-redis": "^0.0.2",
-        "@javatypes/spring-web": "^0.0.2",
-        "@javatypes/tomcat": "^0.0.2",
+        "@javatypes/spring-data-redis": "^0.0.3",
+        "@javatypes/spring-web": "^0.0.3",
+        "@javatypes/tomcat": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/container": "^0.9.4",
-        "@ccms/plugin": "^0.9.7"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8",
+        "@ccms/plugin": "^0.9.8"
    }
 }
--- a/packages/plugins/src/MiaoChat.ts
+++ b/packages/plugins/src/MiaoChat.ts
@@ -170,11 +170,6 @@ export class MiaoChat extends interfaces.Plugin {
                return string
            }
        }
-        if (!this.chat) {
-            this.logger.console('§4消息管理器注入失败 请检查当前服务器是否兼容...')
-            this.AsyncPlayerChatEvent['off']()
-            this.MessageChannelEvent$Chat['off']()
-        }
    }

    disable() {
@@ -182,6 +177,10 @@ export class MiaoChat extends interfaces.Plugin {
    }

    bukkitenable() {
+        if (!this.chat) {
+            this.logger.console('§4消息管理器注入失败 请检查当前服务器是否兼容...')
+            this.AsyncPlayerChatEvent['off']()
+        }
        // 尝试加载 Bukkit 的 PlaceholderAPI
        try {
            //@ts-ignore
@@ -193,6 +192,10 @@ export class MiaoChat extends interfaces.Plugin {
    }

    spongeenable() {
+        if (!this.chat) {
+            this.logger.console('§4消息管理器注入失败 请检查当前服务器是否兼容...')
+            this.MessageChannelEvent$Chat['off']()
+        }
        // 尝试加载 Sponge 的 PlaceholderAPI
        try {
            var spongePapi = this.Server.getService('me.rojo8399.placeholderapi.PlaceholderService')
--- a/packages/plugins/src/MiaoConsole.ts
+++ b/packages/plugins/src/MiaoConsole.ts
@@ -250,7 +250,7 @@ export class MiaoConsole extends interfaces.Plugin {
            client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
        })
        client.on('tabComplate', (input, index, callback) => {
-            callback?.(this.command.tabComplete(this.server.getConsoleSender(), input, index))
+            callback?.(this.command.tabComplete(this.server.getConsoleSender(), input, index) || [])
        })
        client.on('exec', (code) => {
            try {
--- a/packages/plugins/src/MiaoReward.ts
+++ b/packages/plugins/src/MiaoReward.ts
@@ -1,5 +1,5 @@
 import { constants, task, server, channel, chat, proxy } from "@ccms/api"
-import { JSPlugin, interfaces, Cmd, Tab, Listener, Config } from "@ccms/plugin"
+import { JSPlugin, interfaces, Cmd, Tab, Listener, Config, PluginConfig } from "@ccms/plugin"

 import { QRCode, QRErrorCorrectLevel } from '@ccms/common/dist/qrcode'

@@ -51,10 +51,18 @@ class QRCodeRender {

 interface PlaceholderAPI {
    registerPlaceholderHook: (key: string, onPlaceholderRequest: (player, s) => string) => void
+    unregisterPlaceholderHook: (key: string) => void
    setPlaceholders: (player: any, str: string) => string
 }

-@JSPlugin({ prefix: 'MRD', version: '1.3.0', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
+interface UserInfo {
+    balance: number
+    sign: string
+    video: string
+    box: string
+}
+
+@JSPlugin({ prefix: 'MRD', version: '1.3.3', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
 export class MiaoReward extends interfaces.Plugin {
    private serverInfo: any
    private cacheBindUuid = ''
@@ -66,6 +74,9 @@ export class MiaoReward extends interfaces.Plugin {
    private bindingLeftTime = 45
    private bindingNotify = new java.util.HashSet<org.bukkit.entity.Player>()
    private drawCooldown = new Map<string, number>()
+    private playerInfoCache = new Map<string, UserInfo>()
+
+    private downgrade = false

    @Autowired()
    private chat: chat.Chat
@@ -73,14 +84,13 @@ export class MiaoReward extends interfaces.Plugin {
    private server: server.Server
    @Autowired()
    private taskManager: task.TaskManager
-  @optional()
    @Autowired()
    private channel: channel.Channel
    @Autowired()
    private bungee: proxy.BungeeCord

    @Config()
-  private config = {
+    private config: PluginConfig = {
        prefix: '§6[§b广告系统§6]§r',
        serverId: '',
        serverToken: '',
@@ -100,7 +110,11 @@ export class MiaoReward extends interfaces.Plugin {
        this.config.prefix = this.config.prefix || '§6[§b广告系统§6]§r'
        this.config.drawCommand = this.config.drawCommand || 'p give %player_name% %amount%'
        this.config.drawCooldown = this.config.drawCooldown || 300
+        //@ts-ignore
+        this.logger.prefix = this.config.prefix
+        this.downgrade = Bukkit.getServer().class.name.split('.')[3] == "v1_7_R4"
        this.updateServerInfo()
+        this.updateOnlinePlayersInfo()
    }

    private updateServerInfo(player?: any) {
@@ -118,6 +132,14 @@ export class MiaoReward extends interfaces.Plugin {
        }).async().submit()
    }

+    private updateOnlinePlayersInfo() {
+        Java.from(this.server.getOnlinePlayers()).forEach(player => this.updatePlayerInfo(player))
+    }
+
+    private updatePlayerInfo(player: org.bukkit.entity.Player) {
+        this.taskManager.create(() => this.queryUser(player)).async().submit()
+    }
+
    @JSClass('com.google.common.io.ByteStreams')
    private ByteStreams: any

@@ -131,7 +153,6 @@ export class MiaoReward extends interfaces.Plugin {
        this.channelOff = this.channel?.listen(this, 'BungeeCord', (data) => {
            if (!this.isBungeeCord) {
                this.isBungeeCord = true
-        this.PlayerJoinEvent['off']()
            }
            let input = this.ByteStreams.newDataInput(data)
            let subChannel = input.readUTF()
@@ -149,15 +170,6 @@ export class MiaoReward extends interfaces.Plugin {
        if (players.length) this.bungeeCordDetect(players[0])
    }

-  cmdrun(sender: any, ...args: any[]) {
-    try {
-      let tfunc = new Function(`return '§a返回结果: §r'+ eval(${JSON.stringify(args.join(' '))});`)
-      this.logger.sender(sender, tfunc.apply(this) + '')
-    } catch (ex) {
-      this.logger.sender(sender, this.logger.stack(ex))
-    }
-  }
-
    private readForward(input) {
        let message = JSON.parse(input.readUTF())
        console.log(message)
@@ -175,12 +187,15 @@ export class MiaoReward extends interfaces.Plugin {
        } else {
            this.PlaceholderAPI.registerPlaceholderHook("mrd", new this.PlaceholderHook({
                onPlaceholderRequest: (player: any, s: string) => {
+                    if (!this.playerInfoCache.has(player.getName())) { return '用户未绑定' }
+                    let data = this.playerInfoCache.get(player.getName())
                    switch (s.toLowerCase()) {
-            case "server":
-            case "bserver":
-            default:
+                        case "balance": return data.balance
+                        case "sign": return data.sign
+                        case "video": return data.video
+                        case "box": return data.box
+                        default: return "未知的参数: " + s
                    }
-          return "未知的参数"
                }
            }))
        }
@@ -197,6 +212,7 @@ export class MiaoReward extends interfaces.Plugin {
    }

    disable() {
+        this.PlaceholderAPI.unregisterPlaceholderHook("mrd")
        Java.from(this.server.getOnlinePlayers()).forEach(p => this.checkAndClear(p))
        this.channelOff?.off()
    }
@@ -215,11 +231,11 @@ export class MiaoReward extends interfaces.Plugin {
    }

    private scanAuth(sender: org.bukkit.entity.Player, scanType: string, scanObj: { title: string, content: string }, success: (token: string, user: any) => void, cancel?: () => void) {
-    this.chat.sendTitle(sender, this.config.prefix, '§a正在获取授权二维码...')
        this.logger.sender(sender, '§a正在获取授权二维码...')
        let scan = this.httpPost('https://reward.yumc.pw/auth/scan', { ...scanObj, type: scanType })
        if (scan.code == 200) {
            let sync = { scaned: false }
+            this.logger.sender(sender, `§a授权二维码获取成功 §c如地图无法扫描 §6请点击链接\n§3§n${scan.data.qrcode}`)
            this.taskManager.create(() => {
                let result = this.httpPost('https://reward.yumc.pw/auth/scanCheck', {
                    token: scan.data.token,
@@ -228,7 +244,7 @@ export class MiaoReward extends interfaces.Plugin {
                })
                sync.scaned = true
                if (result.code == 200 && result.data.status == "scaned") {
-          this.chat.sendTitle(sender, "§3已扫码", "§a请在手机上确认")
+                    this.sendTitle(sender, "§3已扫码", "§a请在手机上确认")
                    let result = this.httpPost('https://reward.yumc.pw/auth/scanCheck', {
                        token: scan.data.token,
                        type: scanType,
@@ -236,25 +252,25 @@ export class MiaoReward extends interfaces.Plugin {
                    })
                    if (result.code == 200) {
                        if (result.data.status == "confirm") {
-              this.chat.sendTitle(sender, '§3扫码完成')
+                            this.sendTitle(sender, '§3扫码完成')
                            success(scan.data.token, result.data.user)
                        } else if (result.data.status == "cancel") {
-              this.chat.sendTitle(sender, '§c已取消授权')
+                            this.sendTitle(sender, '§c已取消授权')
                            cancel?.()
                        } else if (result.data.status == "scaned") {
-              this.chat.sendTitle(sender, '§c授权操作超时')
+                            this.sendTitle(sender, '§c授权操作超时')
                            cancel?.()
                        } else {
-              this.chat.sendTitle(sender, "§c未知的结果", result.data.status)
+                            this.sendTitle(sender, "§c未知的结果", result.data.status)
                        }
                    } else {
-            this.chat.sendTitle(sender, "§4扫码异常", result.msg)
+                        this.sendTitle(sender, "§4扫码异常", result.msg)
                    }
                }
                sync.scaned = true
            }).async().submit()
            this.setItemAndTp(sender, scan.data.url, sync)
-      this.chat.sendTitle(sender, '')
+            this.sendTitle(sender, '')
        } else {
            this.logger.sender(sender, '§4授权二维码获取失败!')
        }
@@ -263,7 +279,7 @@ export class MiaoReward extends interfaces.Plugin {
    private bindCheck(sender: org.bukkit.entity.Player, cooldown: number) {
        if (this.isBinding) {
            let bindUser = Bukkit.getPlayerExact(this.bindingUser)
-      if (bindUser && bindUser.isOnline() && this.isQrCodeItem(bindUser.getItemInHand())[0]) {
+            if (bindUser && bindUser.isOnline() && this.isHoldQrCodeItem(bindUser)) {
                this.bindingNotify.add(sender)
                this.logger.sender(sender, [
                    "§c当前 §a" + this.bindingUser + " §c玩家正在扫码",
@@ -302,6 +318,7 @@ export class MiaoReward extends interfaces.Plugin {

    cmddraw(sender: org.bukkit.entity.Player, amount: number) {
        if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
+        if (!this.playerInfoCache.has(sender.getName())) { return this.logger.sender(sender, '§c当前用户尚未绑定服务器玩家账号 请先执行 /mrd bind 绑定账号!') }
        amount = Number(amount)
        if (!Number.isInteger(amount)) {
            return this.logger.sender(sender, '§4金额必须是数字!')
@@ -395,12 +412,13 @@ export class MiaoReward extends interfaces.Plugin {
        if (result.code !== 200) {
            return this.logger.sender(sender, `§4操作异常 §6服务器返回: §c${result.msg}`)
        }
+        let data = result.data
        this.logger.sender(sender, [
            `§6====== ${this.config.prefix} §a服务器信息 §6======`,
-      `§6服务器: §a${result.data.name}`,
-      `§6喵币余额: §b${result.data.score} §6喵币`,
-      `§6喵币比例: §b${result.data.ratio}`,
-      `§6今日收入: §b${result.data.today} §6喵币`,
+            `§6服务器: §a${data.name}`,
+            `§6喵币余额: §b${data.score} §6喵币`,
+            `§6喵币比例: §b${data.ratio}`,
+            `§6今日收入: §b${data.today} §6喵币`,
            `§6====== ${this.config.prefix} §a服务器信息 §6======`,
        ])
    }
@@ -445,6 +463,10 @@ export class MiaoReward extends interfaces.Plugin {
        })
    }

+    cmdreload() {
+        this.config.reload()
+    }
+
    private ratio2string(ratio) {
        ratio = parseFloat(ratio)
        if (ratio > 1) {
@@ -475,9 +497,10 @@ export class MiaoReward extends interfaces.Plugin {
            if (check.code == 200) {
                this.config.serverId = check.data.serverId
                this.config.serverToken = check.data.serverToken
-        this.config['save']()
+                this.config.save()
                this.logger.sender(sender, '§a已成功绑定服务器: §b' + check.data.serverName)
-        this.updateServerInfo()
+                this.updateServerInfo(sender)
+                this.updateOnlinePlayersInfo()
            }
            sync.scaned = true
        }).async().submit()
@@ -510,6 +533,21 @@ export class MiaoReward extends interfaces.Plugin {
        this.setItemAndTp(sender, bindUrl, sync)
    }

+    private sendActionBar(sender, message) {
+        if (!this.downgrade) {
+            this.chat.sendActionBar(sender, message)
+        }
+    }
+
+    private sendTitle(sender, title, subtitle?) {
+        if (!title) return
+        if (this.downgrade) {
+            this.logger.sender(sender, `${title}${subtitle ? ` ${subtitle}` : ''}`)
+        } else {
+            this.chat.sendTitle(sender, title, subtitle)
+        }
+    }
+
    private setItemAndTp(sender: org.bukkit.entity.Player, content: string, sync: { scaned: boolean }) {
        this.taskManager.create(() => {
            this.bindingLeftTime = 30
@@ -517,43 +555,63 @@ export class MiaoReward extends interfaces.Plugin {
                try {
                    if (sync.scaned || !sender.isOnline() || !this.isHoldQrCodeItem(sender) || --this.bindingLeftTime < 0) {
                        if (this.bindingLeftTime < 0) {
-              this.logger.sender(sender, '§c二维码已过期 请重新获取!')
+                            this.logger.sender(sender, '§c二维码已过期 请重新获取 如已扫码请忽略!')
                        }
                        this.cancelTask(sender)
                        return
                    }
-          this.chat.sendActionBar(sender, `§c§l手机QQ扫描二维码 剩余 ${this.bindingLeftTime} 秒...`)
+                    this.sendActionBar(sender, `§c§l手机QQ扫描二维码 剩余 ${this.bindingLeftTime} 秒...`)
                } catch (error) {
                    console.ex(error)
                }
            }).async().later(20).timer(20).submit()
            sender.setItemInHand(this.createQrCodeMapItem(content))
+            if (this.downgrade) {
+                this.logger.sender(sender, '§c低版本客户端 二维码渲染中 请等待 6 秒 稍候扫码!')
+                let waitTask = this.taskManager.create(() => {
+                    let temp = sender.getLocation()
+                    temp.setPitch(-90)
+                    sender.teleport(temp)
+                }).later(20).timer(20).submit()
+                this.taskManager.create(() => {
+                    waitTask.cancel()
                    let temp = sender.getLocation()
                    temp.setPitch(90)
                    sender.teleport(temp)
+                }).later(150).submit()
+            } else {
+                let temp = sender.getLocation()
+                temp.setPitch(90)
+                sender.teleport(temp)
+            }
        }).submit()
    }

    private queryUser(sender: org.bukkit.entity.Player, sync = false) {
        if (!this.config.serverId || !this.config.serverToken) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
-    return this.httpPost(`https://reward.yumc.pw/server/queryUser`, {
+        let result = this.httpPost(`https://reward.yumc.pw/server/queryUser`, {
            id: this.config.serverId,
            token: this.config.serverToken,
            uuid: sender.getUniqueId().toString(),
            username: sender.getName(),
            sync
        })
+        if (result?.code == 200) {
+            this.playerInfoCache.set(sender.getName(), result.data)
+        }
+        return result
    }

    cmdquery(sender: org.bukkit.entity.Player) {
-    let check = this.queryUser(sender)
-    if (check.code !== 200) {
-      return this.logger.sender(sender, '§4查询异常! §cError: ' + check.msg)
+        let info = this.queryUser(sender)
+        if (info.code !== 200) {
+            return this.logger.sender(sender, '§4查询异常! §cError: ' + info.msg)
        }
-    this.sendResult(sender, '查询结果', check.data)
+        this.sendResult(sender, '查询结果', info.data)
    }

    private sendResult(sender: any, title: string, data: any) {
+        this.playerInfoCache.set(sender.getName(), data)
        this.logger.sender(sender, [
            `§6====== ${this.config.prefix} §a${title} §6======`,
            `§6用 户 名: §a${sender.getName()}`,
@@ -578,52 +636,13 @@ CAST TIME   : ${Date.now() - startTime}`)
        return result
    }

-  // var server = container.get(api.server.Server)
-  // var console = server.getDedicatedServer()
-  // var mainWorld = reflect.on(console).get('field_71305_c').get()[0]
-  // 设置新的Data
-  // mapdata = new MapData(s);
-  // mapdata.field_76197_d = (byte)3;
-  // mapdata.func_176054_a((double)worldIn.func_72912_H().func_76079_c(), (double)worldIn.func_72912_H().func_76074_e(), (int)mapdata.field_76197_d);
-  // mapdata.field_76200_c = ((WorldServer)worldIn).dimension;
-  // mapdata.func_76185_a();
-  // worldMain.func_72823_a(s, (WorldSavedData)mapdata);
-  // s = "map_" + stack.getMetadata();
-  // mapdata = new MapData(s);
-  // mapdata.scale = 3;
-  // mapdata.calculateMapCenter((double)worldIn.getWorldInfo().getSpawnX(), (double)worldIn.getWorldInfo().getSpawnZ(), mapdata.scale);
-  // // mapdata.dimension = worldIn.provider.getDimension();
-  // mapdata.dimension = ((WorldServer) worldIn).dimension; // CraftBukkit - fixes Bukkit multiworld maps
-  // mapdata.markDirty();
-  // worldMain.setData(s, mapdata);
-  // var mapStorage = mainWorld.field_72988_C
-
-  // var loadedDataMap = reflect.on(mapStorage).get('field_75749_b').get()
-  // var loadedDataList = reflect.on(mapStorage).get('field_75750_c').get()
-  // var idCounts = reflect.on(mapStorage).get('field_75748_d').get()
-
-  // @Override
-  // public CraftMapView createMap(World world) {
-  //     Validate.notNull((Object)world, (String)"World cannot be null", (Object[])new Object[0]);
-  //     net.minecraft.item.ItemStack stack = new net.minecraft.item.ItemStack((Item)Items.field_151148_bJ, 1, -1);
-  //     MapData worldmap = Items.field_151098_aY.func_77873_a(stack, (net.minecraft.world.World)((CraftWorld)world).getHandle());
-  //     return worldmap.mapView;
-  // }
-  //net.minecraft.item.ItemMap
-  // @Override
-  // public CraftMapView createMap(World world) {
-  //     Validate.notNull(world, "World cannot be null");
-
-  //     net.minecraft.item.ItemStack stack = new net.minecraft.item.ItemStack(Items.MAP, 1, -1, true); // CatServer
-  //     MapData worldmap = Items.FILLED_MAP.getMapData(stack, ((CraftWorld) world).getHandle());
-  //     return worldmap.mapView;
-  // }
-
    private createQrCodeMapItem(content: string) {
        let item: org.bukkit.inventory.ItemStack
        item = new ItemStack(Material.FILLED_MAP || Material.MAP)
        let meta = <org.bukkit.inventory.meta.MapMeta>item.getItemMeta()
-    if (meta.setMapId) {
+        if (meta.setMapView) {
+            meta.setMapView(this.zeroMapView)
+        } else if (meta.setMapId) {
            meta.setMapId(this.zeroMapView.getId())
        } else {
            item.setDurability(this.zeroMapView.getId())
@@ -643,15 +662,6 @@ CAST TIME   : ${Date.now() - startTime}`)
        let qrcode = this.js2qr(content)
        let startPoint = Math.round((bufferedImage.getWidth() - qrcode.getWidth()) / 2)
        graphics2D.drawImage(qrcode, startPoint, startPoint, null)
-    // let font = new Font("DejaVuSans", Font.PLAIN, 10)
-    // graphics2D.setFont(font)
-    // let fm = graphics2D.getFontMetrics(font)
-    // let text = "Use QQ Scan Bind!"
-    // let textWidth = fm.stringWidth(text)
-    // let widthX = (128 - textWidth) / 2
-    // graphics2D.setColor(Color.BLACK)
-    // graphics2D.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB)
-    // graphics2D['drawString(java.lang.String, int, int)'](text, Math.round(widthX), 122)
        graphics2D.dispose()
        return bufferedImage
    }
@@ -678,13 +688,14 @@ CAST TIME   : ${Date.now() - startTime}`)

    @Listener()
    PlayerJoinEvent(event: org.bukkit.event.player.PlayerJoinEvent) {
-    this.bungeeCordDetect(event.getPlayer())
+        const player = event.getPlayer()
+        this.bungeeCordDetect(player)
+        this.updatePlayerInfo(player)
    }

    @Listener()
    PlayerDropItemEvent(event: org.bukkit.event.player.PlayerDropItemEvent) {
-    let [cancelled, id] = this.isQrCodeItem(event.getItemDrop().getItemStack())
-    if (id != null && id != undefined && cancelled) {
+        if (this.isQrCodeItem(event.getItemDrop().getItemStack())) {
            event.getItemDrop().remove()
        }
    }
@@ -692,8 +703,7 @@ CAST TIME   : ${Date.now() - startTime}`)
    @Listener()
    PlayerItemHeldEvent(event: org.bukkit.event.player.PlayerItemHeldEvent) {
        let inv = event.getPlayer().getInventory()
-    let [cancelled, id] = this.isQrCodeItem(inv.getItem(event.getPreviousSlot() as any))
-    if (id != null && id != undefined && cancelled) {
+        if (this.isQrCodeItem(inv.getItem(event.getPreviousSlot() as any))) {
            inv.setItem(event.getPreviousSlot(), null)
        }
    }
@@ -701,8 +711,7 @@ CAST TIME   : ${Date.now() - startTime}`)
    @Listener()
    InventoryClickEvent(event: org.bukkit.event.inventory.InventoryClickEvent) {
        let item = event.getCurrentItem()
-    let [cancelled, id] = this.isQrCodeItem(item)
-    if (id != null && id != undefined && cancelled) {
+        if (this.isQrCodeItem(item)) {
            event.getInventory().setItem(event.getSlot(), null)
            event.setCancelled(true)
        }
@@ -720,7 +729,7 @@ CAST TIME   : ${Date.now() - startTime}`)
        this.bindingTask = undefined
        this.bindingUser = 'unknow'
        this.checkAndClear(player)
-    this.chat.sendActionBar(player, "")
+        this.sendActionBar(player, "")
        this.zeroMapRender.setImage(undefined)
        //@ts-ignore
        this.bindingNotify.forEach(p => {
@@ -731,7 +740,7 @@ CAST TIME   : ${Date.now() - startTime}`)
    }

    private isHoldQrCodeItem(player: org.bukkit.entity.Player) {
-    return this.isQrCodeItem(player.getItemInHand())[0]
+        return this.isQrCodeItem(player.getItemInHand())
    }

    private checkAndClear(player: org.bukkit.entity.Player) {
@@ -740,13 +749,12 @@ CAST TIME   : ${Date.now() - startTime}`)
        }
    }

-  private isQrCodeItem(item: org.bukkit.inventory.ItemStack): [boolean, number?] {
-    if (!item) { return [false] }
-    if ((item?.getType() == Material.MAP || item?.getType() == Material.FILLED_MAP) && item.hasItemMeta()) {
-      let meta = item.getItemMeta()
-      return [!!(Java.from(meta.getLore()).indexOf('QRCODE') != -1), item.getDurability()]
+    private isQrCodeItem(item: org.bukkit.inventory.ItemStack): boolean {
+        if (!item || item.getType() == Material.AIR) { return false }
+        if ((item.getType() == Material.MAP || item.getType() == Material.FILLED_MAP) && item.hasItemMeta()) {
+            return Java.from(item.getItemMeta().getLore()).indexOf('QRCODE') != -1
        }
-    return [false]
+        return false
    }

    cmdhelp(sender: any) {
--- a/packages/plugins/src/MiaoScriptPackageManager.ts
+++ b/packages/plugins/src/MiaoScriptPackageManager.ts
@@ -47,6 +47,7 @@ let langMap = {
    'download.start': '§6开始下载插件: §b{name} §6版本 §3{version}',
    'download.url': '§6插件下载地址: §b{url}',
    'download.finish': '§6插件 §b{name} §6版本 §3{version} §a下载完毕 开始加载 ...',
+    'install.already': '§6插件 §b{name} §6版本 §3{version} §c已安装在服务器 §3更新请用 update 命令!',
    'install.finish': '§6插件 §b{name} §6版本 §3{version} §a安装成功!',
    'update.finish': '§6插件 §b{name} §6版本 §3{version} §a更新成功!',
    'upgrade.confirm': '§6您正在尝试更新 §bMiaoScript §c核心 §6请执行 §b/mpm §aupgrade §cconfirm §6确认执行!',
@@ -177,7 +178,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
        let message = JSON.parse(input.readUTF())
        let fakeSender = this.getProxySender(message.sender)
        this.taskManager.create(() => this.main(fakeSender, message.command, message.args)).async().submit()
-        this.logger.sender(fakeSender, `§6命令 §b/mpm ${message.args?.join?.(' ')} §a执行成功!`)
+        this.logger.sender(fakeSender, `§6命令 §b/mspm ${message.args?.join?.(' ')} §a执行成功!`)
    }

    private getProxySender(name: string) {
@@ -224,7 +225,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
        if (!this.isBungeeCord) return this.logger.sender(sender, '§c当前服务器尚未检测到 BungeeCord 链接...')
        this.taskManager.create(() => this.main(sender, command, args)).async().submit()
        this.bungeeCordForward(sender, { sender: sender.getName(), command, args })
-        this.logger.sender(sender, `§6[§3BPM§6][§a${this.serverName}§6] §6命令 §b/mpm ${args.join?.(' ')} §a发布成功!`)
+        this.logger.sender(sender, `§6[§3BPM§6][§a${this.serverName}§6] §6命令 §b/mspm ${args.join?.(' ')} §a发布成功!`)
    }

    @Cmd({ servers: [constants.ServerType.Bungee] })
@@ -264,6 +265,18 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
        ])
    }

+    cmdsudo(sender: any, name: string, ...args: string[]) {
+        this.taskManager.create(() => {
+            let player = this.server.getPlayer(name)
+            if (!player) {
+                return this.logger.sender(sender, `§4玩家 ${player.getName()} 不在线或不存在!`)
+            }
+            let command = args.join(' ')
+            this.server.dispatchCommand(player, command)
+            this.logger.sender(sender, `§6玩家 §a${player.getName()} §6命令 §b${command} §a执行完成!`)
+        }).submit()
+    }
+
    cmdload(sender: any, name: string) {
        let pluginFile = fs.concat(__dirname + '', name)
        if (!fs.exists(pluginFile)) {
@@ -290,7 +303,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
    cmdinstall(sender: any, name: string) {
        if (!name) { return this.i18n(sender, 'plugin.name.empty') }
        if (this.pluginManager.getPlugins().has(name)) {
-
+            this.i18n(sender, 'install.already', { name, version: this.pluginManager.getPlugins().get(name).description.version })
            return
        }
        this.download(sender, name, false, () => {
@@ -402,7 +415,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
            this.i18n(sender, 'prun.script', { name })
            this.i18n(sender, 'run.script', { script })
            let result = this.runCode(script, sender, this.pluginManager.getPlugins().get(name))
-            this.i18n(sender, 'run.result', { result: result == undefined ? this.translate.translate('run.noresult') : result + '' })
+            this.i18n(sender, 'run.result', { result: result == undefined ? this.translate.translate('run.noresult') : typeof result == "string" ? result : JSON.stringify(result) })
        } catch (ex) {
            this.logger.sender(sender, this.logger.stack(ex))
        }
@@ -429,8 +442,8 @@ if (this.serverType == "spring") {
    var db = dbm.getMainDatabase()
    var df = base.getInstance().getAutowireCapableBeanFactory()
 }
-return ''+ eval(${JSON.stringify(code)});`)
-        return tfunc.apply(_this, params) + ''
+return eval(${JSON.stringify(code)});`)
+        return tfunc.apply(_this, params)
    }

    cmddeploy(sender: any, name: any) {
@@ -460,7 +473,7 @@ return ''+ eval(${JSON.stringify(code)});`)

    @Tab({ alias: ['gmspm', 'bungeemspm'] })
    tabmspm(_sender: any, _command: any, args: string | any[]) {
-        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'prun', 'help', 'create', 'deploy'] }
+        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'prun', 'sudo', 'help', 'create', 'deploy'] }
        if (args.length > 1) {
            switch (args[0]) {
                case "list":
@@ -474,6 +487,9 @@ return ''+ eval(${JSON.stringify(code)});`)
                case "prun":
                    if (args.length == 2) return [...this.pluginManager.getPlugins().keys()]
                    return []
+                case "sudo":
+                    if (args.length == 2) return Java.from(this.server.getOnlinePlayers()).map(p => p.getName())
+                    return []
                case "update":
                case "load":
                case "unload":
--- a/packages/sponge/package.json
+++ b/packages/sponge/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/sponge",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -19,14 +19,14 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@javatypes/sponge-api": "^0.0.2",
+        "@javatypes/sponge-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    }
 }
--- a/packages/spring/package.json
+++ b/packages/spring/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/spring",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript spring package",
    "keywords": [
        "miaoscript",
@@ -24,9 +24,9 @@
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/common": "^0.9.4",
-        "@ccms/container": "^0.9.4",
-        "@ccms/database": "^0.9.5"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8",
+        "@ccms/database": "^0.9.8"
    }
 }
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/web",
-    "version": "0.9.5",
+    "version": "0.9.8",
    "description": "MiaoScript web package",
    "keywords": [
        "miaoscript",
@@ -19,17 +19,17 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@javatypes/jdk": "^0.0.2",
-        "@javatypes/spring-beans": "^0.0.2",
-        "@javatypes/spring-core": "^0.0.2",
-        "@javatypes/spring-web": "^0.0.2",
-        "@javatypes/tomcat": "^0.0.2",
+        "@javatypes/jdk": "^0.0.3",
+        "@javatypes/spring-beans": "^0.0.3",
+        "@javatypes/spring-core": "^0.0.3",
+        "@javatypes/spring-web": "^0.0.3",
+        "@javatypes/tomcat": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.9.5",
-        "@ccms/container": "^0.9.4"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8"
    }
 }
--- a/packages/websocket/package.json
+++ b/packages/websocket/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/websocket",
-    "version": "0.9.4",
+    "version": "0.9.8",
    "description": "MiaoScript websocket package",
    "keywords": [
        "miaoscript",
@@ -19,8 +19,8 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.9.4",
-        "@javatypes/tomcat-websocket-api": "^0.0.2",
+        "@ccms/nashorn": "^0.9.8",
+        "@javatypes/tomcat-websocket-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
        "typescript": "^4.0.3"
Author	SHA1	Message	Date
MiaoWoo	0568a7abbe	v0.9.8	2020-10-02 18:59:52 +08:00
MiaoWoo	7375e8e2e9	feat: add .editorconfig Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-10-02 18:54:28 +08:00
MiaoWoo	41d3923d94	feat: backup plugins Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-10-02 18:54:10 +08:00
MiaoWoo	f111b9891c	feat: define config save & load Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-10-02 18:53:31 +08:00
MiaoWoo	2e4fdcb798	fix: Autowired Java class error Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-10-02 18:48:37 +08:00
MiaoWoo	ab7ca932a3	fix: server method error Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-10-02 16:43:18 +08:00
MiaoWoo	e8b3d43cdf	feat: hide internal function Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-10-02 16:21:09 +08:00
MiaoWoo	eaaa0ef139	refactor: update type define Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-10-02 16:20:33 +08:00
MiaoWoo	94840ae59d	feat: add papi hook Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-09-27 19:39:10 +08:00
MiaoWoo	c31eaeb8f6	feat: backup plugin Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-09-26 22:03:49 +08:00
MiaoWoo	469a66a277	feat: update javatypes version Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-09-26 14:50:04 +08:00