Merge branch '1.2.x' into 1.3.x
diff --git "a/deploy-manifests/charts/1.2.0003.\350\256\244\350\257\201\346\216\210\346\235\203-\344\272\221\345\271\263\345\217\260\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210API\350\267\257\347\224\261\343\200\201\345\272\224\347\224\250\343\200\201\350\217\234\345\215\225\343\200\201\350\247\222\350\211\262\346\235\203\351\231\220\357\274\211.md" "b/deploy-manifests/charts/1.2.0003.\350\256\244\350\257\201\346\216\210\346\235\203-\344\272\221\345\271\263\345\217\260\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210API\350\267\257\347\224\261\343\200\201\345\272\224\347\224\250\343\200\201\350\217\234\345\215\225\343\200\201\350\247\222\350\211\262\346\235\203\351\231\220\357\274\211.md"
index 48ff870..f841121 100644
--- "a/deploy-manifests/charts/1.2.0003.\350\256\244\350\257\201\346\216\210\346\235\203-\344\272\221\345\271\263\345\217\260\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210API\350\267\257\347\224\261\343\200\201\345\272\224\347\224\250\343\200\201\350\217\234\345\215\225\343\200\201\350\247\222\350\211\262\346\235\203\351\231\220\357\274\211.md"
+++ "b/deploy-manifests/charts/1.2.0003.\350\256\244\350\257\201\346\216\210\346\235\203-\344\272\221\345\271\263\345\217\260\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210API\350\267\257\347\224\261\343\200\201\345\272\224\347\224\250\343\200\201\350\217\234\345\215\225\343\200\201\350\247\222\350\211\262\346\235\203\351\231\220\357\274\211.md"
@@ -241,6 +241,11 @@
"order": 20800, "resourceIdOrCodes": []
},
{
+ "id": "20900", "parentIdOrCode":"20000", "code": "infoPerfectConfig", "name": "信息完善配置", "memo": "", "status": "1",
+ "icon": "su-icon-chongxintijiao", "origin": "http://admin-platform.paas.xxx.edu.cn", "url": "/cas-server/infoPerfectConfig", "target": "",
+ "order": 20900, "resourceIdOrCodes": []
+ },
+ {
"id": "21000", "parentIdOrCode":"20000", "code": "lockManagement", "name": "认证锁定管理", "memo": "", "status": "1",
"icon": "su-icon-shouquanjiguanli", "origin": "http://admin-platform.paas.xxx.edu.cn", "url": "/cas-server/lockManagement", "target": "",
"order": 21000, "resourceIdOrCodes": []
@@ -457,6 +462,11 @@
"order": 20800, "resourceIdOrCodes": []
},
{
+ "id": "20900", "parentIdOrCode":"20000", "code": "infoPerfectConfig", "name": "信息完善配置", "memo": "", "status": "1",
+ "icon": "su-icon-chongxintijiao", "origin": "http://admin-platform.paas.xxx.edu.cn", "url": "/cas-server/infoPerfectConfig", "target": "",
+ "order": 20900, "resourceIdOrCodes": []
+ },
+ {
"id": "21000", "parentIdOrCode":"20000", "code": "lockManagement", "name": "认证锁定管理", "memo": "", "status": "1",
"icon": "su-icon-shouquanjiguanli", "origin": "http://admin-platform.paas.xxx.edu.cn", "url": "/cas-server/lockManagement", "target": "",
"order": 21000, "resourceIdOrCodes": []
@@ -664,6 +674,9 @@
values ('20800', 0, 'linkLoginConfig', '联合登录配置', '1', '2', 'su-icon-test', '/cas-server/linkLoginConfig', '10', '20000', 20800, 2, 29, 30);
insert into TB_MGT_PERMISSION (ID, DELETED, CODE, NAME, STATUS, TYPE_, ICON, URL, APPLICATION_ID, PARENT_ID, ORDER_, LEVEL_, LFT, RGT)
+values ('20900', 0, 'infoPerfectConfig', '信息完善配置', '1', '2', 'su-icon-chongxintijiao', '/cas-server/infoPerfectConfig', '10', '20000', 20900, 2, 31, 32);
+
+insert into TB_MGT_PERMISSION (ID, DELETED, CODE, NAME, STATUS, TYPE_, ICON, URL, APPLICATION_ID, PARENT_ID, ORDER_, LEVEL_, LFT, RGT)
values ('21000', 0, 'lockManagement', '认证锁定管理', '1', '2', 'su-icon-shouquanjiguanli', '/cas-server/lockManagement', '10', '20000', 21000, 2, 31, 32);
insert into TB_MGT_PERMISSION (ID, DELETED, CODE, NAME, STATUS, TYPE_, ICON, URL, APPLICATION_ID, PARENT_ID, ORDER_, LEVEL_, LFT, RGT)
values ('21100', 0, 'analyze', '认证统计分析', '1', '2', 'su-icon-renzhengtongjifenxi', '/cas-server/analyze', '10', '20000', 21100, 2, 33, 34);
@@ -806,6 +819,13 @@
-d \
'
{
+ "roleCodeIdMap": {
+ "cas-admin": "20",
+ "user-admin": "30",
+ "user-authz-admin": "40",
+ "user-authz-grant-admin": "41",
+ "user-authz-man-grant-admin": "42"
+ },
"rolePermissionList":
[
{
diff --git "a/deploy-manifests/k8s-rancher/0.1.2.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.0-V1.2\357\274\211.md" "b/deploy-manifests/k8s-rancher/0.1.2.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.0-V1.2\357\274\211.md"
index 87e7a1f..e950834 100644
--- "a/deploy-manifests/k8s-rancher/0.1.2.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.0-V1.2\357\274\211.md"
+++ "b/deploy-manifests/k8s-rancher/0.1.2.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.0-V1.2\357\274\211.md"
@@ -98,7 +98,7 @@
```
USER_AUTHORIZATION_SA_USER_RABBITMQ_CONSUMER_ENABLED: "false"
- USER_AUTHORIZATION_SA_USER_RABBITMQ_HOST: rabbitmq-server.jobs-server.svc.cluster.local
+ USER_AUTHORIZATION_SA_USER_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local
USER_AUTHORIZATION_SA_USER_RABBITMQ_PORT: "5672"
USER_AUTHORIZATION_SA_USER_RABBITMQ_USERNAME: guest
USER_AUTHORIZATION_SA_USER_RABBITMQ_PASSWORD: guest