Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #8

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NODE_ENV=production
VUE_APP_PLATFORM_NAME=九信IM
3 changes: 3 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
NODE_ENV=development
VUE_APP_API_BASE_URL=http://localhost:8080/api
IM_SERVER_HOST=tim.im-99.com
3 changes: 3 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
NODE_ENV=production
VUE_APP_API_BASE_URL=http://137.220.228.175
IM_SERVER_HOST=im.ninthchat.com
3 changes: 3 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
NODE_ENV=production
VUE_APP_API_BASE_URL=http://137.220.228.175:8000
IM_SERVER_HOST=tim.im-99.com
12 changes: 6 additions & 6 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
],
// Exclude from transpilation
exclude: [
presets: [
'@vue/cli-plugin-babel/preset'
],
// Exclude from transpilation
exclude: [
/(base64.min.js). /, // Exclude filenames containing `ignoreme`
],
],
}
162 changes: 79 additions & 83 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"scripts": {
"serve": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
"build": "vue-cli-service build --skip-plugins @vue/cli-plugin-eslint",
"build:test": "vue-cli-service build --skip-plugins @vue/cli-plugin-eslint --mode test",
"lint": "vue-cli-service lint"
},
"dependencies": {
Expand Down
30 changes: 18 additions & 12 deletions src/config.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
import {isElectron} from './platform'

export default class Config {
// 调试用
static ENABLE_AUTO_LOGIN = true;
// 是否支持多人音视频通话
static ENABLE_MULTI_VOIP_CALL = true;
// 是否支持1对1音视频通话
static ENABLE_SINGLE_VOIP_CALL = true;
// 打开voip调试模式时,voip window不会自动关闭,方便分析控制台日志,需要手动关闭。
static ENABLE_VOIP_DEBUG_MODE = false;

static DEFAULT_PORTRAIT_URL = 'data:image/png;base64,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';
static DEFAULT_PORTRAIT_URL = 'https://static.wildfirechat.net/user-fallback.png';
// 如果需要支持音视频通话功能,必须全站使用https(包括app server和im server) + wss,
// WebSockets over SSL/TLS,启用https时,一定要配置为true;不启用https,一定要为false
// 置为true时,请确保 IM SERVER 支持https访问。IM SERVER本身不能处理https请求,一般是通过在IM SERVER前面加上nginx之类的负载均衡器来实现https支持
static USE_WSS = true;
static USE_WSS = false;
// WebSocket连接端口,需要和服务端对应,不能随意修改
static WS_PORT = 8083;
// Secure WebSocket连接端口,需要和服务端对应,不能随意修改
static WSS_PORT = 8084;

// ROUTE请求端口,默认是80;配置https时,请修改为其他端口,如443等
static ROUTE_PORT = 443;
static ROUTE_PORT = 80;

// 是否关闭日志,web和小程序有效
static DISABLE_LOG = false;

// IM SERVER的HOST,是域名或者ip,没有http等前缀!
static IM_SERVER_HOST = 'wildfirechat.net';
static PROD = false

// APP SERVER的地址,启用https时,APP SERVER也需要支持https
// 默认的app server使用端口是8888
static APP_SERVER = 'https://app.wildfirechat.net';
static IM_SERVER_HOST = this.PROD ? 'im.ninthchat.com' : 'tim.im-99.com';
static APP_SERVER = process.env.VUE_APP_API_BASE_URL;
static QR_CODE_PREFIX_PC_SESSION = "wildfirechat://pcsession/";
// turn server 配置,可以添加多个
static ICE_SERVERS = [{uri: 'turn:turn.wildfirechat.net:3478', userName: 'wfchat', password: 'wfchat'}];
static ICE_SERVERS = [
{uri: 'turn:47.57.171.96:3478', userName: 'im99', password: 'im99'},
];
static LANGUAGE = 'zh_CN';

// appId和appKey和专业版im server是绑定的,一定要做对应修改
static WEB_APP_ID = 'web_12345678';
static WEB_APP_KEY = '6f8348670cb11cf434451bc9e7ba72eeaf3452c8';
static WEB_APP_KEY = this.PROD ? 'c74cca10dc9a079d3d04c943d6606e8b7deaa342' : '6f8348670cb11cf434451bc9e7ba72eeaf3452c8';

static MESSAGE_ROAMING = 1;
// 拉取最近2小时的消息
Expand Down Expand Up @@ -99,9 +105,9 @@ export default class Config {

static validate() {
let configError = true;
if (Config.APP_SERVER === 'https://app.wildfirechat.net' && Config.IM_SERVER_HOST === 'wildfirechat.net' && Config.WEB_APP_KEY === '6f8348670cb11cf434451bc9e7ba72eeaf3452c8') {
if (Config.APP_SERVER === 'https://app.wildfirechat.net' && Config.IM_SERVER_HOST === 'wildfirechat.net') {
configError = false;
} else if (Config.APP_SERVER !== 'https://app.wildfirechat.net' && Config.IM_SERVER_HOST !== 'wildfirechat.net' && Config.WEB_APP_KEY !== '6f8348670cb11cf434451bc9e7ba72eeaf3452c8') {
} else if (Config.APP_SERVER !== 'https://app.wildfirechat.net' && Config.IM_SERVER_HOST !== 'wildfirechat.net') {
configError = false;
}

Expand Down
Loading