Skip to content

I
ibzuaa
提交 00b16f80 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 517907b6
显示空白字符变更
内嵌 并排
正在显示 包含 72 行增加 和 84 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ 00b16f80
......@@ -5,9 +5,19 @@
"codelisttype":"static",
"items": [
{
"id": "APPMENU",
"label": "应用菜单",
"text": "应用菜单",
"data":"",
"codename":"Appmenu",
"value": "APPMENU",
"disabled": false
}
, {
"id": "OPPRIV",
"label": "数据对象能力",
"text": "数据对象能力",
"label": "数据能力",
"text": "数据能力",
"data":"",
"codename":"Oppriv",
"value": "OPPRIV",
......
app_web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 00b16f80
export default {
CLPermissionType: {
'OPPRIV': '数据对象能力',
'APPMENU': '应用菜单',
'OPPRIV': '数据能力',
'UNIRES': '统一资源',
empty: '',
},
......
app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 00b16f80
export default {
CLPermissionType: {
'OPPRIV': '数据对象能力',
'APPMENU': '应用菜单',
'OPPRIV': '数据能力',
'UNIRES': '统一资源',
empty: '',
},
......
app_web/src/locale/lanres/sys-psappmenuitem/sys-psappmenuitem_en_US.ts
浏览文件 @ 00b16f80
......@@ -3,14 +3,13 @@ export default {
fields: {
appmenuitemid: '系统菜单项标识',
appmenuitemname: '系统菜单项名称',
psappid: '系统应用标识',
psappname: '系统应用名称',
psappmenuid: '系统菜单标识',
psappmenuname: '系统菜单名称',
isleaf: '是否为叶子节点（用于菜单）',
pssystemid: '实体标识',
permissionid: '系统资源标识',
parentpermissionid: '父项资源标识',
psappid: '业务系统应用标识',
psappname: '业务系统应用名称',
psappmenuid: '业务系统菜单标识',
psappmenuname: '业务系统菜单名称',
pssystemid: '业务系统标识',
permissionid: '业务系统菜单项标识',
parentpermissionid: '业务系统父菜单项标识',
createdate: '建立时间',
updatedate: '更新时间',
},
......
app_web/src/locale/lanres/sys-psappmenuitem/sys-psappmenuitem_zh_CN.ts
浏览文件 @ 00b16f80
......@@ -2,14 +2,13 @@ export default {
fields: {
appmenuitemid: '系统菜单项标识',
appmenuitemname: '系统菜单项名称',
psappid: '系统应用标识',
psappname: '系统应用名称',
psappmenuid: '系统菜单标识',
psappmenuname: '系统菜单名称',
isleaf: '是否为叶子节点（用于菜单）',
pssystemid: '实体标识',
permissionid: '系统资源标识',
parentpermissionid: '父项资源标识',
psappid: '业务系统应用标识',
psappname: '业务系统应用名称',
psappmenuid: '业务系统菜单标识',
psappmenuname: '业务系统菜单名称',
pssystemid: '业务系统标识',
permissionid: '业务系统菜单项标识',
parentpermissionid: '业务系统父菜单项标识',
createdate: '建立时间',
updatedate: '更新时间',
},
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ 00b16f80
......@@ -12,10 +12,20 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
emptytext: '未定义',
"codelisttype":"static",
items: [
{
id: 'APPMENU',
label: '应用菜单',
text: '应用菜单',
"data":"",
"codename":"Appmenu",
value: 'APPMENU',
disabled: false,
},
{
id: 'OPPRIV',
label: '数据对象能力',
text: '数据对象能力',
label: '数据能力',
text: '数据能力',
"data":"",
"codename":"Oppriv",
value: 'OPPRIV',
......
config.xml
浏览文件 @ 00b16f80
......@@ -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
浏览文件 @ 00b16f80
......@@ -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 /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
浏览文件 @ 00b16f80
......@@ -3,11 +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
deploy:
mode: replicated
replicas: 1
......
ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-dev.yml
浏览文件 @ 00b16f80
server:
port: 30002
\ No newline at end of file
port: 8080
\ No newline at end of file
ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ 00b16f80
server:
port: 30002
port: 8080
#zuul网关路由设置
zuul:
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSAPPMENUITEM.java
浏览文件 @ 00b16f80
......@@ -49,56 +49,49 @@ public class SYS_PSAPPMENUITEM extends EntityMP implements Serializable {
@JsonProperty("appmenuitemname")
private String appmenuitemname;
/**
* 系统应用标识
* 业务系统应用标识
*/
@TableField(value = "psappid")
@JSONField(name = "psappid")
@JsonProperty("psappid")
private String psappid;
/**
* 系统应用名称
* 业务系统应用名称
*/
@TableField(value = "psappname")
@JSONField(name = "psappname")
@JsonProperty("psappname")
private String psappname;
/**
* 系统菜单标识
* 业务系统菜单标识
*/
@TableField(value = "psappmenuid")
@JSONField(name = "psappmenuid")
@JsonProperty("psappmenuid")
private String psappmenuid;
/**
* 系统菜单名称
* 业务系统菜单名称
*/
@TableField(value = "psappmenuname")
@JSONField(name = "psappmenuname")
@JsonProperty("psappmenuname")
private String psappmenuname;
/**
* 是否为叶子节点（用于菜单）
*/
@TableField(value = "isleaf")
@JSONField(name = "isleaf")
@JsonProperty("isleaf")
private Integer isleaf;
/**
* 实体标识
* 业务系统标识
*/
@TableField(value = "pssystemid")
@JSONField(name = "pssystemid")
@JsonProperty("pssystemid")
private String pssystemid;
/**
* 系统资源标识
* 业务系统菜单项标识
*/
@TableField(value = "permissionid")
@JSONField(name = "permissionid")
@JsonProperty("permissionid")
private String permissionid;
/**
* 父项资源标识
* 业务系统父菜单项标识
*/
@DEField(name = "p_permissionid")
@TableField(value = "p_permissionid")
......@@ -134,56 +127,49 @@ public class SYS_PSAPPMENUITEM extends EntityMP implements Serializable {
this.modify("sys_psappmenuitemname",appmenuitemname);
}
/**
* 设置 [系统应用标识]
* 设置 [业务系统应用标识]
*/
public void setPsappid(String psappid){
this.psappid = psappid ;
this.modify("psappid",psappid);
}
/**
* 设置 [系统应用名称]
* 设置 [业务系统应用名称]
*/
public void setPsappname(String psappname){
this.psappname = psappname ;
this.modify("psappname",psappname);
}
/**
* 设置 [系统菜单标识]
* 设置 [业务系统菜单标识]
*/
public void setPsappmenuid(String psappmenuid){
this.psappmenuid = psappmenuid ;
this.modify("psappmenuid",psappmenuid);
}
/**
* 设置 [系统菜单名称]
* 设置 [业务系统菜单名称]
*/
public void setPsappmenuname(String psappmenuname){
this.psappmenuname = psappmenuname ;
this.modify("psappmenuname",psappmenuname);
}
/**
* 设置 [是否为叶子节点（用于菜单）]
*/
public void setIsleaf(Integer isleaf){
this.isleaf = isleaf ;
this.modify("isleaf",isleaf);
}
/**
* 设置 [实体标识]
* 设置 [业务系统标识]
*/
public void setPssystemid(String pssystemid){
this.pssystemid = pssystemid ;
this.modify("pssystemid",pssystemid);
}
/**
* 设置 [系统资源标识]
* 设置 [业务系统菜单项标识]
*/
public void setPermissionid(String permissionid){
this.permissionid = permissionid ;
this.modify("permissionid",permissionid);
}
/**
* 设置 [父项资源标识]
* 设置 [业务系统父菜单项标识]
*/
public void setParentpermissionid(String parentpermissionid){
this.parentpermissionid = parentpermissionid ;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PSAPPMENUITEMSearchContext.java
浏览文件 @ 00b16f80
......@@ -34,7 +34,7 @@ public class SYS_PSAPPMENUITEMSearchContext extends QueryWrapperContext<SYS_PSAP
this.getSelectCond().like("sys_psappmenuitemname", n_sys_psappmenuitemname_like);
}
}
private String n_pssystemid_eq;//[实体标识]
private String n_pssystemid_eq;//[业务系统标识]
public void setN_pssystemid_eq(String n_pssystemid_eq) {
this.n_pssystemid_eq = n_pssystemid_eq;
if(!ObjectUtils.isEmpty(this.n_pssystemid_eq)){
......
ibzuaa-core/src/main/resources/deprivs/DEPrivs.json
浏览文件 @ 00b16f80
......@@ -3,6 +3,13 @@
],
"predefineddatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
"entities":[
]
],
"appmenus":[
{
"appid":"web",
"appname":"UAA鉴权",
"appmenu":[{"menuid":"Main", "menuname":"MAIN", "menuitem":[{"id":"f59655c22753740bbcf200f5cfee8a54" , "name":"menuitem3" , "text":"用户管理" },{"id":"db3e0d48d6e76a66784adc84edd90cdc" , "name":"menuitem6" , "text":"角色" },{"id":"aa34fa65ba436d9267830d242fcda6c5" , "name":"menuitem7" , "text":"用户角色" },{"id":"6177ea33605de953767d48b120145efb" , "name":"menuitem10" , "text":"权限" },{"id":"2794bbcfc7b3c81b431d1f2e808a793b" , "name":"menuitem1" , "text":"角色权限" }] }]
}
]
}
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 00b16f80
......@@ -158,7 +158,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_PSAPPMENUITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-29-9">
<changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-56-9">
<createTable tableName="IBZPSAPPMENUITEM">
<column name="SYS_PSAPPMENUITEMID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSAPPMENUITEM_SYS_PSAPP"/>
......@@ -173,8 +173,6 @@
</column>
<column name="PSAPPMENUNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="ISLEAF" remarks="" type="INT">
</column>
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="PERMISSIONID" remarks="" type="VARCHAR(100)">
......
ibzuaa-core/src/main/resources/mapper/uaa/sys_psappmenuitem/SYS_PSAPPMENUITEMMapper.xml
浏览文件 @ 00b16f80
......@@ -26,7 +26,7 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`ISLEAF`, t1.`PERMISSIONID`, t1.`PSAPPID`, t1.`PSAPPMENUID`, t1.`PSAPPMENUNAME`, t1.`PSAPPNAME`, t1.`PSSYSTEMID`, t1.`P_PERMISSIONID`, t1.`SYS_PSAPPMENUITEMID`, t1.`SYS_PSAPPMENUITEMNAME`, t1.`UPDATEDATE` FROM `IBZPSAPPMENUITEM` t1
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`PERMISSIONID`, t1.`PSAPPID`, t1.`PSAPPMENUID`, t1.`PSAPPMENUNAME`, t1.`PSAPPNAME`, t1.`PSSYSTEMID`, t1.`P_PERMISSIONID`, t1.`SYS_PSAPPMENUITEMID`, t1.`SYS_PSAPPMENUITEMNAME`, t1.`UPDATEDATE` FROM `IBZPSAPPMENUITEM` t1
]]>
</sql>
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_PSAPPMENUITEMDTO.java
浏览文件 @ 00b16f80
......@@ -71,14 +71,6 @@ public class SYS_PSAPPMENUITEMDTO extends DTOBase implements Serializable {
@JsonProperty("psappmenuname")
private String psappmenuname;
/**
* 属性 [ISLEAF]
*
*/
@JSONField(name = "isleaf")
@JsonProperty("isleaf")
private Integer isleaf;
/**
* 属性 [PSSYSTEMID]
*
......@@ -162,14 +154,6 @@ public class SYS_PSAPPMENUITEMDTO extends DTOBase implements Serializable {
this.modify("psappmenuname",psappmenuname);
}
/**
* 设置 [ISLEAF]
*/
public void setIsleaf(Integer isleaf){
this.isleaf = isleaf ;
this.modify("isleaf",isleaf);
}
/**
* 设置 [PSSYSTEMID]
*/
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或