github/Teamlinker
7
0
Fork 0
mirror of https://github.com/Teamlinker/Teamlinker.git synced 2025-06-03 03:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
sx1989827 2021-08-15 10:17:32 +08:00
parent b833515cc6
commit 92a523a323
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -82,3 +82,4 @@ dist/
*.DS_Store *.DS_Store
package-lock.json package-lock.json
.idea/ .idea/
.vscode/

8
.vscode/launch.json vendored
View File

@ -29,7 +29,9 @@
"nacosUrl":"175.27.166.37", "nacosUrl":"175.27.166.37",
"nacosName":"gateway", "nacosName":"gateway",
"nacosId":"config", "nacosId":"config",
"nacosNamespace":"sunxin" "nacosNamespace":"sunxin",
"nacosUsername":"nacos",
"nacosPassword":"sxsxsxSX1"
}, },
//"sourceMaps": true, //"sourceMaps": true,
"console":"internalConsole", "console":"internalConsole",
@ -64,7 +66,9 @@
"nacosUrl":"175.27.166.37", "nacosUrl":"175.27.166.37",
"nacosName":"user", "nacosName":"user",
"nacosId":"config", "nacosId":"config",
"nacosNamespace":"sunxin" "nacosNamespace":"sunxin",
"nacosUsername":"nacos",
"nacosPassword":"sxsxsxSX1"
}, },
//"sourceMaps": true, //"sourceMaps": true,
"console":"internalConsole", "console":"internalConsole",

11
code/server/common/nacos/nacos.ts
View File

@ -20,7 +20,7 @@ export default class Nacos<T extends IServer_Common_Config_Base> {
private nacosPort:number private nacosPort:number
private nacosNamespace:string private nacosNamespace:string
private objConfigCurrentService:any private objConfigCurrentService:any
constructor(url:string,port:number,name:string,configName:string,namesapce:string="public",logger=console) constructor(url:string,port:number,name:string,configName:string,username:string,password:string,namesapce:string="public",logger=console)
{ {
this.nacosUrl=url; this.nacosUrl=url;
this.nacosPort=port this.nacosPort=port
@ -30,11 +30,16 @@ export default class Nacos<T extends IServer_Common_Config_Base> {
this.client=new NacosNamingClient({ this.client=new NacosNamingClient({
logger, logger,
serverList:`${url}:${port}`, serverList:`${url}:${port}`,
namespace:namesapce namespace:namesapce,
username:username,
password:password
}) })
this.config=new NacosConfigClient({ this.config=new NacosConfigClient({
serverAddr:`${url}:${port}`, serverAddr:`${url}:${port}`,
namespace:namesapce namespace:namesapce,
// @ts-ignore
username:username,
password:password
}) })
g_nacos=this; g_nacos=this;
} }

2
code/server/common/util/init.ts
View File

@ -5,7 +5,7 @@ import { IServer_Common_Config_Base } from "../types/config";
import Mysql from "../../common/db/mysql" import Mysql from "../../common/db/mysql"
export async function init<T extends IServer_Common_Config_Base>() { export async function init<T extends IServer_Common_Config_Base>() {
new Log() new Log()
let nacos=new Nacos<T>(process.env.nacosUrl,Number(process.env.nacosPort),process.env.nacosName,process.env.nacosId,process.env.nacosNamespace) let nacos=new Nacos<T>(process.env.nacosUrl,Number(process.env.nacosPort),process.env.nacosName,process.env.nacosId,process.env.nacosUsername,process.env.nacosPassword ,process.env.nacosNamespace)
await nacos.init() await nacos.init()
new Redis(nacos.redisInfo) new Redis(nacos.redisInfo)
new Mysql(nacos.mysqlInfo) new Mysql(nacos.mysqlInfo)

8
code/server/package.json
View File

@ -34,6 +34,12 @@
"@types/ioredis": "^4.19.4", "@types/ioredis": "^4.19.4",
"@types/koa": "^2.11.8", "@types/koa": "^2.11.8",
"@types/koa-bodyparser": "^4.3.0", "@types/koa-bodyparser": "^4.3.0",
"@types/koa-router": "^7.4.1" "@types/koa-router": "^7.4.1",
"@types/node": "^14.14.27",
"@types/yargs": "^17.0.2",
"reflect-metadata": "^0.1.13",
"ts-node": "^9.1.1",
"ttypescript": "^1.5.12",
"typescript": "^4.3.5"
} }
} }