ibizdev提交

app_Web/src/components/app-form-druipart/app-form-druipart.vue

@@ -47,6 +47,14 @@ export default class AppFormDRUIPart extends Vue {
      */
     @Prop({ default: '' }) public refreshitems!: string;
 
+    /**
+     * 禁止加载
+     *
+     * @type {string}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop({ default: false }) public isForbidLoad!: boolean;
+
     /**
      * 关系视图类型
      *
@@ -254,7 +262,9 @@ export default class AppFormDRUIPart extends Vue {
                 this.blockUIStop();
             }
         }
-        this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+        if(!this.isForbidLoad){
+            this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+        }
     }
 
     /**

app_Web/src/environments/environment.ts

@@ -22,7 +22,7 @@ export const Environment = {
     // 是否为开发模式
     devMode: true,
     // 项目模板地址
-    ProjectUrl: "http://demo.ibizlab.cn/groups/ibizr7pfstdtempl",
+    ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
     // 配置平台地址
     StudioUrl: "http://172.16.170.145/slnstudio/",
     // 中心标识

app_Web/src/mock/app/index-appmenu/index-appmenu.ts

@@ -22,7 +22,7 @@ mock.onGet('v7/indexappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-university',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto3',
@@ -40,7 +40,7 @@ mock.onGet('v7/indexappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-sitemap',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto2',
@@ -58,7 +58,7 @@ mock.onGet('v7/indexappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto4',
@@ -76,7 +76,7 @@ mock.onGet('v7/indexappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user-secret',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto5',
@@ -94,7 +94,7 @@ mock.onGet('v7/indexappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-users',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto1',
@@ -112,7 +112,7 @@ mock.onGet('v7/indexappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-book',
 	icon: '',
 	textcls: '',
 	appfunctag: '_2',

app_Web/src/utils/studio-action/StudioActionUtil.ts

@@ -92,7 +92,7 @@ export class StudioActionUtil {
         const config: any = await this.getConfig(viewName);
         if (config) {
             const context: string = `视图模块：${config.viewmodule}\n视图标识：${config.viewname}\n视图类型：${config.viewtype}\n`;
-            window.open(`${Environment.ProjectUrl}/issues/`, '_blank');
+            window.open(`${Environment.ProjectUrl}/issues/new?issue[title]=${encodeURIComponent('问题')}&issue[description]=${encodeURIComponent(context)}`, '_blank');
         }
     }
 

app_Web/src/widgets/app/index-appmenu/index-appmenu-model.ts

@@ -26,7 +26,7 @@ export default class IndexModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-university',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto3',
@@ -44,7 +44,7 @@ export default class IndexModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-sitemap',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto2',
@@ -62,7 +62,7 @@ export default class IndexModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto4',
@@ -80,7 +80,7 @@ export default class IndexModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user-secret',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto5',
@@ -98,7 +98,7 @@ export default class IndexModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-users',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto1',
@@ -116,7 +116,7 @@ export default class IndexModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-book',
 	icon: '',
 	textcls: '',
 	appfunctag: '_2',

app_Web/src/widgets/ibzdict/main-form/main-form-base.vue

@@ -27,6 +27,7 @@
     <app-form-druipart
     
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='ibzdict' 
     :parentdata='{"srfparentdefname":"DICTID","srfparentdename":"IBZDICT","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBZDICTITEM_IBZDICT_DICTID","SRFDER1NID":"DER1N_IBZDICTITEM_IBZDICT_DICTID"}'
     :parameters="[

app_Web/src/widgets/sys-role/main-form/main-form-base.vue

@@ -46,6 +46,7 @@
     <app-form-druipart
     
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='sys_role' 
     :parentdata='{"srfparentdefname":"SYS_ROLEID","srfparentdename":"SYS_ROLE","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID","SRFDER1NID":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID"}'
     :parameters="[
@@ -81,6 +82,7 @@
     <app-form-druipart
     
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='sys_role' 
     :parentdata='{"srfparentdefname":"SYS_ROLEID","srfparentdename":"SYS_ROLE","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_SYS_USER_ROLE_SYS_ROLE_SYS_ROLEID","SRFDER1NID":"DER1N_SYS_USER_ROLE_SYS_ROLE_SYS_ROLEID"}'
     :parameters="[

app_Web/src/widgets/wfgroup/main-form/main-form-base.vue

@@ -22,6 +22,7 @@
     <app-form-druipart
     
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='wfgroup' 
     :parentdata='{"srfparentdefname":"GROUPID","srfparentdename":"WF_GROUP","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_WF_GROUP_MEMBER_WF_GROUP_GROUPID","SRFDER1NID":"DER1N_WF_GROUP_MEMBER_WF_GROUP_GROUPID"}'
     :parameters="[

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzrt/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzrt/
+      mvn clean package -Pweb
+      cd ibzou-app/ibzou-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-app/ibzou-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30000
 
 ADD ibzou-app-web.jar /ibzou-app-web.jar

ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "8080:8080"
+      - "30000:30000"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-app/ibzou-app-web/src/main/java/cn/ibizlab/web/config/WebSecurityConfig.java

@@ -42,6 +42,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ibzou-app/ibzou-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 30000
\ No newline at end of file

ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30000
 
 #zuul网关路由设置
 zuul:
@@ -14,7 +14,7 @@ zuul:
       stripPrefix: false
     ibzdictitem:
       path: /ibzdictitems/**
-      serviceId: ibzrt-api
+      serviceId: dict
       stripPrefix: false
     wf_group_member:
       path: /wf_group_members/**
@@ -22,19 +22,19 @@ zuul:
       stripPrefix: false
     ibzdict:
       path: /ibzdicts/**
-      serviceId: ibzrt-api
+      serviceId: dict
       stripPrefix: false
     wf_user:
-      path: /wfusers/**
-      serviceId: ibzrt-api
+      path: /wf_users/**
+      serviceId: ibzwf-api
       stripPrefix: false
     ibzorg:
       path: /ibzorgs/**
       serviceId: ibzou-api
       stripPrefix: false
     wf_group:
-      path: /wfgroups/**
-      serviceId: ibzrt-api
+      path: /wf_groups/**
+      serviceId: ibzwf-api
       stripPrefix: false
     sys_user_role:
       path: /sys_user_roles/**

ibzou-boot/src/main/java/cn/ibizlab/config/DevBootSecurityConfig.java

@@ -41,6 +41,9 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -102,6 +105,8 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                     //放行登录请求
                    .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                    //放行注销请求
+                    .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                     // 文件操作
                    .antMatchers("/"+downloadpath+"/**").permitAll()
                    .antMatchers("/"+uploadpath).permitAll()

ibzou-boot/src/main/resources/application-dev.yml

@@ -30,6 +30,10 @@ zuul:
         path: /wf_models/**
         serviceId: ibzwf-api
         stripPrefix: false
+      ibzdictitem:
+        path: /ibzdictitems/**
+        serviceId: dict
+        stripPrefix: false
       wf_task_way:
         path: /wf_task_ways/**
         serviceId: ibzwf-api
@@ -58,6 +62,18 @@ zuul:
         path: /sys_users/**
         serviceId: ibzuaa-api
         stripPrefix: false
+      wf_user:
+        path: /wf_users/**
+        serviceId: ibzwf-api
+        stripPrefix: false
+      wf_group:
+        path: /wf_groups/**
+        serviceId: ibzwf-api
+        stripPrefix: false
+      ibzdict:
+        path: /ibzdicts/**
+        serviceId: dict
+        stripPrefix: false
       ibzemp:
         path: /ibzemps/**
         serviceId: ibzou-api

ibzou-core/src/main/java/cn/ibizlab/core/dict/client/IBZDictFallback.java

+package cn.ibizlab.core.dict.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.dict.domain.IBZDict;
+import cn.ibizlab.core.dict.filter.IBZDictSearchContext;
+import org.springframework.stereotype.Component;
+
+/**
+ * 实体[IBZDict] 服务对象接口
+ */
+@Component
+public class IBZDictFallback implements IBZDictFeignClient{
+
+    public Page<IBZDict> select(){
+            return null;
+     }
+
+    public IBZDict create(IBZDict ibzdict){
+            return null;
+     }
+    public Boolean createBatch(List<IBZDict> ibzdicts){
+            return false;
+     }
+
+    public Boolean remove(String dictid){
+            return false;
+     }
+    public Boolean removeBatch(Collection<String> idList){
+            return false;
+     }
+
+    public IBZDict update(String dictid, IBZDict ibzdict){
+            return null;
+     }
+    public Boolean updateBatch(List<IBZDict> ibzdicts){
+            return false;
+     }
+
+
+    public IBZDict getDraft(){
+            return null;
+    }
+
+
+
+    public Boolean save(IBZDict ibzdict){
+            return false;
+     }
+    public Boolean saveBatch(List<IBZDict> ibzdicts){
+            return false;
+     }
+
+    public IBZDict get(String dictid){
+            return null;
+     }
+
+
+    public Boolean checkKey(IBZDict ibzdict){
+            return false;
+     }
+
+
+    public Page<IBZDict> searchDefault(IBZDictSearchContext context){
+            return null;
+     }
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/dict/client/IBZDictFeignClient.java

+package cn.ibizlab.core.dict.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.dict.domain.IBZDict;
+import cn.ibizlab.core.dict.filter.IBZDictSearchContext;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * 实体[IBZDict] 服务对象接口
+ */
+@FeignClient(value = "dict", contextId = "IBZDict", fallback = IBZDictFallback.class)
+public interface IBZDictFeignClient {
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdicts/select")
+    Page<IBZDict> select();
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdicts")
+    IBZDict create(@RequestBody IBZDict ibzdict);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/batch")
+    Boolean createBatch(@RequestBody List<IBZDict> ibzdicts);
+
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdicts/{dictid}")
+    Boolean remove(@PathVariable("dictid") String dictid);
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdicts/batch}")
+    Boolean removeBatch(@RequestBody Collection<String> idList);
+
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzdicts/{dictid}")
+    IBZDict update(@PathVariable("dictid") String dictid,@RequestBody IBZDict ibzdict);
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzdicts/batch")
+    Boolean updateBatch(@RequestBody List<IBZDict> ibzdicts);
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdicts/getdraft")
+    IBZDict getDraft();
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/save")
+    Boolean save(@RequestBody IBZDict ibzdict);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/save")
+    Boolean saveBatch(@RequestBody List<IBZDict> ibzdicts);
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdicts/{dictid}")
+    IBZDict get(@PathVariable("dictid") String dictid);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/checkkey")
+    Boolean checkKey(@RequestBody IBZDict ibzdict);
+
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdicts/searchdefault")
+    Page<IBZDict> searchDefault(IBZDictSearchContext context);
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/dict/client/IBZDictItemFallback.java

+package cn.ibizlab.core.dict.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.dict.domain.IBZDictItem;
+import cn.ibizlab.core.dict.filter.IBZDictItemSearchContext;
+import org.springframework.stereotype.Component;
+
+/**
+ * 实体[IBZDictItem] 服务对象接口
+ */
+@Component
+public class IBZDictItemFallback implements IBZDictItemFeignClient{
+
+    public Page<IBZDictItem> select(){
+            return null;
+     }
+
+    public IBZDictItem update(String itemid, IBZDictItem ibzdictitem){
+            return null;
+     }
+    public Boolean updateBatch(List<IBZDictItem> ibzdictitems){
+            return false;
+     }
+
+
+    public Boolean checkKey(IBZDictItem ibzdictitem){
+            return false;
+     }
+
+
+    public Boolean save(IBZDictItem ibzdictitem){
+            return false;
+     }
+    public Boolean saveBatch(List<IBZDictItem> ibzdictitems){
+            return false;
+     }
+
+    public Boolean remove(String itemid){
+            return false;
+     }
+    public Boolean removeBatch(Collection<String> idList){
+            return false;
+     }
+
+    public IBZDictItem get(String itemid){
+            return null;
+     }
+
+
+    public IBZDictItem create(IBZDictItem ibzdictitem){
+            return null;
+     }
+    public Boolean createBatch(List<IBZDictItem> ibzdictitems){
+            return false;
+     }
+
+    public IBZDictItem getDraft(){
+            return null;
+    }
+
+
+
+    public Page<IBZDictItem> searchDefault(IBZDictItemSearchContext context){
+            return null;
+     }
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/dict/client/IBZDictItemFeignClient.java

+package cn.ibizlab.core.dict.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.dict.domain.IBZDictItem;
+import cn.ibizlab.core.dict.filter.IBZDictItemSearchContext;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * 实体[IBZDictItem] 服务对象接口
+ */
+@FeignClient(value = "dict", contextId = "IBZDictItem", fallback = IBZDictItemFallback.class)
+public interface IBZDictItemFeignClient {
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdictitems/select")
+    Page<IBZDictItem> select();
+
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzdictitems/{itemid}")
+    IBZDictItem update(@PathVariable("itemid") String itemid,@RequestBody IBZDictItem ibzdictitem);
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzdictitems/batch")
+    Boolean updateBatch(@RequestBody List<IBZDictItem> ibzdictitems);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems/checkkey")
+    Boolean checkKey(@RequestBody IBZDictItem ibzdictitem);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems/save")
+    Boolean save(@RequestBody IBZDictItem ibzdictitem);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems/save")
+    Boolean saveBatch(@RequestBody List<IBZDictItem> ibzdictitems);
+
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdictitems/{itemid}")
+    Boolean remove(@PathVariable("itemid") String itemid);
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdictitems/batch}")
+    Boolean removeBatch(@RequestBody Collection<String> idList);
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdictitems/{itemid}")
+    IBZDictItem get(@PathVariable("itemid") String itemid);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems")
+    IBZDictItem create(@RequestBody IBZDictItem ibzdictitem);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems/batch")
+    Boolean createBatch(@RequestBody List<IBZDictItem> ibzdictitems);
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdictitems/getdraft")
+    IBZDictItem getDraft();
+
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdictitems/searchdefault")
+    Page<IBZDictItem> searchDefault(IBZDictItemSearchContext context);
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDict.java

@@ -19,89 +19,83 @@ import java.io.Serializable;
 import lombok.Data;
 import org.springframework.data.annotation.Transient;
 
-
-import com.baomidou.mybatisplus.annotation.*;
-import cn.ibizlab.util.domain.EntityMP;
+import cn.ibizlab.util.domain.EntityClient;
 
 /**
- * 实体[数据字典]
+ * ServiceApi [数据字典] 对象
  */
 @Data
-@TableName(value = "IBZDICT",resultMap = "IBZDictResultMap")
-public class IBZDict extends EntityMP implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class IBZDict extends EntityClient implements Serializable {
 
     /**
      * 字典标识
      */
     @DEField(name = "ibzdictid" , isKeyField=true)
-    @TableId(value= "ibzdictid",type=IdType.UUID)
     @JSONField(name = "dictid")
     @JsonProperty("dictid")
     private String dictid;
+
     /**
      * 字典名称
      */
     @DEField(name = "ibzdictname")
-    @TableField(value = "ibzdictname")
     @JSONField(name = "dictname")
     @JsonProperty("dictname")
     private String dictname;
+
     /**
      * 逻辑有效标志
      */
     @DEField(preType = DEPredefinedFieldType.LOGICVALID, logicval = "1" , logicdelval="0")
-    @TableLogic(value= "1",delval="0")
-    @TableField(value = "enable")
     @JSONField(name = "enable")
     @JsonProperty("enable")
     private Integer enable;
+
     /**
      * 建立时间
      */
     @DEField(preType = DEPredefinedFieldType.CREATEDATE)
-    @TableField(value = "createdate" , fill = FieldFill.INSERT)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
     private Timestamp createdate;
+
     /**
      * 更新时间
      */
     @DEField(preType = DEPredefinedFieldType.UPDATEDATE)
-    @TableField(value = "updatedate")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
+
     /**
      * 建立人
      */
     @DEField(preType = DEPredefinedFieldType.CREATEMAN)
-    @TableField(value = "createman" , fill = FieldFill.INSERT)
     @JSONField(name = "createman")
     @JsonProperty("createman")
     private String createman;
+
     /**
      * 更新人
      */
     @DEField(preType = DEPredefinedFieldType.UPDATEMAN)
-    @TableField(value = "updateman")
     @JSONField(name = "updateman")
     @JsonProperty("updateman")
     private String updateman;
 
 
+
     /**
      * 字典项目
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "items")
+    @JsonProperty("items")
     private List<cn.ibizlab.core.dict.domain.IBZDictItem> items;
 
 
+
     /**
      * 设置 [字典名称]
      */
@@ -109,6 +103,7 @@ public class IBZDict extends EntityMP implements Serializable {
         this.dictname = dictname ;
         this.modify("ibzdictname",dictname);
     }
+
 }
 
 
@@ -116,3 +111,4 @@ public class IBZDict extends EntityMP implements Serializable {
 
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDictItem.java

@@ -19,132 +19,127 @@ import java.io.Serializable;
 import lombok.Data;
 import org.springframework.data.annotation.Transient;
 
-
-import com.baomidou.mybatisplus.annotation.*;
-import cn.ibizlab.util.domain.EntityMP;
+import cn.ibizlab.util.domain.EntityClient;
 
 /**
- * 实体[字典项目]
+ * ServiceApi [字典项目] 对象
  */
 @Data
-@TableName(value = "IBZDICTITEM",resultMap = "IBZDictItemResultMap")
-public class IBZDictItem extends EntityMP implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class IBZDictItem extends EntityClient implements Serializable {
 
     /**
      * 字典项目标识
      */
     @DEField(name = "ibzdictitemid" , isKeyField=true)
-    @TableId(value= "ibzdictitemid",type=IdType.UUID)
     @JSONField(name = "itemid")
     @JsonProperty("itemid")
     private String itemid;
+
     /**
      * 栏目显示值
      */
     @DEField(name = "ibzdictitemname")
-    @TableField(value = "ibzdictitemname")
     @JSONField(name = "itemname")
     @JsonProperty("itemname")
     private String itemname;
+
     /**
      * 栏目值
      */
     @DEField(name = "dictitemval")
-    @TableField(value = "dictitemval")
     @JSONField(name = "itemval")
     @JsonProperty("itemval")
     private String itemval;
+
     /**
      * 字典标识
      */
-    @TableField(value = "dictid")
     @JSONField(name = "dictid")
     @JsonProperty("dictid")
     private String dictid;
+
     /**
      * 父栏目值
      */
-    @TableField(value = "pitemval")
     @JSONField(name = "pitemval")
     @JsonProperty("pitemval")
     private String pitemval;
+
     /**
      * 过滤项
      */
-    @TableField(value = "itemfilter")
     @JSONField(name = "itemfilter")
     @JsonProperty("itemfilter")
     private String itemfilter;
+
     /**
      * 栏目样式
      */
     @DEField(defaultValue = "itemcls" , defaultValueType = DEFieldDefaultValueType.PARAM)
-    @TableField(value = "itemcls")
     @JSONField(name = "itemcls")
     @JsonProperty("itemcls")
     private String itemcls;
+
     /**
      * 图标
      */
     @DEField(defaultValue = "no,png")
-    @TableField(value = "itemicon")
     @JSONField(name = "itemicon")
     @JsonProperty("itemicon")
     private String itemicon;
+
     /**
      * 排序
      */
-    @TableField(value = "showorder")
     @JSONField(name = "showorder")
     @JsonProperty("showorder")
     private Integer showorder;
+
     /**
      * 建立时间
      */
     @DEField(preType = DEPredefinedFieldType.CREATEDATE)
-    @TableField(value = "createdate" , fill = FieldFill.INSERT)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
     private Timestamp createdate;
+
     /**
      * 更新时间
      */
     @DEField(defaultValueType = DEFieldDefaultValueType.CURTIME , preType = DEPredefinedFieldType.UPDATEDATE)
-    @TableField(value = "updatedate")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
+
     /**
      * 更新人
      */
     @DEField(defaultValue = "SRFPERSONID" , defaultValueType = DEFieldDefaultValueType.SESSION , preType = DEPredefinedFieldType.UPDATEMAN)
-    @TableField(value = "updateman")
     @JSONField(name = "updateman")
     @JsonProperty("updateman")
     private String updateman;
+
     /**
      * 建立人
      */
     @DEField(preType = DEPredefinedFieldType.CREATEMAN)
-    @TableField(value = "createman" , fill = FieldFill.INSERT)
     @JSONField(name = "createman")
     @JsonProperty("createman")
     private String createman;
 
+
     /**
      * 字典
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "dict")
+    @JsonProperty("dict")
     private cn.ibizlab.core.dict.domain.IBZDict dict;
 
 
 
+
     /**
      * 设置 [栏目显示值]
      */
@@ -201,6 +196,7 @@ public class IBZDictItem extends EntityMP implements Serializable {
         this.showorder = showorder ;
         this.modify("showorder",showorder);
     }
+
 }
 
 
@@ -208,3 +204,4 @@ public class IBZDictItem extends EntityMP implements Serializable {
 
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/dict/filter/IBZDictItemSearchContext.java

@@ -17,50 +17,21 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 
-import cn.ibizlab.util.filter.QueryWrapperContext;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import cn.ibizlab.core.dict.domain.IBZDictItem;
+import cn.ibizlab.util.filter.SearchContextBase;
+
 /**
- * 关系型数据实体[IBZDictItem] 查询条件对象
+ * ServiceApi数据实体[IBZDictItem] 查询条件对象
  */
 @Slf4j
 @Data
-public class IBZDictItemSearchContext extends QueryWrapperContext<IBZDictItem> {
-
+public class IBZDictItemSearchContext extends SearchContextBase {
 	private String n_ibzdictitemname_like;//[栏目显示值]
-	public void setN_ibzdictitemname_like(String n_ibzdictitemname_like) {
-        this.n_ibzdictitemname_like = n_ibzdictitemname_like;
-        if(!ObjectUtils.isEmpty(this.n_ibzdictitemname_like)){
-            this.getSelectCond().like("ibzdictitemname", n_ibzdictitemname_like);
-        }
-    }
+
 	private String n_dictitemval_like;//[栏目值]
-	public void setN_dictitemval_like(String n_dictitemval_like) {
-        this.n_dictitemval_like = n_dictitemval_like;
-        if(!ObjectUtils.isEmpty(this.n_dictitemval_like)){
-            this.getSelectCond().like("dictitemval", n_dictitemval_like);
-        }
-    }
+
 	private String n_dictid_eq;//[字典标识]
-	public void setN_dictid_eq(String n_dictid_eq) {
-        this.n_dictid_eq = n_dictid_eq;
-        if(!ObjectUtils.isEmpty(this.n_dictid_eq)){
-            this.getSelectCond().eq("dictid", n_dictid_eq);
-        }
-    }
 
-    /**
-	 * 启用快速搜索
-	 */
-	public void setQuery(String query)
-	{
-		 this.query=query;
-		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("ibzdictitemname",query);
-		 }
-	}
 }
 
 
 
-

ibzou-core/src/main/java/cn/ibizlab/core/dict/filter/IBZDictSearchContext.java

@@ -17,43 +17,19 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 
-import cn.ibizlab.util.filter.QueryWrapperContext;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import cn.ibizlab.core.dict.domain.IBZDict;
+import cn.ibizlab.util.filter.SearchContextBase;
+
 /**
- * 关系型数据实体[IBZDict] 查询条件对象
+ * ServiceApi数据实体[IBZDict] 查询条件对象
  */
 @Slf4j
 @Data
-public class IBZDictSearchContext extends QueryWrapperContext<IBZDict> {
-
+public class IBZDictSearchContext extends SearchContextBase {
 	private String n_ibzdictid_like;//[字典标识]
-	public void setN_ibzdictid_like(String n_ibzdictid_like) {
-        this.n_ibzdictid_like = n_ibzdictid_like;
-        if(!ObjectUtils.isEmpty(this.n_ibzdictid_like)){
-            this.getSelectCond().like("ibzdictid", n_ibzdictid_like);
-        }
-    }
+
 	private String n_ibzdictname_like;//[字典名称]
-	public void setN_ibzdictname_like(String n_ibzdictname_like) {
-        this.n_ibzdictname_like = n_ibzdictname_like;
-        if(!ObjectUtils.isEmpty(this.n_ibzdictname_like)){
-            this.getSelectCond().like("ibzdictname", n_ibzdictname_like);
-        }
-    }
-
-    /**
-	 * 启用快速搜索
-	 */
-	public void setQuery(String query)
-	{
-		 this.query=query;
-		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("ibzdictname",query);
-		 }
-	}
-}
 
+}
 
 
 

ibzou-core/src/main/java/cn/ibizlab/core/dict/service/IIBZDictItemService.java

@@ -17,12 +17,10 @@ import cn.ibizlab.core.dict.domain.IBZDictItem;
 import cn.ibizlab.core.dict.filter.IBZDictItemSearchContext;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * 实体[IBZDictItem] 服务对象接口
  */
-public interface IIBZDictItemService extends IService<IBZDictItem>{
+public interface IIBZDictItemService{
 
     boolean update(IBZDictItem et) ;
     void updateBatch(List<IBZDictItem> list) ;
@@ -39,21 +37,8 @@ public interface IIBZDictItemService extends IService<IBZDictItem>{
     List<IBZDictItem> selectByDictid(String dictid) ;
     void removeByDictid(String dictid) ;
     void saveByDictid(String dictid,List<IBZDictItem> list) ;
-    /**
-     *自定义查询SQL
-     * @param sql  select * from table where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return select * from table where id = '1'
-     */
-    List<JSONObject> select(String sql, Map param);
-    /**
-     *自定义SQL
-     * @param sql  update table  set name ='test' where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return     update table  set name ='test' where id = '1'
-     */
-    boolean execute(String sql, Map param);
 
 }
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/dict/service/IIBZDictService.java

@@ -17,12 +17,10 @@ import cn.ibizlab.core.dict.domain.IBZDict;
 import cn.ibizlab.core.dict.filter.IBZDictSearchContext;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * 实体[IBZDict] 服务对象接口
  */
-public interface IIBZDictService extends IService<IBZDict>{
+public interface IIBZDictService{
 
     boolean create(IBZDict et) ;
     void createBatch(List<IBZDict> list) ;
@@ -36,21 +34,8 @@ public interface IIBZDictService extends IService<IBZDict>{
     IBZDict get(String key) ;
     boolean checkKey(IBZDict et) ;
     Page<IBZDict> searchDefault(IBZDictSearchContext context) ;
-    /**
-     *自定义查询SQL
-     * @param sql  select * from table where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return select * from table where id = '1'
-     */
-    List<JSONObject> select(String sql, Map param);
-    /**
-     *自定义SQL
-     * @param sql  update table  set name ='test' where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return     update table  set name ='test' where id = '1'
-     */
-    boolean execute(String sql, Map param);
 
 }
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/dict/service/impl/IBZDictItemServiceImpl.java

@@ -30,123 +30,110 @@ import cn.ibizlab.core.dict.service.IIBZDictItemService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.ibizlab.core.dict.mapper.IBZDictItemMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.util.StringUtils;
+import cn.ibizlab.core.dict.client.IBZDictItemFeignClient;
 
 /**
  * 实体[字典项目] 服务对象接口实现
  */
 @Slf4j
-@Service("IBZDictItemServiceImpl")
-public class IBZDictItemServiceImpl extends ServiceImpl<IBZDictItemMapper, IBZDictItem> implements IIBZDictItemService {
+@Service
+public class IBZDictItemServiceImpl implements IIBZDictItemService {
 
     @Autowired
-    @Lazy
-    private cn.ibizlab.core.dict.service.IIBZDictService ibzdictService;
+    IBZDictItemFeignClient iBZDictItemFeignClient;
 
-    private int batchSize = 500;
 
     @Override
-    @Transactional
     public boolean update(IBZDictItem et) {
-        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("ibzdictitemid",et.getItemid())))
+        IBZDictItem rt = iBZDictItemFeignClient.update(et.getItemid(),et);
+        if(rt==null)
             return false;
-        CachedBeanCopier.copy(get(et.getItemid()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
+
     }
 
-    @Override
-    public void updateBatch(List<IBZDictItem> list) {
-        updateBatchById(list,batchSize);
+    public void updateBatch(List<IBZDictItem> list){
+        iBZDictItemFeignClient.updateBatch(list) ;
     }
 
     @Override
     public boolean checkKey(IBZDictItem et) {
-        return (!ObjectUtils.isEmpty(et.getItemid()))&&(!Objects.isNull(this.getById(et.getItemid())));
+        return iBZDictItemFeignClient.checkKey(et);
     }
-
     @Override
     @Transactional
     public boolean save(IBZDictItem et) {
-        if(!saveOrUpdate(et))
+        if(et.getItemid()==null) et.setItemid((String)et.getDefaultKey(true));
+        if(!iBZDictItemFeignClient.save(et))
             return false;
         return true;
     }
 
-    @Override
-    @Transactional(
-            rollbackFor = {Exception.class}
-    )
-    public boolean saveOrUpdate(IBZDictItem et) {
-        if (null == et) {
-            return false;
-        } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
-        }
-    }
-
     @Override
     public void saveBatch(List<IBZDictItem> list) {
-        saveOrUpdateBatch(list,batchSize);
+        iBZDictItemFeignClient.saveBatch(list) ;
     }
 
     @Override
-    @Transactional
-    public boolean remove(String key) {
-        boolean result=removeById(key);
-        return result ;
+    public boolean remove(String itemid) {
+        boolean result=iBZDictItemFeignClient.remove(itemid) ;
+        return result;
     }
 
-    @Override
-    public void removeBatch(Collection<String> idList) {
-        removeByIds(idList);
+    public void removeBatch(Collection<String> idList){
+        iBZDictItemFeignClient.removeBatch(idList);
     }
 
     @Override
-    @Transactional
-    public IBZDictItem get(String key) {
-        IBZDictItem et = getById(key);
+    public IBZDictItem get(String itemid) {
+		IBZDictItem et=iBZDictItemFeignClient.get(itemid);
         if(et==null){
             et=new IBZDictItem();
-            et.setItemid(key);
+            et.setItemid(itemid);
         }
         else{
         }
-        return et;
+        return  et;
     }
 
     @Override
-    @Transactional
     public boolean create(IBZDictItem et) {
-        if(!this.retBool(this.baseMapper.insert(et)))
+        IBZDictItem rt = iBZDictItemFeignClient.create(et);
+        if(rt==null)
             return false;
-        CachedBeanCopier.copy(get(et.getItemid()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
     }
 
-    @Override
-    public void createBatch(List<IBZDictItem> list) {
-        saveBatch(list,batchSize);
+    public void createBatch(List<IBZDictItem> list){
+        iBZDictItemFeignClient.createBatch(list) ;
     }
 
     @Override
     public IBZDictItem getDraft(IBZDictItem et) {
+        et=iBZDictItemFeignClient.getDraft();
         return et;
     }
 
 
+
 	@Override
     public List<IBZDictItem> selectByDictid(String dictid) {
-        return baseMapper.selectByDictid(dictid);
+        IBZDictItemSearchContext context=new IBZDictItemSearchContext();
+        context.setSize(Integer.MAX_VALUE);
+        context.setN_dictid_eq(dictid);
+        return iBZDictItemFeignClient.searchDefault(context).getContent();
     }
 
     @Override
     public void removeByDictid(String dictid) {
-        this.remove(new QueryWrapper<IBZDictItem>().eq("dictid",dictid));
+        Set<String> delIds=new HashSet<String>();
+        for(IBZDictItem before:selectByDictid(dictid)){
+            delIds.add(before.getItemid());
+        }
+        if(delIds.size()>0)
+            this.removeBatch(delIds);
     }
 
 	@Override
@@ -179,41 +166,16 @@ public class IBZDictItemServiceImpl extends ServiceImpl<IBZDictItemMapper, IBZDi
 	}
 
 
+
     /**
      * 查询集合 DEFAULT
      */
     @Override
     public Page<IBZDictItem> searchDefault(IBZDictItemSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<IBZDictItem> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<IBZDictItem>(pages.getRecords(), context.getPageable(), pages.getTotal());
-    }
-
-
-
-
-    @Override
-    public List<JSONObject> select(String sql, Map param){
-        return this.baseMapper.selectBySQL(sql,param);
+        Page<IBZDictItem> iBZDictItems=iBZDictItemFeignClient.searchDefault(context);
+        return iBZDictItems;
     }
 
-    @Override
-    @Transactional
-    public boolean execute(String sql , Map param){
-        if (sql == null || sql.isEmpty()) {
-            return false;
-        }
-        if (sql.toLowerCase().trim().startsWith("insert")) {
-            return this.baseMapper.insertBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("update")) {
-            return this.baseMapper.updateBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("delete")) {
-            return this.baseMapper.deleteBySQL(sql,param);
-        }
-        log.warn("暂未支持的SQL语法");
-        return true;
-    }
 
 }
 

ibzou-core/src/main/java/cn/ibizlab/core/dict/service/impl/IBZDictServiceImpl.java

@@ -30,156 +30,106 @@ import cn.ibizlab.core.dict.service.IIBZDictService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.ibizlab.core.dict.mapper.IBZDictMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.util.StringUtils;
+import cn.ibizlab.core.dict.client.IBZDictFeignClient;
 
 /**
  * 实体[数据字典] 服务对象接口实现
  */
 @Slf4j
-@Service("IBZDictServiceImpl")
-public class IBZDictServiceImpl extends ServiceImpl<IBZDictMapper, IBZDict> implements IIBZDictService {
+@Service
+public class IBZDictServiceImpl implements IIBZDictService {
 
     @Autowired
-    @Lazy
-    private cn.ibizlab.core.dict.service.IIBZDictItemService ibzdictitemService;
+    IBZDictFeignClient iBZDictFeignClient;
 
-    private int batchSize = 500;
 
     @Override
-    @Transactional
     public boolean create(IBZDict et) {
-        if(!this.retBool(this.baseMapper.insert(et)))
+        IBZDict rt = iBZDictFeignClient.create(et);
+        if(rt==null)
             return false;
-        ibzdictitemService.saveByDictid(et.getDictid(),et.getItems());
-        CachedBeanCopier.copy(get(et.getDictid()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
     }
 
-    @Override
-    public void createBatch(List<IBZDict> list) {
-        saveBatch(list,batchSize);
+    public void createBatch(List<IBZDict> list){
+        iBZDictFeignClient.createBatch(list) ;
     }
 
     @Override
-    @Transactional
-    public boolean remove(String key) {
-        ibzdictitemService.removeByDictid(key) ;
-        boolean result=removeById(key);
-        return result ;
+    public boolean remove(String dictid) {
+        boolean result=iBZDictFeignClient.remove(dictid) ;
+        return result;
     }
 
-    @Override
-    public void removeBatch(Collection<String> idList) {
-        removeByIds(idList);
+    public void removeBatch(Collection<String> idList){
+        iBZDictFeignClient.removeBatch(idList);
     }
 
     @Override
-    @Transactional
     public boolean update(IBZDict et) {
-        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("ibzdictid",et.getDictid())))
+        IBZDict rt = iBZDictFeignClient.update(et.getDictid(),et);
+        if(rt==null)
             return false;
-        ibzdictitemService.saveByDictid(et.getDictid(),et.getItems());
-        CachedBeanCopier.copy(get(et.getDictid()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
+
     }
 
-    @Override
-    public void updateBatch(List<IBZDict> list) {
-        updateBatchById(list,batchSize);
+    public void updateBatch(List<IBZDict> list){
+        iBZDictFeignClient.updateBatch(list) ;
     }
 
     @Override
     public IBZDict getDraft(IBZDict et) {
+        et=iBZDictFeignClient.getDraft();
         return et;
     }
 
     @Override
     @Transactional
     public boolean save(IBZDict et) {
-        if(!saveOrUpdate(et))
+        if(et.getDictid()==null) et.setDictid((String)et.getDefaultKey(true));
+        if(!iBZDictFeignClient.save(et))
             return false;
         return true;
     }
 
-    @Override
-    @Transactional(
-            rollbackFor = {Exception.class}
-    )
-    public boolean saveOrUpdate(IBZDict et) {
-        if (null == et) {
-            return false;
-        } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
-        }
-    }
-
     @Override
     public void saveBatch(List<IBZDict> list) {
-        saveOrUpdateBatch(list,batchSize);
+        iBZDictFeignClient.saveBatch(list) ;
     }
 
     @Override
-    @Transactional
-    public IBZDict get(String key) {
-        IBZDict et = getById(key);
+    public IBZDict get(String dictid) {
+		IBZDict et=iBZDictFeignClient.get(dictid);
         if(et==null){
             et=new IBZDict();
-            et.setDictid(key);
+            et.setDictid(dictid);
         }
         else{
-            et.setItems(ibzdictitemService.selectByDictid(key));
         }
-        return et;
+        return  et;
     }
 
     @Override
     public boolean checkKey(IBZDict et) {
-        return (!ObjectUtils.isEmpty(et.getDictid()))&&(!Objects.isNull(this.getById(et.getDictid())));
+        return iBZDictFeignClient.checkKey(et);
     }
 
 
 
+
     /**
      * 查询集合 DEFAULT
      */
     @Override
     public Page<IBZDict> searchDefault(IBZDictSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<IBZDict> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<IBZDict>(pages.getRecords(), context.getPageable(), pages.getTotal());
+        Page<IBZDict> iBZDicts=iBZDictFeignClient.searchDefault(context);
+        return iBZDicts;
     }
 
 
-
-
-    @Override
-    public List<JSONObject> select(String sql, Map param){
-        return this.baseMapper.selectBySQL(sql,param);
-    }
-
-    @Override
-    @Transactional
-    public boolean execute(String sql , Map param){
-        if (sql == null || sql.isEmpty()) {
-            return false;
-        }
-        if (sql.toLowerCase().trim().startsWith("insert")) {
-            return this.baseMapper.insertBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("update")) {
-            return this.baseMapper.updateBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("delete")) {
-            return this.baseMapper.deleteBySQL(sql,param);
-        }
-        log.warn("暂未支持的SQL语法");
-        return true;
-    }
-
 }
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/client/IBZDepartmentFeignClient.java

@@ -19,57 +19,57 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzou-api", contextId = "IBZDepartment", fallback = IBZDepartmentFallback.class)
 public interface IBZDepartmentFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzdepartments/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/select")
     Page<IBZDepartment> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzdepartments/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/save")
     Boolean save(@RequestBody IBZDepartment ibzdepartment);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzdepartments/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/save")
     Boolean saveBatch(@RequestBody List<IBZDepartment> ibzdepartments);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzdepartments/{deptid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{deptid}")
     IBZDepartment get(@PathVariable("deptid") String deptid);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/ou/ibzdepartments/{deptid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{deptid}")
     Boolean remove(@PathVariable("deptid") String deptid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/ou/ibzdepartments/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzdepartments/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/checkkey")
     Boolean checkKey(@RequestBody IBZDepartment ibzdepartment);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/ou/ibzdepartments/{deptid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{deptid}")
     IBZDepartment update(@PathVariable("deptid") String deptid,@RequestBody IBZDepartment ibzdepartment);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/ou/ibzdepartments/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/batch")
     Boolean updateBatch(@RequestBody List<IBZDepartment> ibzdepartments);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzdepartments")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments")
     IBZDepartment create(@RequestBody IBZDepartment ibzdepartment);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzdepartments/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/batch")
     Boolean createBatch(@RequestBody List<IBZDepartment> ibzdepartments);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzdepartments/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/getdraft")
     IBZDepartment getDraft();
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzdepartments/searchcurdept")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/searchcurdept")
     Page<IBZDepartment> searchCurDept(IBZDepartmentSearchContext context);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzdepartments/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/searchdefault")
     Page<IBZDepartment> searchDefault(IBZDepartmentSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/client/IBZEmployeeFeignClient.java

@@ -19,56 +19,56 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzou-api", contextId = "IBZEmployee", fallback = IBZEmployeeFallback.class)
 public interface IBZEmployeeFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzemployees/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/select")
     Page<IBZEmployee> select();
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/ou/ibzemployees/{userid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{userid}")
     Boolean remove(@PathVariable("userid") String userid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/ou/ibzemployees/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/ou/ibzemployees/{userid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{userid}")
     IBZEmployee update(@PathVariable("userid") String userid,@RequestBody IBZEmployee ibzemployee);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/ou/ibzemployees/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/batch")
     Boolean updateBatch(@RequestBody List<IBZEmployee> ibzemployees);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzemployees/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/checkkey")
     Boolean checkKey(@RequestBody IBZEmployee ibzemployee);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzemployees/{userid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{userid}")
     IBZEmployee get(@PathVariable("userid") String userid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzemployees/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/save")
     Boolean save(@RequestBody IBZEmployee ibzemployee);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzemployees/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/save")
     Boolean saveBatch(@RequestBody List<IBZEmployee> ibzemployees);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzemployees/{userid}/initpwd")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{userid}/initpwd")
     IBZEmployee initPwd(@PathVariable("userid") String userid,@RequestBody IBZEmployee ibzemployee);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzemployees/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/getdraft")
     IBZEmployee getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzemployees")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees")
     IBZEmployee create(@RequestBody IBZEmployee ibzemployee);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzemployees/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/batch")
     Boolean createBatch(@RequestBody List<IBZEmployee> ibzemployees);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzemployees/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/searchdefault")
     Page<IBZEmployee> searchDefault(IBZEmployeeSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/client/IBZOrganizationFeignClient.java

@@ -19,62 +19,62 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzou-api", contextId = "IBZOrganization", fallback = IBZOrganizationFallback.class)
 public interface IBZOrganizationFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzorganizations/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/select")
     Page<IBZOrganization> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzorganizations/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/save")
     Boolean save(@RequestBody IBZOrganization ibzorganization);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzorganizations/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/save")
     Boolean saveBatch(@RequestBody List<IBZOrganization> ibzorganizations);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzorganizations/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/checkkey")
     Boolean checkKey(@RequestBody IBZOrganization ibzorganization);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzorganizations/{orgid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{orgid}")
     IBZOrganization get(@PathVariable("orgid") String orgid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzorganizations")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations")
     IBZOrganization create(@RequestBody IBZOrganization ibzorganization);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/ou/ibzorganizations/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/batch")
     Boolean createBatch(@RequestBody List<IBZOrganization> ibzorganizations);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/ou/ibzorganizations/{orgid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{orgid}")
     Boolean remove(@PathVariable("orgid") String orgid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/ou/ibzorganizations/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzorganizations/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/getdraft")
     IBZOrganization getDraft();
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/ou/ibzorganizations/{orgid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{orgid}")
     IBZOrganization update(@PathVariable("orgid") String orgid,@RequestBody IBZOrganization ibzorganization);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/ou/ibzorganizations/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/batch")
     Boolean updateBatch(@RequestBody List<IBZOrganization> ibzorganizations);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzorganizations/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/searchdefault")
     Page<IBZOrganization> searchDefault(IBZOrganizationSearchContext context);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzorganizations/searchselectporg")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/searchselectporg")
     Page<IBZOrganization> searchSelectPOrg(IBZOrganizationSearchContext context);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/ou/ibzorganizations/searchselectsorg")
+    @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/searchselectsorg")
     Page<IBZOrganization> searchSelectSOrg(IBZOrganizationSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PERMISSIONFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-PERMISSION", fallback = SYS_PERMISSIONFallback.class)
 public interface SYS_PERMISSIONFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_permissions/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/select")
     Page<SYS_PERMISSION> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_permissions/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/save")
     Boolean save(@RequestBody SYS_PERMISSION sys_permission);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_permissions/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/save")
     Boolean saveBatch(@RequestBody List<SYS_PERMISSION> sys_permissions);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_permissions/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/getdraft")
     SYS_PERMISSION getDraft();
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_permissions/{permissionid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/{permissionid}")
     Boolean remove(@PathVariable("permissionid") String permissionid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_permissions/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_permissions/{permissionid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/{permissionid}")
     SYS_PERMISSION update(@PathVariable("permissionid") String permissionid,@RequestBody SYS_PERMISSION sys_permission);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_permissions/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/batch")
     Boolean updateBatch(@RequestBody List<SYS_PERMISSION> sys_permissions);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_permissions")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_permissions")
     SYS_PERMISSION create(@RequestBody SYS_PERMISSION sys_permission);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_permissions/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/batch")
     Boolean createBatch(@RequestBody List<SYS_PERMISSION> sys_permissions);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_permissions/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/checkkey")
     Boolean checkKey(@RequestBody SYS_PERMISSION sys_permission);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_permissions/{permissionid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{permissionid}")
     SYS_PERMISSION get(@PathVariable("permissionid") String permissionid);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_permissions/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/searchdefault")
     Page<SYS_PERMISSION> searchDefault(SYS_PERMISSIONSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSAPPMENUITEMFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-PSAPPMENUITEM", fallback = SYS_PSAPPMENUITEMFallback.class)
 public interface SYS_PSAPPMENUITEMFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psappmenuitems/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/select")
     Page<SYS_PSAPPMENUITEM> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psappmenuitems/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/save")
     Boolean save(@RequestBody SYS_PSAPPMENUITEM sys_psappmenuitem);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psappmenuitems/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/save")
     Boolean saveBatch(@RequestBody List<SYS_PSAPPMENUITEM> sys_psappmenuitems);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psappmenuitems")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems")
     SYS_PSAPPMENUITEM create(@RequestBody SYS_PSAPPMENUITEM sys_psappmenuitem);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psappmenuitems/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/batch")
     Boolean createBatch(@RequestBody List<SYS_PSAPPMENUITEM> sys_psappmenuitems);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_psappmenuitems/{appmenuitemid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_psappmenuitems/{appmenuitemid}")
     SYS_PSAPPMENUITEM update(@PathVariable("appmenuitemid") String appmenuitemid,@RequestBody SYS_PSAPPMENUITEM sys_psappmenuitem);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_psappmenuitems/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_psappmenuitems/batch")
     Boolean updateBatch(@RequestBody List<SYS_PSAPPMENUITEM> sys_psappmenuitems);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psappmenuitems/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/getdraft")
     SYS_PSAPPMENUITEM getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psappmenuitems/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/checkkey")
     Boolean checkKey(@RequestBody SYS_PSAPPMENUITEM sys_psappmenuitem);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_psappmenuitems/{appmenuitemid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_psappmenuitems/{appmenuitemid}")
     Boolean remove(@PathVariable("appmenuitemid") String appmenuitemid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_psappmenuitems/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_psappmenuitems/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psappmenuitems/{appmenuitemid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/{appmenuitemid}")
     SYS_PSAPPMENUITEM get(@PathVariable("appmenuitemid") String appmenuitemid);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psappmenuitems/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/searchdefault")
     Page<SYS_PSAPPMENUITEM> searchDefault(SYS_PSAPPMENUITEMSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSDEOPPRIVFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-PSDEOPPRIV", fallback = SYS_PSDEOPPRIVFallback.class)
 public interface SYS_PSDEOPPRIVFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psdeopprivs/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/select")
     Page<SYS_PSDEOPPRIV> select();
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_psdeopprivs/{psdeopprivid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_psdeopprivs/{psdeopprivid}")
     Boolean remove(@PathVariable("psdeopprivid") String psdeopprivid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_psdeopprivs/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_psdeopprivs/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psdeopprivs/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/checkkey")
     Boolean checkKey(@RequestBody SYS_PSDEOPPRIV sys_psdeoppriv);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psdeopprivs/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/getdraft")
     SYS_PSDEOPPRIV getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psdeopprivs")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs")
     SYS_PSDEOPPRIV create(@RequestBody SYS_PSDEOPPRIV sys_psdeoppriv);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psdeopprivs/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/batch")
     Boolean createBatch(@RequestBody List<SYS_PSDEOPPRIV> sys_psdeopprivs);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psdeopprivs/{psdeopprivid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/{psdeopprivid}")
     SYS_PSDEOPPRIV get(@PathVariable("psdeopprivid") String psdeopprivid);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_psdeopprivs/{psdeopprivid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_psdeopprivs/{psdeopprivid}")
     SYS_PSDEOPPRIV update(@PathVariable("psdeopprivid") String psdeopprivid,@RequestBody SYS_PSDEOPPRIV sys_psdeoppriv);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_psdeopprivs/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_psdeopprivs/batch")
     Boolean updateBatch(@RequestBody List<SYS_PSDEOPPRIV> sys_psdeopprivs);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psdeopprivs/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/save")
     Boolean save(@RequestBody SYS_PSDEOPPRIV sys_psdeoppriv);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_psdeopprivs/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/save")
     Boolean saveBatch(@RequestBody List<SYS_PSDEOPPRIV> sys_psdeopprivs);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_psdeopprivs/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/searchdefault")
     Page<SYS_PSDEOPPRIV> searchDefault(SYS_PSDEOPPRIVSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSSYSTEMFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-PSSYSTEM", fallback = SYS_PSSYSTEMFallback.class)
 public interface SYS_PSSYSTEMFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssystems/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssystems/select")
     Page<SYS_PSSYSTEM> select();
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssystems/{pssystemid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssystems/{pssystemid}")
     SYS_PSSYSTEM get(@PathVariable("pssystemid") String pssystemid);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_pssystems/{pssystemid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_pssystems/{pssystemid}")
     SYS_PSSYSTEM update(@PathVariable("pssystemid") String pssystemid,@RequestBody SYS_PSSYSTEM sys_pssystem);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_pssystems/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_pssystems/batch")
     Boolean updateBatch(@RequestBody List<SYS_PSSYSTEM> sys_pssystems);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssystems/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssystems/checkkey")
     Boolean checkKey(@RequestBody SYS_PSSYSTEM sys_pssystem);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_pssystems/{pssystemid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_pssystems/{pssystemid}")
     Boolean remove(@PathVariable("pssystemid") String pssystemid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_pssystems/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_pssystems/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssystems")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssystems")
     SYS_PSSYSTEM create(@RequestBody SYS_PSSYSTEM sys_pssystem);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssystems/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssystems/batch")
     Boolean createBatch(@RequestBody List<SYS_PSSYSTEM> sys_pssystems);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssystems/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssystems/getdraft")
     SYS_PSSYSTEM getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssystems/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssystems/save")
     Boolean save(@RequestBody SYS_PSSYSTEM sys_pssystem);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssystems/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssystems/save")
     Boolean saveBatch(@RequestBody List<SYS_PSSYSTEM> sys_pssystems);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssystems/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssystems/searchdefault")
     Page<SYS_PSSYSTEM> searchDefault(SYS_PSSYSTEMSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSSYSUNIRESFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-PSSYSUNIRES", fallback = SYS_PSSYSUNIRESFallback.class)
 public interface SYS_PSSYSUNIRESFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssysunires/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssysunires/select")
     Page<SYS_PSSYSUNIRES> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssysunires/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssysunires/checkkey")
     Boolean checkKey(@RequestBody SYS_PSSYSUNIRES sys_pssysunires);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssysunires/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssysunires/getdraft")
     SYS_PSSYSUNIRES getDraft();
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_pssysunires/{uniresid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_pssysunires/{uniresid}")
     SYS_PSSYSUNIRES update(@PathVariable("uniresid") String uniresid,@RequestBody SYS_PSSYSUNIRES sys_pssysunires);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_pssysunires/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_pssysunires/batch")
     Boolean updateBatch(@RequestBody List<SYS_PSSYSUNIRES> sys_pssysunires);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssysunires/{uniresid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssysunires/{uniresid}")
     SYS_PSSYSUNIRES get(@PathVariable("uniresid") String uniresid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssysunires/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssysunires/save")
     Boolean save(@RequestBody SYS_PSSYSUNIRES sys_pssysunires);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssysunires/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssysunires/save")
     Boolean saveBatch(@RequestBody List<SYS_PSSYSUNIRES> sys_pssysunires);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssysunires")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssysunires")
     SYS_PSSYSUNIRES create(@RequestBody SYS_PSSYSUNIRES sys_pssysunires);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_pssysunires/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_pssysunires/batch")
     Boolean createBatch(@RequestBody List<SYS_PSSYSUNIRES> sys_pssysunires);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_pssysunires/{uniresid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_pssysunires/{uniresid}")
     Boolean remove(@PathVariable("uniresid") String uniresid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_pssysunires/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_pssysunires/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_pssysunires/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_pssysunires/searchdefault")
     Page<SYS_PSSYSUNIRES> searchDefault(SYS_PSSYSUNIRESSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_ROLEFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-ROLE", fallback = SYS_ROLEFallback.class)
 public interface SYS_ROLEFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_roles/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_roles/select")
     Page<SYS_ROLE> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_roles/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_roles/save")
     Boolean save(@RequestBody SYS_ROLE sys_role);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_roles/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_roles/save")
     Boolean saveBatch(@RequestBody List<SYS_ROLE> sys_roles);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_roles/{roleid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{roleid}")
     SYS_ROLE update(@PathVariable("roleid") String roleid,@RequestBody SYS_ROLE sys_role);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_roles/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/batch")
     Boolean updateBatch(@RequestBody List<SYS_ROLE> sys_roles);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_roles")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_roles")
     SYS_ROLE create(@RequestBody SYS_ROLE sys_role);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_roles/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_roles/batch")
     Boolean createBatch(@RequestBody List<SYS_ROLE> sys_roles);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_roles/{roleid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{roleid}")
     SYS_ROLE get(@PathVariable("roleid") String roleid);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_roles/{roleid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{roleid}")
     Boolean remove(@PathVariable("roleid") String roleid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_roles/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_roles/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_roles/getdraft")
     SYS_ROLE getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_roles/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_roles/checkkey")
     Boolean checkKey(@RequestBody SYS_ROLE sys_role);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_roles/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_roles/searchdefault")
     Page<SYS_ROLE> searchDefault(SYS_ROLESearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_ROLE_PERMISSIONFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-ROLE-PERMISSION", fallback = SYS_ROLE_PERMISSIONFallback.class)
 public interface SYS_ROLE_PERMISSIONFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_role_permissions/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/select")
     Page<SYS_ROLE_PERMISSION> select();
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_role_permissions/{rolepermissionid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/{rolepermissionid}")
     SYS_ROLE_PERMISSION get(@PathVariable("rolepermissionid") String rolepermissionid);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_role_permissions/{rolepermissionid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_role_permissions/{rolepermissionid}")
     Boolean remove(@PathVariable("rolepermissionid") String rolepermissionid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_role_permissions/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_role_permissions/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_role_permissions/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/getdraft")
     SYS_ROLE_PERMISSION getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_role_permissions")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions")
     SYS_ROLE_PERMISSION create(@RequestBody SYS_ROLE_PERMISSION sys_role_permission);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_role_permissions/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/batch")
     Boolean createBatch(@RequestBody List<SYS_ROLE_PERMISSION> sys_role_permissions);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_role_permissions/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/checkkey")
     Boolean checkKey(@RequestBody SYS_ROLE_PERMISSION sys_role_permission);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_role_permissions/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/save")
     Boolean save(@RequestBody SYS_ROLE_PERMISSION sys_role_permission);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_role_permissions/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/save")
     Boolean saveBatch(@RequestBody List<SYS_ROLE_PERMISSION> sys_role_permissions);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_role_permissions/{rolepermissionid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_role_permissions/{rolepermissionid}")
     SYS_ROLE_PERMISSION update(@PathVariable("rolepermissionid") String rolepermissionid,@RequestBody SYS_ROLE_PERMISSION sys_role_permission);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_role_permissions/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_role_permissions/batch")
     Boolean updateBatch(@RequestBody List<SYS_ROLE_PERMISSION> sys_role_permissions);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_role_permissions/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/searchdefault")
     Page<SYS_ROLE_PERMISSION> searchDefault(SYS_ROLE_PERMISSIONSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_USERFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-USER", fallback = SYS_USERFallback.class)
 public interface SYS_USERFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_users/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_users/select")
     Page<SYS_USER> select();
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_users/{userid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/{userid}")
     Boolean remove(@PathVariable("userid") String userid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_users/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_users/{userid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_users/{userid}")
     SYS_USER update(@PathVariable("userid") String userid,@RequestBody SYS_USER sys_user);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_users/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_users/batch")
     Boolean updateBatch(@RequestBody List<SYS_USER> sys_users);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_users/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_users/checkkey")
     Boolean checkKey(@RequestBody SYS_USER sys_user);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_users/{userid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_users/{userid}")
     SYS_USER get(@PathVariable("userid") String userid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_users/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_users/save")
     Boolean save(@RequestBody SYS_USER sys_user);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_users/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_users/save")
     Boolean saveBatch(@RequestBody List<SYS_USER> sys_users);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_users/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_users/getdraft")
     SYS_USER getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_users")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_users")
     SYS_USER create(@RequestBody SYS_USER sys_user);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_users/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_users/batch")
     Boolean createBatch(@RequestBody List<SYS_USER> sys_users);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_users/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_users/searchdefault")
     Page<SYS_USER> searchDefault(SYS_USERSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_USER_ROLEFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzuaa-api", contextId = "SYS-USER-ROLE", fallback = SYS_USER_ROLEFallback.class)
 public interface SYS_USER_ROLEFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_user_roles/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/select")
     Page<SYS_USER_ROLE> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_user_roles/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/checkkey")
     Boolean checkKey(@RequestBody SYS_USER_ROLE sys_user_role);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_user_roles/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/getdraft")
     SYS_USER_ROLE getDraft();
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_user_roles/{userroleid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/{userroleid}")
     SYS_USER_ROLE update(@PathVariable("userroleid") String userroleid,@RequestBody SYS_USER_ROLE sys_user_role);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/uaa/sys_user_roles/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/batch")
     Boolean updateBatch(@RequestBody List<SYS_USER_ROLE> sys_user_roles);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_user_roles/{userroleid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_user_roles/{userroleid}")
     Boolean remove(@PathVariable("userroleid") String userroleid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/uaa/sys_user_roles/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/sys_user_roles/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_user_roles")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles")
     SYS_USER_ROLE create(@RequestBody SYS_USER_ROLE sys_user_role);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_user_roles/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/batch")
     Boolean createBatch(@RequestBody List<SYS_USER_ROLE> sys_user_roles);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_user_roles/{userroleid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/{userroleid}")
     SYS_USER_ROLE get(@PathVariable("userroleid") String userroleid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_user_roles/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/save")
     Boolean save(@RequestBody SYS_USER_ROLE sys_user_role);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/uaa/sys_user_roles/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/save")
     Boolean saveBatch(@RequestBody List<SYS_USER_ROLE> sys_user_roles);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/uaa/sys_user_roles/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/searchdefault")
     Page<SYS_USER_ROLE> searchDefault(SYS_USER_ROLESearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFGroupFallback.java

+package cn.ibizlab.core.workflow.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.workflow.domain.WFGroup;
+import cn.ibizlab.core.workflow.filter.WFGroupSearchContext;
+import org.springframework.stereotype.Component;
+
+/**
+ * 实体[WFGroup] 服务对象接口
+ */
+@Component
+public class WFGroupFallback implements WFGroupFeignClient{
+
+    public Page<WFGroup> select(){
+            return null;
+     }
+
+    public Boolean remove(String id){
+            return false;
+     }
+    public Boolean removeBatch(Collection<String> idList){
+            return false;
+     }
+
+    public Boolean save(WFGroup wfgroup){
+            return false;
+     }
+    public Boolean saveBatch(List<WFGroup> wfgroups){
+            return false;
+     }
+
+    public WFGroup get(String id){
+            return null;
+     }
+
+
+    public WFGroup create(WFGroup wfgroup){
+            return null;
+     }
+    public Boolean createBatch(List<WFGroup> wfgroups){
+            return false;
+     }
+
+    public WFGroup getDraft(){
+            return null;
+    }
+
+
+
+    public Boolean checkKey(WFGroup wfgroup){
+            return false;
+     }
+
+
+    public WFGroup update(String id, WFGroup wfgroup){
+            return null;
+     }
+    public Boolean updateBatch(List<WFGroup> wfgroups){
+            return false;
+     }
+
+
+    public Page<WFGroup> searchDefault(WFGroupSearchContext context){
+            return null;
+     }
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFGroupFeignClient.java

+package cn.ibizlab.core.workflow.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.workflow.domain.WFGroup;
+import cn.ibizlab.core.workflow.filter.WFGroupSearchContext;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * 实体[WFGroup] 服务对象接口
+ */
+@FeignClient(value = "ibzwf-api", contextId = "WFGroup", fallback = WFGroupFallback.class)
+public interface WFGroupFeignClient {
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/select")
+    Page<WFGroup> select();
+
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{id}")
+    Boolean remove(@PathVariable("id") String id);
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/batch}")
+    Boolean removeBatch(@RequestBody Collection<String> idList);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/save")
+    Boolean save(@RequestBody WFGroup wfgroup);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/save")
+    Boolean saveBatch(@RequestBody List<WFGroup> wfgroups);
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{id}")
+    WFGroup get(@PathVariable("id") String id);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfgroups")
+    WFGroup create(@RequestBody WFGroup wfgroup);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/batch")
+    Boolean createBatch(@RequestBody List<WFGroup> wfgroups);
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/getdraft")
+    WFGroup getDraft();
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/checkkey")
+    Boolean checkKey(@RequestBody WFGroup wfgroup);
+
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{id}")
+    WFGroup update(@PathVariable("id") String id,@RequestBody WFGroup wfgroup);
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/batch")
+    Boolean updateBatch(@RequestBody List<WFGroup> wfgroups);
+
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/searchdefault")
+    Page<WFGroup> searchDefault(WFGroupSearchContext context);
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFMemberFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFMember", fallback = WFMemberFallback.class)
 public interface WFMemberFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfmembers/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfmembers/select")
     Page<WFMember> select();
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfmembers/{memberid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/{memberid}")
     Boolean remove(@PathVariable("memberid") String memberid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfmembers/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfmembers/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfmembers/getdraft")
     WFMember getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfmembers/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/save")
     Boolean save(@RequestBody WFMember wfmember);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfmembers/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/save")
     Boolean saveBatch(@RequestBody List<WFMember> wfmembers);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfmembers/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/checkkey")
     Boolean checkKey(@RequestBody WFMember wfmember);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfmembers/{memberid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/{memberid}")
     WFMember update(@PathVariable("memberid") String memberid,@RequestBody WFMember wfmember);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfmembers/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/batch")
     Boolean updateBatch(@RequestBody List<WFMember> wfmembers);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfmembers")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfmembers")
     WFMember create(@RequestBody WFMember wfmember);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfmembers/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/batch")
     Boolean createBatch(@RequestBody List<WFMember> wfmembers);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfmembers/{memberid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfmembers/{memberid}")
     WFMember get(@PathVariable("memberid") String memberid);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfmembers/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfmembers/searchdefault")
     Page<WFMember> searchDefault(WFMemberSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFProcessDefinitionFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFProcessDefinition", fallback = WFProcessDefinitionFallback.class)
 public interface WFProcessDefinitionFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessdefinitions/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/select")
     Page<WFProcessDefinition> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessdefinitions/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/checkkey")
     Boolean checkKey(@RequestBody WFProcessDefinition wfprocessdefinition);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfprocessdefinitions/{definitionkey}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/{definitionkey}")
     Boolean remove(@PathVariable("definitionkey") String definitionkey);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfprocessdefinitions/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessdefinitions/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/save")
     Boolean save(@RequestBody WFProcessDefinition wfprocessdefinition);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessdefinitions/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/save")
     Boolean saveBatch(@RequestBody List<WFProcessDefinition> wfprocessdefinitions);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessdefinitions")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions")
     WFProcessDefinition create(@RequestBody WFProcessDefinition wfprocessdefinition);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessdefinitions/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/batch")
     Boolean createBatch(@RequestBody List<WFProcessDefinition> wfprocessdefinitions);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessdefinitions/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/getdraft")
     WFProcessDefinition getDraft();
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfprocessdefinitions/{definitionkey}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/{definitionkey}")
     WFProcessDefinition update(@PathVariable("definitionkey") String definitionkey,@RequestBody WFProcessDefinition wfprocessdefinition);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfprocessdefinitions/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/batch")
     Boolean updateBatch(@RequestBody List<WFProcessDefinition> wfprocessdefinitions);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessdefinitions/{definitionkey}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/{definitionkey}")
     WFProcessDefinition get(@PathVariable("definitionkey") String definitionkey);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessdefinitions/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/searchdefault")
     Page<WFProcessDefinition> searchDefault(WFProcessDefinitionSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFProcessInstanceFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFProcessInstance", fallback = WFProcessInstanceFallback.class)
 public interface WFProcessInstanceFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessinstances/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessinstances/select")
     Page<WFProcessInstance> select();
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessinstances/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessinstances/getdraft")
     WFProcessInstance getDraft();
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessinstances/{id}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessinstances/{id}")
     WFProcessInstance get(@PathVariable("id") String id);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessinstances/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessinstances/checkkey")
     Boolean checkKey(@RequestBody WFProcessInstance wfprocessinstance);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfprocessinstances/{id}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessinstances/{id}")
     WFProcessInstance update(@PathVariable("id") String id,@RequestBody WFProcessInstance wfprocessinstance);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfprocessinstances/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessinstances/batch")
     Boolean updateBatch(@RequestBody List<WFProcessInstance> wfprocessinstances);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessinstances/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessinstances/save")
     Boolean save(@RequestBody WFProcessInstance wfprocessinstance);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessinstances/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessinstances/save")
     Boolean saveBatch(@RequestBody List<WFProcessInstance> wfprocessinstances);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessinstances")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessinstances")
     WFProcessInstance create(@RequestBody WFProcessInstance wfprocessinstance);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessinstances/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessinstances/batch")
     Boolean createBatch(@RequestBody List<WFProcessInstance> wfprocessinstances);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfprocessinstances/{id}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessinstances/{id}")
     Boolean remove(@PathVariable("id") String id);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfprocessinstances/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessinstances/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessinstances/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessinstances/searchdefault")
     Page<WFProcessInstance> searchDefault(WFProcessInstanceSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFProcessNodeFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFProcessNode", fallback = WFProcessNodeFallback.class)
 public interface WFProcessNodeFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessnodes/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessnodes/select")
     Page<WFProcessNode> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessnodes")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessnodes")
     WFProcessNode create(@RequestBody WFProcessNode wfprocessnode);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessnodes/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessnodes/batch")
     Boolean createBatch(@RequestBody List<WFProcessNode> wfprocessnodes);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessnodes/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessnodes/save")
     Boolean save(@RequestBody WFProcessNode wfprocessnode);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessnodes/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessnodes/save")
     Boolean saveBatch(@RequestBody List<WFProcessNode> wfprocessnodes);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfprocessnodes/{usertaskid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessnodes/{usertaskid}")
     Boolean remove(@PathVariable("usertaskid") String usertaskid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfprocessnodes/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessnodes/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfprocessnodes/{usertaskid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessnodes/{usertaskid}")
     WFProcessNode update(@PathVariable("usertaskid") String usertaskid,@RequestBody WFProcessNode wfprocessnode);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfprocessnodes/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessnodes/batch")
     Boolean updateBatch(@RequestBody List<WFProcessNode> wfprocessnodes);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessnodes/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessnodes/getdraft")
     WFProcessNode getDraft();
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessnodes/{usertaskid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessnodes/{usertaskid}")
     WFProcessNode get(@PathVariable("usertaskid") String usertaskid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfprocessnodes/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfprocessnodes/checkkey")
     Boolean checkKey(@RequestBody WFProcessNode wfprocessnode);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfprocessnodes/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfprocessnodes/searchdefault")
     Page<WFProcessNode> searchDefault(WFProcessNodeSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFREModelFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFREModel", fallback = WFREModelFallback.class)
 public interface WFREModelFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfremodels/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfremodels/select")
     Page<WFREModel> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfremodels")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfremodels")
     WFREModel create(@RequestBody WFREModel wfremodel);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfremodels/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/batch")
     Boolean createBatch(@RequestBody List<WFREModel> wfremodels);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfremodels/{id}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfremodels/{id}")
     WFREModel get(@PathVariable("id") String id);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfremodels/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/save")
     Boolean save(@RequestBody WFREModel wfremodel);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfremodels/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/save")
     Boolean saveBatch(@RequestBody List<WFREModel> wfremodels);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfremodels/{id}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/{id}")
     WFREModel update(@PathVariable("id") String id,@RequestBody WFREModel wfremodel);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfremodels/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/batch")
     Boolean updateBatch(@RequestBody List<WFREModel> wfremodels);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfremodels/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfremodels/getdraft")
     WFREModel getDraft();
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfremodels/{id}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/{id}")
     Boolean remove(@PathVariable("id") String id);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfremodels/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfremodels/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/checkkey")
     Boolean checkKey(@RequestBody WFREModel wfremodel);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfremodels/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfremodels/searchdefault")
     Page<WFREModel> searchDefault(WFREModelSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFSystemFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFSystem", fallback = WFSystemFallback.class)
 public interface WFSystemFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfsystems/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfsystems/select")
     Page<WFSystem> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfsystems/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/save")
     Boolean save(@RequestBody WFSystem wfsystem);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfsystems/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/save")
     Boolean saveBatch(@RequestBody List<WFSystem> wfsystems);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfsystems/{pssystemid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/{pssystemid}")
     Boolean remove(@PathVariable("pssystemid") String pssystemid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wfsystems/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfsystems/{pssystemid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfsystems/{pssystemid}")
     WFSystem get(@PathVariable("pssystemid") String pssystemid);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfsystems/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfsystems/getdraft")
     WFSystem getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfsystems")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfsystems")
     WFSystem create(@RequestBody WFSystem wfsystem);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfsystems/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/batch")
     Boolean createBatch(@RequestBody List<WFSystem> wfsystems);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wfsystems/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/checkkey")
     Boolean checkKey(@RequestBody WFSystem wfsystem);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfsystems/{pssystemid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/{pssystemid}")
     WFSystem update(@PathVariable("pssystemid") String pssystemid,@RequestBody WFSystem wfsystem);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wfsystems/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/batch")
     Boolean updateBatch(@RequestBody List<WFSystem> wfsystems);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wfsystems/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wfsystems/searchdefault")
     Page<WFSystem> searchDefault(WFSystemSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFTaskFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFTask", fallback = WFTaskFallback.class)
 public interface WFTaskFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftasks/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftasks/select")
     Page<WFTask> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftasks/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftasks/checkkey")
     Boolean checkKey(@RequestBody WFTask wftask);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftasks/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftasks/getdraft")
     WFTask getDraft();
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wftasks/{id}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wftasks/{id}")
     Boolean remove(@PathVariable("id") String id);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wftasks/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wftasks/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftasks/{id}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftasks/{id}")
     WFTask get(@PathVariable("id") String id);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftasks")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftasks")
     WFTask create(@RequestBody WFTask wftask);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftasks/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftasks/batch")
     Boolean createBatch(@RequestBody List<WFTask> wftasks);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wftasks/{id}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wftasks/{id}")
     WFTask update(@PathVariable("id") String id,@RequestBody WFTask wftask);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wftasks/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wftasks/batch")
     Boolean updateBatch(@RequestBody List<WFTask> wftasks);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftasks/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftasks/save")
     Boolean save(@RequestBody WFTask wftask);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftasks/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftasks/save")
     Boolean saveBatch(@RequestBody List<WFTask> wftasks);
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftasks/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftasks/searchdefault")
     Page<WFTask> searchDefault(WFTaskSearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFTaskWayFeignClient.java

@@ -19,52 +19,52 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(value = "ibzwf-api", contextId = "WFTaskWay", fallback = WFTaskWayFallback.class)
 public interface WFTaskWayFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftaskways/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftaskways/select")
     Page<WFTaskWay> select();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftaskways/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftaskways/save")
     Boolean save(@RequestBody WFTaskWay wftaskway);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftaskways/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftaskways/save")
     Boolean saveBatch(@RequestBody List<WFTaskWay> wftaskways);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftaskways/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftaskways/checkkey")
     Boolean checkKey(@RequestBody WFTaskWay wftaskway);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftaskways/{sequenceflowid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftaskways/{sequenceflowid}")
     WFTaskWay get(@PathVariable("sequenceflowid") String sequenceflowid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftaskways")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftaskways")
     WFTaskWay create(@RequestBody WFTaskWay wftaskway);
 
-    @RequestMapping(method = RequestMethod.POST, value = "/wf/wftaskways/batch")
+    @RequestMapping(method = RequestMethod.POST, value = "/wftaskways/batch")
     Boolean createBatch(@RequestBody List<WFTaskWay> wftaskways);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wftaskways/{sequenceflowid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wftaskways/{sequenceflowid}")
     WFTaskWay update(@PathVariable("sequenceflowid") String sequenceflowid,@RequestBody WFTaskWay wftaskway);
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/wf/wftaskways/batch")
+    @RequestMapping(method = RequestMethod.PUT, value = "/wftaskways/batch")
     Boolean updateBatch(@RequestBody List<WFTaskWay> wftaskways);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wftaskways/{sequenceflowid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wftaskways/{sequenceflowid}")
     Boolean remove(@PathVariable("sequenceflowid") String sequenceflowid);
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/wf/wftaskways/batch}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wftaskways/batch}")
     Boolean removeBatch(@RequestBody Collection<String> idList);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftaskways/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftaskways/getdraft")
     WFTaskWay getDraft();
 
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/wf/wftaskways/searchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/wftaskways/searchdefault")
     Page<WFTaskWay> searchDefault(WFTaskWaySearchContext context);
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFUserFallback.java

+package cn.ibizlab.core.workflow.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.workflow.domain.WFUser;
+import cn.ibizlab.core.workflow.filter.WFUserSearchContext;
+import org.springframework.stereotype.Component;
+
+/**
+ * 实体[WFUser] 服务对象接口
+ */
+@Component
+public class WFUserFallback implements WFUserFeignClient{
+
+    public Page<WFUser> select(){
+            return null;
+     }
+
+    public WFUser update(String id, WFUser wfuser){
+            return null;
+     }
+    public Boolean updateBatch(List<WFUser> wfusers){
+            return false;
+     }
+
+
+    public WFUser getDraft(){
+            return null;
+    }
+
+
+
+    public WFUser get(String id){
+            return null;
+     }
+
+
+    public WFUser create(WFUser wfuser){
+            return null;
+     }
+    public Boolean createBatch(List<WFUser> wfusers){
+            return false;
+     }
+
+    public Boolean checkKey(WFUser wfuser){
+            return false;
+     }
+
+
+    public Boolean save(WFUser wfuser){
+            return false;
+     }
+    public Boolean saveBatch(List<WFUser> wfusers){
+            return false;
+     }
+
+    public Boolean remove(String id){
+            return false;
+     }
+    public Boolean removeBatch(Collection<String> idList){
+            return false;
+     }
+
+    public Page<WFUser> searchDefault(WFUserSearchContext context){
+            return null;
+     }
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/workflow/client/WFUserFeignClient.java

+package cn.ibizlab.core.workflow.client;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import cn.ibizlab.core.workflow.domain.WFUser;
+import cn.ibizlab.core.workflow.filter.WFUserSearchContext;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * 实体[WFUser] 服务对象接口
+ */
+@FeignClient(value = "ibzwf-api", contextId = "WFUser", fallback = WFUserFallback.class)
+public interface WFUserFeignClient {
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfusers/select")
+    Page<WFUser> select();
+
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{id}")
+    WFUser update(@PathVariable("id") String id,@RequestBody WFUser wfuser);
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/wfusers/batch")
+    Boolean updateBatch(@RequestBody List<WFUser> wfusers);
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfusers/getdraft")
+    WFUser getDraft();
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfusers/{id}")
+    WFUser get(@PathVariable("id") String id);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfusers")
+    WFUser create(@RequestBody WFUser wfuser);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfusers/batch")
+    Boolean createBatch(@RequestBody List<WFUser> wfusers);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfusers/checkkey")
+    Boolean checkKey(@RequestBody WFUser wfuser);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfusers/save")
+    Boolean save(@RequestBody WFUser wfuser);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/wfusers/save")
+    Boolean saveBatch(@RequestBody List<WFUser> wfusers);
+
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{id}")
+    Boolean remove(@PathVariable("id") String id);
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/batch}")
+    Boolean removeBatch(@RequestBody Collection<String> idList);
+
+
+
+    @RequestMapping(method = RequestMethod.GET, value = "/wfusers/searchdefault")
+    Page<WFUser> searchDefault(WFUserSearchContext context);
+
+
+}

ibzou-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java

@@ -19,53 +19,48 @@ import java.io.Serializable;
 import lombok.Data;
 import org.springframework.data.annotation.Transient;
 
-
-import com.baomidou.mybatisplus.annotation.*;
-import cn.ibizlab.util.domain.EntityMP;
+import cn.ibizlab.util.domain.EntityClient;
 
 /**
- * 实体[角色/用户组]
+ * ServiceApi [角色/用户组] 对象
  */
 @Data
-@TableName(value = "IBZWFGROUP",resultMap = "WFGroupResultMap")
-public class WFGroup extends EntityMP implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class WFGroup extends EntityClient implements Serializable {
 
     /**
      * 组标识
      */
     @DEField(name = "groupid" , isKeyField=true)
-    @TableId(value= "groupid",type=IdType.UUID)
     @JSONField(name = "id")
     @JsonProperty("id")
     private String id;
+
     /**
      * 组名称
      */
     @DEField(name = "groupname")
-    @TableField(value = "groupname")
     @JSONField(name = "name")
     @JsonProperty("name")
     private String name;
+
     /**
      * 范围
      */
-    @TableField(value = "groupscope")
     @JSONField(name = "groupscope")
     @JsonProperty("groupscope")
     private String groupscope;
 
 
+
     /**
      * 成员
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "wfmembers")
+    @JsonProperty("wfmembers")
     private List<cn.ibizlab.core.workflow.domain.WFMember> wfmember;
 
 
+
     /**
      * 设置 [组名称]
      */
@@ -80,6 +75,7 @@ public class WFGroup extends EntityMP implements Serializable {
         this.groupscope = groupscope ;
         this.modify("groupscope",groupscope);
     }
+
 }
 
 
@@ -87,3 +83,4 @@ public class WFGroup extends EntityMP implements Serializable {
 
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java

@@ -19,46 +19,42 @@ import java.io.Serializable;
 import lombok.Data;
 import org.springframework.data.annotation.Transient;
 
-
-import com.baomidou.mybatisplus.annotation.*;
-import cn.ibizlab.util.domain.EntityMP;
+import cn.ibizlab.util.domain.EntityClient;
 
 /**
- * 实体[用户]
+ * ServiceApi [用户] 对象
  */
 @Data
-@TableName(value = "IBZUSER",resultMap = "WFUserResultMap")
-public class WFUser extends EntityMP implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class WFUser extends EntityClient implements Serializable {
 
     /**
      * 用户标识
      */
     @DEField(name = "userid" , isKeyField=true)
-    @TableId(value= "userid",type=IdType.UUID)
     @JSONField(name = "id")
     @JsonProperty("id")
     private String id;
+
     /**
      * 用户全局名
      */
     @DEField(name = "username")
-    @TableField(value = "username")
     @JSONField(name = "firstname")
     @JsonProperty("firstname")
     private String firstname;
+
     /**
      * 用户名称
      */
     @DEField(name = "personname")
-    @TableField(value = "personname")
     @JSONField(name = "displayname")
     @JsonProperty("displayname")
     private String displayname;
 
 
 
+
+
     /**
      * 设置 [用户全局名]
      */
@@ -73,6 +69,7 @@ public class WFUser extends EntityMP implements Serializable {
         this.displayname = displayname ;
         this.modify("personname",displayname);
     }
+
 }
 
 
@@ -80,3 +77,4 @@ public class WFUser extends EntityMP implements Serializable {
 
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/workflow/filter/WFGroupSearchContext.java

@@ -17,36 +17,17 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 
-import cn.ibizlab.util.filter.QueryWrapperContext;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import cn.ibizlab.core.workflow.domain.WFGroup;
+import cn.ibizlab.util.filter.SearchContextBase;
+
 /**
- * 关系型数据实体[WFGroup] 查询条件对象
+ * ServiceApi数据实体[WFGroup] 查询条件对象
  */
 @Slf4j
 @Data
-public class WFGroupSearchContext extends QueryWrapperContext<WFGroup> {
-
+public class WFGroupSearchContext extends SearchContextBase {
 	private String n_groupname_like;//[组名称]
-	public void setN_groupname_like(String n_groupname_like) {
-        this.n_groupname_like = n_groupname_like;
-        if(!ObjectUtils.isEmpty(this.n_groupname_like)){
-            this.getSelectCond().like("groupname", n_groupname_like);
-        }
-    }
-
-    /**
-	 * 启用快速搜索
-	 */
-	public void setQuery(String query)
-	{
-		 this.query=query;
-		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("groupname",query);
-		 }
-	}
-}
 
+}
 
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/filter/WFUserSearchContext.java

@@ -17,36 +17,17 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 
-import cn.ibizlab.util.filter.QueryWrapperContext;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import cn.ibizlab.core.workflow.domain.WFUser;
+import cn.ibizlab.util.filter.SearchContextBase;
+
 /**
- * 关系型数据实体[WFUser] 查询条件对象
+ * ServiceApi数据实体[WFUser] 查询条件对象
  */
 @Slf4j
 @Data
-public class WFUserSearchContext extends QueryWrapperContext<WFUser> {
-
+public class WFUserSearchContext extends SearchContextBase {
 	private String n_personname_like;//[用户名称]
-	public void setN_personname_like(String n_personname_like) {
-        this.n_personname_like = n_personname_like;
-        if(!ObjectUtils.isEmpty(this.n_personname_like)){
-            this.getSelectCond().like("personname", n_personname_like);
-        }
-    }
-
-    /**
-	 * 启用快速搜索
-	 */
-	public void setQuery(String query)
-	{
-		 this.query=query;
-		 if(!StringUtils.isEmpty(query)){
-			this.getSelectCond().or().like("personname",query);
-		 }
-	}
-}
 
+}
 
 
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/service/IWFGroupService.java

@@ -17,12 +17,10 @@ import cn.ibizlab.core.workflow.domain.WFGroup;
 import cn.ibizlab.core.workflow.filter.WFGroupSearchContext;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * 实体[WFGroup] 服务对象接口
  */
-public interface IWFGroupService extends IService<WFGroup>{
+public interface IWFGroupService{
 
     boolean remove(String key) ;
     void removeBatch(Collection<String> idList) ;
@@ -36,21 +34,8 @@ public interface IWFGroupService extends IService<WFGroup>{
     boolean update(WFGroup et) ;
     void updateBatch(List<WFGroup> list) ;
     Page<WFGroup> searchDefault(WFGroupSearchContext context) ;
-    /**
-     *自定义查询SQL
-     * @param sql  select * from table where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return select * from table where id = '1'
-     */
-    List<JSONObject> select(String sql, Map param);
-    /**
-     *自定义SQL
-     * @param sql  update table  set name ='test' where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return     update table  set name ='test' where id = '1'
-     */
-    boolean execute(String sql, Map param);
 
 }
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/workflow/service/IWFUserService.java

@@ -17,12 +17,10 @@ import cn.ibizlab.core.workflow.domain.WFUser;
 import cn.ibizlab.core.workflow.filter.WFUserSearchContext;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * 实体[WFUser] 服务对象接口
  */
-public interface IWFUserService extends IService<WFUser>{
+public interface IWFUserService{
 
     boolean update(WFUser et) ;
     void updateBatch(List<WFUser> list) ;
@@ -36,21 +34,8 @@ public interface IWFUserService extends IService<WFUser>{
     boolean remove(String key) ;
     void removeBatch(Collection<String> idList) ;
     Page<WFUser> searchDefault(WFUserSearchContext context) ;
-    /**
-     *自定义查询SQL
-     * @param sql  select * from table where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return select * from table where id = '1'
-     */
-    List<JSONObject> select(String sql, Map param);
-    /**
-     *自定义SQL
-     * @param sql  update table  set name ='test' where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return     update table  set name ='test' where id = '1'
-     */
-    boolean execute(String sql, Map param);
 
 }
 
 
+

ibzou-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFGroupServiceImpl.java

@@ -30,155 +30,105 @@ import cn.ibizlab.core.workflow.service.IWFGroupService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.ibizlab.core.workflow.mapper.WFGroupMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.util.StringUtils;
+import cn.ibizlab.core.workflow.client.WFGroupFeignClient;
 
 /**
  * 实体[角色/用户组] 服务对象接口实现
  */
 @Slf4j
-@Service("WFGroupServiceImpl")
-public class WFGroupServiceImpl extends ServiceImpl<WFGroupMapper, WFGroup> implements IWFGroupService {
+@Service
+public class WFGroupServiceImpl implements IWFGroupService {
 
     @Autowired
-    @Lazy
-    private cn.ibizlab.core.workflow.service.IWFMemberService wfmemberService;
+    WFGroupFeignClient wFGroupFeignClient;
 
-    private int batchSize = 500;
 
     @Override
-    @Transactional
-    public boolean remove(String key) {
-        wfmemberService.removeByGroupid(key) ;
-        boolean result=removeById(key);
-        return result ;
+    public boolean remove(String id) {
+        boolean result=wFGroupFeignClient.remove(id) ;
+        return result;
     }
 
-    @Override
-    public void removeBatch(Collection<String> idList) {
-        removeByIds(idList);
+    public void removeBatch(Collection<String> idList){
+        wFGroupFeignClient.removeBatch(idList);
     }
 
     @Override
     @Transactional
     public boolean save(WFGroup et) {
-        if(!saveOrUpdate(et))
+        if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
+        if(!wFGroupFeignClient.save(et))
             return false;
         return true;
     }
 
-    @Override
-    @Transactional(
-            rollbackFor = {Exception.class}
-    )
-    public boolean saveOrUpdate(WFGroup et) {
-        if (null == et) {
-            return false;
-        } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
-        }
-    }
-
     @Override
     public void saveBatch(List<WFGroup> list) {
-        saveOrUpdateBatch(list,batchSize);
+        wFGroupFeignClient.saveBatch(list) ;
     }
 
     @Override
-    @Transactional
-    public WFGroup get(String key) {
-        WFGroup et = getById(key);
+    public WFGroup get(String id) {
+		WFGroup et=wFGroupFeignClient.get(id);
         if(et==null){
             et=new WFGroup();
-            et.setId(key);
+            et.setId(id);
         }
         else{
-            et.setWfmember(wfmemberService.selectByGroupid(key));
         }
-        return et;
+        return  et;
     }
 
     @Override
-    @Transactional
     public boolean create(WFGroup et) {
-        if(!this.retBool(this.baseMapper.insert(et)))
+        WFGroup rt = wFGroupFeignClient.create(et);
+        if(rt==null)
             return false;
-        wfmemberService.saveByGroupid(et.getId(),et.getWfmember());
-        CachedBeanCopier.copy(get(et.getId()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
     }
 
-    @Override
-    public void createBatch(List<WFGroup> list) {
-        saveBatch(list,batchSize);
+    public void createBatch(List<WFGroup> list){
+        wFGroupFeignClient.createBatch(list) ;
     }
 
     @Override
     public WFGroup getDraft(WFGroup et) {
+        et=wFGroupFeignClient.getDraft();
         return et;
     }
 
     @Override
     public boolean checkKey(WFGroup et) {
-        return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
+        return wFGroupFeignClient.checkKey(et);
     }
-
     @Override
-    @Transactional
     public boolean update(WFGroup et) {
-        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("groupid",et.getId())))
+        WFGroup rt = wFGroupFeignClient.update(et.getId(),et);
+        if(rt==null)
             return false;
-        wfmemberService.saveByGroupid(et.getId(),et.getWfmember());
-        CachedBeanCopier.copy(get(et.getId()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
+
     }
 
-    @Override
-    public void updateBatch(List<WFGroup> list) {
-        updateBatchById(list,batchSize);
+    public void updateBatch(List<WFGroup> list){
+        wFGroupFeignClient.updateBatch(list) ;
     }
 
 
 
+
+
     /**
      * 查询集合 DEFAULT
      */
     @Override
     public Page<WFGroup> searchDefault(WFGroupSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<WFGroup> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<WFGroup>(pages.getRecords(), context.getPageable(), pages.getTotal());
-    }
-
-
-
-
-    @Override
-    public List<JSONObject> select(String sql, Map param){
-        return this.baseMapper.selectBySQL(sql,param);
+        Page<WFGroup> wFGroups=wFGroupFeignClient.searchDefault(context);
+        return wFGroups;
     }
 
-    @Override
-    @Transactional
-    public boolean execute(String sql , Map param){
-        if (sql == null || sql.isEmpty()) {
-            return false;
-        }
-        if (sql.toLowerCase().trim().startsWith("insert")) {
-            return this.baseMapper.insertBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("update")) {
-            return this.baseMapper.updateBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("delete")) {
-            return this.baseMapper.deleteBySQL(sql,param);
-        }
-        log.warn("暂未支持的SQL语法");
-        return true;
-    }
 
 }
 

ibzou-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFUserServiceImpl.java

@@ -30,151 +30,105 @@ import cn.ibizlab.core.workflow.service.IWFUserService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.ibizlab.core.workflow.mapper.WFUserMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.util.StringUtils;
+import cn.ibizlab.core.workflow.client.WFUserFeignClient;
 
 /**
  * 实体[用户] 服务对象接口实现
  */
 @Slf4j
-@Service("WFUserServiceImpl")
-public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> implements IWFUserService {
+@Service
+public class WFUserServiceImpl implements IWFUserService {
 
     @Autowired
-    @Lazy
-    private cn.ibizlab.core.workflow.service.IWFMemberService wfmemberService;
+    WFUserFeignClient wFUserFeignClient;
 
-    private int batchSize = 500;
 
     @Override
-    @Transactional
     public boolean update(WFUser et) {
-        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("userid",et.getId())))
+        WFUser rt = wFUserFeignClient.update(et.getId(),et);
+        if(rt==null)
             return false;
-        CachedBeanCopier.copy(get(et.getId()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
+
     }
 
-    @Override
-    public void updateBatch(List<WFUser> list) {
-        updateBatchById(list,batchSize);
+    public void updateBatch(List<WFUser> list){
+        wFUserFeignClient.updateBatch(list) ;
     }
 
     @Override
     public WFUser getDraft(WFUser et) {
+        et=wFUserFeignClient.getDraft();
         return et;
     }
 
     @Override
-    @Transactional
-    public WFUser get(String key) {
-        WFUser et = getById(key);
+    public WFUser get(String id) {
+		WFUser et=wFUserFeignClient.get(id);
         if(et==null){
             et=new WFUser();
-            et.setId(key);
+            et.setId(id);
         }
         else{
         }
-        return et;
+        return  et;
     }
 
     @Override
-    @Transactional
     public boolean create(WFUser et) {
-        if(!this.retBool(this.baseMapper.insert(et)))
+        WFUser rt = wFUserFeignClient.create(et);
+        if(rt==null)
             return false;
-        CachedBeanCopier.copy(get(et.getId()),et);
+        CachedBeanCopier.copy(rt,et);
         return true;
     }
 
-    @Override
-    public void createBatch(List<WFUser> list) {
-        saveBatch(list,batchSize);
+    public void createBatch(List<WFUser> list){
+        wFUserFeignClient.createBatch(list) ;
     }
 
     @Override
     public boolean checkKey(WFUser et) {
-        return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
+        return wFUserFeignClient.checkKey(et);
     }
-
     @Override
     @Transactional
     public boolean save(WFUser et) {
-        if(!saveOrUpdate(et))
+        if(et.getId()==null) et.setId((String)et.getDefaultKey(true));
+        if(!wFUserFeignClient.save(et))
             return false;
         return true;
     }
 
-    @Override
-    @Transactional(
-            rollbackFor = {Exception.class}
-    )
-    public boolean saveOrUpdate(WFUser et) {
-        if (null == et) {
-            return false;
-        } else {
-            return checkKey(et) ? this.update(et) : this.create(et);
-        }
-    }
-
     @Override
     public void saveBatch(List<WFUser> list) {
-        saveOrUpdateBatch(list,batchSize);
+        wFUserFeignClient.saveBatch(list) ;
     }
 
     @Override
-    @Transactional
-    public boolean remove(String key) {
-        boolean result=removeById(key);
-        return result ;
+    public boolean remove(String id) {
+        boolean result=wFUserFeignClient.remove(id) ;
+        return result;
     }
 
-    @Override
-    public void removeBatch(Collection<String> idList) {
-        removeByIds(idList);
+    public void removeBatch(Collection<String> idList){
+        wFUserFeignClient.removeBatch(idList);
     }
 
 
 
+
+
     /**
      * 查询集合 DEFAULT
      */
     @Override
     public Page<WFUser> searchDefault(WFUserSearchContext context) {
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<WFUser> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
-        return new PageImpl<WFUser>(pages.getRecords(), context.getPageable(), pages.getTotal());
-    }
-
-
-
-
-    @Override
-    public List<JSONObject> select(String sql, Map param){
-        return this.baseMapper.selectBySQL(sql,param);
+        Page<WFUser> wFUsers=wFUserFeignClient.searchDefault(context);
+        return wFUsers;
     }
 
-    @Override
-    @Transactional
-    public boolean execute(String sql , Map param){
-        if (sql == null || sql.isEmpty()) {
-            return false;
-        }
-        if (sql.toLowerCase().trim().startsWith("insert")) {
-            return this.baseMapper.insertBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("update")) {
-            return this.baseMapper.updateBySQL(sql,param);
-        }
-        if (sql.toLowerCase().trim().startsWith("delete")) {
-            return this.baseMapper.deleteBySQL(sql,param);
-        }
-        log.warn("暂未支持的SQL语法");
-        return true;
-    }
 
 }
 

ibzou-core/src/main/resources/liquibase/h2_table.xml

@@ -120,7 +120,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDICTITEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdictitem-5-7">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdictitem-7-7">
         <createTable tableName="IBZDICTITEM">
                 <column name="IBZDICTITEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDICTITEM_IBZDICTITEMID"/>
@@ -289,7 +289,7 @@
     </changeSet>
     <!--输出实体[WF_USER]数据结构 -->
     <!--输出实体[WF_GROUP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group-2-16">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group-4-16">
         <createTable tableName="IBZWFGROUP">
                 <column name="GROUPID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
@@ -301,7 +301,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDICT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdict-4-17">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdict-6-17">
         <createTable tableName="IBZDICT">
                 <column name="IBZDICTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDICT_IBZDICTID"/>
@@ -522,7 +522,7 @@
         <!--输出实体[WF_INSTANCE]外键关系 -->
         <!--输出实体[WF_MODEL]外键关系 -->
         <!--输出实体[IBZDICTITEM]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdictitem-5-26">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdictitem-7-26">
        <addForeignKeyConstraint baseColumnNames="DICTID" baseTableName="IBZDICTITEM" constraintName="DER1N_IBZDICTITEM_IBZDICT_DICT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBZDICTID" referencedTableName="IBZDICT" validate="true"/>
     </changeSet>
         <!--输出实体[WF_TASK_WAY]外键关系 -->

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDictItemResource.java

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.transaction.annotation.Transactional;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.HttpStatus;
@@ -55,10 +55,10 @@ public class IBZDictItemResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzdictitem_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#ibzdictitem_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Update", tags = {"IBZDictItem" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdictitems/{ibzdictitem_id}")
-    @Transactional
+
     public ResponseEntity<IBZDictItemDTO> update(@PathVariable("ibzdictitem_id") String ibzdictitem_id, @RequestBody IBZDictItemDTO ibzdictitemdto) {
 		IBZDictItem domain = ibzdictitemMapping.toDomain(ibzdictitemdto);
         domain.setItemid(ibzdictitem_id);
@@ -67,7 +67,7 @@ public class IBZDictItemResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#ibzdictitem_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#ibzdictitem_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "UpdateBatch", tags = {"IBZDictItem" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdictitems/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZDictItemDTO> ibzdictitemdtos) {
@@ -103,10 +103,10 @@ public class IBZDictItemResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#ibzdictitem_id,{this.getEntity(),'Sql'}})")
+    @PreAuthorize("hasPermission('Remove',{#ibzdictitem_id,{this.getEntity(),'ServiceApi'}})")
     @ApiOperation(value = "Remove", tags = {"IBZDictItem" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdictitems/{ibzdictitem_id}")
-    @Transactional
+
     public ResponseEntity<Boolean> remove(@PathVariable("ibzdictitem_id") String ibzdictitem_id) {
          return ResponseEntity.status(HttpStatus.OK).body(ibzdictitemService.remove(ibzdictitem_id));
     }
@@ -121,7 +121,7 @@ public class IBZDictItemResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzdictitem_id,'Get',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#ibzdictitem_id,'Get',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Get", tags = {"IBZDictItem" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzdictitems/{ibzdictitem_id}")
     public ResponseEntity<IBZDictItemDTO> get(@PathVariable("ibzdictitem_id") String ibzdictitem_id) {
@@ -133,10 +133,10 @@ public class IBZDictItemResource {
 
 
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Create", tags = {"IBZDictItem" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems")
-    @Transactional
+
     public ResponseEntity<IBZDictItemDTO> create(@RequestBody IBZDictItemDTO ibzdictitemdto) {
         IBZDictItem domain = ibzdictitemMapping.toDomain(ibzdictitemdto);
 		ibzdictitemService.create(domain);
@@ -144,7 +144,7 @@ public class IBZDictItemResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "createBatch", tags = {"IBZDictItem" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZDictItemDTO> ibzdictitemdtos) {
@@ -161,7 +161,7 @@ public class IBZDictItemResource {
         return ResponseEntity.status(HttpStatus.OK).body(ibzdictitemMapping.toDto(ibzdictitemService.getDraft(new IBZDictItem())));
     }
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDictItem" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzdictitems/fetchdefault")
 	public ResponseEntity<List<IBZDictItemDTO>> fetchDefault(IBZDictItemSearchContext context) {
@@ -174,7 +174,7 @@ public class IBZDictItemResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"IBZDictItem" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzdictitems/searchdefault")
 	public ResponseEntity<Page<IBZDictItemDTO>> searchDefault(IBZDictItemSearchContext context) {
@@ -187,7 +187,7 @@ public class IBZDictItemResource {
 
     @ApiOperation(value = "UpdateByIBZDict", tags = {"IBZDictItem" },  notes = "UpdateByIBZDict")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdicts/{ibzdict_id}/ibzdictitems/{ibzdictitem_id}")
-    @Transactional
+
     public ResponseEntity<IBZDictItemDTO> updateByIBZDict(@PathVariable("ibzdict_id") String ibzdict_id, @PathVariable("ibzdictitem_id") String ibzdictitem_id, @RequestBody IBZDictItemDTO ibzdictitemdto) {
         IBZDictItem domain = ibzdictitemMapping.toDomain(ibzdictitemdto);
         domain.setDictid(ibzdict_id);
@@ -235,7 +235,7 @@ public class IBZDictItemResource {
 
     @ApiOperation(value = "RemoveByIBZDict", tags = {"IBZDictItem" },  notes = "RemoveByIBZDict")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdicts/{ibzdict_id}/ibzdictitems/{ibzdictitem_id}")
-    @Transactional
+
     public ResponseEntity<Boolean> removeByIBZDict(@PathVariable("ibzdict_id") String ibzdict_id, @PathVariable("ibzdictitem_id") String ibzdictitem_id) {
 		return ResponseEntity.status(HttpStatus.OK).body(ibzdictitemService.remove(ibzdictitem_id));
     }
@@ -257,7 +257,7 @@ public class IBZDictItemResource {
 
     @ApiOperation(value = "CreateByIBZDict", tags = {"IBZDictItem" },  notes = "CreateByIBZDict")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/{ibzdict_id}/ibzdictitems")
-    @Transactional
+
     public ResponseEntity<IBZDictItemDTO> createByIBZDict(@PathVariable("ibzdict_id") String ibzdict_id, @RequestBody IBZDictItemDTO ibzdictitemdto) {
         IBZDictItem domain = ibzdictitemMapping.toDomain(ibzdictitemdto);
         domain.setDictid(ibzdict_id);

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDictResource.java

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.transaction.annotation.Transactional;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.HttpStatus;
@@ -55,10 +55,10 @@ public class IBZDictResource {
 
 
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Create", tags = {"IBZDict" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdicts")
-    @Transactional
+
     public ResponseEntity<IBZDictDTO> create(@RequestBody IBZDictDTO ibzdictdto) {
         IBZDict domain = ibzdictMapping.toDomain(ibzdictdto);
 		ibzdictService.create(domain);
@@ -66,7 +66,7 @@ public class IBZDictResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "createBatch", tags = {"IBZDict" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZDictDTO> ibzdictdtos) {
@@ -77,10 +77,10 @@ public class IBZDictResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#ibzdict_id,{this.getEntity(),'Sql'}})")
+    @PreAuthorize("hasPermission('Remove',{#ibzdict_id,{this.getEntity(),'ServiceApi'}})")
     @ApiOperation(value = "Remove", tags = {"IBZDict" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdicts/{ibzdict_id}")
-    @Transactional
+
     public ResponseEntity<Boolean> remove(@PathVariable("ibzdict_id") String ibzdict_id) {
          return ResponseEntity.status(HttpStatus.OK).body(ibzdictService.remove(ibzdict_id));
     }
@@ -95,10 +95,10 @@ public class IBZDictResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzdict_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#ibzdict_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Update", tags = {"IBZDict" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdicts/{ibzdict_id}")
-    @Transactional
+
     public ResponseEntity<IBZDictDTO> update(@PathVariable("ibzdict_id") String ibzdict_id, @RequestBody IBZDictDTO ibzdictdto) {
 		IBZDict domain = ibzdictMapping.toDomain(ibzdictdto);
         domain.setDictid(ibzdict_id);
@@ -107,7 +107,7 @@ public class IBZDictResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#ibzdict_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#ibzdict_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "UpdateBatch", tags = {"IBZDict" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdicts/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZDictDTO> ibzdictdtos) {
@@ -143,7 +143,7 @@ public class IBZDictResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzdict_id,'Get',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#ibzdict_id,'Get',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Get", tags = {"IBZDict" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzdicts/{ibzdict_id}")
     public ResponseEntity<IBZDictDTO> get(@PathVariable("ibzdict_id") String ibzdict_id) {
@@ -161,7 +161,7 @@ public class IBZDictResource {
         return  ResponseEntity.status(HttpStatus.OK).body(ibzdictService.checkKey(ibzdictMapping.toDomain(ibzdictdto)));
     }
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDict" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzdicts/fetchdefault")
 	public ResponseEntity<List<IBZDictDTO>> fetchDefault(IBZDictSearchContext context) {
@@ -174,7 +174,7 @@ public class IBZDictResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"IBZDict" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzdicts/searchdefault")
 	public ResponseEntity<Page<IBZDictDTO>> searchDefault(IBZDictSearchContext context) {

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.transaction.annotation.Transactional;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.HttpStatus;
@@ -55,10 +55,10 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#wfgroup_id,{this.getEntity(),'Sql'}})")
+    @PreAuthorize("hasPermission('Remove',{#wfgroup_id,{this.getEntity(),'ServiceApi'}})")
     @ApiOperation(value = "Remove", tags = {"WFGroup" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}")
-    @Transactional
+
     public ResponseEntity<Boolean> remove(@PathVariable("wfgroup_id") String wfgroup_id) {
          return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.remove(wfgroup_id));
     }
@@ -89,7 +89,7 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasPermission(#wfgroup_id,'Get',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#wfgroup_id,'Get',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Get", tags = {"WFGroup" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}")
     public ResponseEntity<WFGroupDTO> get(@PathVariable("wfgroup_id") String wfgroup_id) {
@@ -101,10 +101,10 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Create", tags = {"WFGroup" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups")
-    @Transactional
+
     public ResponseEntity<WFGroupDTO> create(@RequestBody WFGroupDTO wfgroupdto) {
         WFGroup domain = wfgroupMapping.toDomain(wfgroupdto);
 		wfgroupService.create(domain);
@@ -112,7 +112,7 @@ public class WFGroupResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "createBatch", tags = {"WFGroup" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
@@ -141,10 +141,10 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasPermission(#wfgroup_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#wfgroup_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Update", tags = {"WFGroup" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}")
-    @Transactional
+
     public ResponseEntity<WFGroupDTO> update(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFGroupDTO wfgroupdto) {
 		WFGroup domain = wfgroupMapping.toDomain(wfgroupdto);
         domain.setId(wfgroup_id);
@@ -153,7 +153,7 @@ public class WFGroupResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#wfgroup_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#wfgroup_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "UpdateBatch", tags = {"WFGroup" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
@@ -161,7 +161,7 @@ public class WFGroupResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFGroup" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfgroups/fetchdefault")
 	public ResponseEntity<List<WFGroupDTO>> fetchDefault(WFGroupSearchContext context) {
@@ -174,7 +174,7 @@ public class WFGroupResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFGroup" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfgroups/searchdefault")
 	public ResponseEntity<Page<WFGroupDTO>> searchDefault(WFGroupSearchContext context) {

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.transaction.annotation.Transactional;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.HttpStatus;
@@ -55,10 +55,10 @@ public class WFUserResource {
 
 
 
-    @PreAuthorize("hasPermission(#wfuser_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#wfuser_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Update", tags = {"WFUser" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}")
-    @Transactional
+
     public ResponseEntity<WFUserDTO> update(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFUserDTO wfuserdto) {
 		WFUser domain = wfuserMapping.toDomain(wfuserdto);
         domain.setId(wfuser_id);
@@ -67,7 +67,7 @@ public class WFUserResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#wfuser_id,'Update',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#wfuser_id,'Update',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "UpdateBatch", tags = {"WFUser" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
@@ -87,7 +87,7 @@ public class WFUserResource {
 
 
 
-    @PreAuthorize("hasPermission(#wfuser_id,'Get',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission(#wfuser_id,'Get',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Get", tags = {"WFUser" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}")
     public ResponseEntity<WFUserDTO> get(@PathVariable("wfuser_id") String wfuser_id) {
@@ -99,10 +99,10 @@ public class WFUserResource {
 
 
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "Create", tags = {"WFUser" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers")
-    @Transactional
+
     public ResponseEntity<WFUserDTO> create(@RequestBody WFUserDTO wfuserdto) {
         WFUser domain = wfuserMapping.toDomain(wfuserdto);
 		wfuserService.create(domain);
@@ -110,7 +110,7 @@ public class WFUserResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
     @ApiOperation(value = "createBatch", tags = {"WFUser" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
@@ -146,10 +146,10 @@ public class WFUserResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#wfuser_id,{this.getEntity(),'Sql'}})")
+    @PreAuthorize("hasPermission('Remove',{#wfuser_id,{this.getEntity(),'ServiceApi'}})")
     @ApiOperation(value = "Remove", tags = {"WFUser" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}")
-    @Transactional
+
     public ResponseEntity<Boolean> remove(@PathVariable("wfuser_id") String wfuser_id) {
          return ResponseEntity.status(HttpStatus.OK).body(wfuserService.remove(wfuser_id));
     }
@@ -161,7 +161,7 @@ public class WFUserResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFUser" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfusers/fetchdefault")
 	public ResponseEntity<List<WFUserDTO>> fetchDefault(WFUserSearchContext context) {
@@ -174,7 +174,7 @@ public class WFUserResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFUser" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfusers/searchdefault")
 	public ResponseEntity<Page<WFUserDTO>> searchDefault(WFUserSearchContext context) {

ibzou-util/src/main/java/cn/ibizlab/util/rest/AppController.java

@@ -9,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import cn.ibizlab.util.security.AuthenticationUser;
+import cn.ibizlab.util.service.AuthenticationUserService;
 
 @RestController
 @RequestMapping(value = "")
@@ -18,6 +20,9 @@ public class AppController {
 	@Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
+	@Autowired
+	private AuthenticationUserService userDetailsService;
+
 	@RequestMapping(method = RequestMethod.GET, value = "/appdata")
 	public ResponseEntity<JSONObject> getAppData() {
 
@@ -36,4 +41,11 @@ public class AppController {
 		appData.put("enablepermissionvalid",enablePermissionValid);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}
+
+    @RequestMapping(method = RequestMethod.GET, value = "${ibiz.auth.logoutpath:v7/logout}")
+    public void logout() {
+		if(AuthenticationUser.getAuthenticationUser()!=null){
+			userDetailsService.resetByUsername(AuthenticationUser.getAuthenticationUser().getUsername());
+    	}
+    }
 }