Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix

This commit is contained in:
ciniao 2024-01-03 14:00:29 +08:00
commit 6e9d65241e
3 changed files with 17 additions and 6 deletions

5
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"recommendations": [
"ms-ceintl.vscode-language-pack-zh-hans"
]
}

4
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"editor.suggest.snippetsPreventQuickSuggestions": false,
"aiXcoder.showTrayIcon": true
}

View File

@ -2,22 +2,22 @@
export default { export default {
/**时区偏移量 */ /**时区偏移量 */
utc: 8, utc: 8,
/**是否开发模式 */ /**是否开发模式 */
debug: true, debug: true,
/**消息服socket端口*/ /**消息服socket端口*/
msgPort: 7778, msgPort: 7778,
/**http端口 msg服专用*/ /**http端口 msg服专用*/
// httpPort: 7779, httpPort: 7779,
/**跨服socket端口 */ /**跨服socket端口 */
crossPort: 7780, crossPort: 7780,
/**跨服 ws url */ /**跨服 ws url */
corssWsUrl: "ws://10.0.1.20:10003", corssWsUrl: "ws://localhost:7780",
/**服务器id */ /**服务器id */
serverId: 1001, serverId: 15,
/**redis url */ /**redis url */
redisUrl: 'redis://:lyMaple525458@10.0.1.20:6379/0', redisUrl: 'redis://:lyMaple525458@10.0.1.20:6379/0',
/**mongodb url */ /**mongodb url */
mongodbUrl: 'mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao?authSource=admin', mongodbUrl: 'mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao_cl?authSource=admin',
/**cross redis url */ /**cross redis url */
crossRedisUrl: 'redis://:lyMaple525458@10.0.1.20:6379/1', crossRedisUrl: 'redis://:lyMaple525458@10.0.1.20:6379/1',
/**cross mongodb url */ /**cross mongodb url */
@ -27,11 +27,13 @@ export default {
/**服务器时间 */ /**服务器时间 */
time: '', time: '',
/**开服时间 */ /**开服时间 */
openTime: '2023-12-11 1:0:0', openTime: '2023-12-05 01:00:00',
/**项目名称 */ /**项目名称 */
projectName: 'heijiao', projectName: 'heijiao',
/**加密key */ /**加密key */
APIKEY: 'uutown123456', APIKEY: 'uutown123456',
/**是否已经开区 */
opened:true,
/**wss */ /**wss */
wss: { wss: {
key: '', key: '',