ibiz4j 发布系统代码 [ibiz-rt，ibizlab-runtime]

app_Web/src/widgets/sys-user-auth/main-form/main-form-base.vue

@@ -35,21 +35,14 @@
 </i-col>
 <i-col v-show="detailsModel.identity_type.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='identity_type' :itemRules="this.rules().identity_type" class='' :caption="$t('entities.sysuserauth.main_form.details.identity_type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.identity_type.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
-    v-model="data.identity_type" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :formState="formState" 
-    :localContext ='{ }' 
-    :localParam ='{ }' 
+    <input-box 
+    v-model="data.identity_type"  
+    @enter="onEnter($event)"  
+     unit=""  
     :disabled="detailsModel.identity_type.disabled" 
-    valueType="string"
-    tag='UaaOpenAccessType' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    type='text' 
+    style="">
+</input-box>
 
 </app-form-item>
 

ibzrt-core/src/main/java/cn/ibizlab/core/util/config/MybatisConfiguration.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import java.util.Properties;
 
 /**
@@ -19,7 +20,6 @@ import java.util.Properties;
 @Configuration
 @MapperScan(value="cn.ibizlab.core.*.mapper",nameGenerator = UniqueNameGenerator.class)
 public class MybatisConfiguration {
-
     /**
      * mybatis适配多数据库
      * @return
@@ -53,5 +53,6 @@ public class MybatisConfiguration {
         paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
         return paginationInterceptor;
     }
+    
 
 }
\ No newline at end of file

ibzrt-core/src/main/resources/sysmodel/ibzrt.json

@@ -5598,7 +5598,7 @@
     "data_type":"VARCHAR",
     "data_length":200,
     "key_field":0,
-    "show_order":1000,
+    "show_order":6,
     "major_field":1
     }
     ],

ibzrt-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -49,6 +49,14 @@ public class AuthenticationUser implements UserDetails
 	 */
 	private String domain;
 	/**
+     * 租户
+     */
+    private String srfdcid;
+    /**
+     * 动态实例标识
+     */
+    private String srfdynainstid;
+	/**
 	 * 部门标识
 	 */
 	private String mdeptid;

ibzrt-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -3,6 +3,7 @@ package cn.ibizlab.util.security;
 import io.jsonwebtoken.ExpiredJwtException;
 import lombok.extern.slf4j.Slf4j;
 import cn.ibizlab.util.service.AuthenticationUserService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -26,7 +27,7 @@ import java.util.*;
 @Component
 public class AuthorizationTokenFilter extends OncePerRequestFilter {
 
-    private final UserDetailsService userDetailsService;
+    private final AuthenticationUserService userDetailsService;
     private final AuthTokenUtil authTokenUtil;
     private final String tokenHeader;
     private Set<String> excludesPattern = new HashSet<String>();
@@ -60,7 +61,6 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
 
         if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
             UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
-
             if (authTokenUtil.validateToken(authToken, userDetails)) {
                 UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
                 authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));

ibzrt-util/src/main/java/cn/ibizlab/util/service/AuthenticationUserService.java

@@ -16,11 +16,16 @@ public interface AuthenticationUserService extends UserDetailsService {
 
     @Override
     @Cacheable( value="ibzuaa_users", key = "'getByUsername:'+#p0")
-    AuthenticationUser loadUserByUsername(String username);
+    default AuthenticationUser loadUserByUsername(String username){
+        return null ;
+    }
+
 
     @Cacheable( value="ibzuaa_users", key = "'getByUsername:'+#p0")
     AuthenticationUser loadUserByLogin(String username,String password);
 
     @CacheEvict( value="ibzuaa_users", key = "'getByUsername:'+#p0")
-    void resetByUsername(String username);
+    default void resetByUsername(String username){}
+
+
 }

ibzrt-util/src/main/java/cn/ibizlab/util/service/IBZUAAUserService.java

@@ -54,10 +54,4 @@ public class IBZUAAUserService implements AuthenticationUserService{
 		return user;
 	}
 
-
-	@Override
-	public void resetByUsername(String username) {
-
-	}
-
 }