Merge branch 'master' into dev

# Conflicts:
#	src/public/rank/rank.ts

src/api_s2c/kuangdong/ApiYanShi.ts

@@ -4,6 +4,9 @@ import {PlayerFun} from "../../public/player";
 import {ReqYanShi, ResYanShi} from "../../shared/protocols/kuangdong/PtlYanShi";
 
 export default async function (call: ApiCall<ReqYanShi, ResYanShi>) {
+
+    return call.errorCode(1)
+
     let hdid = call.req.hdid
     let con = await KuangDongfun.getCon(hdid)
 

src/gameLog.ts

@@ -30,16 +30,17 @@ async function connGameLogDB() {
 
 
 process.on('uncaughtException',function(err:Error){
-    addErrorLog((err.stack).toString());
+    addErrorLog((err?.stack)?.toString());
 })
 
 process.on('unhandledRejection', function (err:Error, promise) {
-    addErrorLog((err.stack).toString());
+    addErrorLog((err?.stack)?.toString());
 })
 
 async function addErrorLog(errData:any){
     try{
         //g123测试版连接不上db，不抓取
+        if(!errData)return;
         if(isG123stg())return;
         let log = {
             serverId : G.config.serverId,