zhouweidong 发布系统代码 [ibiz-uaa，UAA鉴权]

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

 import AuthService from '../auth-service';
 
 /**
- * 应用权限服务对象基类
+ * 系统应用权限服务对象基类
  *
  * @export
  * @class SysAppAuthServiceBase

app_web/src/authservice/sys-app/sys-app-auth-service.ts

@@ -2,7 +2,7 @@ import SysAppAuthServiceBase from './sys-app-auth-service-base';
 
 
 /**
- * 应用权限服务对象
+ * 系统应用权限服务对象
  *
  * @export
  * @class SysAppAuthService

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

@@ -4,7 +4,7 @@ import EntityService from '../entity-service';
 
 
 /**
- * 应用服务对象基类
+ * 系统应用服务对象基类
  *
  * @export
  * @class SysAppServiceBase

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

@@ -3,7 +3,7 @@ import SysAppServiceBase from './sys-app-service-base';
 
 
 /**
- * 应用服务对象
+ * 系统应用服务对象
  *
  * @export
  * @class SysAppService

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

@@ -6,7 +6,7 @@ import SysAppService from '@/service/sys-app/sys-app-service';
 import SysAppAuthService from '@/authservice/sys-app/sys-app-auth-service';
 
 /**
- * 应用UI服务对象基类
+ * 系统应用UI服务对象基类
  *
  * @export
  * @class SysAppUIServiceBase

app_web/src/uiservice/sys-app/sys-app-ui-service.ts

 import SysAppUIServiceBase from './sys-app-ui-service-base';
 
 /**
- * 应用UI服务对象
+ * 系统应用UI服务对象
  *
  * @export
  * @class SysAppUIService

app_web/src/widgets/sys-app/default-searchform/default-searchform-service.ts

@@ -14,7 +14,7 @@ import DefaultModel from './default-searchform-model';
 export default class DefaultService extends ControlService {
 
     /**
-     * 应用服务对象
+     * 系统应用服务对象
      *
      * @type {SysAppService}
      * @memberof DefaultService

app_web/src/widgets/sys-app/main-form/main-form-service.ts

@@ -14,7 +14,7 @@ import MainModel from './main-form-model';
 export default class MainService extends ControlService {
 
     /**
-     * 应用服务对象
+     * 系统应用服务对象
      *
      * @type {SysAppService}
      * @memberof MainService

app_web/src/widgets/sys-app/main-grid/main-grid-service.ts

@@ -14,7 +14,7 @@ import MainModel from './main-grid-model';
 export default class MainService extends ControlService {
 
     /**
-     * 应用服务对象
+     * 系统应用服务对象
      *
      * @type {SysAppService}
      * @memberof MainService

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -320,6 +320,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -824,7 +838,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SYS_ROLE_PERMISSIONPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SysRolePermissionGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -919,7 +933,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SYS_ROLE_PERMISSIONPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SysRolePermissionGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1025,7 +1039,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SYS_ROLE_PERMISSIONPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SysRolePermissionGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1812,7 +1826,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzuaa_web_sys_role_permissionpickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzuaa_web_sysrolepermissiongridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1879,7 +1893,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzuaa_web_sys_role_permissionpickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzuaa_web_sysrolepermissiongridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -1950,7 +1964,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SYS_ROLE_PERMISSIONPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SysRolePermissionGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1958,7 +1972,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SYS_ROLE_PERMISSIONPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SysRolePermissionGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.sysrolepermission){
@@ -2025,7 +2039,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SYS_ROLE_PERMISSIONPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'SysRolePermissionGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysApp.java

@@ -29,14 +29,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 /**
- * [应用] 对象
+ * [系统应用] 对象
  */
 @Builder
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("应用")
+@ApiModel("系统应用")
 public class SysApp extends EntityBase implements Serializable {
 
     /**

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAppServiceImpl.java

@@ -35,7 +35,7 @@ import com.alibaba.fastjson.JSONObject;
 
 
 /**
- * 实体[应用] 无存储服务对象接口实现
+ * 实体[系统应用] 无存储服务对象接口实现
  */
 @Slf4j
 @Service

ibzuaa-core/src/main/resources/permission/systemResource.json

@@ -6,7 +6,7 @@
     "entities":[
     {
     "dename":"SysApp",
-    "delogicname":"应用",
+    "delogicname":"系统应用",
     "sysmoudle":{"id":"UAA","name":"uaa"},
     "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],

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

@@ -4,7 +4,7 @@
     "entities":[
     {
     "entity_name":"SYS_APP",
-    "logic_name":"应用",
+    "logic_name":"系统应用",
     "code_name":"SysApp",
     "table_name":"",
     "system_id":"ibzuaa",

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysAppDTO.java

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 服务DTO对象[SysAppDTO]
  */
 @Data
-@ApiModel("应用")
+@ApiModel("系统应用")
 public class SysAppDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysAppResource.java

@@ -35,7 +35,7 @@ import cn.ibizlab.core.uaa.filter.SysAppSearchContext;
 import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
-@Api(tags = {"应用" })
+@Api(tags = {"系统应用" })
 @RestController("api-sysapp")
 @RequestMapping("")
 public class SysAppResource {
@@ -47,7 +47,7 @@ public class SysAppResource {
     @Lazy
     public SysAppMapping sysappMapping;
 
-    @ApiOperation(value = "新建应用", tags = {"应用" },  notes = "新建应用")
+    @ApiOperation(value = "新建系统应用", tags = {"系统应用" },  notes = "新建系统应用")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysapps")
     public ResponseEntity<SysAppDTO> create(@Validated @RequestBody SysAppDTO sysappdto) {
         SysApp domain = sysappMapping.toDomain(sysappdto);
@@ -56,14 +56,14 @@ public class SysAppResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "批量新建应用", tags = {"应用" },  notes = "批量新建应用")
+    @ApiOperation(value = "批量新建系统应用", tags = {"系统应用" },  notes = "批量新建系统应用")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysapps/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SysAppDTO> sysappdtos) {
         sysappService.createBatch(sysappMapping.toDomain(sysappdtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "获取应用", tags = {"应用" },  notes = "获取应用")
+    @ApiOperation(value = "获取系统应用", tags = {"系统应用" },  notes = "获取系统应用")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysapps/{sysapp_id}")
     public ResponseEntity<SysAppDTO> get(@PathVariable("sysapp_id") String sysapp_id) {
         SysApp domain = sysappService.get(sysapp_id);
@@ -71,20 +71,20 @@ public class SysAppResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "删除应用", tags = {"应用" },  notes = "删除应用")
+    @ApiOperation(value = "删除系统应用", tags = {"系统应用" },  notes = "删除系统应用")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysapps/{sysapp_id}")
     public ResponseEntity<Boolean> remove(@PathVariable("sysapp_id") String sysapp_id) {
          return ResponseEntity.status(HttpStatus.OK).body(sysappService.remove(sysapp_id));
     }
 
-    @ApiOperation(value = "批量删除应用", tags = {"应用" },  notes = "批量删除应用")
+    @ApiOperation(value = "批量删除系统应用", tags = {"系统应用" },  notes = "批量删除系统应用")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysapps/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         sysappService.removeBatch(ids);
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "更新应用", tags = {"应用" },  notes = "更新应用")
+    @ApiOperation(value = "更新系统应用", tags = {"系统应用" },  notes = "更新系统应用")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysapps/{sysapp_id}")
     public ResponseEntity<SysAppDTO> update(@PathVariable("sysapp_id") String sysapp_id, @RequestBody SysAppDTO sysappdto) {
 		SysApp domain  = sysappMapping.toDomain(sysappdto);
@@ -94,27 +94,27 @@ public class SysAppResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "批量更新应用", tags = {"应用" },  notes = "批量更新应用")
+    @ApiOperation(value = "批量更新系统应用", tags = {"系统应用" },  notes = "批量更新系统应用")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysapps/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysAppDTO> sysappdtos) {
         sysappService.updateBatch(sysappMapping.toDomain(sysappdtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "检查应用", tags = {"应用" },  notes = "检查应用")
+    @ApiOperation(value = "检查系统应用", tags = {"系统应用" },  notes = "检查系统应用")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysapps/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SysAppDTO sysappdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sysappService.checkKey(sysappMapping.toDomain(sysappdto)));
     }
 
-    @ApiOperation(value = "获取应用草稿", tags = {"应用" },  notes = "获取应用草稿")
+    @ApiOperation(value = "获取系统应用草稿", tags = {"系统应用" },  notes = "获取系统应用草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysapps/getdraft")
     public ResponseEntity<SysAppDTO> getDraft(SysAppDTO dto) {
         SysApp domain = sysappMapping.toDomain(dto);
         return ResponseEntity.status(HttpStatus.OK).body(sysappMapping.toDto(sysappService.getDraft(domain)));
     }
 
-    @ApiOperation(value = "保存应用", tags = {"应用" },  notes = "保存应用")
+    @ApiOperation(value = "保存系统应用", tags = {"系统应用" },  notes = "保存系统应用")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysapps/save")
     public ResponseEntity<SysAppDTO> save(@RequestBody SysAppDTO sysappdto) {
         SysApp domain = sysappMapping.toDomain(sysappdto);
@@ -122,14 +122,14 @@ public class SysAppResource {
         return ResponseEntity.status(HttpStatus.OK).body(sysappMapping.toDto(domain));
     }
 
-    @ApiOperation(value = "批量保存应用", tags = {"应用" },  notes = "批量保存应用")
+    @ApiOperation(value = "批量保存系统应用", tags = {"系统应用" },  notes = "批量保存系统应用")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysapps/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysAppDTO> sysappdtos) {
         sysappService.saveBatch(sysappMapping.toDomain(sysappdtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-	@ApiOperation(value = "获取DEFAULT", tags = {"应用" } ,notes = "获取DEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"系统应用" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sysapps/fetchdefault")
 	public ResponseEntity<List<SysAppDTO>> fetchDefault(SysAppSearchContext context) {
         Page<SysApp> domains = sysappService.searchDefault(context) ;
@@ -141,7 +141,7 @@ public class SysAppResource {
                 .body(list);
 	}
 
-	@ApiOperation(value = "查询DEFAULT", tags = {"应用" } ,notes = "查询DEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"系统应用" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sysapps/searchdefault")
 	public ResponseEntity<Page<SysAppDTO>> searchDefault(@RequestBody SysAppSearchContext context) {
         Page<SysApp> domains = sysappService.searchDefault(context) ;