Merge pull request #136 from erupts/develop

1.11.2
erupts · Jan 7, 2023 · f10c6fa · f10c6fa
2 parents 22922de + 53b6be6
commit f10c6fa
Show file tree

Hide file tree

Showing 27 changed files with 58 additions and 29 deletions.
diff --git a/erupt-annotation/pom.xml b/erupt-annotation/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/IfRender.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/IfRender.java
@@ -0,0 +1,25 @@
+package xyz.erupt.annotation.sub_field;
+
+import java.beans.Transient;
+
+public @interface IfRender {
+
+    boolean value() default true;
+
+    @Transient
+    String[] params() default {};
+
+    @Transient
+    Class<? extends RenderHandler> renderHandler() default RenderHandler.class;
+
+    interface RenderHandler {
+
+        /**
+         * @param expr   表达式
+         * @param params 注解参数
+         * @return 程序处理后的表达式
+         */
+        boolean render(boolean expr, String[] params);
+    }
+
+}
diff --git a/erupt-cloud/erupt-cloud-common/pom.xml b/erupt-cloud/erupt-cloud-common/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node-jpa/pom.xml b/erupt-cloud/erupt-cloud-node-jpa/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node/pom.xml b/erupt-cloud/erupt-cloud-node/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-server/pom.xml b/erupt-cloud/erupt-cloud-server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-core/pom.xml b/erupt-core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-data/erupt-jpa/pom.xml b/erupt-data/erupt-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-data/erupt-mongodb/pom.xml b/erupt-data/erupt-mongodb/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-excel/pom.xml b/erupt-excel/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-generator/pom.xml b/erupt-extra/erupt-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-job/pom.xml b/erupt-extra/erupt-job/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-magic-api/pom.xml b/erupt-extra/erupt-magic-api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-monitor/pom.xml b/erupt-extra/erupt-monitor/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-i18n/pom.xml b/erupt-i18n/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-security/pom.xml b/erupt-security/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-toolkit/pom.xml b/erupt-toolkit/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-tpl-ui/amis/pom.xml b/erupt-tpl-ui/amis/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl-ui/ant-design/pom.xml b/erupt-tpl-ui/ant-design/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl-ui/element-plus/pom.xml b/erupt-tpl-ui/element-plus/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl-ui/element-ui/pom.xml b/erupt-tpl-ui/element-ui/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl/pom.xml b/erupt-tpl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-upms/pom.xml b/erupt-upms/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-upms/src/main/java/xyz/erupt/upms/controller/EruptUserController.java b/erupt-upms/src/main/java/xyz/erupt/upms/controller/EruptUserController.java
@@ -4,7 +4,10 @@
 import com.wf.captcha.SpecCaptcha;
 import com.wf.captcha.base.Captcha;
 import lombok.SneakyThrows;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import xyz.erupt.core.annotation.EruptRouter;
 import xyz.erupt.core.constant.EruptRestPath;
 import xyz.erupt.core.util.EruptInformation;
@@ -143,7 +146,7 @@ public List<EruptMenuVo> getMenu() {
     }
 
     //登出
-    @RequestMapping(value = "/logout", method = {RequestMethod.GET, RequestMethod.POST})
+    @GetMapping(value = "/logout")
     @EruptRouter(verifyType = EruptRouter.VerifyType.LOGIN)
     public EruptApiModel logout(HttpServletRequest request) {
         String token = eruptContextService.getCurrentToken();
@@ -165,8 +168,7 @@ public EruptApiModel logout(HttpServletRequest request) {
      */
     @GetMapping(value = "/change-pwd")
     @EruptRouter(verifyType = EruptRouter.VerifyType.LOGIN)
-    public EruptApiModel changePwd(@RequestParam("pwd") String pwd,
-                                   @RequestParam("newPwd") String newPwd, @RequestParam("newPwd2") String newPwd2) {
+    public EruptApiModel changePwd(@RequestParam("pwd") String pwd, @RequestParam("newPwd") String newPwd, @RequestParam("newPwd2") String newPwd2) {
         return eruptUserService.changePwd(eruptUserService.getCurrentAccount(), pwd, newPwd, newPwd2);
     }
 

diff --git a/erupt-web/pom.xml b/erupt-web/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-web/src/main/resources/public/auth.html b/erupt-web/src/main/resources/public/auth.html
@@ -12,7 +12,9 @@
         let arr = paramsArr[i].split('=')
         param[arr[0]] = arr[1];
     }
-    localStorage.setItem("_token", param["token"]);
+    localStorage.setItem("_token", JSON.stringify({
+        token: param["token"]
+    }));
     window.location = "./index.html";
 </script>
 </body>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>xyz.erupt</groupId>
     <artifactId>erupt</artifactId>
-    <version>1.11.1</version>
+    <version>1.11.2</version>
 
     <packaging>pom</packaging>
     <name>erupt</name>