zhouweidong@lab.ibiz5.com 发布系统代码

app_web/src/components/app-breadcrumb/app-breadcrumb.vue

@@ -161,6 +161,7 @@ export default class Breadcrumb extends Vue {
       if(item && item.meta && item.meta.viewType && Object.is(item.meta.viewType,"APPINDEX")){
         let path: string | null = window.sessionStorage.getItem(Environment.AppName);
         if (path) {
+          this.$store.commit("removeAllPage");
           this.$router.push({ path: path });
         } else {
           this.$router.push("/");

app_web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
      * @memberof SYS_PERMISSIONMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-permissionpickup-view/sys-permissionpickup-view-base.vue

@@ -661,6 +661,7 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
      * @memberof SYS_PERMISSIONPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-role-permission-mpickup-view/sys-role-permission-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SysRolePermissionMPickupViewBase extends Vue {
      * @memberof SysRolePermissionMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-role-permission-pickup-view/sys-role-permission-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class SysRolePermissionPickupViewBase extends Vue {
      * @memberof SysRolePermissionPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
      * @memberof SYS_ROLEMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-rolepickup-view/sys-rolepickup-view-base.vue

@@ -661,6 +661,7 @@ export default class SYS_ROLEPickupViewBase extends Vue {
      * @memberof SYS_ROLEPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
      * @memberof SYS_USER_ROLEMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-user-rolepickup-view/sys-user-rolepickup-view-base.vue

@@ -661,6 +661,7 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
      * @memberof SYS_USER_ROLEPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
      * @memberof SYS_USERMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/pages/uaa/sys-userpickup-view/sys-userpickup-view-base.vue

@@ -661,6 +661,7 @@ export default class SYS_USERPickupViewBase extends Vue {
      * @memberof SYS_USERPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_web/src/service/sys-app/sys-app-service-base.ts

@@ -48,8 +48,9 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
-            return Http.getInstance().get(`/sysapps/${context.sysapp}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysapps/${context.sysapp}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,9 +63,6 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -75,6 +73,7 @@ export default class SysAppServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysapps`,data,isloading);
+
         return res;
     }
 
@@ -88,12 +87,10 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysapps/${context.sysapp}`,data,isloading);
+
             return res;
     }
 
@@ -107,10 +104,8 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().delete(`/sysapps/${context.sysapp}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysapps/${context.sysapp}`,isloading);
+            return res;
     }
 
     /**
@@ -123,10 +118,8 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
             let res:any = await Http.getInstance().get(`/sysapps/${context.sysapp}`,isloading);
+
             return res;
     }
 
@@ -140,11 +133,9 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let res:any = await  Http.getInstance().get(`/sysapps/getdraft`,isloading);
         res.data.sysapp = data.sysapp;
+
         return res;
     }
 
@@ -158,10 +149,8 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().post(`/sysapps/${context.sysapp}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysapps/${context.sysapp}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -174,12 +163,10 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysapps/${context.sysapp}/save`,data,isloading);
+
             return res;
     }
 
@@ -193,9 +180,9 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysapps/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysapps/fetchdefault`,tempData,isloading);
+        return res;
     }
 
     /**

app_web/src/service/sys-auth-log/sys-auth-log-service-base.ts

@@ -48,8 +48,9 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
-            return Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,9 +63,6 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -75,6 +73,7 @@ export default class SysAuthLogServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysauthlogs`,data,isloading);
+
         return res;
     }
 
@@ -88,12 +87,10 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysauthlogs/${context.sysauthlog}`,data,isloading);
+
             return res;
     }
 
@@ -107,10 +104,8 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().delete(`/sysauthlogs/${context.sysauthlog}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysauthlogs/${context.sysauthlog}`,isloading);
+            return res;
     }
 
     /**
@@ -123,10 +118,8 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
             let res:any = await Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}`,isloading);
+
             return res;
     }
 
@@ -140,11 +133,9 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let res:any = await  Http.getInstance().get(`/sysauthlogs/getdraft`,isloading);
         res.data.sysauthlog = data.sysauthlog;
+
         return res;
     }
 
@@ -158,10 +149,8 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -174,12 +163,10 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/save`,data,isloading);
+
             return res;
     }
 
@@ -193,9 +180,9 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysauthlogs/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysauthlogs/fetchdefault`,tempData,isloading);
+        return res;
     }
 
     /**

app_web/src/service/sys-permission/sys-permission-service-base.ts

@@ -48,8 +48,9 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
-            return Http.getInstance().get(`/syspermissions/${context.syspermission}/select`,isloading);
+            let res:any = Http.getInstance().get(`/syspermissions/${context.syspermission}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,9 +63,6 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -76,6 +74,7 @@ export default class SysPermissionServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/syspermissions`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_sysrolepermissions',JSON.stringify(res.data.sysrolepermissions));
+
         return res;
     }
 
@@ -89,12 +88,10 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/syspermissions/${context.syspermission}`,data,isloading);
+
             return res;
     }
 
@@ -108,10 +105,8 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().delete(`/syspermissions/${context.syspermission}`,isloading);
+            let res:any = Http.getInstance().delete(`/syspermissions/${context.syspermission}`,isloading);
+            return res;
     }
 
     /**
@@ -124,10 +119,8 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
             let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}`,isloading);
+
             return res;
     }
 
@@ -141,11 +134,9 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let res:any = await  Http.getInstance().get(`/syspermissions/getdraft`,isloading);
         res.data.syspermission = data.syspermission;
+
         return res;
     }
 
@@ -159,10 +150,8 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().post(`/syspermissions/${context.syspermission}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/syspermissions/${context.syspermission}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -175,12 +164,10 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/syspermissions/${context.syspermission}/save`,data,isloading);
+
             return res;
     }
 
@@ -194,9 +181,9 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/syspermissions/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/syspermissions/fetchdefault`,tempData,isloading);
+        return res;
     }
 
     /**

app_web/src/service/sys-role-permission/sys-role-permission-service-base.ts

@@ -49,13 +49,18 @@ export default class SysRolePermissionServiceBase extends EntityService {
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysrole && context.sysrolepermission){
-            return Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
+
+            return res;
         }
         if(context.syspermission && context.sysrolepermission){
-            return Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
+            let res:any = Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
+
+            return res;
         }
-        
-            return Http.getInstance().get(`/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -79,6 +84,7 @@ export default class SysRolePermissionServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysrolepermissions`,data,isloading);
+
             return res;
         }
         if(context.syspermission && true){
@@ -92,11 +98,9 @@ export default class SysRolePermissionServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/syspermissions/${context.syspermission}/sysrolepermissions`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -107,6 +111,7 @@ export default class SysRolePermissionServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysrolepermissions`,data,isloading);
+
         return res;
     }
 
@@ -124,20 +129,20 @@ export default class SysRolePermissionServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,data,isloading);
+
             return res;
         }
         if(context.syspermission && context.sysrolepermission){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysrolepermissions/${context.sysrolepermission}`,data,isloading);
+
             return res;
     }
 
@@ -152,15 +157,15 @@ export default class SysRolePermissionServiceBase extends EntityService {
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysrole && context.sysrolepermission){
-            return Http.getInstance().delete(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,isloading);
+            return res;
         }
         if(context.syspermission && context.sysrolepermission){
-            return Http.getInstance().delete(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,isloading);
+            let res:any = Http.getInstance().delete(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,isloading);
+            return res;
         }
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().delete(`/sysrolepermissions/${context.sysrolepermission}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysrolepermissions/${context.sysrolepermission}`,isloading);
+            return res;
     }
 
     /**
@@ -175,16 +180,16 @@ export default class SysRolePermissionServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysrole && context.sysrolepermission){
             let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,isloading);
+
             return res;
         }
         if(context.syspermission && context.sysrolepermission){
             let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
             let res:any = await Http.getInstance().get(`/sysrolepermissions/${context.sysrolepermission}`,isloading);
+
             return res;
     }
 
@@ -201,18 +206,18 @@ export default class SysRolePermissionServiceBase extends EntityService {
         if(context.sysrole && true){
             let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/getdraft`,isloading);
             res.data.sysrolepermission = data.sysrolepermission;
+
             return res;
         }
         if(context.syspermission && true){
             let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/getdraft`,isloading);
             res.data.sysrolepermission = data.sysrolepermission;
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let res:any = await  Http.getInstance().get(`/sysrolepermissions/getdraft`,isloading);
         res.data.sysrolepermission = data.sysrolepermission;
+
         return res;
     }
 
@@ -230,18 +235,18 @@ export default class SysRolePermissionServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
+
             return res;
         }
         if(context.syspermission && context.sysrolepermission){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().post(`/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -258,20 +263,20 @@ export default class SysRolePermissionServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/save`,data,isloading);
+
             return res;
         }
         if(context.syspermission && context.sysrolepermission){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/save`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysrolepermissions/${context.sysrolepermission}/save`,data,isloading);
+
             return res;
     }
 
@@ -287,15 +292,17 @@ export default class SysRolePermissionServiceBase extends EntityService {
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysrole && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/fetchdefault`,tempData,isloading);
+            return res;
         }
         if(context.syspermission && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/fetchdefault`,tempData,isloading);
+            return res;
         }
-        
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysrolepermissions/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysrolepermissions/fetchdefault`,tempData,isloading);
+        return res;
     }
 
     /**

app_web/src/service/sys-role/sys-role-service-base.ts

@@ -48,8 +48,9 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
-            return Http.getInstance().get(`/sysroles/${context.sysrole}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysroles/${context.sysrole}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,9 +63,6 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -77,6 +75,7 @@ export default class SysRoleServiceBase extends EntityService {
         let res:any = await Http.getInstance().post(`/sysroles`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_sysrolepermissions',JSON.stringify(res.data.sysrolepermissions));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_sysuserroles',JSON.stringify(res.data.sysuserroles));
+
         return res;
     }
 
@@ -90,12 +89,10 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysroles/${context.sysrole}`,data,isloading);
+
             return res;
     }
 
@@ -109,10 +106,8 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().delete(`/sysroles/${context.sysrole}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysroles/${context.sysrole}`,isloading);
+            return res;
     }
 
     /**
@@ -125,10 +120,8 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
             let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}`,isloading);
+
             return res;
     }
 
@@ -142,11 +135,9 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let res:any = await  Http.getInstance().get(`/sysroles/getdraft`,isloading);
         res.data.sysrole = data.sysrole;
+
         return res;
     }
 
@@ -160,10 +151,8 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().post(`/sysroles/${context.sysrole}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysroles/${context.sysrole}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -176,12 +165,10 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysroles/${context.sysrole}/save`,data,isloading);
+
             return res;
     }
 
@@ -195,9 +182,9 @@ export default class SysRoleServiceBase extends EntityService {
      * @memberof SysRoleServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysroles/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysroles/fetchdefault`,tempData,isloading);
+        return res;
     }
 
     /**

app_web/src/service/sys-user-role/sys-user-role-service-base.ts

@@ -49,13 +49,18 @@ export default class SysUserRoleServiceBase extends EntityService {
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && context.sysuserrole){
-            return Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/select`,isloading);
+
+            return res;
         }
         if(context.sysrole && context.sysuserrole){
-            return Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/select`,isloading);
+
+            return res;
         }
-        
-            return Http.getInstance().get(`/sysuserroles/${context.sysuserrole}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysuserroles/${context.sysuserrole}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -79,6 +84,7 @@ export default class SysUserRoleServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles`,data,isloading);
+
             return res;
         }
         if(context.sysrole && true){
@@ -92,11 +98,9 @@ export default class SysUserRoleServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -107,6 +111,7 @@ export default class SysUserRoleServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysuserroles`,data,isloading);
+
         return res;
     }
 
@@ -124,20 +129,20 @@ export default class SysUserRoleServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,data,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysuserroles/${context.sysuserrole}`,data,isloading);
+
             return res;
     }
 
@@ -152,15 +157,15 @@ export default class SysUserRoleServiceBase extends EntityService {
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && context.sysuserrole){
-            return Http.getInstance().delete(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
+            return res;
         }
         if(context.sysrole && context.sysuserrole){
-            return Http.getInstance().delete(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
+            return res;
         }
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().delete(`/sysuserroles/${context.sysuserrole}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysuserroles/${context.sysuserrole}`,isloading);
+            return res;
     }
 
     /**
@@ -175,16 +180,16 @@ export default class SysUserRoleServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && context.sysuserrole){
             let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
             let res:any = await Http.getInstance().get(`/sysuserroles/${context.sysuserrole}`,isloading);
+
             return res;
     }
 
@@ -201,18 +206,18 @@ export default class SysUserRoleServiceBase extends EntityService {
         if(context.sysuser && true){
             let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/getdraft`,isloading);
             res.data.sysuserrole = data.sysuserrole;
+
             return res;
         }
         if(context.sysrole && true){
             let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/getdraft`,isloading);
             res.data.sysuserrole = data.sysuserrole;
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let res:any = await  Http.getInstance().get(`/sysuserroles/getdraft`,isloading);
         res.data.sysuserrole = data.sysuserrole;
+
         return res;
     }
 
@@ -230,18 +235,18 @@ export default class SysUserRoleServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -258,20 +263,20 @@ export default class SysUserRoleServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/save`,data,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/save`,data,isloading);
+
             return res;
         }
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/save`,data,isloading);
+
             return res;
     }
 
@@ -287,15 +292,17 @@ export default class SysUserRoleServiceBase extends EntityService {
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/fetchdefault`,tempData,isloading);
+            return res;
         }
         if(context.sysrole && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/fetchdefault`,tempData,isloading);
+            return res;
         }
-        
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysuserroles/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysuserroles/fetchdefault`,tempData,isloading);
+        return res;
     }
 
     /**

app_web/src/service/sys-user/sys-user-service-base.ts

@@ -48,8 +48,9 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
-            return Http.getInstance().get(`/sysusers/${context.sysuser}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysusers/${context.sysuser}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,9 +63,6 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -76,6 +74,7 @@ export default class SysUserServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysusers`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_sysuserroles',JSON.stringify(res.data.sysuserroles));
+
         return res;
     }
 
@@ -89,12 +88,10 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysusers/${context.sysuser}`,data,isloading);
+
             return res;
     }
 
@@ -108,10 +105,8 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().delete(`/sysusers/${context.sysuser}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysusers/${context.sysuser}`,isloading);
+            return res;
     }
 
     /**
@@ -124,10 +119,8 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
             let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}`,isloading);
+
             return res;
     }
 
@@ -141,11 +134,9 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let res:any = await  Http.getInstance().get(`/sysusers/getdraft`,isloading);
         res.data.sysuser = data.sysuser;
+
         return res;
     }
 
@@ -159,10 +150,8 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
-            return Http.getInstance().post(`/sysusers/${context.sysuser}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysusers/${context.sysuser}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -175,12 +164,10 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            // aaaaa
-    // bbbbb
-
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysusers/${context.sysuser}/save`,data,isloading);
+
             return res;
     }
 
@@ -194,9 +181,9 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysusers/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysusers/fetchdefault`,tempData,isloading);
+        return res;
     }
 
     /**

config.xml

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

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

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

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

@@ -3,24 +3,9 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "30002:30002"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - ABC=1
-      - DEC=3
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzuaa-app/ibzuaa-app-web/src/main/java/cn/ibizlab/web/webApplication.java

@@ -28,6 +28,7 @@ import java.util.List;
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
             org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
+            com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure.class
 })
 public class webApplication extends WebMvcConfigurerAdapter{
 

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

@@ -9,31 +9,31 @@ zuul:
   routes:
     sys_authlog:
       path: /sysauthlogs/**
-      serviceId: ibzuaa-api
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
       stripPrefix: false
     sys_app:
       path: /sysapps/**
-      serviceId: ibzuaa-api
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
       stripPrefix: false
     sys_role_permission:
       path: /sysrolepermissions/**
-      serviceId: ibzuaa-api
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
       stripPrefix: false
     sys_permission:
       path: /syspermissions/**
-      serviceId: ibzuaa-api
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
       stripPrefix: false
     sys_user_role:
       path: /sysuserroles/**
-      serviceId: ibzuaa-api
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
       stripPrefix: false
     sys_user:
       path: /sysusers/**
-      serviceId: ibzuaa-api
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
       stripPrefix: false
     sys_role:
       path: /sysroles/**
-      serviceId: ibzuaa-api
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
       stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysUserMapper.java

@@ -17,6 +17,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.alibaba.fastjson.JSONObject;
 
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface SysUserMapper extends BaseMapper<SysUser>{
 
     Page<SysUser> searchDefault(IPage page, @Param("srf") SysUserSearchContext context, @Param("ew") Wrapper<SysUser> wrapper) ;

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

-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-
-
-
-
-
-    <!--输出实体[SYS_AUTHLOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-40-1">
-        <createTable tableName="IBZAUTHLOG">
-                <column name="LOGID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
-                </column>
-                <column name="USERNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="PERSONNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="DOMAIN" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="AUTHTIME" remarks="" type="DATETIME">
-                </column>
-                <column name="IPADDR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="MACADDR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="USERAGENT" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="AUTHCODE" remarks="" type="VARCHAR(15)">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_PSSYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-39-2">
-        <createTable tableName="IBZPSSYSTEM">
-                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
-                </column>
-                <column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
-                </column>
-                <column name="APPS" remarks="" type="TEXT(1048576)">
-                </column>
-                <column name="MD5CHECK" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SHOWORDER" remarks="" type="INT">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-3">
-        <createTable tableName="IBZPERMISSION">
-                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
-                </column>
-                <column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
-                </column>
-                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ENABLE" remarks="" type="INT">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-94-4">
-        <createTable tableName="IBZROLE">
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
-                </column>
-                <column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="MEMO" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-98-5">
-        <createTable tableName="IBZROLE_PERMISSION">
-                <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
-                </column>
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-
-
-    <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-72-6">
-        <createTable tableName="IBZUSER_ROLE">
-                <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
-                </column>
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYS_USERID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-        <!--输出实体[SYS_AUTHLOG]外键关系 -->
-        <!--输出实体[SYS_PSSYSTEM]外键关系 -->
-        <!--输出实体[SYS_PERMISSION]外键关系 -->
-        <!--输出实体[SYS_ROLE]外键关系 -->
-        <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-98-7">
-       <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
-    </changeSet>
-        <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-72-9">
-       <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
-    </changeSet>
-
-</databaseChangeLog>
+!!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${dbinst.getUserName()}  [in template "CODETEMPL_zh_CN" at line 28, column 24]
+----
\ No newline at end of file

ibzuaa-dependencies/pom.xml

@@ -77,6 +77,9 @@
         <!--baomidou-jobs定时服务 -->
         <baomidou-jobs.version>1.0.3</baomidou-jobs.version>
 
+        <!-- eureka微服务注册中心 -->
+        <eureka-client.version>2.2.1.RELEASE</eureka-client.version>
+
         <oracle.version>11.2.0.3</oracle.version>
         <postgresql.version>42.2.6</postgresql.version>
 
@@ -314,6 +317,13 @@
             <artifactId>h2</artifactId>
         </dependency>
 
+        <!--  eureka服务注册中心 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <version>${eureka-client.version}</version>
+        </dependency>
+
         <!--  Oracle驱动包 -->
         <dependency>
             <groupId>com.oracle</groupId>
@@ -332,6 +342,12 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!--  mp动态数据源 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application.yml

 spring:
   profiles:
-    include: sys , api-prod
+    include: sys ,nacos, api-prod
   application:
     name: ibzuaa-api
\ No newline at end of file

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZOUFeignClient.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "ibzou-api",fallback = IBZOUFallback.class)
+@FeignClient(value = "${ibiz.ref.service.ou:ibzou-api}",fallback = IBZOUFallback.class)
 public interface IBZOUFeignClient
 {
 	/**

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZUAAFeignClient.java

@@ -7,7 +7,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import com.alibaba.fastjson.JSONObject;
 
-@FeignClient(value = "ibzuaa-api",fallback = IBZUAAFallback.class)
+@FeignClient(value = "${ibiz.ref.service.uaa:ibzuaa-api}",fallback = IBZUAAFallback.class)
 public interface IBZUAAFeignClient
 {
 	/**

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -4,7 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import java.util.*;
 
-@FeignClient(value = "ibzwf-api",fallback = IBZWFFallback.class)
+@FeignClient(value = "${ibiz.ref.service.wf:ibzwf-api}",fallback = IBZWFFallback.class)
 public interface IBZWFFeignClient
 {
 	@RequestMapping(method = RequestMethod.GET, value = "/{system}-app-{appname}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")

ibzuaa-util/src/main/java/cn/ibizlab/util/domain/LiquibaseProp.java

@@ -4,9 +4,9 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-@Component
-@ConfigurationProperties(prefix = "spring.datasource")
 @Data
+@Component
+@ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.master")
 public class LiquibaseProp{
 
     private  String url;

ibzuaa-util/src/main/resources/application-eureka.yml

+#eureka配置中心
+spring:
+  cloud:
+    nacos:
+      discovery:
+        enabled: false
+
+eureka:
+  client:
+    enabled: true
+    serviceUrl:
+      defaultZone: http://127.0.0.1:40002/eureka/
+
+

ibzuaa-util/src/main/resources/application-nacos.yml

+#nacos配置中心
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 172.16.102.211:8848
+        enabled: true
+
+eureka:
+  client:
+    enabled: false
+

ibzuaa-util/src/main/resources/application-sys.yml

-#nacos配置中心、数据源
+#缓存、数据源
 spring:
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.211:8848
   cache:
     redis:
       time-to-live: 3600
@@ -21,31 +17,43 @@ spring:
         max-idle: 16
         min-idle: 8
   datasource:
-    username: a_A_5d9d78509
-    password: '@6dEfb3@'
-    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-    driver-class-name: com.mysql.jdbc.Driver
-    filters: stat,wall,log4j2
-    #配置初始化大小/最小/最大
-    initial-size: 1
-    min-idle: 1
-    max-active: 20
-    #获取连接等待超时时间
-    max-wait: 60000
-    #间隔多久进行一次检测，检测需要关闭的空闲连接
-    time-between-eviction-runs-millis: 60000
-    #一个连接在池中最小生存的时间
-    min-evictable-idle-time-millis: 300000
-    validation-query: SELECT 1 FROM DUAL
-    test-while-idle: true
-    test-on-borrow: false
-    test-on-return: false
-    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
-    pool-prepared-statements: false
-    max-pool-prepared-statement-per-connection-size: 20
-    isSyncDBSchema: false
-    defaultSchema: a_A_5d9d78509
-    conf: classpath:liquibase/master.xml
+    dynamic:
+      druid: #以下是全局默认值，可以全局更改
+        filters: stat,wall,log4j2
+        #配置初始化大小/最小/最大
+        initial-size: 1
+        min-idle: 1
+        max-active: 20
+        #获取连接等待超时时间
+        max-wait: 60000
+        #间隔多久进行一次检测，检测需要关闭的空闲连接
+        time-between-eviction-runs-millis: 60000
+        #一个连接在池中最小生存的时间
+        min-evictable-idle-time-millis: 300000
+        validation-query: SELECT 1 FROM DUAL
+        test-while-idle: true
+        test-on-borrow: false
+        test-on-return: false
+        #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+        pool-prepared-statements: false
+        max-pool-prepared-statement-per-connection-size: 20
+      datasource:
+        master:
+          username: a_A_5d9d78509
+          password: '@6dEfb3@'
+          url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+          driver-class-name: com.mysql.jdbc.Driver
+          conf: classpath:liquibase/master.xml
+          isSyncDBSchema: false
+          defaultSchema: a_A_5d9d78509
+        db2:
+          username: a_A_5d9d78509
+          password: '@6dEfb3@'
+          url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+          driver-class-name: com.mysql.jdbc.Driver
+          conf: classpath:liquibase/master.xml
+          isSyncDBSchema: false
+          defaultSchema: a_A_5d9d78509
 
 #Mybatis-plus配置
 mybatis-plus: