变更

.gitignore

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

WebRoot/html/lib/common.js

@@ -1,9 +1,9 @@
-let csrf_token_key="baseService_csrf_token"
+let csrf_token_key="FengHuang_csrf_token"
-//保存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;

WebRoot/html/pages/global/edit.html

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

WebRoot/html/pages/school/schoolList.html

@@ -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");
-
             }
-
         }
 
         //绑定下拉树

src/main/java/Backup/BackupAll.java

@@ -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("数据库备份正在进行，有点慢，耐心等...");

src/main/java/Tools/CallPhantonJS.java

@@ -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";
 
     /**
      * 功能：调用可执行的Phantom，下载html代码中的图片

src/main/java/Tools/CopyLib.java

@@ -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 + "/*.*");
         //上传

src/main/java/UnitTest/UploadToOssForPreview.java

@@ -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);

src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/StudentCopyToSample.java

@@ -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";

src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/StudentInitImportTemplate.java

@@ -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";

src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/TeacherCopyToSample.java

@@ -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";

src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/TeacherInitImportTemplate.java

@@ -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";

src/main/java/com/dsideal/FengHuang/Index/Controller/IndexController.java

@@ -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
+     * 访问办法：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=baseService/html/pages/dataSystem/dataSystem.html
+     * 访问办法：http://127.0.0.1:9000/FengHuang/pub602app?port=80&url=FengHuang/html/pages/dataSystem/dataSystem.html
      *
      * @throws IOException
      */

src/main/resource/application.properties

@@ -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密码或者独立密码！

target/classes/application.properties

@@ -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密码或者独立密码！