Skip to content

C
catalog
提交 b9d2abd1 作者: 施泽锋
操作

2.2.0

上级 cf070dfb
正在显示 包含 474 行增加 和 0 行删除
templates/blockchain/29/README.md 0 → 100644
# 欢迎使用微三云企业区块链积分系统
**微三云企业区块链积分系统**专为企业实现区块链、商业目标、参与者的良性互动，打通上下游产业链，实现资源有效交互
v2.2.0-20200330
更新内容：
- **新增 ：**
+ 新baas和共享节点
+ 更新SDK版本v2.1.6-191220
- **修复/优化 :**
+ 修复 删除私钥备份再重新备份，提示验证码错误
+ 修复 去除日志挂载，和旧无用挂载目录
- **注意事项 :**
+ 若使用SaaS模式，需准备2个子域名，按照指定格式，配置其DNS泛解析记录到集群公网入口IP上，【*.saas.主系统域名 *.browser.区块链浏览器域名】
如： 区块链主系统域名为blockchain.baidu.com, 区块链浏览器（官网）的域名为：website.baidu.com;
则需要解析的2个A记录 分别是 *.saas.blockchain.baidu.com 和 *.browser.website.baidu.com
+ 睡多多客户需要开发手动开启睡眠挖矿功能模块，其他客户默认隐藏该睡眠挖矿功能。
+ 若客户需要使用人脸识别功能，需自行与商汤对接。
- **v2.1.0-v2.1.2升级执行 ：**
+ 初始化睡眠挖矿资产户: http://域名/wsy_blockchain/script/V2.1.1/createSleepAccount.php
+ 从挖矿资产户拨款到冻结项,使冻结项数目恢复正常: http://域名/wsy_blockchain/script/V2.1.1/remining_script.php
+ saas套餐补齐：http://域名/wsy_blockchain/script/V2.1.1/menus_script.php
+ 安装包加四位随机数，生成manifest.plist: http://域名/wsy_blockchain/script/V2.1.1/plist_script.php
+ 删除投资券数据库中多余的默认分类: http://域名/wsy_blockchain/script/V2.1.1/del_invest_ticket_group.php
+ 给旧商户增加商户钱包： http://域名/wsy_blockchain/script/V2.1.2/add_merchant_account.php
+ SaaS套餐补齐（UC同步加到saas账号基础权限里面）： http://域名/wsy_blockchain/script/V2.1.1/menus_script.php 1
+ 用户基因代数关系修正： http://域名/wsy_blockchain/script/V2.1.2/update_user_generation.php
- **v2.1.2-v2.1.3升级执行：**
+ 新增后台实名认证配置的数据结构升级脚本：http://域名/wsy_blockchain/script/V2.1.3/update_auth_setting.php
- **v2.1.5.2版本注意事项**
+ 特别注意新旧BAAS选项，旧BAAS的SDK版本选择2，新BAAS客户选3
+ 特别注意共享链独立链选择，旧客户为独立链，选1，新客户根据情况判断选择独立链还是共享链
- **v2.2.0版本注意事项**
+ 注意事项：共享链客户不允许创建子母链和同链模式的SaaS子账号，只能创建baas配置的SaaS子账号
templates/blockchain/29/docker-compose.yml 0 → 100644
{{- $redisImage:="bitnami/redis:4.0"}}
{{- $taskImage:=printf "%s/task:alpine" .Values.docker_registry}}
{{- $appImage:=printf "%s/blockchain:2.2.0_20200330" .Values.docker_registry}}
{{- $dbImage:=printf "%s/mysql:5.6" .Values.docker_registry}}
{{- $sdkImage:=printf "%s/trustsql-sdk:v2.1.6-191220" .Values.docker_registry}}
{{- $mqSImage:="rabbitmq:3.6.16-management-alpine"}}
{{- $mqCImage:=printf "%s/mq-client:1.0.3_20200117" .Values.docker_registry}}
{{- $websiteImage:=printf "%s/website:1.0.2_20200117" .Values.docker_registry}}
{{- $sphinxImage:=printf "%s/coreseek:4.1_blockchain2.0" .Values.docker_registry}}
version: '2'
services:
bc-redis:
image: {{$redisImage}}
environment:
- REDIS_PASSWORD=${redis_pwd}
stdin_open: true
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
io.rancher.container.pull_image: always
bc-task:
image: {{$taskImage}}
environment:
- TASK_CNF=*/1 * * * * wget --spider 'http://bc-app/wsy_blockchain/task/api/index.php?m=cron_dispatch&a=index'
stdin_open: true
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
io.rancher.container.pull_image: always
bc-app:
image: {{$appImage}}
environment:
- JAVA_TRUSTSQL_URL=${java_trustsql_url}
- DB_HOST=${db_host}
- DB_PORT=3306
- DB_NAME=${db_name}
- DB_USER=${db_user}
- DB_PWD=${db_pwd}
- REDIS_HOST=${redis_host}
- REDIS_PASS=${redis_pwd}
- DAN_PIN_LINK=${dan_pin_link}
- UPLOAD_SIZE=${upload_size}
- MQ_URL=http://bc-mq-client/
- SPHINX_HOST=sphinx
- SPHINX_PORT=9312
- DEBUG=${debug_mode}
{{- if eq .Values.oss_enabled "true"}}
- OSS_ON=true
- OSS_KEY=${oss_key}
- OSS_SECRET=${oss_secret}
- OSS_CUSTOMURL=${oss_customurl}
- OSS_ENDPOINT=${oss_endpoint}
- OSS_BUCKET=${oss_bucket}
{{- end}}
- WEB_SERVICE_URL=${host_url}
- CRM_URL=http://admin.dgshanger.com/crm/
- CRM_SERVER_ID=${lic_id}
- CRM_SERVER_CODE=${lic_code}
- BAAS_VERSION=${sdk_version}
- TBAAS_TYPE=${tbaas_type}
stdin_open: true
volumes:
- bc-resources:/var/www/html/resources
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
traefik.web.frontend.rule: Host:${host_url}
traefik.wildcard.frontend.rule: HostRegexp:{.*}.saas.${host_url}
traefik.port: '80'
traefik.enable: 'true'
io.rancher.container.pull_image: always
bc-db:
image: {{$dbImage}}
environment:
- MYSQL_ROOT_PASSWORD=${db_pwd}
- LANG=C.UTF-8
- MY_CNF=[mysqld]\nmax_allowed_packet =30M
stdin_open: true
volumes:
- bc-mysql:/var/lib/mysql
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
io.rancher.container.pull_image: always
bc-sdk:
image: {{$sdkImage}}
stdin_open: true
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
io.rancher.container.pull_image: always
bc-mq-server:
image: {{$mqSImage}}
environment:
- RABBITMQ_DEFAULT_USER=${mq_user}
- RABBITMQ_DEFAULT_PASS=${mq_pass}
- RABBITMQ_DEFAULT_VHOST=${mq_vhost}
stdin_open: true
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
io.rancher.container.pull_image: always
bc-mq-client:
image: {{$mqCImage}}
environment:
- MQ_HOST=${mq_host}
- MQ_USER=${mq_user}
- MQ_PASS=${mq_pass}
- MQ_PORT=5672
- MQ_VHOST=${mq_vhost}
- DB_HOST=${db_host}
- DB_PORT=3306
- DB_NAME=${db_name}
- DB_USER=${db_user}
- DB_PWD=${db_pwd}
- REDIS_HOST=${redis_host}
- REDIS_PASS=${redis_pwd}
stdin_open: true
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
io.rancher.container.pull_image: always
website:
image: {{$websiteImage}}
environment:
- API_URL=http://bc-app/
- DEBUG=${debug_mode}
- JAVA_TRUSTSQL_URL=${java_trustsql_url}
- WEB_BROWSER_SERVICE_URL=${website_url}
- DB_HOST=${db_host}
- DB_PORT=3306
- DB_NAME=${db_name}
- DB_USER=${db_user}
- DB_PWD=${db_pwd}
- REDIS_HOST=${redis_host}
- REDIS_PASS=${redis_pwd}
stdin_open: true
volumes:
- bc-resources:/var/www/html/resources
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
traefik.web.frontend.rule: Host:${website_url}
traefik.wildcard.frontend.rule: HostRegexp:{.*}.browser.${host_url}
traefik.port: '80'
traefik.enable: 'true'
io.rancher.container.pull_image: always
sphinx:
image: {{$sphinxImage}}
environment:
- TASK_CNF=*/5 * * * * /usr/local/bin/indexer IDX_information_delta --rotate > /var/sphinx/log/indexer.log\n0 1 * * * /usr/local/bin/indexer IDX_information_main --rotate > /var/sphinx/log/indexer.log
- sphinx_DB_HOST=${db_host}
- sphinx_DB_NAME=${db_name}
- sphinx_DB_PORT=3306
- sphinx_DB_PWD=${db_pwd}
- sphinx_DB_USER=${db_user}
stdin_open: true
tty: true
logging:
driver: json-file
options:
max-size: 100m
max-file: '3'
labels:
io.rancher.container.pull_image: always
volumes:
bc-resources:
driver: ${volume_driver}
bc-mysql:
driver: ${volume_driver}
templates/blockchain/29/rancher-compose.yml 0 → 100644
version: '2'
catalog:
name: "Blockchain |企业区块链积分系统"
version: "v2.2.0-20200330"
description: "微三云区块链积分系统，共享价值链接器 开启未来商业秘密。"
minimum_rancher_version: v0.51.0
questions:
- variable: host_url
description: "区块链系统所使用的域名，不用加http/https【别忘了解析对应的SaaS泛解析域名！】"
label: "区块链系统域名"
required: true
default: ""
type: "string"
- variable: website_url
description: "区块链浏览器（官网）所使用的域名，不用加http/https【别忘了解析对应的SaaS泛解析域名！】"
label: "区块链浏览器域名"
required: true
default: ""
type: "string"
- variable: db_host
description: "数据库连接地址，应用内可直接使用服务名"
label: "数据库连接地址"
required: true
default: "bc-db"
type: "string"
- variable: db_name
description: "数据库名称"
label: "数据库名称"
required: true
default: "wsy_blockchain"
type: "string"
- variable: db_user
description: "数据库账号，首次运行会自动创建"
label: "数据库账号"
required: true
default: "root"
type: "string"
- variable: db_pwd
description: "数据库密码，首次运行会自动创建"
label: "数据库密码"
required: true
default: ""
type: "string"
- variable: redis_host
description: "redis数据库连接地址"
label: "redis数据库连接地址"
required: true
default: "bc-redis"
type: "string"
- variable: redis_pwd
description: "redis数据库密码"
label: "redis数据库密码"
required: true
default: ""
type: "string"
- variable: mq_host
description: "消息队列服务器地址，应用内可直接使用服务名"
label: "消息队列服务器地址"
required: true
default: "bc-mq-server"
type: "string"
- variable: mq_vhost
description: "消息队列虚拟主机名"
label: "消息队列虚拟主机"
required: true
default: "my_vhost"
type: "string"
- variable: mq_user
description: "消息队列账号"
label: "消息队列账号"
required: true
default: "mquser"
type: "string"
- variable: mq_pass
description: "消息队列密码"
label: "消息队列密码"
required: true
default: ""
type: "string"
- variable: dan_pin_link
description: "对接单品系统域名(如有),如：www.abc.com 不用带http/https"
label: "单品系统域名"
required: false
default: ""
type: "string"
- variable: java_trustsql_url
description: "TrustSQL api 域名，旧BAAS使用blockchain/新BAAS使用tbaas。"
label: "TrustSQL api 域名"
required: true
default: "http://bc-sdk:8080/blockchain/"
type: "enum"
options:
- http://bc-sdk:8080/blockchain/
- http://bc-sdk:8080/tbaas/
- variable: lic_id
description: "授权id，请向服务商索要"
label: "授权ID"
required: true
default: ""
type: "string"
- variable: lic_code
description: "授权序列号，请向服务商索要"
label: "授权序列号"
required: true
default: ""
type: "string"
- variable: oss_enabled
description: "是否开启OSS支持，用于存储APP包等比较大的静态资源包"
label: "是否开启OSS支持"
required: true
default: "false"
type: "boolean"
- variable: oss_key
description: "具有OSS权限的阿里云AccessKey ID"
label: "阿里云AccessKey ID"
required: false
default: ""
type: "string"
- variable: oss_secret
description: "具有OSS权限的阿里云AccessKey Secret"
label: "阿里云AccessKey Secret"
required: false
default: ""
type: "string"
- variable: oss_customurl
description: "自定义OSS域名(可选)，如不填写，则使用OSS_ENDPOINT配置项作为外网访问入口，此时相应的BUCKET权限需设置为公共读"
label: "自定义OSS域名"
required: false
default: ""
type: "string"
- variable: oss_endpoint
description: "EndPoint 外网访问地址，即OSS所属地域，如：oss-cn-hangzhou.aliyuncs.com"
label: "EndPoint（地域节点）"
required: false
default: ""
type: "string"
- variable: oss_bucket
description: "OSS Bucket 名称，如 my-Bucket （注意，请不要填写成 Bucket 域名）"
label: "Bucket 名称"
required: false
default: ""
type: "string"
- variable: upload_size
description: "PHP及商城文件上传大小限制，单位为M"
label: "文件上传大小限制"
required: true
default: "100"
type: "string"
- variable: sdk_version
description: "SDK版本"
label: "SDK版本选择【旧2/新3】"
required: true
default: "2"
type: enum
options:
- 2
- 3
- variable: tbaas_type
description: "独立链选1，共享链选2，老客户默认为1，独立链。"
label: "独立/共享链选择"
required: true
default: "1"
type: enum
options:
- 1
- 2
- variable: volume_driver
description: "应用数据卷驱动程序"
label: "卷驱动"
required: true
default: "local"
type: enum
options:
- rancher-nfs
- local
- variable: debug_mode
description: "debug模式，生产环境慎用！"
label: "debug模式"
required: true
default: "false"
type: enum
options:
- true
- false
- readonly
- variable: docker_registry
description: "仓库加速节点"
label: "仓库地址"
required: true
default: "registry.cn-hangzhou.aliyuncs.com/weisanyun"
type: enum
options:
- registry.cn-hangzhou.aliyuncs.com/weisanyun
- reg.wsy010.cn/blockchain
services:
bc-redis:
scale: 1
start_on_create: true
bc-task:
scale: 1
start_on_create: true
bc-app:
scale: 1
start_on_create: true
bc-db:
scale: 1
start_on_create: true
bc-sdk:
scale: 1
start_on_create: true
health_check:
healthy_threshold: 2
response_timeout: 2000
port: 8080
unhealthy_threshold: 3
initializing_timeout: 60000
interval: 2000
strategy: recreate
request_line: GET "/blockchain/" "HTTP/1.0"
reinitializing_timeout: 60000
website:
scale: 1
start_on_create: true
sphinx:
scale: 1
start_on_create: true
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论