yeshijie пре 4 година
родитељ
комит
3f83087d5c

+ 15 - 2
src/server/app.js

@ -71,11 +71,24 @@ process.on('uncaughtException', function (err) {
});
// now enable http server and socket.io
let server = require('http').createServer(app);
let server;
// https
if(config.httpsOpen){
    let fs = require("fs");
// Configuare https
    let httpsOption = {
        key : fs.readFileSync(config.httpsConfig.key),
        cert: fs.readFileSync(config.httpsConfig.pem)
    }
    server = require('https').createServer(app);
}else{
    server = require('http').createServer(app);
}
let io = require('socket.io').listen(server);
server.listen(config.serverPort);
// event listener for HTTP server "error" event
server.on('error', function (error) {
    if (error.syscall !== 'listen') throw error;

+ 27 - 0
src/server/https/zsyy/server.key

@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAoolT5lTdAsVSHU/WLhWb/VcGf8cUg9bEvAAItKLcCQc1eMjX
WJLhTr8ILZ72+pzJc+EdwgphQTpQy1KbVaTZbpfh9NYQlZQ7v1N8B/Bdb6jvirnI
UqBFwvGYSbcISxeZhljZAm8hn+QSg57IJOj8iH+qz8QxuCOYFI54XDs3QVVOhuMF
wueo3dgWBYCA9uo2OL2xjt7MyA4pYu1wU9YJfL3dx0TxUGKYoPDWLuoL5eKuSmw9
reT6YBmEfe5bVazZQ6FHozMhcAqZnnH291JGOxG9qiaaPsQZ9pIwbkVecyk6e5Tz
LqPzesoGguMABMyhjCfJ5xdyY/K+sLz7JhKQpwIDAQABAoIBAGh85h3VgnsshLxp
PaREqhI0Ju5v+gVDRRgi4XXWmKOJKdvrKV08l3E7J7PEVLwJnQxMtQewCpOXPKdp
BIkLP+hz5YOzNdgjAkHeFoc4A6krrkq9YkWT2SUYkTEaZE957W1Lor6I2NHkGe7Z
XYs06FuLzzBfzSK2ZycX69JHEx+BBH7Wf6NYYkpsxK0B5o57zvsTJq4KHusJvQ70
ROLXNbm9PW4Z1NxRkAyWtNySVVwtDLbMV1if0u0tsyk3q0O4h4zKcdwkDeRtEtcY
rS1SREcrUZs6f+HBlFbw92yS2Q7HMErE8kgeAW+UObLDguNkXjnUMgKqgP9NdWuq
JtexzmkCgYEAzqu12Mm/6Q0LdyTy/whIYAFjE4XQPsfwoxY4vKmn5laU7190eyYt
WUnishS/W5T6uREfAh3uYprHgvA3Z6mMtH4ujtyH02OIxP04NwBWgmrC4huvdsT1
gKPFbKAY/mpSrAGIrBcu0JkodwDGCgupDeLZq8xzS2hRsBEkOXb9G50CgYEAyVTc
Nlyw1qz/WdVsb91yO3pt5hxyjvcyirmb8SG+IsEhM4JRReNLkDoGM+FxhTnbMsia
vzk5Ji5BBVJFeWpFo4VJ5bgB8km2uqcS67U9ze2WBkNtvnS8keta9bsd0AEn/AOj
Tz7g9nEjBS6CG9p1T628/6aLaWRPATAhPTECVBMCgYEAyY8VrvQ0QmoCgJR8mNXP
IDK6GdQroM8GlUea1gTwRuiyIDKMO36kQ6yXdu5dIkhNrihQgZQHZgtmAQGeR29I
Vs+pQJM7tKIiRVxgcuPVeyP8JOCzY7X7aRZP+Py644V2U2K7lHqXocF9gXIzsqBk
o7JWcALZfvWilYBiP9kYSNECgYEAi09w4RzaMHGcb2jCk9VDSey5RtTAYDSkgGFW
ik+y5RGGC8JMwnM4wh+kUxnYFzuldUph6ZeK9+RhkXEQKadjcHa2X4IntqNTEWyy
Ju9OSMPxX3wg3/yezslwM0C6rEdgh31s71SvDVfTx64a0XMkYXHyqWNwbAjAsi2/
kjvrRIkCgYAauOZSsd6ykgUtOd/quiGG9bMgUe+fNyoaRX2lX8PbG2fpz9Z8WtcX
DhGF3vh6asdo2q3MTCbmiu0bb1GJYQncR19c1mFDQ8nitDelpp/o+zAsOTf3ILF8
4wx2fGuSvcBdXqEvaGmxlPnjnEM7cEqaPusEGRBF1j106R07wusBMA==
-----END RSA PRIVATE KEY-----

+ 69 - 0
src/server/https/zsyy/xmzsh.pem

@ -0,0 +1,69 @@
-----BEGIN CERTIFICATE-----
MIIGwDCCBaigAwIBAgIQA/h5NNzW6VgXzrWTZvA+WjANBgkqhkiG9w0BAQsFADBf
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMR4wHAYDVQQDExVEaWdpQ2VydCBDTiBSU0EgQ0EgRzEw
HhcNMjAxMjAzMDAwMDAwWhcNMjIwMTAzMjM1OTU5WjCB8jELMAkGA1UEBhMCQ04x
EjAQBgNVBAgMCeemj+W7uuecgTESMBAGA1UEBwwJ5Y6m6Zeo5biCMYGkMIGhBgNV
BAoMgZnljqbpl6jlpKflrabpmYTlsZ7kuK3lsbHljLvpmaLvvIjljqbpl6jkuK3l
sbHljLvpmaLjgIHljqbpl6jluILogIHlubTnl4XlurflpI3noJTnqbbmiYDjgIHl
jqbpl6jluILmtojljJbnlr7nl4XnoJTnqbbmiYDjgIHljqbpl6jluILkuLTluorm
o4DpqozkuK3lv4PvvIkxFDASBgNVBAMMCyoueG16c2guY29tMIIBIjANBgkqhkiG
9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoolT5lTdAsVSHU/WLhWb/VcGf8cUg9bEvAAI
tKLcCQc1eMjXWJLhTr8ILZ72+pzJc+EdwgphQTpQy1KbVaTZbpfh9NYQlZQ7v1N8
B/Bdb6jvirnIUqBFwvGYSbcISxeZhljZAm8hn+QSg57IJOj8iH+qz8QxuCOYFI54
XDs3QVVOhuMFwueo3dgWBYCA9uo2OL2xjt7MyA4pYu1wU9YJfL3dx0TxUGKYoPDW
LuoL5eKuSmw9reT6YBmEfe5bVazZQ6FHozMhcAqZnnH291JGOxG9qiaaPsQZ9pIw
bkVecyk6e5TzLqPzesoGguMABMyhjCfJ5xdyY/K+sLz7JhKQpwIDAQABo4IC4jCC
At4wHwYDVR0jBBgwFoAU70ULeBWRpbbRc6SSb2NaWdNfPp0wHQYDVR0OBBYEFP5h
nqB9zpziWbSVW7jVvazWoO5qMCEGA1UdEQQaMBiCCyoueG16c2guY29tggl4bXpz
aC5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
BQcDAjB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY3JsMy5kaWdpY2VydC5jb20v
RGlnaUNlcnRDTlJTQUNBRzEuY3JsMDSgMqAwhi5odHRwOi8vY3JsNC5kaWdpY2Vy
dC5jb20vRGlnaUNlcnRDTlJTQUNBRzEuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9
bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMw
CAYGZ4EMAQICMG8GCCsGAQUFBwEBBGMwYTAhBggrBgEFBQcwAYYVaHR0cDovL29j
c3AuZGNvY3NwLmNuMDwGCCsGAQUFBzAChjBodHRwOi8vY3JsLmRpZ2ljZXJ0LWNu
LmNvbS9EaWdpQ2VydENOUlNBQ0FHMS5jcnQwDAYDVR0TAQH/BAIwADCCAQQGCisG
AQQB1nkCBAIEgfUEgfIA8AB2ACl5vvCeOTkh8FZzn2Old+W+V32cYAr4+U1dJlwl
XceEAAABdid/WE8AAAQDAEcwRQIhAMuUTDAabntVZPy4JVXU1kLJ8z3jTzJDIL4x
BacLZdY1AiBjBnkYVYKQBXZ4+Co73wL2BvlMDk5yixr9AXDK39fDjwB2AEHIyrHf
IkZKEMahOglCh15OMYsbA+vrS8do8JBilgb2AAABdid/WG4AAAQDAEcwRQIgbgoo
G2Ld7pgsVq1ehqcuc3v+fr+aYOUWMQ3B1u1gm2sCIQCUankj8vW+k6MZFARnUYNJ
Ye5Wdyq66cicmD+0O5RGTTANBgkqhkiG9w0BAQsFAAOCAQEAb5e+zM9qda8+ZCPu
jYu0T9nhDt3GbnwaktrsONajFniNbmglh3cAsE1JmG6I2uPDbgNuQF8MLMNssAS6
nSIm9uoMSvUBDyHXdkWubO6ftH3a3//Ar90rTJNS3TVpqbTf76ShcsCPu2h54nf+
s54V078o63mz3gSSfuRKCD+OVKCRt1Y64R6aazkAfbzWtgUuE4aMMIRcxXrkpPRx
RZ/VLBOk1PHwNwYZOejnNXUWD0yzQPOfPH5UMMuLAiFs5SYZ5QR12dV17h8DjSGL
DU5EvpRYsM2lS6i7qh0YonfZh0k5F3U6MPZ0CRNPETud+1WaM1Z5S+aa+IfgwJSc
Dk2Ysw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIFGjCCBAKgAwIBAgIQC1D+aUyDyVziJBXGCVz+QDANBgkqhkiG9w0BAQsFADBh
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
QTAeFw0xOTA2MjAxMjI3MzRaFw0yOTA2MjAxMjI3MzRaMF8xCzAJBgNVBAYTAlVT
MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
b20xHjAcBgNVBAMTFURpZ2lDZXJ0IENOIFJTQSBDQSBHMTCCASIwDQYJKoZIhvcN
AQEBBQADggEPADCCAQoCggEBALv4mF6rORUUXZuwg/FR9YFOM5tZj3RE5JTMFWrD
darbvnxdgu5BHqmPyt/Q7xNS7wOyHRJ4eRpYh0hJPRbtVQI/0VggjVpXLdNhxpVd
/RhQ44rej5/YVSUkgSPagM5zppdCo6lSBIa3pznzXTVsHgE6umt6RzaxCQs0RrU1
StqME9YlRHO2cY0skyA5eYYbxrlr5xJZ4m1j89r3OyHYM0Mc4y0bio7gUhWPZl17
BvDuGbk9DXDxowd+5vnpKpN051Ltm84N6BECzeE/vbHOLGVU6cY01V750zDJ7STp
dNz8FrV0CMP6K9rfBGRVYYEy6+rMSOvLthP+RqId3b/IbnkCAwEAAaOCAc4wggHK
MB0GA1UdDgQWBBTvRQt4FZGlttFzpJJvY1pZ018+nTAfBgNVHSMEGDAWgBQD3lA1
VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYB
BQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMBAf8wMQYIKwYBBQUHAQEEJTAj
MCEGCCsGAQUFBzABhhVodHRwOi8vb2NzcC5kY29jc3AuY24wRAYDVR0fBD0wOzA5
oDegNYYzaHR0cDovL2NybC5kaWdpY2VydC1jbi5jb20vRGlnaUNlcnRHbG9iYWxS
b290Q0EuY3JsMIHOBgNVHSAEgcYwgcMwgcAGBFUdIAAwgbcwKAYIKwYBBQUHAgEW
HGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYoGCCsGAQUFBwICMH4MfEFu
eSB1c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjb25zdGl0dXRlcyBhY2NlcHRhbmNl
IG9mIHRoZSBSZWx5aW5nIFBhcnR5IEFncmVlbWVudCBsb2NhdGVkIGF0IGh0dHBz
Oi8vd3d3LmRpZ2ljZXJ0LmNvbS9ycGEtdWEwDQYJKoZIhvcNAQELBQADggEBAL9c
8lmaFkBmO0ch6w5mi1RKS7c7U3pq3wWOXzUFKKJZCnyJYHcMUIyNCDg71clCFz4F
t/yYLoXkzqNULAaEUtZ5ikf4I8hJHv60kg25GLCsfm2O1isbE0Wxpeb4qf7OGPKK
MLCmmcdbZkuO+Ax38jo8/BO4TnVoeb+bYKgTuvev6wGCTezIDNGB5+/pD2NXwpkq
cgX4ofIK4CdKlD1Hi5nwJbKYOLRpNrXp83n5oacxlezxp4ikt64EhDsG1mWaQD0t
qCcBpGHbb8GSyBs2KohCp/lcysTVLZtUZkZGtIBd+Nli3jVPpuZjlGi51P30TReJ
rgH4+ePTzmDxnYSkUhI=
-----END CERTIFICATE-----

+ 1 - 0
src/server/resources/config/config.dev.js

@ -84,6 +84,7 @@ exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.httpsOpen = false;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;

+ 1 - 0
src/server/resources/config/config.local.js

@ -83,6 +83,7 @@ exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.httpsOpen = false;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;

+ 8 - 1
src/server/resources/config/config.prod.js

@ -112,6 +112,11 @@ let imClientType = {
    url : "https://hlwyy.xmzsh.com"
}
let httpsConfig = {
    key : "./https/zsyy/server.key",
    pem: "./https/zsyy/xmzsh.pem"
}
exports.environment = 'prod';
exports.pubChannel = 'phone_to_pc';
exports.subChannel = 'pc_to_phone';
@ -124,6 +129,7 @@ exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.showSQL = false;
exports.httpsOpen = true;
exports.imDbConfig = imDbConfig;
exports.redisConfig = redisConfig;
exports.innerRedisConfig = innerRedisConfig;
@ -137,4 +143,5 @@ exports.thirdApiMessageConfig = thirdApiMessageConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;
exports.imClientType = imClientType;
exports.xmIjkTemplateConfig = xmIjkTemplateConfig
exports.xmIjkTemplateConfig = xmIjkTemplateConfig
exports.httpsConfig = httpsConfig

+ 1 - 0
src/server/resources/config/config.prod_sdtn.js

@ -122,6 +122,7 @@ exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.httpsOpen = false;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;

+ 1 - 0
src/server/resources/config/config.prod_xmijk.js

@ -113,6 +113,7 @@ exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 16000;
exports.sessionExpire = 1800;
exports.httpsOpen = false;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;

+ 1 - 0
src/server/resources/config/config.prod_xzzx.js

@ -113,6 +113,7 @@ exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.httpsOpen = false;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;

+ 1 - 0
src/server/resources/config/config.test.js

@ -90,6 +90,7 @@ exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.httpsOpen = false;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;

+ 1 - 0
src/server/resources/config/config.ystest.js

@ -111,6 +111,7 @@ exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.httpsOpen = false;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;