1.一些配置项改为内部地址
2.初始化数据库脚本添加一些账号数据
diff --git "a/deploy-manifests/k8s-rancher/0.0.1.\345\274\200\346\224\276\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md" "b/deploy-manifests/k8s-rancher/0.0.1.\345\274\200\346\224\276\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
index 14d1cab..949e2d3 100644
--- "a/deploy-manifests/k8s-rancher/0.0.1.\345\274\200\346\224\276\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
+++ "b/deploy-manifests/k8s-rancher/0.0.1.\345\274\200\346\224\276\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
@@ -221,9 +221,4 @@
### 服务依赖
- user-data-service 服务版本请确保在1.1或者更高
-
-### 在用户服务中创建关联身份
-
- D01 ： 个人开发者
- D02 ： 企业开发者
\ No newline at end of file
+ user-data-service 服务版本请确保在1.1或者更高
\ No newline at end of file
diff --git a/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.4.developer-center-bff.yaml b/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.4.developer-center-bff.yaml
index 71726f2..290a1fc 100644
--- a/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.4.developer-center-bff.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.4.developer-center-bff.yaml
@@ -5,7 +5,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: develop-center-test
+ namespace: developer-center
name: developer-center-bff-env
data:
SERVER_PORT: "8080"
@@ -18,7 +18,7 @@
LOGGING_LEVEL_ROOT: INFO
#同环境中backend服务的地址
- DEVELOPER_CENTER_SA_SERVER_URL: http://developer-center-backend-sa-svc.develop-center-test.svc.cluster.local:8080
+ DEVELOPER_CENTER_SA_SERVER_URL: http://developer-center-backend-sa-svc.developed-center.svc.cluster.local:8080
DEVELOPER_CENTER_SA_CLIENT_AUTH_ENABLED: "false"
# DEVELOPER_CENTER_SA_CLIENT_AUTH_KEY_PASSWORD: ""
# DEVELOPER_CENTER_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -27,7 +27,7 @@
# DEVELOPER_CENTER_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
#同环境中poa服务的地址
- PLATFORM_OPENAPI_SA_SERVER_URL: http://poa-sa-test.paas.newcapec.cn
+ PLATFORM_OPENAPI_SA_SERVER_URL: http://poa-sa-svc.poa.svc.cluster.local:8080
PLATFORM_OPENAPI_SA_CLIENT_AUTH_ENABLED: "false"
# PLATFORM_OPENAPI_SA_CLIENT_AUTH_KEY_PASSWORD: ""
# PLATFORM_OPENAPI_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -36,7 +36,7 @@
# PLATFORM_OPENAPI_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
#同环境中授权服务的地址
- USER_AUTHZ_SA_SERVICE_URL: http://user-authz-sa-test.paas.newcapec.cn
+ USER_DATA_SERVICE_SERVER_URL: http://user-authorization-sa-svc.user-authorization-service.svc.cluster.local:8080
USER_AUTHZ_SA_CLIENT_AUTH_ENABLED: "false"
# USER_AUTHZ_SA_CLIENT_AUTH_KEY_PASSWORD: ""
# USER_AUTHZ_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -45,7 +45,7 @@
# USER_AUTHZ_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
#同环境中用户服务的地址
- USER_DATA_SERVICE_SERVICE_URL: http://user-data-service-goa-svc.user-data-service-test.svc.cluster.local:8080
+ USER_AUTHZ_SA_SERVER_URL: http://user-data-service-goa-svc.user-data-service.svc.cluster.local:8080
USER_DATA_SERVICE_CLIENT_AUTH_ENABLED: "false"
# USER_DATA_SERVICE_CLIENT_AUTH_KEY_PASSWORD: ""
# USER_DATA_SERVICE_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -54,7 +54,7 @@
# USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
#同环境中认证服务的地址
- CAS_SA_SERVICE_URL: http://cas-server-sa-api-svc.cas-server-test.svc.cluster.local:8080
+ CAS_SA_SERVER_URL: http://cas-server-sa-api-svc.cas-server.svc.cluster.local:8080
CAS_SA_CLIENT_AUTH_ENABLED: "false"
# CAS_SA_CLIENT_AUTH_KEY_PASSWORD: ""
# CAS_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -63,7 +63,7 @@
# CAS_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
#同环境中消息服务的地址
- MESSAGE_MANAGER_SA_SERVICE_URL: https://message-manager-test.paas.newcapec.cn
+ MESSAGE_MANAGER_SA_SERVER_URL: https://message-manager-test.paas.newcapec.cn
MESSAGE_MANAGER_SA_CLIENT_AUTH_ENABLED: "false"
# MESSAGE_MANAGER_SA_AUTH_KEY_PASSWORD: ""
# MESSAGE_MANAGER_SA_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -72,7 +72,7 @@
# MESSAGE_MANAGER_SA_AUTH_TRUSTSTORE_PASSWORD: ""
#同环境中文件服务的地址
- MINIO_SA_SERVICE_URL: https://develop-center-minio-sa-test.paas.newcapec.cn
+ MINIO_SA_SERVER_URL: http://minio-sa-svc.developer-center-minio-sa.svc.cluster.local:9090
MINIO_SA_CLIENT_AUTH_ENABLED: "false"
# MINIO_SA_CLIENT_AUTH_KEY_PASSWORD: ""
# MINIO_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -93,7 +93,7 @@
MINIO_BASIC_AUTH_SA_PASSWORD: saadmin
MINIO_BASIC_AUTH_SA_USERNAME: saadmin
- POA_DOCS_URL: https://poa-docs-test.paas.newcapec.cn
+ POA_DOCS_URL: https://poa-docs-svc.poa.svc.cluster.local:8080
POA_SA_API_SEPCS_UPLOAD_CHECK_STYLE: "true"
USER_AUTHZ_BUSINESSDOMAINID: "1"
@@ -112,7 +112,7 @@
apiVersion: v1
kind: Secret
metadata:
- namespace: develop-center-test
+ namespace: developer-center
name: developer-center-bff-env-secret
type: Opaque
data:
@@ -124,7 +124,7 @@
apiVersion: v1
kind: Service
metadata:
- namespace: develop-center-test
+ namespace: developer-center
name: developer-center-bff-svc
labels:
app: developer-center-bff
@@ -145,7 +145,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- namespace: develop-center-test
+ namespace: developer-center
name: developer-center-bff
spec:
selector:
diff --git a/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.5.developer-center-gateway-zuul.yaml b/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.5.developer-center-gateway-zuul.yaml
index 1cf259f..78df15c 100644
--- a/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.5.developer-center-gateway-zuul.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/0.open-platform/4.5.developer-center-gateway-zuul.yaml
@@ -87,7 +87,7 @@
#USER_AUTHZ_SERVICE_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#USER_AUTHZ_SERVICE_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- ZUUL_ROUTES_BFF_ABILITY_MESSAGE_URL: http://message-manager-test.paas.newcapec.cn/manager/api/v1
+ ZUUL_ROUTES_BFF_ABILITY_MESSAGE_URL: http://message-manager.dice.supwisdom.com/manager/api/v1
ZUUL_ROUTES_BFF_ADMIN_URL: http://developer-center-bff-svc.develop-center-test.svc.cluster.local:8080
ZUUL_ROUTES_BFF_PORTAL_URL: http://developer-center-bff-svc.develop-center-test.svc.cluster.local:8080
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.0.init.sql b/deploy-manifests/k8s-rancher/open-platform/1.0.init.sql
index a1fb0e8..cdd37ed 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.0.init.sql
+++ b/deploy-manifests/k8s-rancher/open-platform/1.0.init.sql
@@ -1,7 +1,6 @@
use cas_server;
-
INSERT INTO `TB_SERVICE` (`ID`, `COMPANY_ID`, `DELETED`, `ADD_ACCOUNT`, `ADD_TIME`,
`NAME`, `DESCRIPTION`, `INFORMATION_URL`, `LOGOUT_URL`,
`RESPONSE_TYPE`, `LOGOUT_TYPE`,
@@ -20,3 +19,74 @@
13, 13,
'dev-admin.dev.supwisdom.com'
);
+
+
+use developer_center;
+
+INSERT INTO `TB_DEV_ACCOUNT` (`ID`, `COMPANY_ID`, `DELETED`, `USERNAME`, `PASSWORD`, `IS_DEVELOPER`,
+ `TYPE`, `NAME`, `STATUS`, `CERTIFICATE_TYPE`, `CERTIFICATE_NUMBER`, `EXTERNAL_ID`
+)
+VALUES ('150', '1', '0', 'defaultDeveloper', 'defaultDeveloper', '1',
+'individual', '上海树维', '1', '1', '150', '150');
+
+INSERT INTO `TB_DEV_ACCOUNT` (`ID`, `COMPANY_ID`, `DELETED`, `USERNAME`, `PASSWORD`, `IS_OPERATOR`,
+ `TYPE`, `NAME`, `STATUS`, `CERTIFICATE_TYPE`, `CERTIFICATE_NUMBER`, `EXTERNAL_ID`
+)
+VALUES ('151', '1', '0', 'defaultOperator', 'defaultOperator', '1',
+'individual', '上海树维管理员', '1', '1', '151','151');
+
+INSERT INTO `TB_DEV_ACCOUNT` (`ID`, `COMPANY_ID`, `DELETED`, `ADD_ACCOUNT`, `ADD_TIME`,
+ `USERNAME`, `PASSWORD`, `ENABLED`, `ACCOUNT_NON_EXPIRED`, `ACCOUNT_NON_LOCKED`, `CREDENTIALS_NON_EXPIRED`,
+ `IS_DEVELOPER`, `IS_OPERATOR`, `IS_SCOPE_AUDIT`, `IS_ADMINISTRATOR`, `IS_SCHOOL_ACCOUNT`,
+ `TYPE`, `NAME`, `STATUS`
+)
+VALUES ('13', '1', 0, 'admin', '2020-07-01 00:00:00',
+ 'openadmin', 'openadmin', 1, 1, 1, 1,
+ 0, 0, 0, 1, 0,
+ 'admin', '开放平台管理员', '1'
+);
+
+
+use user;
+
+-- 身份
+INSERT INTO `TB_B_IDENTITY_TYPE`(`ID`, `DELETED`, `PARENT_IDENTITY_TYPE_ID`,
+ `CODE`, `NAME`, `ENABLE`, `SORT`)
+VALUES ('D01', 0, null, 'D01', '个人开发者', 1, 0);
+
+INSERT INTO `TB_B_IDENTITY_TYPE`(`ID`, `DELETED`, `PARENT_IDENTITY_TYPE_ID`,
+ `CODE`, `NAME`, `ENABLE`, `SORT`)
+VALUES ('D02', 0, null, 'D02', '企业开发者', 1, 0);
+commit;
+
+
+-- defaultDeveloper
+INSERT INTO `TB_B_USER` (`ID`, `DELETED`,
+ `UID`, `PASSWORD`, `NAME`, `NAME_SPELLING`, `FULL_NAME_SPELLING`,
+ `CERTIFICATE_TYPE_ID`, `CERTIFICATE_NUMBER`, `PHONE_NUMBER`, `EMAIL`,
+ `GENDER_ID`, `NATION_ID`, `COUNTRY_ID`, `ADDRESS_ID`)
+VALUES ('150', 0,
+ '150', 'defaultDeveloper', '上海树维', 'defaultDeveloper', 'defaultDeveloper',
+ '20001', '150', null, 'defaultDeveloper@supwisdom.com',
+ '30001', '40001', '50156', '310000');
+
+INSERT INTO `TB_B_ACCOUNT` (`ID`, `DELETED`, `USER_ID`,
+ `ACCOUNT_NAME`, `ACCOUNT_EXPIRY_DATE`, `ORGANIZATION_ID`, `IDENTITY_TYPE_ID`,
+ `ACTIVATION`, `STATE`, `IS_DATA_CENTER`)
+VALUES ('150', 0, '150',
+ 'defaultDeveloper', null, '1', 'D01',
+ 1, 'NORMAL', 0);
+
+INSERT INTO `TB_B_SAFETY`(`ID`, `DELETED`, `USER_ID`, `SCORE`, `PASSWORD_SCORE`, `SECURE_EMAIL`, `SECURE_PHONE`)
+VALUES ('150', 0, '150', '0', '0', null, null);
+
+INSERT INTO `TB_B_ACCOUNT_ORGANIZATION` (`ID`, `DELETED`,
+ `ROOT_ORGANIZATION_ID`, `ACCOUNT_ID`, `ORGANIZATION_ID`)
+VALUES ('150_1', 0,
+ '0', '150', '1');
+
+INSERT INTO `TB_B_ACCOUNT_LABEL`(`ID`, `DELETED`,
+ `ACCOUNT_ID`, `LABEL_ID`)
+VALUES ('150_1', 0, '150', '1');
+
+commit;
\ No newline at end of file
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/01-namespace.yaml b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/01-namespace.yaml
index 96d5c48..230f587 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/01-namespace.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/01-namespace.yaml
@@ -4,4 +4,4 @@
apiVersion: v1
kind: Namespace
metadata:
- name: minio-sa-test
+ name: developer-center-minio-sa
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/02-registry.yaml b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/02-registry.yaml
index 5571be2..8884c36 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/02-registry.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/02-registry.yaml
@@ -3,7 +3,7 @@
type: kubernetes.io/dockerconfigjson
metadata:
name: harbor-supwisdom
- namespace: minio-sa-test
+ namespace: developer-center-minio-sa
data:
# 替换成自己的仓库用户名密码配置
.dockerconfigjson: eyJhdXRocyI6eyJoYXJib3Iuc3Vwd2lzZG9tLmNvbSI6eyJwYXNzd29yZCI6IlBXTWdQODVxaUxGQzIwIiwidXNlcm5hbWUiOiJyYW5jaGVyLmRldm9wcyJ9fX0=
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-1-configmap.yaml b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-1-configmap.yaml
index 086158d..d4416a2 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-1-configmap.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-1-configmap.yaml
@@ -1,9 +1,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: minio-sa-test
+ namespace: developer-center-minio-sa
name: minio-sa-config
data:
- # Minio参数
+ # Minio参数,这里需要改为依赖的minio服务的地址
MINIO_ENDPOINT: developer-center-minio-test.paas.newcapec.cn
MINIO_USE_SSL: "false"
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-2-secret.yaml b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-2-secret.yaml
index 3f89721..aec37da 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-2-secret.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-2-secret.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Secret
metadata:
- namespace: minio-sa-test
+ namespace: developer-center-minio-sa
name: minio-sa-secret
type: Opaque
data:
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-3-svc.yaml b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-3-svc.yaml
index 8f7fe5a..8b4af2f 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-3-svc.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-3-svc.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- namespace: minio-sa-test
+ namespace: developer-center-minio-sa
name: minio-sa-svc
labels:
app: minio-sa-svc
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-4-deployment.yaml b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-4-deployment.yaml
index 8e21724..3a58ea0 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-4-deployment.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/03-4-deployment.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: minio-sa
- namespace: minio-sa-test
+ namespace: developer-center-minio-sa
spec:
selector:
matchLabels:
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/04-ingress.yaml b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/04-ingress.yaml
index 5d3baf4..06d991d 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/04-ingress.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.minio-sa/04-ingress.yaml
@@ -2,7 +2,7 @@
kind: Ingress
metadata:
name: minio-sa-ingress
- namespace: minio-sa-test
+ namespace: developer-center-minio-sa
# annotations:
# cert-manager.io/cluster-issuer: "letsencrypt-prod"
# 如果采用letsencrypt自动签发证书