fix: needless AuthUtils on some case

deepexi · Oct 9, 2019 · f23a843 · f23a843
1 parent 06679be
commit f23a843
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -71,6 +71,7 @@ $ yo deepexi-spring-cloud --help
 |RDBMS|✅MySQL|☑️PG SQL|☑️SQL Server|
 |NoSQL|✅Redis|☑️MongoDB|
 |连接池|✅Druid|☑️Hikari|
+|认证机制|✅JWT|
 |权限控制|✅Shiro|☑️Spring Security|
 |分布式事务|☑️TCC-Transaction|☑️LCN|
 |APM|☑️SkyWalking|☑️Zipkin|☑️PinPoint|

diff --git a/generators/app/index.js b/generators/app/index.js
@@ -234,6 +234,10 @@ module.exports = require('yo-power-generator').getGenerator(obj, {
       props.conditions[props.configservice] = true;
     }
 
+    if (props.authentication !== 'none') {
+      props.conditions[props.authentication] = true;
+    }
+
     if (props.security !== 'none') {
       props.conditions[props.security] = true;
     }

diff --git a/...til/if_authentication.AuthUtils.tmpl.java → ...th}/util/if_shiro_jwt.AuthUtils.tmpl.java b/...til/if_authentication.AuthUtils.tmpl.java → ...th}/util/if_shiro_jwt.AuthUtils.tmpl.java
@@ -1,9 +1,5 @@
 package ${basePackage}.util;
 
-<%
-switch (authentication) {
-    case 'jwt':
-        print(`
 import com.github.taccisum.shiro.web.autoconfigure.stateless.support.jwt.JWTPrincipal;
 import com.github.taccisum.shiro.web.autoconfigure.stateless.support.jwt.Payload;
 import org.apache.shiro.SecurityUtils;
@@ -21,10 +17,3 @@ private static JWTPrincipal getPrincipal() {
         return (JWTPrincipal) SecurityUtils.getSubject().getPrincipal();
     }
 }
-        `)
-        break;
-
-    default:
-        break;
-}
-%>