From 43e1b9eb199920301363fc93cccc0522308ca1d9 Mon Sep 17 00:00:00 2001 From: songanwei <50330690@qq.com> Date: Tue, 17 Nov 2020 15:00:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E5=A2=9E=E5=8A=A0i?= =?UTF-8?q?dea=E7=83=AD=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 28 +++++++++++++++++++ pear-entrance/pom.xml | 3 ++ .../META-INF/spring-devtools.properties | 2 ++ .../resources/templates/generator/edit.html | 7 +++-- .../src/main/resources/templates/login.html | 3 +- pom.xml | 6 ++++ 6 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 .gitignore create mode 100644 pear-entrance/src/main/resources/META-INF/spring-devtools.properties diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..afbe56de --- /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 +z-old-proj diff --git a/pear-entrance/pom.xml b/pear-entrance/pom.xml index 34e9bfce..47f34243 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 00000000..81a6464f --- /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 1b742a43..45d404ce 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 19b35a7e..d8aa689e 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/pom.xml b/pom.xml index 8764dfc8..fb9ebab2 100644 --- a/pom.xml +++ b/pom.xml @@ -235,6 +235,12 @@ ${lombok.version} provided + + + org.springframework.boot + spring-boot-devtools + runtime + -- Gitee From 87f13870399fce03705903d61470d22b83867b0b Mon Sep 17 00:00:00 2001 From: songanwei <50330690@qq.com> Date: Tue, 17 Nov 2020 15:02:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=94=BE=E5=88=B0git=E4=B8=8A=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- pear-admin-boot.iml | 13 -- pear-common/pear-common.iml | 92 --------- pear-entrance/pear-entrance.iml | 177 ------------------ .../pear-generator/pear-generator.iml | 101 ---------- pear-modules/pear-modules.iml | 13 -- pear-modules/pear-process/pear-process.iml | 149 --------------- pear-modules/pear-schedule/pear-schedule.iml | 97 ---------- pear-modules/pear-system/pear-system.iml | 98 ---------- 9 files changed, 1 insertion(+), 741 deletions(-) delete mode 100644 pear-admin-boot.iml delete mode 100644 pear-common/pear-common.iml delete mode 100644 pear-entrance/pear-entrance.iml delete mode 100644 pear-modules/pear-generator/pear-generator.iml delete mode 100644 pear-modules/pear-modules.iml delete mode 100644 pear-modules/pear-process/pear-process.iml delete mode 100644 pear-modules/pear-schedule/pear-schedule.iml delete mode 100644 pear-modules/pear-system/pear-system.iml diff --git a/.gitignore b/.gitignore index afbe56de..fc59d651 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,4 @@ classes .history /target/ node_modules -z-old-proj + diff --git a/pear-admin-boot.iml b/pear-admin-boot.iml deleted file mode 100644 index 23a5119e..00000000 --- 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 c462ceb1..00000000 --- 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 a8400d8a..00000000 --- a/pear-entrance/pear-entrance.iml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pear-modules/pear-generator/pear-generator.iml b/pear-modules/pear-generator/pear-generator.iml deleted file mode 100644 index 3d327b82..00000000 --- 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 23a5119e..00000000 --- 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 dcb50689..00000000 --- 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 069d8906..00000000 --- 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 b0a719f2..00000000 --- a/pear-modules/pear-system/pear-system.iml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee