cgserver 7.9.2113 → 7.11.2113

package/src/Framework/WebServer/Controller/BaseUserController.ts

@@ -1,209 +0,0 @@
-import { BaseController } from './BaseController';
-import { UserModel, GUserSer } from '../../Service/UserService';
-import { GCacheTool } from '../../Logic/CacheTool';
-import { ESessionType } from '../../Config/FrameworkConfig';
-import { GRedisMgr } from '../../Database/RedisManager';
-import { MongoCacheModel, GMongoCacheSer } from '../../Service/MongoCacheService';
-import { ERoleGroup } from '../../Service/ini';
-export class BaseUserController<T extends UserModel> extends BaseController
-{
-    protected _user_session_id="user_session_id"
-    protected _self_user:T=null
-    protected _user:T=null//网页内容的所属，比如，查看别人的博客，那这个信息就是作者的
-    protected _session_id:string=null
-    get selfUser()
-    {
-        return <T>this._self_user
-    }
-    get isSelf()
-    {
-        return this._self_user && (this._self_user.id == this._user.id)
-    }
-    get isLogin()
-    {
-        return this._self_user&&true
-    }
-    get isCreator()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Creator)
-    }
-    get isAdmin()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Admin||this._self_user.role_group==ERoleGroup.Creator)
-    }
-    get isProxy()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Proxy)
-    }
-    get isCommon()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Common)
-    }
-    async init()
-    {
-        this._engine.cfg.session_type=this._engine.cfg.session_type||ESessionType.Cache
-        this._session_id = this._request.getCookie(this._user_session_id)||this._request.params.session_id||this._request.postData.session_id
-        let userId = -1
-        if (this._session_id)
-        {
-            let user = await this._getUserBySession(this._session_id)
-            if (!user)
-            {
-                this._update_session()
-                //Session不存在清除客户端cookie
-                this._response.clearCookie(this._user_session_id)
-            }
-            else
-            {
-                this._login(user)
-                userId = user.id
-            }
-        }
-        let params = this._request.params
-        if (params.userId && params.userId!=userId+"")
-        {
-            this._user = <T>(await GUserSer.getById(params.userId))
-        }
-        else
-        {
-            //不是别人的信息就查看自己的
-            this._user = this._self_user
-        }
-    }
-    protected async _getUserBySession(session:string)
-    {
-        let user:T= null
-        if(!session)
-        {
-            return user
-        }
-        //每次强制从cache中先找，提高效率
-        //if(this._engine.cfg.session_type==ESessionType.Cache)
-        {
-            user= GCacheTool.get(this._session_id)
-        }
-        if(user)
-        {
-            return user
-        }
-        if(this._engine.cfg.session_type==ESessionType.Redis)
-        {
-            let user_id = parseInt((await GRedisMgr.get(this._session_id))||"-1")
-            if(user_id>0)
-            {
-                user = <T>(await GUserSer.getById(user_id))
-            }
-        }
-        else if(this._engine.cfg.session_type==ESessionType.Mongo)
-        {
-            let user_id = (await GMongoCacheSer.getData(this._session_id))||-1
-            if(user_id>0)
-            {
-                user = <T>(await GUserSer.getById(user_id))
-            }
-        }
-        if(user)
-        {
-            this._login(user)
-        }
-        return user
-    }
-    protected _logout()
-    {
-        if(this._session_id)
-        {
-            if(this._engine.cfg.session_type==ESessionType.Cache)
-            {
-                GCacheTool.remove(this._session_id)
-            }
-            else if(this._engine.cfg.session_type==ESessionType.Redis)
-            {
-                GRedisMgr.del(this._session_id)
-            }
-            else if(this._engine.cfg.session_type==ESessionType.Mongo)
-            {
-                GMongoCacheSer.deleteOne({key:this._session_id})
-            }
-            this._session_id = null
-        }
-        this._response.clearCookie(this._user_session_id)
-    }
-    protected _login(user:T)
-    {
-        if(!user)
-        {
-            return;
-        }
-        if(!this._session_id)
-        {
-            this._session_id = Math.random().toString(36).substring(2)+user.id
-        }
-        let time = 0
-        if(this._request.postData.remember=="on")
-        {
-            time = this._engine.cfg.cookie.expires.account_remember
-        }
-        else
-        {
-            time = this._engine.cfg.cookie.expires.account
-        }
-        this._response.setCookie(this._user_session_id,this._session_id,time)
-
-        //if(this._engine.cfg.session_type==ESessionType.Cache)
-        {
-            if(time>24*60*60)
-            {
-                GCacheTool.add(this._session_id,user,24*60*60*1000)
-            }
-            else
-            {
-                GCacheTool.add(this._session_id,user,time*1000)
-            }
-        }
-        if(this._engine.cfg.session_type==ESessionType.Redis)
-        {
-            GRedisMgr.set(this._session_id,user.id).then(()=>
-            {
-                GRedisMgr.expire(this._session_id,time)
-            })
-        }
-        else if(this._engine.cfg.session_type==ESessionType.Mongo)
-        {
-            let cm = new MongoCacheModel()
-            cm.key=this._session_id
-            cm.data=user.id
-            cm.expireAt=Date.now()+time*1000
-            GMongoCacheSer.updateOne(cm,{key:cm.key},true)
-        }
-        this._self_user = user
-    }
-    /**
-     * 已经被启用
-     */
-    protected async _update_session()
-    {
-
-    }
-    async update_user(user_id:number)
-    {
-        let user = <T>(await GUserSer.getById(user_id))
-        if(this._user&&this._user.id==user.id)
-        {
-            this._user = user
-        }
-        if(this._self_user&&this._self_user.id==user.id)
-        {
-            this._login(user)
-        }
-    }
-    //填充每个页面需要的通用数据
-    protected _init_data(datas)
-    {
-        let data = super._init_data(datas)
-        data.model.isLogin = this.isLogin
-        data.model.user = this._user
-        data.model.selfUser = this._self_user
-        data.model.isSelf = this.isSelf
-        return data
-    }
-}

package/src/Framework/WebServer/Controller/MongoBaseUserController.ts

@@ -1,209 +0,0 @@
-import { BaseController } from './BaseController';
-import { GCacheTool } from '../../Logic/CacheTool';
-import { ESessionType } from '../../Config/FrameworkConfig';
-import { GRedisMgr } from '../../Database/RedisManager';
-import { MongoCacheModel, GMongoCacheSer } from '../../Service/MongoCacheService';
-import { ERoleGroup } from '../../Service/ini';
-import { GUserSer, UserModel } from '../../Service/MongoUserService';
-export class MongoBaseUserController<T extends UserModel> extends BaseController
-{
-    protected _user_session_id="user_session_id"
-    protected _self_user:T=null
-    protected _user:T=null//网页内容的所属，比如，查看别人的博客，那这个信息就是作者的
-    protected _session_id:string=null
-    get selfUser()
-    {
-        return <T>this._self_user
-    }
-    get isSelf()
-    {
-        return this._self_user && (this._self_user.id == this._user.id)
-    }
-    get isLogin()
-    {
-        return this._self_user&&true
-    }
-    get isCreator()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Creator)
-    }
-    get isAdmin()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Admin||this._self_user.role_group==ERoleGroup.Creator)
-    }
-    get isProxy()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Proxy)
-    }
-    get isCommon()
-    {
-        return this._self_user&&(this._self_user.role_group==ERoleGroup.Common)
-    }
-    async init()
-    {
-        this._engine.cfg.session_type=this._engine.cfg.session_type||ESessionType.Cache
-        this._session_id = this._request.getCookie(this._user_session_id)||this._request.params.session_id||this._request.postData.session_id
-        let userId = -1
-        if (this._session_id)
-        {
-            let user = await this._getUserBySession(this._session_id)
-            if (!user)
-            {
-                this._update_session()
-                //Session不存在清除客户端cookie
-                this._response.clearCookie(this._user_session_id)
-            }
-            else
-            {
-                this._login(user)
-                userId = user.id
-            }
-        }
-        let params = this._request.params
-        if (params.userId && params.userId!=userId+"")
-        {
-            this._user = <T>(await GUserSer.getById(params.userId))
-        }
-        else
-        {
-            //不是别人的信息就查看自己的
-            this._user = this._self_user
-        }
-    }
-    protected async _getUserBySession(session:string)
-    {
-        let user:T= null
-        if(!session)
-        {
-            return user
-        }
-        //每次强制从cache中先找，提高效率
-        //if(this._engine.cfg.session_type==ESessionType.Cache)
-        {
-            user= GCacheTool.get(this._session_id)
-        }
-        if(user)
-        {
-            return user
-        }
-        if(this._engine.cfg.session_type==ESessionType.Redis)
-        {
-            let user_id = parseInt((await GRedisMgr.get(this._session_id))||"-1")
-            if(user_id>0)
-            {
-                user = <T>(await GUserSer.getById(user_id))
-            }
-        }
-        else if(this._engine.cfg.session_type==ESessionType.Mongo)
-        {
-            let user_id = (await GMongoCacheSer.getData(this._session_id))||-1
-            if(user_id>0)
-            {
-                user = <T>(await GUserSer.getById(user_id))
-            }
-        }
-        if(user)
-        {
-            this._login(user)
-        }
-        return user
-    }
-    protected _logout()
-    {
-        if(this._session_id)
-        {
-            if(this._engine.cfg.session_type==ESessionType.Cache)
-            {
-                GCacheTool.remove(this._session_id)
-            }
-            else if(this._engine.cfg.session_type==ESessionType.Redis)
-            {
-                GRedisMgr.del(this._session_id)
-            }
-            else if(this._engine.cfg.session_type==ESessionType.Mongo)
-            {
-                GMongoCacheSer.deleteOne({key:this._session_id})
-            }
-            this._session_id = null
-        }
-        this._response.clearCookie(this._user_session_id)
-    }
-    protected _login(user:T)
-    {
-        if(!user)
-        {
-            return;
-        }
-        if(!this._session_id)
-        {
-            this._session_id = Math.random().toString(36).substring(2)+user.id
-        }
-        let time = 0
-        if(this._request.postData.remember=="on")
-        {
-            time = this._engine.cfg.cookie.expires.account_remember
-        }
-        else
-        {
-            time = this._engine.cfg.cookie.expires.account
-        }
-        this._response.setCookie(this._user_session_id,this._session_id,time)
-
-        //if(this._engine.cfg.session_type==ESessionType.Cache)
-        {
-            if(time>24*60*60)
-            {
-                GCacheTool.add(this._session_id,user,24*60*60*1000)
-            }
-            else
-            {
-                GCacheTool.add(this._session_id,user,time*1000)
-            }
-        }
-        if(this._engine.cfg.session_type==ESessionType.Redis)
-        {
-            GRedisMgr.set(this._session_id,user.id).then(()=>
-            {
-                GRedisMgr.expire(this._session_id,time)
-            })
-        }
-        else if(this._engine.cfg.session_type==ESessionType.Mongo)
-        {
-            let cm = new MongoCacheModel()
-            cm.key=this._session_id
-            cm.data=user.id
-            cm.expireAt=Date.now()+time*1000
-            GMongoCacheSer.updateOne(cm,{key:cm.key},true)
-        }
-        this._self_user = user
-    }
-    /**
-     * 已经被启用
-     */
-    protected async _update_session()
-    {
-
-    }
-    async update_user(user_id:number)
-    {
-        let user = <T>(await GUserSer.getById(user_id))
-        if(this._user&&this._user.id==user.id)
-        {
-            this._user = user
-        }
-        if(this._self_user&&this._self_user.id==user.id)
-        {
-            this._login(user)
-        }
-    }
-    //填充每个页面需要的通用数据
-    protected _init_data(datas)
-    {
-        let data = super._init_data(datas)
-        data.model.isLogin = this.isLogin
-        data.model.user = this._user
-        data.model.selfUser = this._self_user
-        data.model.isSelf = this.isSelf
-        return data
-    }
-}

