diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..fc59d65141c06630cbc3e7bb44ef2971386f010b --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Icon? +.project +.vscode +.factorypath +*.class +*.log +**/target/** +**/.settings/** +.classpath +build/** +.svn/** +.idea +*.iml +.metadata/** +logging.fileDir* + +/.settings/** + +classes +.history +/target/ +node_modules + diff --git a/pear-admin-boot.iml b/pear-admin-boot.iml deleted file mode 100644 index 23a5119e4f61f0298b0961dc6693125e49dd57dc..0000000000000000000000000000000000000000 --- a/pear-admin-boot.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-common/pear-common.iml b/pear-common/pear-common.iml deleted file mode 100644 index c462ceb10224d17f5fe477f7ef027e6ac53a8316..0000000000000000000000000000000000000000 --- a/pear-common/pear-common.iml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-entrance/pear-entrance.iml b/pear-entrance/pear-entrance.iml deleted file mode 100644 index a8400d8a5f939c15d22f6ad0576b681f26014d61..0000000000000000000000000000000000000000 --- a/pear-entrance/pear-entrance.iml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-entrance/pom.xml b/pear-entrance/pom.xml index 34e9bfce0ef724b2a672af7348f49455bb51e059..47f34243f3a44d31518403d6225be39527fff27c 100644 --- a/pear-entrance/pom.xml +++ b/pear-entrance/pom.xml @@ -97,6 +97,9 @@ org.springframework.boot spring-boot-maven-plugin + + true + diff --git a/pear-entrance/src/main/resources/META-INF/spring-devtools.properties b/pear-entrance/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 0000000000000000000000000000000000000000..81a6464f1c3f383ca4377f5bd2530d4d9b7f25c2 --- /dev/null +++ b/pear-entrance/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1,2 @@ +restart.include.mapper=/mapper-[\\w-\\.]+jar +restart.include.pagehelper=/pagehelper-[\\w-\\.]+jar \ No newline at end of file diff --git a/pear-entrance/src/main/resources/templates/generator/edit.html b/pear-entrance/src/main/resources/templates/generator/edit.html index 1b742a43d14a08401055f7d9a7c3c21105aebbfd..45d404ce91ecde3ae65f2294b1538e0030d7f5b2 100644 --- a/pear-entrance/src/main/resources/templates/generator/edit.html +++ b/pear-entrance/src/main/resources/templates/generator/edit.html @@ -173,9 +173,10 @@ data: data.field, async: false, success: function (data) { - layui.layer.alert(data.msg); - if (data.code == 0) { - window.location.href = prefix; + + if (data.code == 200) { + console.log("保存成功"); + layui.layer.msg("保存成功",{icon:1,time:1000}) } } }); diff --git a/pear-entrance/src/main/resources/templates/login.html b/pear-entrance/src/main/resources/templates/login.html index 19b35a7e70107e0ae0147fa28d006787af583564..d8aa689e98c46c0a14b15b2111f15f324268c26d 100644 --- a/pear-entrance/src/main/resources/templates/login.html +++ b/pear-entrance/src/main/resources/templates/login.html @@ -65,7 +65,8 @@ return false; }); - $("#codeImage").click(function(){ + $("#captchaImage").click(function(){ + document.getElementById("captchaImage").src="/system/captcha/generate?"+Math.random(); }) diff --git a/pear-modules/pear-generator/pear-generator.iml b/pear-modules/pear-generator/pear-generator.iml deleted file mode 100644 index 3d327b82cc213623730031c4a844c95745b9d735..0000000000000000000000000000000000000000 --- a/pear-modules/pear-generator/pear-generator.iml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-modules/pear-modules.iml b/pear-modules/pear-modules.iml deleted file mode 100644 index 23a5119e4f61f0298b0961dc6693125e49dd57dc..0000000000000000000000000000000000000000 --- a/pear-modules/pear-modules.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-modules/pear-process/pear-process.iml b/pear-modules/pear-process/pear-process.iml deleted file mode 100644 index dcb506896400f0390700a83ebaababcfe849a0ad..0000000000000000000000000000000000000000 --- a/pear-modules/pear-process/pear-process.iml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-modules/pear-schedule/pear-schedule.iml b/pear-modules/pear-schedule/pear-schedule.iml deleted file mode 100644 index 069d890640a9a637866791ac22ea5d8c5270394c..0000000000000000000000000000000000000000 --- a/pear-modules/pear-schedule/pear-schedule.iml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-modules/pear-system/pear-system.iml b/pear-modules/pear-system/pear-system.iml deleted file mode 100644 index b0a719f25f3749b68b75c4abaf9f7e4f4a06725d..0000000000000000000000000000000000000000 --- a/pear-modules/pear-system/pear-system.iml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8764dfc80e4303f9cf73846696184cbb55abca97..fb9ebab2a9b308cc56f9a8d707f7b60c7687ecc0 100644 --- a/pom.xml +++ b/pom.xml @@ -235,6 +235,12 @@ ${lombok.version} provided + + + org.springframework.boot + spring-boot-devtools + runtime +