Merge branch '1.0.x' into 1.1.x
diff --git a/deploy-manifests/1.0.0001.init-poa-service.sql b/deploy-manifests/1.0.0001.init-poa-service.sql
index 66cda66..03e7171 100644
--- a/deploy-manifests/1.0.0001.init-poa-service.sql
+++ b/deploy-manifests/1.0.0001.init-poa-service.sql
@@ -1,5 +1,8 @@
-- 1.1.init-poa-service.sql
+
+DELETE FROM TB_DEV_SERVICE;
+
-- 将以下 sql 生成的 insert 语句，在 developer_center 下进行执行
-- SERVICE 记录
@@ -11,8 +14,6 @@
;
/*
-DELETE FROM TB_DEV_SERVICE;
-
INSERT INTO `TB_DEV_SERVICE` (ID,DELETED, NAME, DESCRIPTION, ORIGIN, SYSTEM_ID) VALUES('admincenter','0','管理中心','管理中心','http://admin-center-poa-svc.admin-center.svc.cluster.local:8080','1');
INSERT INTO `TB_DEV_SERVICE` (ID,DELETED, NAME, DESCRIPTION, ORIGIN, SYSTEM_ID) VALUES('authz','0','授权服务','授权服务','http://user-authorization-poa-svc.user-authorization-service.svc.cluster.local:8080','1');
INSERT INTO `TB_DEV_SERVICE` (ID,DELETED, NAME, DESCRIPTION, ORIGIN, SYSTEM_ID) VALUES('communicate','0','通信服务','通信服务','http://communicate-center-poa-svc.communicate-center.svc.cluster.local:8080','1');
@@ -100,3 +101,93 @@
;
+
+/*
+在 platform-openapi-sa 上 执行命令行
+
+```bash
+curl -i -s -X POST "http://localhost:8443/v1/apiSchema/refresh" -H 'Content-Type: application/json' \
+-d \
+'
+[
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "createAppGroup"
+ },
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "getAppGroup"
+ },
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "updateAppGroup"
+ },
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "deleteAppGroup"
+ }
+]
+'
+
+
+curl -i -s -X POST "http://localhost:8443/v1/apiSchema/latest" -H 'Content-Type: application/json' \
+-d \
+'
+[
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "createAppGroup"
+ },
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "getAppGroup"
+ },
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "updateAppGroup"
+ },
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1",
+ "operationId": "deleteAppGroup"
+ }
+]
+'
+
+curl -i -s -X POST "https://poa-sa.dev2.supwisdom.com/v1/apiSchema/refresh" -H 'Content-Type: application/json' \
+-d \
+'
+[
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1"
+ }
+]
+'
+
+
+curl -i -s -X POST "https://poa-sa.dev2.supwisdom.com/v1/apiSchema/latest" -H 'Content-Type: application/json' \
+-d \
+'
+[
+ {
+ "serviceId": "userThirdparty",
+ "apiVersion": "v1"
+ }
+]
+'
+
+```
+
+
+
+*/
+
+
diff --git a/deploy-manifests/1.1.init-ability.sql b/deploy-manifests/1.1.init-ability.sql
new file mode 100644
index 0000000..7ba769f
--- /dev/null
+++ b/deploy-manifests/1.1.init-ability.sql
@@ -0,0 +1,7 @@
+-- 1.1.init-ability.sql
+
+
+insert into TB_DEV_ABILITY (ID, DELETED, ADD_ACCOUNT, NAME, DESCRIPTION, ENABLED)
+values ('smp', 0, 'init', '电子签章', '电子签章（天威）', 1);
+
+commit;
diff --git a/deploy-manifests/1.1.init-application.sql b/deploy-manifests/1.1.init-application.sql
new file mode 100644
index 0000000..036ed8c
--- /dev/null
+++ b/deploy-manifests/1.1.init-application.sql
@@ -0,0 +1,42 @@
+-- 1.1.init-application.sql
+
+insert into TB_DEV_APPLICATION (ID, DELETED, ADD_ACCOUNT, NAME, DESCRIPTION, ENABLED, URL, ICON, SYSTEM_ID, ABILITY_COUNT, APPLICATION_IDENTIFICATION)
+values ('0', 0, 'init', '示例', '示例', 1, '', '', '1', 0, '0');
+
+
+
+
+select CONCAT(
+ 'INSERT INTO \`TB_DEV_APPLICATION\` (ID, DELETED, NAME, DESCRIPTION, URL, SYSTEM_ID, APPLICATION_IDENTIFICATION) VALUES',
+ '(\'cas_server-', ID, '\',\'1\',\'',NAME, '\',\'',DESCRIPTION,'\',\'', IFNULL(INFORMATION_URL,''),'\',\'','1', '\',\'', APPLICATION_ID , '\');') as INSERT_SQL
+from cas_server.TB_SERVICE
+where DELETED = 0
+
+union
+
+select CONCAT(
+ 'INSERT INTO \`TB_DEV_APPLICATION\` (ID, DELETED, NAME, DESCRIPTION, URL, SYSTEM_ID, APPLICATION_IDENTIFICATION) VALUES ',
+ '(\'message-',ID,'\',\'1\',\'',NAME,'\',\'', IFNULL(DESCRIPTION,''),'\',\'', IFNULL(URL,''),'\',\'','1','\',\'',APP_ID,'\');') as INSERT_SQL
+from message.ACCESS_APP
+where DELETED = 0 AND APP_ID IS NOT NULL
+
+
+
+
+
+select CONCAT(
+ 'INSERT INTO \`TB_DEV_APPLICATION_ABILITY_USAGE\` (ID, COMPANY_ID, DELETED, APPLICATION_ID, ABILITY_ID, APPLY_TIME,ABILITY_SETTINGS) VALUES (',
+ '\'cas_server-',ID,'cas','\',\'',' 1\', \'0','\',\'', ID,'\',\'', 'cas\', \'2020-12-22 15:32:43\',\'',
+ '{"logoutType":"',IFNULL(LOGOUT_TYPE,''),'","applicationDomain":"',IFNULL(APPLICATION_DOMAIN,''),'","addTime":1608538919314,"description":"',IFNULL(DESCRIPTION,''),
+ '","externalId":"',IFNULL(EXTERNAL_ID,''),'","informationUrl":"',IFNULL(INFORMATION_URL,''),'","enabled":true,"registeredServiceId":',IFNULL(REGISTERED_SERVICE_ID,''),
+ ',"companyId":"1","responseType":"',RESPONSE_TYPE,'","deleted":false,"ssoEnabled":',IF(SSO_ENABLED = 1,'true','false'),',"idTokenEnabled":',IF(ID_TOKEN_ENABLED = 1,'true','false'),
+ ',"jwtAsServiceTicket":',IF(JWT_AS_SERVICE_TICKET = 1,'true','false'),',"logoutUrl":"',IFNULL(LOGOUT_URL,''),'","name":"',NAME,
+ '","id":"',ID,'","addAccount":"admin","applicationId":"',IFNULL(APPLICATION_ID,''),'","serviceId":"',IFNULL(SERVICE_ID,''),'","requireAllAttributes":',IFNULL(REQUIRE_ALL_ATTRIBUTES,'1'),
+ '}',
+ '\');'
+) as INSERT_SQL
+from cas_server.TB_SERVICE
+where DELETED = '0'
+;
+
+
diff --git "a/deploy-manifests/charts/1.0.0001.\345\274\200\346\224\276\345\271\263\345\217\260-\350\256\244\350\257\201\345\257\271\346\216\245\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210\345\274\200\345\217\221\350\200\205\344\270\255\345\277\203\357\274\211.md" "b/deploy-manifests/charts/1.0.0001.\345\274\200\346\224\276\345\271\263\345\217\260-\350\256\244\350\257\201\345\257\271\346\216\245\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210\345\274\200\345\217\221\350\200\205\344\270\255\345\277\203\357\274\211.md"
index a5bfff5..06690e8 100644
--- "a/deploy-manifests/charts/1.0.0001.\345\274\200\346\224\276\345\271\263\345\217\260-\350\256\244\350\257\201\345\257\271\346\216\245\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210\345\274\200\345\217\221\350\200\205\344\270\255\345\277\203\357\274\211.md"
+++ "b/deploy-manifests/charts/1.0.0001.\345\274\200\346\224\276\345\271\263\345\217\260-\350\256\244\350\257\201\345\257\271\346\216\245\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\357\274\210\345\274\200\345\217\221\350\200\205\344\270\255\345\277\203\357\274\211.md"
@@ -41,9 +41,9 @@
`APPLICATION_DOMAIN`
)
VALUES ('90', '1', 0, 'admin', '2021-10-20 00:00:00',
- '开发者中心', '开发者中心', 'https://dev-portal.paas.xxx.edu.cn/', 'https://dev-portal.paas.xxx.edu.cn/?clearCertification=clearCertification',
+ '开发者中心', '开发者中心', 'https://dev-center.paas.xxx.edu.cn/dev-portal/', 'https://dev-center.paas.xxx.edu.cn/dev-portal/?clearCertification=clearCertification',
'REDIRECT', 'FRONT_CHANNEL',
- 90, '开发者中心', 90, 'https://dev-portal.paas.xxx.edu.cn/(.*)',
+ 90, '开发者中心', 90, 'https://dev-center.paas.xxx.edu.cn/dev-portal/(.*)',
1, 1, 1,
1, 1,
'90', '90',
@@ -54,12 +54,12 @@
-- 修改根域名
update TB_SERVICE
set
- INFORMATION_URL='https://dev-portal.paas.xxx.edu.cn/',
- LOGOUT_URL='https://dev-portal.paas.xxx.edu.cn/?clearCertification=clearCertification',
- SERVICE_ID='https://dev-portal.paas.xxx.edu.cn/(.*)',
+ INFORMATION_URL='https://dev-center.paas.xxx.edu.cn/dev-portal/',
+ LOGOUT_URL='https://dev-center.paas.xxx.edu.cn/dev-portal/?clearCertification=clearCertification',
+ SERVICE_ID='https://dev-center.paas.xxx.edu.cn/dev-portal/(.*)',
ID_TOKEN_ENABLED=1,
JWT_AS_SERVICE_TICKET=1,
- APPLICATION_DOMAIN='dev-portal.paas.xxx.edu.cn'
+ APPLICATION_DOMAIN='dev-center.paas.xxx.edu.cn'
where ID='90'; -- todo, modify