package/src/Framework/WebServer/Decorator/AdminValidate.ts

@@ -1,19 +0,0 @@
-export function AdminValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-{
-    let method = descriptor.value
-    descriptor.value = function () 
-    {
-        let self=this
-        if(!self.isLogin)
-        {
-            self.redirect(null,"Login")
-            return
-        }
-        if(!self.isAdmin)
-        {
-            self.showText("需要管理员权限")
-            return
-        }
-        return method.apply(this, arguments)
-    }
-}

package/src/Framework/WebServer/Decorator/AuthorityValidate.ts

@@ -1,25 +0,0 @@
-import { ERoleGroup } from "../../Service/ini"
-
-export let AuthorityValidate=function(rg?:ERoleGroup,ctr_name?:string)
-{
-    ctr_name=ctr_name||"Wechat"
-    return function(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-    {
-        let method = descriptor.value
-        descriptor.value = function () 
-        {
-            let self=this
-            if(!self.isLogin)
-            {
-                self.redirect(null,ctr_name)
-                return
-            }
-            if(rg&&self.selfUser.role_group!=rg)
-            {
-                self.redirect(null,ctr_name)//权限不足
-                return
-            }
-            return method.apply(this, arguments)
-        }
-    }
-}

package/src/Framework/WebServer/Decorator/CreatorValidate.ts

@@ -1,19 +0,0 @@
-export function CreatorValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-{
-    let method = descriptor.value
-    descriptor.value = function () 
-    {
-        let self=this
-        if(!self.isLogin)
-        {
-            self.redirect(null,"Login")
-            return
-        }
-        if(!self.isCreator)
-        {
-            self.showText("需要创始人权限")
-            return
-        }
-        return method.apply(this, arguments)
-    }
-}

package/src/Framework/WebServer/Decorator/JsonAdminValidate.ts

@@ -1,16 +0,0 @@
-import { UserModel } from "../../Service/MongoUserService";
-
-export function JsonAdminValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-{
-    let method = descriptor.value
-    descriptor.value = function () 
-    {
-        let self=this
-        if(!self.isAdmin)
-        {
-            self.showJson({errcode:{id:1,des:"需要管理员或创始人权限"},err:"需要管理员或创始人权限"})
-            return
-        }
-        return method.apply(this, arguments)
-    }
-}

package/src/Framework/WebServer/Decorator/JsonAuthorityValidate.d.ts

@@ -1,2 +0,0 @@
-import { ERoleGroup } from "../../Service/ini";
-export declare let JsonAuthorityValidate: (rg?: ERoleGroup) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/src/Framework/WebServer/Decorator/JsonAuthorityValidate.ts

@@ -1,23 +0,0 @@
-import { ERoleGroup } from "../../Service/ini"
-
-export let JsonAuthorityValidate=function(rg?:ERoleGroup)
-{
-    return function(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-    {
-        let method = descriptor.value
-        descriptor.value = function () 
-        {
-            let self=this
-            if(!self.isLogin)
-            {
-                self.showJson({errcode:{id:1,des:"未登陆"},err:"未登陆"})
-            }
-            if(rg&&self.selfUser.role_group!=rg)
-            {
-                self.showJson({errcode:{id:2,des:"权限不足"},err:"权限不足"})
-                return
-            }
-            return method.apply(this, arguments)
-        }
-    }
-}

package/src/Framework/WebServer/Decorator/JsonCreatorValidate.ts

@@ -1,19 +0,0 @@
-export function JsonCreatorValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-{
-    let method = descriptor.value
-    descriptor.value = function () 
-    {
-        let self=this
-        if(!self.isLogin)
-        {
-            self.showJson({errcode:{id:1,des:"请登陆后尝试"},err:"请登陆后尝试"})
-            return
-        }
-        if(!self.isCreator)
-        {
-            self.showJson({errcode:{id:1,des:"需要创始人权限"},err:"需要创始人权限"})
-            return
-        }
-        return method.apply(this, arguments)
-    }
-}

package/src/Framework/WebServer/Decorator/SyncCall.ts

@@ -1,20 +0,0 @@
-import { GSyncQueueTool } from "../../Logic/SyncQueueTool"
-/**
- * 异步函数变为同步函数，当前进程有效
- * @param target 
- * @param propertyName 
- * @param descriptor 
- */
-export function SyncCall(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-{
-    let method = descriptor.value
-    descriptor.value = function () 
-    {
-        let self=this
-        let ret = GSyncQueueTool.add(method.name,async ()=>
-        {
-            return await method.apply(self, arguments)
-        })
-        return ret
-    }
-}

package/src/Framework/WebServer/Decorator/SyncCallServer.ts

@@ -1,45 +0,0 @@
-import { core } from "../../Core/Core"
-import { GSyncQueueTool } from "../../Logic/SyncQueueTool"
-import { GMongoCacheSer } from "../../Service/MongoCacheService"
-
-/**
- * 异步函数变为同步函数
- * 服务器间的异步，效率低
- * 只支持mongo模式
- * @returns 
- */
-export let SyncCallServer=function()
-{
-    return function(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) 
-    {
-        let method = descriptor.value
-        descriptor.value = async ()=>
-        {
-            let key = "sync_"+method.name
-            let func = async ()=>
-            {
-                let item = await GMongoCacheSer.getData(key)
-                let ret = null
-                while(item)
-                {
-                    await core.sleep(200)
-                    item = await GMongoCacheSer.getData(key)
-                }
-                //10秒后过期，避免卡死
-                let mcm = await GMongoCacheSer.addData(key,true,Date.now()+10*1000)
-                if(!mcm)
-                {
-                    await func()
-                }
-                return
-            }
-            await func()
-            let ret = GSyncQueueTool.add(method.name,async ()=>
-            {
-                return await method.apply(self, arguments)
-            })
-            await GMongoCacheSer.deleteOne({key})
-            return ret
-        }
-    }
-}