This commit is contained in:
root 2023-06-25 16:59:43 +08:00
parent c55f2a0fed
commit e2e8d91fbd
36 changed files with 4585 additions and 309 deletions

3
hosts
View File

@ -80,3 +80,6 @@ monitorEmailPort=465
monitorEmailUsername=hnck
monitorEmailFrom=hnck@greatwall.com.cn
monitorEmailPassword=Eghucn-91406
#ES 索引使用的mysql binlog服务器root密码, 取mysql的第一个服务器的密码
mysqlBinlogServerPassword=greatwall@123

View File

@ -1,6 +1,6 @@
---
kind: StorageClass
apiVersion: storage.k8s.io/v1beta1
apiVersion: storage.k8s.io/v1
metadata:
name: gluster-heketi
namespace: kube-system
@ -15,4 +15,3 @@ parameters:
{% else %}
volumetype: replicate:{{ groups['kube-storage-node']|length }}
{% endif %}
allowVolumeExpansion: true

View File

@ -35,10 +35,10 @@ gateway_image: uat/pumpkin-gateway-uat:RC-V2.5.20210629.33593.32
baremetal_image: uat/pumpkin-baremetal-uat:RC-V2.5.20210629.33640.58
point_api_image: uat/pumpkin-points-api-uat:RC-V2.5.20210629.33595.13
es_api_image: uat/pumpkin-es-api-uat:RC-V2.5.20210629.34976.79
mall_api_image: uat/pumpkin-es-api-uat:RC-V2.5.20210629.34976.79
recruit_api_image: uat/pumpkin-es-api-uat:RC-V2.5.20210629.34976.79
mall_api_image: uat/pumpkin-mall-api-uat:RC-V2.5.20210629.33594.14
recruit_api_image: uat/pumpkin-recruit-api-uat:RC-V2.5.20210629.33596.11
file_api_image: uat/pumpkin-file-api-uat:RC-V2.5.20210629.33592.25
comment_api_image: uat/pumpkin-file-api-uat:RC-V2.5.20210629.33592.25
comment_api_image: uat/pumpkin-comment-api-uat:RC-V2.5.20210629.33589.20
charts_api_image: uat/pumpkin-charts-api-uat:RC-V2.5.20210629.33587.10
auth_image: uat/pumpkin-auth-uat:RC-V2.5.20210629.33581.33
mcu_image: uat/pumpkin-mcu-uat:RC-V2.5.20210629.33605.12

View File

@ -7,7 +7,6 @@
- charts-api
- edu-api
- mall-api
- seo-api
- adapter-api
- bbs-api
- cloud-api
@ -22,6 +21,7 @@
- campaigns-api
- daily-api
- recruit-api
- gateway
- name: 创建组件文件
template: src={{ item }} dest={{ base_dir }}/manifests/proprietary-cloud/{{item |relpath('/etc/ansible/roles/proprietary-cloud/templates')}}
@ -32,7 +32,6 @@
- "{{ base_dir }}/roles/proprietary-cloud/templates/charts-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/edu-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/mall-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/seo-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/adapter-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/bbs-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/cloud-api/*"
@ -47,6 +46,7 @@
- "{{ base_dir }}/roles/proprietary-cloud/templates/campaigns-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/daily-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/recruit-api/*"
- "{{ base_dir }}/roles/proprietary-cloud/templates/gateway/*"
- name: 部署组件
shell: "{{bin_dir}}/kubectl apply -f {{ base_dir }}/manifests/proprietary-cloud/{{item}}/ -n {{namespace}}"
@ -57,7 +57,6 @@
- charts-api
- edu-api
- mall-api
- seo-api
- adapter-api
- bbs-api
- cloud-api
@ -71,7 +70,8 @@
- auth
- campaigns-api
- daily-api
- recruit-api
# - recruit-api
- gateway
- name: 创建cloud-servcie所需的命名空间
shell: "{{bin_dir}}/kubectl create ns cloud-service"

View File

@ -17,6 +17,8 @@
- include_tasks : skywalking.yml
- include_tasks : es.yml
- name: 取得当前k8s集群的admin账户token
shell: "{{bin_dir}}/kubectl get secret `{{bin_dir}}/kubectl get secret -n kube-system|grep user|awk '{print $1}'` -n kube-system -o jsonpath='{.data.token}'|base64 -d"
register: k8s_admin_token
@ -26,9 +28,10 @@
with_items:
- db.sql
- user-data.sql
- biz-data.sql
- init_config.sql
- name: 执行初始化sql脚本
shell: "cd {{base_dir}}/manifests/proprietary-cloud ; cat db.sql user-data.sql init_config.sql|{{bin_dir}}/kubectl exec -i -c mysql `{{bin_dir}}/kubectl get pods -l 'mysql.presslabs.org/cluster=mysql-cluster,role=master' -n {{namespace}} -o jsonpath='{.items[0].metadata.name}'` -n {{namespace}} -- mysql -u{{db_username}} -p{{db_password}} --default-character-set=utf8 "
shell: "cd {{base_dir}}/manifests/proprietary-cloud ; cat db.sql user-data.sql biz-data.sql init_config.sql|{{bin_dir}}/kubectl exec -i -c mysql `{{bin_dir}}/kubectl get pods -l 'mysql.presslabs.org/cluster=mysql-cluster,role=master' -n {{namespace}} -o jsonpath='{.items[0].metadata.name}'` -n {{namespace}} -- mysql -u{{db_username}} -p{{db_password}} --default-character-set=utf8 "
- include_tasks : cloud.yml

View File

@ -7,13 +7,16 @@
- name: 准备平nacos设置的sql脚本
template: src=nacos/nacos.sql dest={{ base_dir }}/manifests/proprietary-cloud/nacos.sql
- name: 准备业务服务配置文件的sql脚本
template: src=nacos/config.sql dest={{ base_dir }}/manifests/proprietary-cloud/config.sql
- name: 等待mysql服务启动成功
shell: "{{bin_dir}}/kubectl get statefulset mysql-cluster-mysql -n {{namespace}} -o jsonpath='{.status.readyReplicas}'"
register: status_result
until: '"3" == status_result.stdout'
until: "groups['mysql']|length|string == status_result.stdout"
retries: 50
delay: 8
- name: 执行nacos sql脚本
shell: "cat {{base_dir}}/manifests/proprietary-cloud/nacos.sql |{{bin_dir}}/kubectl exec -i -c mysql `{{bin_dir}}/kubectl get pods -l 'mysql.presslabs.org/cluster=mysql-cluster,role=master' -n {{namespace}} -o jsonpath='{.items[0].metadata.name}'` -n {{namespace}} -- mysql -u nacos -p{{db_password}} -D nacos --default-character-set=utf8 "
shell: "cat {{base_dir}}/manifests/proprietary-cloud/nacos.sql {{base_dir}}/manifests/proprietary-cloud/config.sql |{{bin_dir}}/kubectl exec -i -c mysql `{{bin_dir}}/kubectl get pods -l 'mysql.presslabs.org/cluster=mysql-cluster,role=master' -n {{namespace}} -o jsonpath='{.items[0].metadata.name}'` -n {{namespace}} -- mysql -u{{db_username}} -p{{db_password}} -D nacos --default-character-set=utf8 "
ignore_errors: true

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /adapter-api/actuator/health
port: 6002
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /adapter-api/actuator/health

View File

@ -1,15 +1,16 @@
apiVersion: v1
kind: Service
metadata:
name: pumpkin-adapter-api
namespace: {{namespace}}
labels:
k8s-app: pumpkin-doc-api
name: pumpkin-doc-api
k8s-app: pumpkin-adapter-api
spec:
ports:
- name: http
port: 80
protocol: TCP
targetPort: 8080
targetPort: 6002
selector:
k8s-app: pumpkin-doc-api
k8s-app: pumpkin-adapter-api
type: ClusterIP

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /app-api/actuator/health
port: 6009
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /app-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /actuator/health
port: 8101
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /baremetal/actuator/health
port: 9888
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /baremetal/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /bbs-api/actuator/health
port: 8000
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /bbs-api/actuator/health

View File

@ -1,15 +1,16 @@
apiVersion: v1
kind: Service
metadata:
name: pumpkin-bbs-api
namespace: {{namespace}}
labels:
k8s-app: pumpkin-doc-api
name: pumpkin-doc-api
k8s-app: pumpkin-bbs-api
spec:
ports:
- name: http
port: 80
protocol: TCP
targetPort: 8080
targetPort: 8000
selector:
k8s-app: pumpkin-doc-api
k8s-app: pumpkin-bbs-api
type: ClusterIP

File diff suppressed because one or more lines are too long

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /blog-api/actuator/health
port: 1000
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /blog-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /campaigns-api/actuator/health
port: 6008
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /campaigns-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /cloud-api/actuator/health
port: 9090
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /cloud-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /comment-api/actuator/health
port: 6000
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /comment-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /daily-api/actuator/health
port: 6011
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /daily-api/actuator/health

View File

@ -33,12 +33,11 @@ spec:
mysqlConf:
default-time-zone: '+08:00'
max-connections: 1000
plugin-load: rpl_semi_sync_master=semisync_master.so
plugin-load-add: rpl_semi_sync_slave=semisync_slave.so
rpl-semi-sync-master-enabled: 'on'
rpl-semi-sync-slave-enabled: 'on'
# plugin-load: rpl_semi_sync_master=semisync_master.so
# plugin-load-add: rpl_semi_sync_slave=semisync_slave.so
# rpl-semi-sync-master-enabled: 'on'
# rpl-semi-sync-slave-enabled: 'on'
slave-skip-errors: all
sort_buffer_size: 524288
sql-mode: >-
STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
@ -162,7 +161,7 @@ spec:
## Add additional SQL commands to run during init of mysql
initFileExtraSQL:
- "CREATE USER 'greatwall'@'%' IDENTIFIED BY 'Greatwall8888' "
# - "CREATE DATABASE IF NOT EXISTS `system-management` "
- "CREATE DATABASE IF NOT EXISTS `nacos` "
- "GRANT ALL ON *.* TO 'greatwall'@'%' "
---

File diff suppressed because it is too large Load Diff

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /doc-api/actuator/health
port: 8080
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /doc-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /edu-api/actuator/health
port: 6008
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /edu-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /search-api/actuator/health
port: 7000
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /search-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /file-api/actuator/health
port: 6003
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /file-api/actuator/health

View File

@ -1,3 +1,46 @@
DELETE FROM `pumpkin-cloud`.`cloud_region`;
INSERT INTO `pumpkin-cloud`.`cloud_region` (id, area_name, area_code, status, creator_id, create_time, update_time, remark, platform_type) VALUES (1, '一区', 'cn-cs-1', 1, 15, '2020-04-30 22:55:27', null, null, 'ZSTACK');
-- 插入区域cloud-serivce配置数据为了支持重复执行先删除后插入
DELETE FROM `pumpkin-cloud`.z_cloud_db_region_settings;
INSERT INTO `pumpkin-cloud`.z_cloud_db_region_settings (id, region,create_time, update_time, k8s_master_url, k8s_oauth_token, external_ip) VALUES (1, '{{defaultRegionCode}}', now(), now(), 'https://{{MASTER_IP}}:{{MASTER_PORT}}', '{{k8s_admin_token.stdout}}', '{{MASTER_IP}}');
-- app-api
use `pumpkin-app`;
DELETE FROM app_category;
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('办公', 0, 34, 0, '2021-03-26 02:21:43', '02', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('社交', 0, 36, 0, '2021-03-26 02:24:22', '03', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('系统', 0, 58, 0, '2021-03-26 02:30:19', '12', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('其他', 0, 48, 0, '2021-03-26 03:25:57', '07', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('教育', 0, 56, 0, '2021-05-12 22:18:49', '11', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('开发', 0, 38, 0, '2021-05-12 22:19:03', '04', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('图像', 0, 30, 0, '2021-07-07 03:05:13', '01', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('网络', 0, 55, 0, '2021-07-07 03:05:50', '10', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('游戏', 0, 39, 0, '2021-07-07 03:06:22', '05', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('输入法', 0, 40, 0, '2021-07-28 04:10:28', '06', null);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('影音', 0, 59, 0, '2021-09-25 00:09:04', '13', 102);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('视频剪辑', 0, 49, 0, '2021-09-25 00:09:14', '08', 102);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('远程', 0, 60, 0, '2021-09-25 00:09:36', '14', 102);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('网络', 0, 61, 0, '2021-09-25 00:35:50', '15', 102);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('分类11', 0, 54, 0, '2021-10-10 05:26:15', '09', 102);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('测试', 0, 62, 0, '2023-03-31 03:42:35', '16', 102);
INSERT INTO app_category (category_name, parent_id, sort_no, status, create_time, category_code, create_id) VALUES ('测试', 29, 3, 0, '2023-04-05 03:51:05', '0201', 102);
use `pumpkin-user-0801`;
DELETE FROM `user` where mobile like '1771111111%'
INSERT INTO `user` (uid, wx_open_id, name, nick_name, mobile, password, salt, avatar, sex, status, source, profile, province, position, ip, ip_city, city, last_login_time, creator_id, create_time, update_time, zstack_password, zstack_uuid, invite_code, personal_id, identitification_status, email, original_uid, current_mobile, site_region, reg_topic, trustie_open_id, mac, keep_status) VALUES (1, null, '管理员账号', '管理员账号', '17711111111', 'rzivI6K7T60qNJ3ifOnNCab3BsULmHEql4WKBxuR78GTkva0J5%2BvmnuBid%2FzFUSl', '$2a$10$h1whGu', null, null, 0, null, null, null, null, '42.48.104.45', null, null, '2023-06-25 10:46:52', null, '2019-12-23 09:19:28', '2021-09-29 12:43:40', '$2a$10$APZWU.', '09661e8ac12c48afadfc89fe13fef35b', 168168, 17246775788042, 1, null, null, '17711111111', '430000', null, null, null, 0);
INSERT INTO `user` (uid, wx_open_id, name, nick_name, mobile, password, salt, avatar, sex, status, source, profile, province, position, ip, ip_city, city, last_login_time, creator_id, create_time, update_time, zstack_password, zstack_uuid, invite_code, personal_id, identitification_status, email, original_uid, current_mobile, site_region, reg_topic, trustie_open_id, mac, keep_status) VALUES (2, null, '普通业务账号', '普通业务账号', '17711111112', 'rzivI6K7T60qNJ3ifOnNCab3BsULmHEql4WKBxuR78GTkva0J5%2BvmnuBid%2FzFUSl', '$2a$10$h1whGu', null, null, 0, null, null, null, null, '42.48.104.45', null, null, '2023-06-25 10:46:52', null, '2019-12-23 09:19:28', '2021-09-29 12:43:40', '$2a$10$APZWU.', '09661e8ac12c48afadfc89fe13fef35b', 168168, 17246775788042, 1, null, null, '17711111112', '430000', null, null, null, 0);
DELETE FROM enterprise where id=0;
INSERT INTO enterprise (id, enterprise_identification_id, enterprise_name, certificate_type, certificate_url, certificate_code, legal_person, legal_person_id_card_no, identity_type, identity_card_front_url, identity_card_verso_url, authorization_url, creator_id, create_time, update_id, update_time, account_id, account_name, parent_id, pay_discount, points_discount, other_pay_discount) VALUES (0, 0, '中国长城科技集团股份有限公司', null, null, null, null, null, null, null, null, null, 1, null, null, null, 1, '王婷婷', null, 0.00, 0.00, 0.00);
DELETE FROM `enterprise_user` where id=1;
INSERT INTO enterprise_user (id, enterprise_id, enterprise_name, uid, u_name, email, is_leader, position, is_master, create_time) VALUES (1, 0, '中国长城科技集团股份有限公司', 2, '罗琨', '1@1.com', null, '领导', 1, '2019-12-24 04:49:09');
DELETE FROM user_role_mapping where id=1;
INSERT INTO user_role_mapping (id, uid, user_role_id, create_time, update_time, enterprise_id, sys_type) VALUES (1, 1, 1, '2019-12-17 22:52:29', '2019-12-17 22:52:29', 0, 1);

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /mall-api/actuator/health
port: 8888
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /mall-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,7 +93,7 @@ spec:
path: /pumkin-mcu/actuator/health
port: 9009
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1

View File

@ -2,8 +2,8 @@ apiVersion: v1
kind: Service
metadata:
labels:
k8s-app: pumpkin-muc
name: pumpkin-muc
k8s-app: pumpkin-mcu
name: pumpkin-mcu
spec:
ports:
- name: http
@ -11,5 +11,5 @@ spec:
protocol: TCP
targetPort: 9009
selector:
k8s-app: pumpkin-muc
k8s-app: pumpkin-mcu
type: ClusterIP

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,7 @@
/* 数据库全名 = nacos_config */
/* 表名称 = config_info */
/******************************************/
CREATE TABLE `config_info` (
CREATE TABLE IF NOT EXISTS `config_info` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
`group_id` varchar(255) DEFAULT NULL,
@ -43,7 +43,7 @@ CREATE TABLE `config_info` (
/* 数据库全名 = nacos_config */
/* 表名称 = config_info_aggr */
/******************************************/
CREATE TABLE `config_info_aggr` (
CREATE TABLE IF NOT EXISTS `config_info_aggr` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
`group_id` varchar(255) NOT NULL COMMENT 'group_id',
@ -61,7 +61,7 @@ CREATE TABLE `config_info_aggr` (
/* 数据库全名 = nacos_config */
/* 表名称 = config_info_beta */
/******************************************/
CREATE TABLE `config_info_beta` (
CREATE TABLE IF NOT EXISTS `config_info_beta` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
`group_id` varchar(128) NOT NULL COMMENT 'group_id',
@ -82,7 +82,7 @@ CREATE TABLE `config_info_beta` (
/* 数据库全名 = nacos_config */
/* 表名称 = config_info_tag */
/******************************************/
CREATE TABLE `config_info_tag` (
CREATE TABLE IF NOT EXISTS `config_info_tag` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
`group_id` varchar(128) NOT NULL COMMENT 'group_id',
@ -103,7 +103,7 @@ CREATE TABLE `config_info_tag` (
/* 数据库全名 = nacos_config */
/* 表名称 = config_tags_relation */
/******************************************/
CREATE TABLE `config_tags_relation` (
CREATE TABLE IF NOT EXISTS `config_tags_relation` (
`id` bigint(20) NOT NULL COMMENT 'id',
`tag_name` varchar(128) NOT NULL COMMENT 'tag_name',
`tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type',
@ -120,7 +120,7 @@ CREATE TABLE `config_tags_relation` (
/* 数据库全名 = nacos_config */
/* 表名称 = group_capacity */
/******************************************/
CREATE TABLE `group_capacity` (
CREATE TABLE IF NOT EXISTS `group_capacity` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID空字符表示整个集群',
`quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额0表示使用默认值',
@ -139,7 +139,7 @@ CREATE TABLE `group_capacity` (
/* 数据库全名 = nacos_config */
/* 表名称 = his_config_info */
/******************************************/
CREATE TABLE `his_config_info` (
CREATE TABLE IF NOT EXISTS `his_config_info` (
`id` bigint(64) unsigned NOT NULL,
`nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`data_id` varchar(255) NOT NULL,
@ -164,7 +164,7 @@ CREATE TABLE `his_config_info` (
/* 数据库全名 = nacos_config */
/* 表名称 = tenant_capacity */
/******************************************/
CREATE TABLE `tenant_capacity` (
CREATE TABLE IF NOT EXISTS `tenant_capacity` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID',
`quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额0表示使用默认值',
@ -180,7 +180,7 @@ CREATE TABLE `tenant_capacity` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表';
CREATE TABLE `tenant_info` (
CREATE TABLE IF NOT EXISTS `tenant_info` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`kp` varchar(128) NOT NULL COMMENT 'kp',
`tenant_id` varchar(128) default '' COMMENT 'tenant_id',
@ -194,25 +194,27 @@ CREATE TABLE `tenant_info` (
KEY `idx_tenant_id` (`tenant_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info';
CREATE TABLE `users` (
CREATE TABLE IF NOT EXISTS `users` (
`username` varchar(50) NOT NULL PRIMARY KEY,
`password` varchar(500) NOT NULL,
`enabled` boolean NOT NULL
);
CREATE TABLE `roles` (
CREATE TABLE IF NOT EXISTS `roles` (
`username` varchar(50) NOT NULL,
`role` varchar(50) NOT NULL,
UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE
);
CREATE TABLE `permissions` (
CREATE TABLE IF NOT EXISTS `permissions` (
`role` varchar(50) NOT NULL,
`resource` varchar(255) NOT NULL,
`action` varchar(8) NOT NULL,
UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE
);
DELETE FROM users where username='nacos';
INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE);
DELETE FROM roles where username='nacos';
INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN');

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /points-api/actuator/health
port: 8011
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /points-api/actuator/health

View File

@ -83,7 +83,7 @@ spec:
cpu: '4'
memory: 4Gi
requests:
cpu: '1'
cpu: '500m'
memory: 1Gi
volumeMounts:
- name: skywalking-agent
@ -93,11 +93,11 @@ spec:
path: /recruit-api/actuator/health
port: 6001
scheme: HTTP
initialDelaySeconds: 60
initialDelaySeconds: 160
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 5
failureThreshold: 15
readinessProbe:
httpGet:
path: /recruit-api/actuator/health

View File

@ -93,11 +93,11 @@ spec:
path: /user-api/actuator/health
port: 5000
scheme: HTTP
initialDelaySeconds: 5
initialDelaySeconds: 240
timeoutSeconds: 3
periodSeconds: 10
successThreshold: 1
failureThreshold: 3
failureThreshold: 10
readinessProbe:
httpGet:
path: /user-api/actuator/health
@ -108,16 +108,6 @@ spec:
periodSeconds: 10
successThreshold: 1
failureThreshold: 3
startupProbe:
httpGet:
path: /user-api/actuator/health
port: 5000
scheme: HTTP
initialDelaySeconds: 100
timeoutSeconds: 1
periodSeconds: 10
successThreshold: 1
failureThreshold: 15
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:

File diff suppressed because one or more lines are too long

View File

@ -2,23 +2,23 @@ apiVersion: v1
data:
upstream.conf: |-
upstream pumpkin-user-api {
server pumpkin-user-api.{{namespace}};
server pumpkin-user-api.{{namespace}}:80;
}
upstream pumpkin-es-api {
server pumpkin-es-api.{{namespace}};
server pumpkin-es-api.{{namespace}}:80;
}
upstream pumpkin-charts-api {
server pumpkin-charts-api.{{namespace}};
server pumpkin-charts-api.{{namespace}}:80;
}
upstream pumpkin-recruit-api {
server pumpkin-recruit-api.{{namespace}};
server pumpkin-recruit-api.{{namespace}}:80;
}
upstream adapter-api {
server pumpkin-adapter-api;
server pumpkin-adapter-api:80;
}
upstream file-api {
@ -30,51 +30,51 @@ data:
}
upstream bbs-api {
server pumpkin-bbs-api;
server pumpkin-bbs-api:80;
}
upstream mall-api {
server pumpkin-mall-api;
server pumpkin-mall-api:80;
}
upstream points-api {
server pumpkin-points-api;
server pumpkin-points-api:80;
}
upstream blog-api {
server pumpkin-blog-api;
server pumpkin-blog-api:80;
}
upstream campaigns-api {
server pumpkin-campaigns-api;
server pumpkin-campaigns-api:80;
}
upstream app-api {
server pumpkin-app-api;
server pumpkin-app-api:80;
}
upstream edu-api {
server pumpkin-edu-api;
server pumpkin-edu-api:80;
}
upstream daily-api {
server pumpkin-daily-api;
server pumpkin-daily-api:80;
}
upstream doc-api {
server pumpkin-doc-api;
}
# upstream doc-api {
# server pumpkin-doc-api:80;
# }
upstream gateway {
server pumpkin-gateway;
server pumpkin-gateway:80;
}
upstream pumpkin-mcu {
server pumpkin-mcu;
server pumpkin-mcu:80;
}
upstream pumpkin-auth {
server pumpkin-auth.{{namespace}};
server pumpkin-auth.{{namespace}}:80;
}
upstream mirror {
@ -92,11 +92,11 @@ data:
}
upstream baremetal {
server pumpkin-baremetal;
server pumpkin-baremetal:80;
}
upstream cloud-api {
server pumpkin-cloud-api;
server pumpkin-cloud-api:80;
}
kind: ConfigMap
metadata: