Skip to content

Z
zhichan
Commit c70ea340 by 孙亚楠
Options

d

parent 8d037cea
Showing with 227 additions and 227 deletions
.gitignore
/xgg-saas-platform/node_modules/ /xgg-saas-admin/node_modules/
.idea/* .idea/*
\ No newline at end of file
.vscode/launch.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"name": "Launch Program", "name": "Launch Program",
"program": "${workspaceFolder}/xgg-saas-platform/main.js" "program": "${workspaceFolder}/xgg-saas-admin/main.js"
} }
] ]
} }
\ No newline at end of file
Dockerfile
#!/bin/bash #!/bin/bash
FROM registry.cn-beijing.aliyuncs.com/hantang2/node105:v2 FROM registry.cn-beijing.aliyuncs.com/hantang2/node105:v2
MAINTAINER jy "jiangyong@gongsibao.com" MAINTAINER jy "jiangyong@gongsibao.com"
ADD xgg-saas-platform /apps/xgg-saas-platform/ ADD xgg-saas-admin /apps/xgg-saas-admin/
WORKDIR /apps/xgg-saas-platform/ WORKDIR /apps/xgg-saas-admin/
RUN cnpm install -S RUN cnpm install -S
CMD ["node","/apps/xgg-saas-platform/main.js"] CMD ["node","/apps/xgg-saas-admin/main.js"]
......
release-note.txt
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化） 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
项目版本号段分配 项目版本号段分配
19. xggsaasplatform release-v24.x.x 19. xggsaasadmin release-v24.x.x
后续号端请继续补充 后续号端请继续补充
查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】
......
xgg-saas-platform/app/base/service/svems.base.js → xgg-saas-admin/app/base/service/svems.base.js
...@@ -220,7 +220,7 @@ class ServiceBase { ...@@ -220,7 +220,7 @@ class ServiceBase {
} }
try { try {
var params = { var params = {
"action_process": "xgg-saas-platform", "action_process": "xgg-saas-admin",
"action_type": apiName, "action_type": apiName,
"action_body": params || {}, "action_body": params || {},
} }
......
xgg-saas-platform/app/config/routes/doc.js → xgg-saas-admin/app/config/routes/doc.js
...@@ -7,7 +7,7 @@ module.exports = function (app) { ...@@ -7,7 +7,7 @@ module.exports = function (app) {
app.get('/doc', function (req, res) { app.get('/doc', function (req, res) {
var path = process.cwd() + "/app/front/entry/public/apidoc/README.md"; var path = process.cwd() + "/app/front/entry/public/apidoc/README.md";
// var path = process.cwd() + "/xgg-saas-platform/app/front/entry/public/apidoc/README.md"; // var path = process.cwd() + "/xgg-saas-admin/app/front/entry/public/apidoc/README.md";
fs.readFile(path, function(err, data){ fs.readFile(path, function(err, data){
if(err){ if(err){
console.log(err); console.log(err);
...@@ -22,7 +22,7 @@ module.exports = function (app) { ...@@ -22,7 +22,7 @@ module.exports = function (app) {
app.get('/doc/:forder', function (req, res) { app.get('/doc/:forder', function (req, res) {
var path = process.cwd() + "/app/front/entry/public/apidoc/README.md"; var path = process.cwd() + "/app/front/entry/public/apidoc/README.md";
// var path = process.cwd() + "/xgg-saas-platform/app/front/entry/public/apidoc/README.md"; // var path = process.cwd() + "/xgg-saas-admin/app/front/entry/public/apidoc/README.md";
fs.readFile(path, function(err, data){ fs.readFile(path, function(err, data){
if(err){ if(err){
...@@ -40,7 +40,7 @@ module.exports = function (app) { ...@@ -40,7 +40,7 @@ module.exports = function (app) {
var forder = req.params["forder"]; var forder = req.params["forder"];
var fileName = req.params["fileName"] || "README.md"; var fileName = req.params["fileName"] || "README.md";
var path = process.cwd() + "/app/front/entry/public/apidoc"; var path = process.cwd() + "/app/front/entry/public/apidoc";
// var path = process.cwd() + "/xgg-saas-platform/app/front/entry/public/apidoc"; // var path = process.cwd() + "/xgg-saas-admin/app/front/entry/public/apidoc";
if(forder) { if(forder) {
path = path + "/" + forder + "/" + fileName; path = path + "/" + forder + "/" + fileName;
} else { } else {
......
xgg-saas-platform/app/config/settings.js → xgg-saas-admin/app/config/settings.js
...@@ -7,8 +7,8 @@ var ENVINPUT = { ...@@ -7,8 +7,8 @@ var ENVINPUT = {
REDIS_HOST: process.env.REDIS_HOST, REDIS_HOST: process.env.REDIS_HOST,
REDIS_PORT: process.env.REDIS_PORT, REDIS_PORT: process.env.REDIS_PORT,
REDIS_PWD: process.env.REDIS_PWD, REDIS_PWD: process.env.REDIS_PWD,
DB_NAME: process.env.XGGSAASPLATFORM_DB_NAME, DB_NAME: process.env.XGGSAASADMIN_DB_NAME,
REDIS_DB: process.env.XGGSAASPLATFORM_REDIS_DB, REDIS_DB: process.env.XGGSAASADMIN_REDIS_DB,
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev" APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
}; };
var settings = { var settings = {
...@@ -26,7 +26,7 @@ var settings = { ...@@ -26,7 +26,7 @@ var settings = {
salt: "%iatpD1gcxz7iF#B", salt: "%iatpD1gcxz7iF#B",
defaultpwd: "987456", defaultpwd: "987456",
basepath: path.normalize(path.join(__dirname, '../..')), basepath: path.normalize(path.join(__dirname, '../..')),
port: process.env.NODE_PORT || 3701, port: process.env.NODE_PORT || 3703,
reqEsAddr: function () { reqEsAddr: function () {
if (this.env == "dev") { if (this.env == "dev") {
var localsettings = require("./localsettings"); var localsettings = require("./localsettings");
......
xgg-saas-admin/app/front/entry/public/js/vue/fakeLoader.min.js 0 → 100644
(function(b){b.fn.fakeLoader=function(m){var f=b.extend({timeToHide:1200,pos:"fixed",top:"0px",left:"0px",width:"100%",height:"100%",zIndex:"999",bgColor:"#2ecc71",spinner:"spinner7",imagePath:""},m);var l='<div class="fl spinner1"><div class="double-bounce1"></div><div class="double-bounce2"></div></div>';var k='<div class="fl spinner2"><div class="spinner-container container1"><div class="circle1"></div><div class="circle2"></div><div class="circle3"></div><div class="circle4"></div></div><div class="spinner-container container2"><div class="circle1"></div><div class="circle2"></div><div class="circle3"></div><div class="circle4"></div></div><div class="spinner-container container3"><div class="circle1"></div><div class="circle2"></div><div class="circle3"></div><div class="circle4"></div></div></div>';var j='<div class="fl spinner3"><div class="dot1"></div><div class="dot2"></div></div>';var i='<div class="fl spinner4"></div>';var h='<div class="fl spinner5"><div class="cube1"></div><div class="cube2"></div></div>';var g='<div class="fl spinner6"><div class="rect1"></div><div class="rect2"></div><div class="rect3"></div><div class="rect4"></div><div class="rect5"></div></div>';var e='<div class="fl spinner7"><div class="circ1"></div><div class="circ2"></div><div class="circ3"></div><div class="circ4"></div></div>';var d=b(this);var c={position:f.pos,width:f.width,height:f.height,top:f.top,left:f.left};d.css(c);d.each(function(){var n=f.spinner;switch(n){case"spinner1":d.html(l);break;case"spinner2":d.html(k);break;case"spinner3":d.html(j);break;case"spinner4":d.html(i);break;case"spinner5":d.html(h);break;case"spinner6":d.html(g);break;case"spinner7":d.html(e);break;default:d.html(l)}if(f.imagePath!=""){d.html('<div class="fl"><img src="'+f.imagePath+'"></div>');a()}});setTimeout(function(){b(d).fadeOut()},f.timeToHide);return this.css({backgroundColor:f.bgColor,zIndex:f.zIndex})};function a(){var c=b(window).width();var e=b(window).height();var d=b(".fl").outerWidth();var f=b(".fl").outerHeight();b(".fl").css({position:"absolute",left:(c/2)-(d/2),top:(e/2)-(f/2)})}b(window).load(function(){a();b(window).resize(function(){a()})})}(jQuery));
\ No newline at end of file
xgg-saas-admin/app/front/vues/pages/home/home.html 0 → 100644
<div class="home">
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
</div>
xgg-saas-admin/dowloaddemo.js 0 → 100644
data:function(){
return {
downloadTimes : 1, // 设置检查重试次数变量,
code : '', // 下载文件的code值
}
},
methods : {
// 创建下载文件方法
exportFile() {
var self = this;
var datas = self.querydata;
if(!datas || datas.length == 0) {
that.$message.warning(`无查询结果`);
return ;
}
/* [{},{},{}]转换成[[],[],[]] 格式 */
var rows = [];
for(var dd of datas) {
var arr = [];
for(var _idx in dd) {
arr.push(dd[_idx]);
}
rows.push(arr);
}
this.code = "";
/* 生成文件 */
self.$root.postReq("/web/filedownloadCtl/download",{rows : rows}).then(function(d){
if(d.status == 0) {
setTimeout((function(){
/* d.data 返回文件标识 */
self.code = d.data;
self.downloadFile();
}), 2000);
}
});
},
/* 循环检查code, 并下载文件 */
downloadFile() {
var self = this;
self.$root.postReq("/web/filedownloadCtl/findOne",{code : self.code}).then(function(d){
if(d.status == 0) {
if(d.data && d.data.filePath) {
downloadTimes = 1;
/* 文件生成成功 */
window.open(d.data.filePath, "_blank");
} else {
/* 递归2秒一次,超过5次,下载失败 */
if(downloadTimes > 5) {
downloadTimes = 1;
/* 下载超时 */
return;
}
downloadTimes = downloadTimes + 1;
setTimeout((function(){
self.downloadFile();
}), 2000);
}
}
});
},
}
xgg-saas-admin/main.js 0 → 100644
var http = require('http');
var express = require('express');
var app = express();
var setttings=require("./app/config/settings");
var environment = require('./app/config/environment');
// var SocketServer=require("./app/config/socket.server");
//const cluster = require('cluster');
//const numCPUs = require('os').cpus().length;
// all environments
environment(app);//初始化环境
// 错误处理中间件应当在路由加载之后才能加载
// if (cluster.isMaster) {
// console.log(`Master ${process.pid} is running`);
//
// // Fork workers.
// for (let i = 0; i < numCPUs; i++) {
// cluster.fork();
// }
// cluster.on('exit', (worker, code, signal) => {
// console.log(`worker ${worker.process.pid} died`);
// });
// }else{
// var server = http.createServer(app);
// var socketServer = new SocketServer(server);
// server.listen(setttings.port, function(){
// console.log('Express server listening on port ' + app.get('port'));
// });
// }
var server = http.createServer(app);
//var socketServer = new SocketServer(server);
server.listen(setttings.port, function(){
console.log('Express server listening on port ' + app.get('port'));
});
xgg-saas-admin/package.json 0 → 100644
{
"name": "xgg-deliver",
"version": "1.0.0",
"description": "h5framework",
"main": "main.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "sunyanan",
"license": "ISC",
"dependencies": {
"MD5": "^1.3.0",
"after": "^0.8.2",
"ali-oss": "^4.12.2",
"axios": "^0.19.2",
"babel-polyfill": "^6.26.0",
"base64id": "^1.0.0",
"bluebird": "^3.5.1",
"body-parser": "^1.18.2",
"co": "^4.6.0",
"connect-redis": "^3.3.3",
"continuation-local-storage": "^3.2.1",
"cookie-parser": "^1.4.3",
"crypto": "^1.0.1",
"crypto-js": "^3.1.9-1",
"ejs": "^2.5.8",
"element-ui": "^2.4.0",
"engine.io-parser": "^2.1.2",
"errorhandler": "^1.5.0",
"exif-js": "^2.3.0",
"express": "^4.16.2",
"express-session": "^1.15.6",
"gm": "^1.23.1",
"marked": "^0.7.0",
"method-override": "^2.3.10",
"morgan": "^1.9.0",
"multer": "^1.3.0",
"mysql2": "^1.5.3",
"node-cron": "^2.0.1",
"node-uuid": "^1.4.8",
"qr-image": "^3.2.0",
"sequelize": "^4.37.8",
"sequelize-cli": "^4.1.1",
"serve-favicon": "^2.4.5",
"sha1": "^1.1.1",
"socket.io": "^2.1.1",
"svg-captcha": "^1.4.0",
"uuid": "^3.2.1"
},
"devDependencies": {
"element-theme": "^2.0.1",
"element-theme-chalk": "^2.4.0"
}
}
xgg-saas-platform/app/front/entry/public/js/vue/fakeLoader.min.js deleted 100644 → 0
(function(b){b.fn.fakeLoader=function(m){var f=b.extend({timeToHide:1200,pos:"fixed",top:"0px",left:"0px",width:"100%",height:"100%",zIndex:"999",bgColor:"#2ecc71",spinner:"spinner7",imagePath:""},m);var l='<div class="fl spinner1"><div class="double-bounce1"></div><div class="double-bounce2"></div></div>';var k='<div class="fl spinner2"><div class="spinner-container container1"><div class="circle1"></div><div class="circle2"></div><div class="circle3"></div><div class="circle4"></div></div><div class="spinner-container container2"><div class="circle1"></div><div class="circle2"></div><div class="circle3"></div><div class="circle4"></div></div><div class="spinner-container container3"><div class="circle1"></div><div class="circle2"></div><div class="circle3"></div><div class="circle4"></div></div></div>';var j='<div class="fl spinner3"><div class="dot1"></div><div class="dot2"></div></div>';var i='<div class="fl spinner4"></div>';var h='<div class="fl spinner5"><div class="cube1"></div><div class="cube2"></div></div>';var g='<div class="fl spinner6"><div class="rect1"></div><div class="rect2"></div><div class="rect3"></div><div class="rect4"></div><div class="rect5"></div></div>';var e='<div class="fl spinner7"><div class="circ1"></div><div class="circ2"></div><div class="circ3"></div><div class="circ4"></div></div>';var d=b(this);var c={position:f.pos,width:f.width,height:f.height,top:f.top,left:f.left};d.css(c);d.each(function(){var n=f.spinner;switch(n){case"spinner1":d.html(l);break;case"spinner2":d.html(k);break;case"spinner3":d.html(j);break;case"spinner4":d.html(i);break;case"spinner5":d.html(h);break;case"spinner6":d.html(g);break;case"spinner7":d.html(e);break;default:d.html(l)}if(f.imagePath!=""){d.html('<div class="fl"><img src="'+f.imagePath+'"></div>');a()}});setTimeout(function(){b(d).fadeOut()},f.timeToHide);return this.css({backgroundColor:f.bgColor,zIndex:f.zIndex})};function a(){var c=b(window).width();var e=b(window).height();var d=b(".fl").outerWidth();var f=b(".fl").outerHeight();b(".fl").css({position:"absolute",left:(c/2)-(d/2),top:(e/2)-(f/2)})}b(window).load(function(){a();b(window).resize(function(){a()})})}(jQuery));
\ No newline at end of file
xgg-saas-platform/app/front/vues/pages/home/home.html deleted 100644 → 0
<div class="home">
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
</div>
xgg-saas-platform/dowloaddemo.js deleted 100644 → 0
data:function(){
return {
downloadTimes : 1, // 设置检查重试次数变量,
code : '', // 下载文件的code值
}
},
methods : {
// 创建下载文件方法
exportFile() {
var self = this;
var datas = self.querydata;
if(!datas || datas.length == 0) {
that.$message.warning(`无查询结果`);
return ;
}
/* [{},{},{}]转换成[[],[],[]] 格式 */
var rows = [];
for(var dd of datas) {
var arr = [];
for(var _idx in dd) {
arr.push(dd[_idx]);
}
rows.push(arr);
}
this.code = "";
/* 生成文件 */
self.$root.postReq("/web/filedownloadCtl/download",{rows : rows}).then(function(d){
if(d.status == 0) {
setTimeout((function(){
/* d.data 返回文件标识 */
self.code = d.data;
self.downloadFile();
}), 2000);
}
});
},
/* 循环检查code, 并下载文件 */
downloadFile() {
var self = this;
self.$root.postReq("/web/filedownloadCtl/findOne",{code : self.code}).then(function(d){
if(d.status == 0) {
if(d.data && d.data.filePath) {
downloadTimes = 1;
/* 文件生成成功 */
window.open(d.data.filePath, "_blank");
} else {
/* 递归2秒一次,超过5次,下载失败 */
if(downloadTimes > 5) {
downloadTimes = 1;
/* 下载超时 */
return;
}
downloadTimes = downloadTimes + 1;
setTimeout((function(){
self.downloadFile();
}), 2000);
}
}
});
},
}
xgg-saas-platform/main.js deleted 100644 → 0
var http = require('http');
var express = require('express');
var app = express();
var setttings=require("./app/config/settings");
var environment = require('./app/config/environment');
// var SocketServer=require("./app/config/socket.server");
//const cluster = require('cluster');
//const numCPUs = require('os').cpus().length;
// all environments
environment(app);//初始化环境
// 错误处理中间件应当在路由加载之后才能加载
// if (cluster.isMaster) {
// console.log(`Master ${process.pid} is running`);
//
// // Fork workers.
// for (let i = 0; i < numCPUs; i++) {
// cluster.fork();
// }
// cluster.on('exit', (worker, code, signal) => {
// console.log(`worker ${worker.process.pid} died`);
// });
// }else{
// var server = http.createServer(app);
// var socketServer = new SocketServer(server);
// server.listen(setttings.port, function(){
// console.log('Express server listening on port ' + app.get('port'));
// });
// }
var server = http.createServer(app);
//var socketServer = new SocketServer(server);
server.listen(setttings.port, function(){
console.log('Express server listening on port ' + app.get('port'));
});
xgg-saas-platform/package.json deleted 100644 → 0
{
"name": "xgg-deliver",
"version": "1.0.0",
"description": "h5framework",
"main": "main.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "sunyanan",
"license": "ISC",
"dependencies": {
"MD5": "^1.3.0",
"after": "^0.8.2",
"ali-oss": "^4.12.2",
"axios": "^0.19.2",
"babel-polyfill": "^6.26.0",
"base64id": "^1.0.0",
"bluebird": "^3.5.1",
"body-parser": "^1.18.2",
"co": "^4.6.0",
"connect-redis": "^3.3.3",
"continuation-local-storage": "^3.2.1",
"cookie-parser": "^1.4.3",
"crypto": "^1.0.1",
"crypto-js": "^3.1.9-1",
"ejs": "^2.5.8",
"element-ui": "^2.4.0",
"engine.io-parser": "^2.1.2",
"errorhandler": "^1.5.0",
"exif-js": "^2.3.0",
"express": "^4.16.2",
"express-session": "^1.15.6",
"gm": "^1.23.1",
"marked": "^0.7.0",
"method-override": "^2.3.10",
"morgan": "^1.9.0",
"multer": "^1.3.0",
"mysql2": "^1.5.3",
"node-cron": "^2.0.1",
"node-uuid": "^1.4.8",
"qr-image": "^3.2.0",
"sequelize": "^4.37.8",
"sequelize-cli": "^4.1.1",
"serve-favicon": "^2.4.5",
"sha1": "^1.1.1",
"socket.io": "^2.1.1",
"svg-captcha": "^1.4.0",
"uuid": "^3.2.1"
},
"devDependencies": {
"element-theme": "^2.0.1",
"element-theme-chalk": "^2.4.0"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment