📝 prop to en #64 uniauth prop #21

trydofor · May 13, 2023 · a89e72c · a89e72c
1 parent 4d3173c
commit a89e72c
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 66 deletions.
diff --git a/observe/docs b/observe/docs
diff --git a/wings/aegis/src/main/java/pro/fessional/wings/spring/consts/OrderedWarlockConst.java b/wings/aegis/src/main/java/pro/fessional/wings/spring/consts/OrderedWarlockConst.java
@@ -17,6 +17,7 @@ public interface OrderedWarlockConst extends WingsBeanOrdered {
     int BondAutoRunConfiguration = Lv4Application + PriorityD;
     int BondBeanConfiguration = Lv4Application + PriorityD;
     int JustAuthConfiguration = Lv4Application + PriorityD;
+    int UnionAuthConfiguration = Lv4Application + PriorityD;
     int OauthTicketConfiguration = Lv4Application + PriorityD;
     int OtherBeanConfiguration = Lv4Application + PriorityD;
     int HazelcastConfiguration = Lv4Application + PriorityD;

diff --git a/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/prop/WarlockCheckProp.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/prop/WarlockCheckProp.java
@@ -5,6 +5,7 @@
 
 /**
  * wings-warlock-check-77.properties
+ * whether to check timezone.
  *
  * @author trydofor
  * @see #Key
@@ -17,12 +18,16 @@ public class WarlockCheckProp {
     public static final String Key = "wings.warlock.check";
 
     /**
+     * seconds, database and JVM time offset, absolute maximum.
+     *
      * @see #Key$tzOffset
      */
     private int tzOffset = 5;
     public static final String Key$tzOffset = Key + ".tz-offset";
 
     /**
+     * whether to terminate or to log only when the time offset is exceeded.
+     *
      * @see #Key$tzFail
      */
     private boolean tzFail = true;

diff --git a/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/prop/WarlockEnabledProp.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/prop/WarlockEnabledProp.java
@@ -17,61 +17,71 @@ public class WarlockEnabledProp {
     public static final String Key = "spring.wings.warlock.enabled";
 
     /**
-     * 是否启动自动配置
+     * whether to enable auto config.
      *
      * @see #Key$autoconf
      */
     private boolean autoconf = true;
     public static final String Key$autoconf = Key + ".autoconf";
 
     /**
-     * 是否支持 warlock security web and http配置
+     * whether to support "warlock security web and http".
      *
      * @see #Key$securityAuto
      */
     private boolean securityAuto = true;
     public static final String Key$securityAuto = Key + ".security-auto";
 
     /**
-     * 是否支持 Web 自动配置，firewall，debug等
+     * whether to enable Web auto config, eg. firewall, debug, etc.
      *
      * @see #Key$securityWebAutos
      */
     private boolean securityWebAutos = true;
     public static final String Key$securityWebAutos = Key + ".security-web-autos";
 
     /**
+     * whether to support "warlock security http wing bind".
+     *
      * @see #Key$securityHttpBind
      */
     private boolean securityHttpBind = true;
     public static final String Key$securityHttpBind = Key + ".security-http-bind";
 
     /**
+     * whether to support "warlock security http wing auth".
+     *
      * @see #Key$securityHttpAuth
      */
     private boolean securityHttpAuth = true;
     public static final String Key$securityHttpAuth = Key + ".security-http-auth";
 
     /**
+     * whether to support "warlock security http base auth".
+     *
      * @see #Key$securityHttpBase
      */
     private boolean securityHttpBase = true;
     public static final String Key$securityHttpBase = Key + ".security-http-base";
 
     /**
+     * whether to support "warlock security http auto".
+     *
      * @see #Key$securityHttpAuto
      */
     private boolean securityHttpAuto = true;
     public static final String Key$securityHttpAuto = Key + ".security-http-auto";
 
     /**
+     * whether to support SecurityFilterChain.
+     *
      * @see #Key$securityHttpChain
      */
     private boolean securityHttpChain = true;
     public static final String Key$securityHttpChain = Key + ".security-http-chain";
 
     /**
-     * 是否支持 warlock security 默认Bean
+     * whether to support warlock security Bean.
      *
      * @see #Key$securityBean
      */
@@ -80,185 +90,211 @@ public class WarlockEnabledProp {
 
 
     /**
-     * 是否注入 wings的全局锁
+     * whether to inject wings global lock.
      *
      * @see #Key$globalLock
      */
     private boolean globalLock = true;
     public static final String Key$globalLock = Key + ".global-lock";
 
     /**
-     * 是否注入 jooq dao
+     * whether to inject jooq dao.
      *
      * @see #Key$jooqAutogen
      */
     private boolean jooqAutogen = true;
     public static final String Key$jooqAutogen = Key + ".jooq-autogen";
 
     /**
-     * 是否注入 ListAllLoginPageCombo
+     * whether to inject ListAllLoginPageCombo.
      *
      * @see #Key$comboListAllLoginPage
      */
     private boolean comboListAllLoginPage = true;
     public static final String Key$comboListAllLoginPage = Key + ".combo-list-all-login-page";
 
     /**
-     * 是否注入 NonceUserDetailsCombo
+     * whether to inject NonceUserDetailsCombo.
      *
      * @see #Key$comboNonceUserDetails
      */
     private boolean comboNonceUserDetails = true;
     public static final String Key$comboNonceUserDetails = Key + ".combo-nonce-user-details";
 
     /**
-     * 是否支持 just auth登录
+     * whether to support just auth.
      *
      * @see #Key$justAuth
      */
     private boolean justAuth = true;
     public static final String Key$justAuth = Key + ".just-auth";
 
     /**
-     * 是否注入 justAuthLoginPageCombo
+     * whether to inject JustAuthLoginPageCombo.
      *
      * @see #Key$comboJustAuthLoginPage
      */
     private boolean comboJustAuthLoginPage = true;
     public static final String Key$comboJustAuthLoginPage = Key + ".combo-just-auth-login-page";
 
     /**
-     * 是否注入 JustAuthUserDetailsCombo
+     * whether to inject JustAuthUserDetailsCombo.
      *
      * @see #Key$comboJustAuthUserDetails
      */
     private boolean comboJustAuthUserDetails = true;
     public static final String Key$comboJustAuthUserDetails = Key + ".combo-just-auth-user-details";
 
     /**
-     * 是否注入 JustAuthUserAuthnAutoReg
+     * whether to inject JustAuthUserAuthnAutoReg.
      *
      * @see #Key$comboJustAuthAutoreg
      */
     private boolean comboJustAuthAutoreg = true;
     public static final String Key$comboJustAuthAutoreg = Key + ".combo-just-auth-autoreg";
 
     /**
-     * 是否支持 AuthZonePermChecker
+     * whether to support AuthZonePermChecker.
      *
      * @see #Key$zonePermCheck
      */
     private boolean zonePermCheck = false;
     public static final String Key$zonePermCheck = Key + ".zone-perm-check";
 
     /**
-     * 是否支持 AuthAppPermChecker
+     * whether to support AuthAppPermChecker.
      *
      * @see #Key$appPermCheck
      */
     private boolean appPermCheck = false;
     public static final String Key$appPermCheck = Key + ".app-perm-check";
 
     /**
+     * whether to inject DefaultExceptionResolver.
+     *
      * @see #Key$defaultExceptionHandler
      */
     private boolean defaultExceptionHandler = true;
     public static final String Key$defaultExceptionHandler = Key + ".default-exception-handler";
 
     /**
+     * whether to inject CodeExceptionResolver.
+     *
      * @see #Key$codeExceptionHandler
      */
     private boolean codeExceptionHandler = true;
     public static final String Key$codeExceptionHandler = Key + ".code-exception-handler";
 
     /**
-     * 是否注入 BindExceptionAdvice
+     * whether to inject BindExceptionAdvice.
      *
      * @see #Key$bindExceptionAdvice
      */
     private boolean bindExceptionAdvice = true;
     public static final String Key$bindExceptionAdvice = Key + ".bind-exception-advice";
 
     /**
-     * 是否检查mysql和本机timezone兼容性
+     * whether to check mysql and local timezone compatibility.
      *
      * @see #Key$checkDatabase
      */
     private boolean checkDatabase = true;
     public static final String Key$checkDatabase = Key + ".check-database";
 
     /**
-     * 是否支持为Docket全局注入AlternateTypeRule
+     * whether to support global inject AlternateTypeRule into Docket.
      *
      * @see #Key$swaggerRule
      */
     private boolean swaggerRule = true;
     public static final String Key$swaggerRule = Key + ".swagger-rule";
 
     /**
-     * 是否支持为Docket全局注入java.time.Local*
+     * whether to support global inject "java.time.Local*" into Docket.
      *
      * @see #Key$swaggerJsr310
      */
     private boolean swaggerJsr310 = true;
     public static final String Key$swaggerJsr310 = Key + ".swagger-jsr-310";
 
     /**
-     * 是否开启table CUD 监听
+     * whether to enable table CUD listener.
      *
      * @see #Key$tableChange
      */
     private boolean tableChange = true;
     public static final String Key$tableChange = Key + ".table-change";
 
     /**
+     * whether to enable the default auth Controller.
+     *
      * @see #Key$controllerAuth
      */
     private boolean controllerAuth = true;
     public static final String Key$controllerAuth = Key + ".controller-auth";
 
     /**
+     * whether to enable document-only login/out proc that processed by filter.
+     *
      * @see #Key$controllerProc
      */
     private boolean controllerProc = true;
     public static final String Key$controllerProc = Key + ".controller-proc";
 
     /**
+     * whether to enable the default user Controller.
+     *
      * @see #Key$controllerUser
      */
     private boolean controllerUser = true;
     public static final String Key$controllerUser = Key + ".controller-user";
 
     /**
+     * whether to enable the default mock Controller.
+     *
      * @see #Key$controllerMock
      */
     private boolean controllerMock = true;
     public static final String Key$controllerMock = Key + ".controller-mock";
 
     /**
+     * whether to enable the default test Controller.
+     *
      * @see #Key$controllerTest
      */
     private boolean controllerTest = true;
     public static final String Key$controllerTest = Key + ".controller-test";
 
     /**
+     * whether to enable the default TweakController.
+     *
      * @see #Key$controllerTest
      */
     private boolean controllerTweak = false;
     public static final String Key$controllerTweak = Key + ".controller-tweak";
 
     /**
+     * whether to enable the default OauthController.
+     *
      * @see #Key$controllerOauth
      */
     private boolean controllerOauth = true;
     public static final String Key$controllerOauth = Key + ".controller-oauth";
 
 
     /**
-     * 是否支持计时分析
+     * whether to enable timing watching and analysis.
      *
      * @see #Key$watching
      */
     private boolean watching = false;
     public static final String Key$watching = Key + ".watching";
+
+    /**
+     * whether to support wings union login.
+     *
+     * @see #Key$uniauth
+     */
+    private boolean uniauth = false;
+    public static final String Key$uniauth = Key + ".uniauth";
 }
diff --git a/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/prop/WarlockI18nProp.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/prop/WarlockI18nProp.java
@@ -20,12 +20,16 @@ public class WarlockI18nProp {
     public static final String Key = "wings.warlock.i18n";
 
     /**
+     * init ZoneId by StandardTimezoneEnum.
+     *
      * @see #Key$zoneidEnum
      */
     private Set<String> zoneidEnum = Collections.emptySet();
     public static final String Key$zoneidEnum = Key + ".zoneid-enum";
 
     /**
+     * init Locale by StandardLanguageEnum.
+     *
      * @see #Key$localeEnum
      */
     private Set<String> localeEnum = Collections.emptySet();