cgserver 7.10.2113 → 7.12.2113

package/src/Framework/ThirdParty/EmailTool.ts

@@ -1,37 +0,0 @@
-
-import * as nodeMailer from "nodemailer";
-import { GServerCfg } from "../Config/IServerConfig";
-import { GLog } from "../Logic/Log";
-export let GEmailTool:EmailTool=null
-class EmailTool
-{
-    send(to:string,subject:string,html:string)
-    {
-        return new Promise((resolve,reject)=>
-        {        
-            let transport = nodeMailer.createTransport({
-                    host: GServerCfg.third_cfg.email.host,
-                    port: GServerCfg.third_cfg.email.port,
-                    secure: GServerCfg.third_cfg.email.secure,
-                    auth: 
-                    {
-                        user: GServerCfg.third_cfg.email.auth.user,
-                        pass: GServerCfg.third_cfg.email.auth.pass
-                    }
-            })
-            let mail =
-            {
-                from: GServerCfg.third_cfg.email.from,
-                to: to,
-                subject: subject,
-                html: html
-            }
-            transport.sendMail(mail,(_err,msg)=>
-            {
-                GLog.error(JSON.stringify(_err))
-                resolve(_err)
-            })
-        })
-    }
-}
-GEmailTool = new EmailTool()

package/src/Framework/ThirdParty/OpenSocial.ts

@@ -1,36 +0,0 @@
-import { GServerCfg } from "../Config/IServerConfig";
-import { GHttpTool } from "../Logic/HttpTool";
-
-export let GOpenSocial:OpenSocial=null
-class OpenSocial
-{
-    protected _getNewMsg():any
-    {
-        return {
-            app_id:GServerCfg.third_cfg.open_social.app_id,
-            app_secret:GServerCfg.third_cfg.open_social.app_secret
-        }
-    }
-    async getUser(unionid:string,openid:string)
-    {
-        let msg=
-        {
-            unionid:unionid,
-            openid:openid
-        }
-        let rs=await GHttpTool.post({url:GServerCfg.third_cfg.open_social.user_url,json:msg})
-        return rs.body
-    }
-    async updatePwd(unionid:string,openid:string,new_pwd:string)
-    {
-        let msg=
-        {
-            unionid:unionid,
-            openid:openid,
-            password:new_pwd
-        }
-        let jsonData = await GHttpTool.post({url:GServerCfg.third_cfg.open_social.update_pwd_url,json:msg})
-        return jsonData.body||jsonData.error
-    }
-}
-GOpenSocial = new OpenSocial()

package/src/Framework/ThirdParty/QQTool.ts

