main
黄海 2 years ago
parent 4a3e5d9a34
commit 62b757e9cb

2
.gitignore vendored

@ -1,6 +1,6 @@
/.idea/
/WebRoot/WEB-INF/classes
baseServiceJava.iml
FengHuangJava.iml
*.log
*.class
/WebRoot/Upload

@ -1,9 +1,9 @@
let csrf_token_key="baseService_csrf_token"
//保存csrf_token的返回值
let csrf_token_key="FengHuang_csrf_token"
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>csrf_token<EFBFBD>ķ<EFBFBD><EFBFBD><EFBFBD>ֵ
function setCsrfLocalStorage(data){
localStorage.setItem(csrf_token_key, data.csrf_token);
}
//获取csrf_token的存储值
//<EFBFBD><EFBFBD>ȡcsrf_token<EFBFBD>Ĵ洢ֵ
function getCsrfLocalStorage(){
let item = localStorage.getItem(csrf_token_key);
return item;

@ -99,9 +99,6 @@
admin = layui.admin,
layer = layui.layer,
laytpl = layui.laytpl;
var ids = "";
$.getUrlParam("")
$(function () {
//定位焦点
$("#global_name").focus();

@ -332,29 +332,21 @@
table = layui.table,
laytpl = layui.laytpl;
var info=getcookie();//获取cookie中身份id
alert(info);
if ($("#area_id").val().length == 0 || $("#level_id").val().length == 0) {
if(info.identity_id==1){
var installInfo = getInstallInfo();
$("#area_id").val(installInfo.installArea);
// var installLevel = installInfo.installLevel;
// if (installLevel == "03") {
// $("#level_id").val("2");
// }
// else if (installLevel == "04") {
// $("#level_id").val("3");
// }
$("#level_id").val("2");
$("#regionTree").show();
}else if(info.identity_id==3){//区管理员
$("#area_id").val(info.area_id);
$("#level_id").val("3");
}else if(info.identity_id==2){
$("#area_id").val(info.city_id);
$("#level_id").val("2");
}
}
//绑定下拉树

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -35,7 +35,7 @@ public class BackupAll implements Runnable {
//执行脚本的位置
String path = PathKit.getRootClassPath().replace("\\", "/") + "/WEB-INF/classes/Backup/";
//数据库备份前缀
String KeyPrefix = PropKit.get("baseServiceDbBackup");
String KeyPrefix = PropKit.get("FengHuangDbBackup");
//3、备份数据库(系统管理员应该界面可以查看备份情况)
log.info("数据库备份正在进行,有点慢,耐心等...");

@ -16,7 +16,7 @@ public class CallPhantonJS {
private static String PHANTOM_PATH = PHANTOM_HOME + File.separator + "bin" + File.separator + "phantomjs.exe";
//注入的javascript文件位置是固定的写死即可
private static final String downImgJs = "D:\\dsWork\\baseServiceJava\\src\\main\\java\\Tools\\echarts_load.js";
private static final String downImgJs = "D:\\dsWork\\FengHuangJava\\src\\main\\java\\Tools\\echarts_load.js";
/**
* Phantomhtml

@ -23,7 +23,7 @@ public class CopyLib {
ssh.exec("mkdir -p /usr/local/tomcat8/webapps/FengHuang/WEB-INF/lib");
//先删除远程的jar包
ssh.exec("mkdir -p /usr/local/tomcat8/webapps/FengHuang/WEB-INF/lib");
String libPath = "D:\\dsWork\\baseServiceJava\\lib";
String libPath = "D:\\dsWork\\FengHuangJava\\lib";
String targetLibPath = "/usr/local/tomcat8/webapps/FengHuang/WEB-INF/lib";
ssh.exec("rm -rf " + targetLibPath + "/*.*");
//上传

@ -26,7 +26,7 @@ public class UploadToOssForPreview {
//加载配置文件
PropKit.use("application.properties");
//上传预览文件
String filePath = "D:\\dsWork\\baseServiceJava\\src\\main\\resource\\Py\\演示文稿.pptx";
String filePath = "D:\\dsWork\\FengHuangJava\\src\\main\\resource\\Py\\演示文稿.pptx";
uploadForPreview(filePath);
//获取预览地址
File file = FileUtil.file(filePath);

@ -48,7 +48,7 @@ public class StudentCopyToSample {
arp.addSqlTemplate(basePath + "dm/dm.sql");
arp.start();
String TargetExcelTemplatePath="E:\\Work\\BigData\\baseServiceJava\\src\\com\\dsideal\\baseService\\ExcelImportTemplate";
String TargetExcelTemplatePath="E:\\Work\\BigData\\FengHuangJava\\src\\com\\dsideal\\FengHuang\\ExcelImportTemplate";
//生成学生的导入模板
String templateXls=TargetExcelTemplatePath+"\\Student.xls";

@ -35,7 +35,7 @@ public class StudentInitImportTemplate {
arp.addSqlTemplate(basePath + "dm/dm.sql");
arp.start();
String TargetExcelTemplatePath="E:\\Work\\BigData\\baseServiceJava\\src\\com\\dsideal\\baseService\\ExcelImportTemplate";
String TargetExcelTemplatePath="E:\\Work\\BigData\\FengHuangJava\\src\\com\\dsideal\\FengHuang\\ExcelImportTemplate";
//生成学生的导入模板
String templateXls=TargetExcelTemplatePath+"\\Student.xls";

@ -46,7 +46,7 @@ public class TeacherCopyToSample {
arp.start();
String TargetExcelTemplatePath="E:\\Work\\BigData\\baseServiceJava\\src\\com\\dsideal\\baseService\\ExcelImportTemplate";
String TargetExcelTemplatePath="E:\\Work\\BigData\\FengHuangJava\\src\\com\\dsideal\\FengHuang\\ExcelImportTemplate";
//生成教师的导入模板
String templateXls=TargetExcelTemplatePath+"\\Teacher.xls";

@ -33,7 +33,7 @@ public class TeacherInitImportTemplate {
arp.addSqlTemplate(basePath + "dm/dm.sql");
arp.start();
String TargetExcelTemplatePath="E:\\Work\\BigData\\baseServiceJava\\src\\com\\dsideal\\baseService\\ExcelImportTemplate";
String TargetExcelTemplatePath="E:\\Work\\BigData\\FengHuangJava\\src\\com\\dsideal\\FengHuang\\ExcelImportTemplate";
//生成教师的导入模板
String templateXls=TargetExcelTemplatePath+"\\Teacher.xls";

@ -99,8 +99,8 @@ public class IndexController extends Controller {
/**
* IP
* 访https://www.ccsjy.cn/FengHuang/pub602app?port=80&url=baseService/html/pages/dataSystem/dataSystem.html
* 访http://127.0.0.1:9000/FengHuang/pub602app?port=80&url=baseService/html/pages/dataSystem/dataSystem.html
* 访https://www.ccsjy.cn/FengHuang/pub602app?port=80&url=FengHuang/html/pages/dataSystem/dataSystem.html
* 访http://127.0.0.1:9000/FengHuang/pub602app?port=80&url=FengHuang/html/pages/dataSystem/dataSystem.html
*
* @throws IOException
*/

@ -20,7 +20,7 @@ obs_accessKeySecret=dlWTUbqgCICaYJG3n0Rot4jXaen2HnfFtMVxiPEo
obs_endpoint=obs.cn-north-1.myhuaweicloud.com
obs_bucket_name=dsideal
# 在云存储上备份的路径名称
baseServiceDbBackup=baseServiceDbBackup/
FengHuangDbBackup=FengHuangDbBackup/
# 管理员邮箱
adminEmailAddress=10402852@qq.com
# 口令,注意这里是腾讯的授权码,可不是什么 QQ密码或者独立密码

@ -20,7 +20,7 @@ obs_accessKeySecret=dlWTUbqgCICaYJG3n0Rot4jXaen2HnfFtMVxiPEo
obs_endpoint=obs.cn-north-1.myhuaweicloud.com
obs_bucket_name=dsideal
# 在云存储上备份的路径名称
baseServiceDbBackup=baseServiceDbBackup/
FengHuangDbBackup=FengHuangDbBackup/
# 管理员邮箱
adminEmailAddress=10402852@qq.com
# 口令,注意这里是腾讯的授权码,可不是什么 QQ密码或者独立密码

Loading…
Cancel
Save