@@ -1,124 +0,0 @@
-import * as _ from "underscore";
-import * as URLEncode from "urlencode";
-import { GServerCfg } from "../Config/IServerConfig";
-import { GHttpTool } from "../Logic/HttpTool";
-import { GLog } from "../Logic/Log";
-
-export class QQUserInfo
-{
-    ret=0
-    msg=""
-    is_lost=0
-    nickname=""
-    gender=""//"男"
-    province=""//"四川"
-    city=""//"成都"
-    year=""//"1988"
-    constellation=""
-    figureurl=""//http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/30
-    figureurl_1=""//http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/50
-    figureurl_2=""//http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/100
-    figureurl_qq_1=""//http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=40&t=1556419177
-    figureurl_qq_2=""//http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=100&t=1556419177
-    figureurl_qq=""//http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=140&t=1556419177
-    figureurl_type=""//"1"
-    is_yellow_vip:""//"0"
-    vip=""//"0"
-    yellow_vip_level=""//"0"
-    level=""//"0"
-    is_yellow_year_vip=""//"0"
-}
-
-export let GQQTool:QQTool=null
-export class QQTool
-{
-    /**
-     * 获取Authorization Code
-     * @param scope 可选	请求用户授权时向用户显示的可进行授权的列表。
-                    可填写的值是API文档中列出的接口，以及一些动作型的授权（目前仅有：do_like），如果要填写多个接口名称，请用逗号隔开。
-                    例如：scope=get_user_info,list_album,upload_pic,do_like
-                    不传则默认请求对接口get_user_info进行授权。
-                    建议控制授权项的数量，只传入必要的接口名称，因为授权项越多，用户越可能拒绝进行任何授权。
-     * @param display 仅PC网站接入时使用。
-                    用于展示的样式。不传则默认展示为PC下的样式。
-                    如果传入“mobile”，则展示为mobile端下的样式。
-     */
-    getAuthCodeUrl(scope?:string,display?:string)
-    {
-        //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(GServerCfg.third_cfg.qq.redirect_uri)
-        //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = GServerCfg.third_cfg.qq.app_id
-        //必须	授权类型，此值固定为“code”。
-        let response_type="code"
-        //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
-        let state=_.random(1000000,9999999)
-        //PC网站
-        let url="https://graph.qq.com/oauth2.0/authorize?redirect_uri="+redirect_uri+"&response_type="+response_type+"&state="+state+"&client_id="+client_id
-        if(scope)
-        {
-            url+="&scope="+scope
-        }
-        if(display)
-        {
-            url+="&display="+display
-        }
-        return url
-    }
-    async getAccessToken(auth_code:string):Promise<string>
-    {
-        if(!auth_code)
-        {
-            return null
-        }
-        //必须	授权类型，在本步骤中，此值为“authorization_code”。
-        let grant_type = "authorization_code"
-        //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = GServerCfg.third_cfg.qq.app_id
-        //必须	申请QQ登录成功后，分配给网站的appkey。
-        let client_secret = GServerCfg.third_cfg.qq.app_key
-        //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(GServerCfg.third_cfg.qq.redirect_uri)
-
-        let url="https://graph.qq.com/oauth2.0/token?code="+auth_code+"&grant_type="+grant_type+"&client_id="+client_id+"&client_secret="+client_secret+"&redirect_uri="+redirect_uri
-        let rs = await GHttpTool.get(url)
-        if(rs.body&&rs.body.access_token)
-        {
-            return rs.body.access_token
-        }
-        else
-        {
-            GLog.error(rs.body)
-        }
-        return null
-    }
-    async getOpenId(access_token:string):Promise<string>
-    {
-        let url="https://graph.qq.com/oauth2.0/me?access_token="+access_token
-        let rs = await GHttpTool.get(url)
-        let body = rs.response?rs.response.body:null
-        if(body)
-        {
-            body=body.replace("callback( ","")
-            body=body.replace(" );\n","")
-            try{body=JSON.parse(body)}catch(e){}
-            if(!body.openid)
-            {
-                GLog.error(rs.response.body)
-            }
-            return body.openid
-        }
-        return null
-    }
-    async getUserInfo(access_token:string,openid:string):Promise<QQUserInfo>
-    {
-        let url = "https://graph.qq.com/user/get_user_info?access_token="+access_token+"&oauth_consumer_key="+GServerCfg.third_cfg.qq.app_id+"&openid="+openid
-        let rs = await GHttpTool.get(url)
-        if(rs.body)
-        {
-            return rs.body
-        }
-        return null
-    }
-}
-GQQTool=new QQTool()

package/src/Framework/ThirdParty/QiniuTool.ts

@@ -1,23 +0,0 @@
-import * as qiniu from "qiniu";
-import { GServerCfg } from "../Config/IServerConfig";
-
-export let GQiniuTool:QiniuTool = null
-class QiniuTool
-{
-    get host()
-    {
-        return GServerCfg.third_cfg.qiniu.host
-    }
-    getUploadToken(filename)
-    {
-        let mac = new qiniu.auth.digest.Mac(GServerCfg.third_cfg.qiniu.accessKey, GServerCfg.third_cfg.qiniu.secretKey)
-        let options = 
-        {
-            scope: GServerCfg.third_cfg.qiniu.bucket+":"+filename,
-        }
-        let putPolicy = new qiniu.rs.PutPolicy(options)
-        let uploadToken = putPolicy.uploadToken(mac)
-        return uploadToken
-    }
-}
-GQiniuTool = new QiniuTool()

package/src/Framework/ThirdParty/Rpc.ts

@@ -1,75 +0,0 @@
-import { core } from "../Core/Core"
-import { GLog } from "../Logic/Log"
-import { CgMq, CgMqConfig, CgMqRetMsg } from "./CgMq"
-
-class Remote
-{
-    protected _retmsg:CgMqRetMsg=null
-    get retMsg()
-    {
-        return this._retmsg
-    }
-    protected _cgmq:CgMq=null
-    get cgmq()
-    {
-        return this._cgmq
-    }
-    protected _to_identity=""
-    constructor(identity:string,cgmq:CgMq)
-    {
-        this._to_identity=identity
-        this._cgmq=cgmq
-    }
-    async call(func_name:string,...args):Promise<any|any[]>
-    {
-        this._retmsg = await this._cgmq.callRemote(this._to_identity,func_name,...args)
-        if(!this._retmsg.data)
-        {
-            return
-        }
-        let datas:any[]=this._retmsg.data 
-        if(datas.length==1)
-        {
-            return datas[0]
-        }
-        return datas
-    }
-}
-export class RpcConfig extends CgMqConfig
-{
-
-}
-export class Rpc
-{
-    protected _cgmq:CgMq=null
-    get cgmq()
-    {
-        return this._cgmq
-    }
-    async init(cfg:RpcConfig)
-    {
-        this._cgmq=new CgMq()
-        let ret = await this._cgmq.init(cfg,this.onMsg.bind(this))
-        return ret
-    }
-    getRemote(identity:string)
-    {
-        return new Remote(identity,this._cgmq)
-    }
-    async onMsg(msg:CgMqRetMsg)
-    {
-        if(!msg||!msg.data||!msg.data.cmd)
-        {
-            return
-        }
-        let cmd:string = msg.data.cmd
-        let func = this[cmd]
-        if(!func)
-        {
-            GLog.error({des:"rpc no cmd",msg})
-            return
-        }
-        let data = await core.safeCall(func,this,...msg.data?.args,msg)
-        return data
-    }
-}

package/src/Framework/ThirdParty/WechatOATool.ts

@@ -1,61 +0,0 @@
-//OA=offical account公众号
-export class WechatOAMsg
-{
-    // <xml>
-    // <ToUserName><![CDATA[toUser]]></ToUserName>
-    // <FromUserName><![CDATA[fromUser]]></FromUserName>
-    // <CreateTime>1348831860</CreateTime>
-    // <MsgType><![CDATA[text]]></MsgType>
-    // <Content><![CDATA[this is a test]]></Content>
-    // <MsgId>1234567890123456</MsgId>
-    // </xml>
-    toUserName=""
-    fromUserName=""//其实是一个userid
-    createTime=-1
-    msgType=""//text文本
-    content=""
-    msgId=-1//只有收到消息才会有
-}
-export let GWechatOATool:WechatOATool=null
-export class WechatOATool
-{
-    convertMsg(xmlStr:string)
-    {
-        if(!xmlStr)
-        {
-            return null
-        }
-        let msg = new WechatOAMsg()
-        let pre = "<ToUserName><![CDATA["
-        xmlStr=xmlStr.substr(xmlStr.indexOf(pre)+pre.length)
-        msg.toUserName=xmlStr.substr(0,xmlStr.indexOf("]"))
-        pre = "<FromUserName><![CDATA["
-        xmlStr=xmlStr.substr(xmlStr.indexOf(pre)+pre.length)
-        msg.fromUserName=xmlStr.substr(0,xmlStr.indexOf("]"))
-        pre = "<CreateTime>"
-        xmlStr=xmlStr.substr(xmlStr.indexOf(pre)+pre.length)
-        msg.createTime=parseInt(xmlStr.substr(0,xmlStr.indexOf("<")))
-        pre = "<MsgType><![CDATA["
-        xmlStr=xmlStr.substr(xmlStr.indexOf(pre)+pre.length)
-        msg.msgType=xmlStr.substr(0,xmlStr.indexOf("]"))
-        pre = "<Content><![CDATA["
-        xmlStr=xmlStr.substr(xmlStr.indexOf(pre)+pre.length)
-        msg.content=xmlStr.substr(0,xmlStr.indexOf("]"))
-        pre = "<MsgId>"
-        xmlStr=xmlStr.substr(xmlStr.indexOf(pre)+pre.length)
-        msg.msgId=parseInt(xmlStr.substr(0,xmlStr.indexOf("<")))
-        return msg
-    }
-    toReplyXmlStr(msg:WechatOAMsg)
-    {
-        let xmlStr="<xml>"
-        xmlStr+="<ToUserName><![CDATA["+msg.toUserName+"]]></ToUserName>"
-        xmlStr+="<FromUserName><![CDATA["+msg.fromUserName+"]]></FromUserName>"
-        xmlStr+="<CreateTime>"+msg.createTime+"</CreateTime>"
-        xmlStr+="<MsgType><![CDATA["+msg.msgType+"]]></MsgType>"
-        xmlStr+="<Content><![CDATA["+msg.content+"]]></Content>"
-        xmlStr+="</xml>"
-        return xmlStr
-    }
-}
-GWechatOATool=new WechatOATool()

package/src/Framework/ThirdParty/WechatTool.ts

@@ -1,80 +0,0 @@
-import * as _ from "underscore";
-import * as URLEncode from "urlencode";
-import { GServerCfg } from "../Config/IServerConfig";
-import { GHttpTool } from "../Logic/HttpTool";
-import { GLog } from "../Logic/Log";
-
-export class WechatUserInfo
-{
-    openid="OPENID"
-    nickname="NICKNAME"
-    sex=1
-    province="PROVINCE"
-    city="CITY"
-    country="COUNTRY"
-    headimgurl= "http://wx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/0"
-    privilege=[
-        "PRIVILEGE1",
-        "PRIVILEGE2"
-    ]
-    unionid="o6_bmasdasdsad6_2sgVt7hMZOPfL"
-}
-
-export let GWechatTool:WechatTool=null
-export class WechatTool
-{
-    /**
-     * 获取获取code的url
-     */
-    getAuthCodeUrl()
-    {
-        let appid="wx80f0f10fe1304e9d"
-        let url = "https://open.weixin.qq.com/connect/qrconnect?appid="+ GServerCfg.third_cfg.wechat.app_id
-        url+="&redirect_uri="+URLEncode.encode(GServerCfg.third_cfg.wechat.redirect_uri)
-        url+="&response_type=code&scope=snsapi_login"
-        //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
-        let state=_.random(1000000,9999999)
-        url+="&state="+state
-        return url
-    }
-    async getAccessInfo(auth_code:string):Promise<any>
-    {
-        if(!auth_code)
-        {
-            return null
-        }
-        let url="https://api.weixin.qq.com/sns/oauth2/access_token?appid="+GServerCfg.third_cfg.wechat.app_id+"&secret="+GServerCfg.third_cfg.wechat.app_key+"&code="+auth_code+"&grant_type=authorization_code"
-        let rs = await GHttpTool.get(url)
-        /*
-        { 
-            "access_token":"ACCESS_TOKEN", 
-            "expires_in":7200, 
-            "refresh_token":"REFRESH_TOKEN",
-            "openid":"OPENID", 
-            "scope":"SCOPE",
-            "unionid": "o6_bmasdasdsad6_2sgVt7hMZOPfL"
-        }
-        {"errcode":40029,"errmsg":"invalid code"}
-        */
-        if(rs.body&&rs.body.access_token)
-        {
-            return rs.body
-        }
-        else
-        {
-            GLog.error(rs.body)
-        }
-        return null
-    }
-    async getUserInfo(access_token:string,openid:string):Promise<WechatUserInfo>
-    {
-        let url = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+openid
-        let rs = await GHttpTool.get(url)
-        if(rs.body)
-        {
-            return rs.body
-        }
-        return null
-    }
-}
-GWechatTool=new WechatTool()

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

@@ -1,140 +0,0 @@
-import { Engine } from './../Engine/Engine';
-import { Request } from '../Engine/Request';
-import { Response } from '../Engine/Response';
-
-export class BaseController
-{
-    protected _request:Request=null
-    get request()
-    {
-        return this._request
-    }
-    protected _response:Response=null
-    get response()
-    {
-        return this._response
-    }
-    //模块名称
-    protected _module:string=""
-    protected _ctr_name:string=""
-    get ctrName()
-    {
-        return this._ctr_name
-    }
-    protected _engine:Engine=null
-    get postData()
-    {
-        if(!this._request)
-        {
-            return <any>{}
-        }
-        return this._request.postData||<any>{}
-    }
-    get paramData()
-    {
-        if(!this._request)
-        {
-            return <any>{}
-        }
-        return this._request.params||<any>{}
-    }
-    constructor(req:Request, res:Response,engine:Engine)
-    {
-        this._engine = engine
-        this._request = req
-        this._response = res
-        //静态控制器，传过来全是空
-        if(this._request)
-        {
-            this._request.debugInfo()
-        }
-    }
-    async init()
-    {
-
-    }
-    /**
-     * 方便static ctr使用
-     * @param req 
-     * @param res 
-     * @param engine 
-     */
-    initStatic(req:Request, res:Response,engine:Engine)
-    {
-        this._engine = engine
-        this._request = req
-        this._response = res
-        this._request.debugInfo()
-    }
-    //填充每个页面需要的通用数据
-    protected _init_data(model?)
-    {
-        model = model||{}
-        model.webName = this._engine.cfg.web_name
-        return {model}
-    }
-    showJson(model?)
-    {
-        this._response.renderJson(model,this._request.headers.origin)
-    }
-    show(model?)
-    {
-        let html = this._engine.getRenderHtml(this._request, this._response, this._init_data(model))
-        this._response.renderHtml(html)
-    }
-    showText(text,noMeta?:boolean)
-    {
-        if(!noMeta)
-        {
-            text="<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />"+text    
-        }
-        this._response.renderHtml(text)
-    }
-    redirect(module?:string,controller?:string, action?:string,params?)
-    {
-        module = module || this._module
-        controller = controller || this._ctr_name
-        let url = this.parseFullUrl(module,controller, action)
-        params=params||{}
-        let str_p=""
-        for(let key in params)
-        {
-            str_p+="&"+key+"="+params[key]
-        }
-        if(str_p.length>0)
-        {
-            str_p="?"+str_p.substring(1)
-        }
-        url+=str_p
-        this._response.redirect(url)
-    }
-    parseFullUrl(module:string,controller:string, action:string)
-    {
-        if (typeof action === "undefined" || !action)
-        {
-            action = "index"
-            if(this._engine.cfg.routs.defaults.action==action)
-            {
-                action=null
-            }
-        }
-        let url = ""
-        if(this._engine.cfg.routs.onlyModule)
-        {
-            url =  this._request.root + "/" + controller
-        }
-        else
-        {
-            url = this._request.root + "/" + module+ "/" + controller
-        }
-        if(action)
-        {
-            url+="/"+action
-        }
-        return url
-    }
-    get remoteHost()
-    {
-        return this._request.remoteHost
-    }
-}