update README.md

README.md

@@ -7,8 +7,6 @@
 ### jdk 和框架
 - os:Linux
 > 推荐使用 Debian11
-> 
-> Windows 系统理论上可以运行, 但未实践
 - jdk:17
 - maven:3.9.11
 - spring:6.1.2
@@ -48,43 +46,9 @@ tnb 项目模块:
 > 依赖 mysql, redis, rabbitmq, mongodb
 - search:6007
 > 依赖 mysql, redis, zookeeper, rabbitmq, mongodb, elasticsearch, nacos
-> > 选用 lucene 则不再需要 elasticsearch
+> > 选用 lucene 则不需要 elasticsearch
 - oss-store:4010
 > 依赖 mysql
 
 ## 构建部署
-### pull 项目源码
-```
-cd ~/Downloads
-git clone https://git.reghao.cn/reghao/tnb.git
-```
-
-### 初始化 MySQL
-```
-cd ~/Downloads/tnb/zzz
-bash db_init.sh
-```
-> 执行 db_init.sh 会自动创建 tnb 项目需要的数据库并初始化数据库表
-> > 需要自行指定 db_init.sh 脚本中的 host, username, password 等变量值
-
-### 构建并运行
-```
-cd ~/Downloads/tnb/zzz
-bash build_jar.sh
-```
-> 执行 db_init.sh 会自动构建并运行 tnb 项目各应用 jar 包
-> > build_jar.sh 脚本中的 proj_dir 变量默认是 ~/Downloads/tnb
-> 
-> mvn 构建默认使用 dev 环境, 所以需要修改每个应用 resources/application-dev.yml 配置文件中的第三方服务配置
-> 
-> 默认运行的是 jar 包, 也可构建并运行 docker 镜像, 详见 build_jar.sh 脚本的 build_image 和 exec_image 函数
-
-### 停止应用
-```
-cd ~/Downloads/tnb/zzz
-bash shutdown.sh
-```
-> 执行 shutdown.sh 会结束 tnb 项目中的各个应用
-
-## 其他
-本项目模块太多, 构建部署都太过繁琐, 推荐使用 [bnt](https://git.reghao.cn/reghao/bnt) 项目提供的 devops 系统来自动构建部署应用.
+项目的构建部署可见 [tnb0](https://git.reghao.cn/reghao/tnb0) 项目

oss/oss-store/bin/oss.yml

@@ -3,12 +3,12 @@ server:
     basedir: /opt/tmp/tomcat
 spring:
   datasource:
-    url: jdbc:mysql://localhost/tnb_oss_rdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-    username: dev
-    password: Dev@123456
+    url: jdbc:mysql://localhost/tnb_oss_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+    username: test
+    password: Test@123456
 oss:
   store-host: 127.0.0.1
   store-dirs:
-    - /disk/13f654c8-af87-4710-aac9-7aa086c99aec/
+    - /opt/disk/1/
   console-host: 127.0.0.1
   console-port: 6103

zzz/build.sh

@@ -51,46 +51,6 @@ deploy_dependencies() {
   mvn clean deploy -Dmaven.test.skip -am -pl data/data-api/
 }
 
-###############################################################################
-# 构建 tnb 应用 jar 包
-###############################################################################
-build_jar() {
-  cd ${proj_dir}
-  mvn clean package -Dmaven.test.skip -P${env}
-#  mvn clean package -Dmaven.test.skip -am -pl oss/oss-store -P${env}
-}
-
-###############################################################################
-# 构建 tnb 应用镜像
-###############################################################################
-build_image() {
-  commit_id=`git rev-parse HEAD | cut -c 1-8`
-  docker_prefix='tnb'
-
-  cd ${proj_dir}/eureka/eureka-server
-  docker build -t ${docker_prefix}/eureka:${commit_id} .
-
-  cd ${proj_dir}/gateway/
-  docker build -t ${docker_prefix}/gateway:${commit_id} .
-  
-  cd ${proj_dir}/account/account-service/
-  docker build -t ${docker_prefix}/account:${commit_id} .
-
-  cd ${proj_dir}/message/message-service/
-  docker build -t ${docker_prefix}/message:${commit_id} .
-
-  cd ${proj_dir}/file/file-service
-  docker build -t ${docker_prefix}/file:${commit_id} .
-
-  cd ${proj_dir}/user/user-service/
-  docker build -t ${docker_prefix}/user:${commit_id} .
-  
-  cd ${proj_dir}/content/content-service/
-  docker build -t ${docker_prefix}/content:${commit_id} .
-  
-  cd ${proj_dir}/search/search-service/
-  docker build -t ${docker_prefix}/search:${commit_id} .
-}
 
 echo "构建第三方依赖..."
 #build_dependencies
@@ -99,10 +59,4 @@ echo "安装 tnb 依赖到本地仓库..."
 #install_dependencies
 
 echo "部署 tnb 依赖到远程仓库..."
-#deploy_dependencies
-
-echo "构建 tnb jar 应用..."
-#build_jar
-
-echo "构建 tnb docker 应用..."
-#build_image
+#deploy_dependencies

zzz/db_init.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-###############################################################################
-# 初始化数据库, 包括创建数据库和初始化数据库表
-###############################################################################
-
-set -e
-
-base_dir=`pwd`
-cd ${base_dir}/schema
-
-host='127.0.0.1'
-username='dev'
-password='Dev@123456'
-
-db1='tnb_account_tdb'
-db2='tnb_content_tdb'
-
-db11='tnb_account_rdb'
-db21='tnb_content_rdb'
-
-create_db() {
-sql1="CREATE DATABASE ${db1} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;"
-sql2="CREATE DATABASE ${db2} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;"
-
-mysql -h${host} -u${username} -p${password} << EOF
- ${sql1}
- ${sql2}
-EOF
-}
-
-init_db() {
-  # 还原整个数据库结构(不包含数据)
-  mysql -h${host} -u${username} -p${password} ${db11} < ${db1}.sql
-  mysql -h${host} -u${username} -p${password} ${db21} < ${db2}.sql
-
-  # 还原表数据到数据库
-  mysql -h${host} -u${username} -p${password} ${db11} < msg_email_account.sql
-  mysql -h${host} -u${username} -p${password} ${db11} < user_registry.sql
-  mysql -h${host} -u${username} -p${password} ${db11} < user_vip_plan.sql
-
-  mysql -h${host} -u${username} -p${password} ${db21} < file_store_config.sql
-  mysql -h${host} -u${username} -p${password} ${db21} < vod_video_category.sql
-}
-
-echo "create db..."
-create_db
-
-echo "init db..."
-init_db

zzz/docker_start.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-###############################################################################
-# 运行 docker 镜像
-###############################################################################
-
-set -e
-
-function start() {
-  commit_id=`git rev-parse HEAD | cut -c 1-8`
-  docker run -d --name=tnbeureka --network=host -v /opt/log:/app/logs tnb/eureka:${commit_id}
-  docker run -d --name=tnbgateway --network=host -v /opt/log:/app/logs tnb/gateway:${commit_id}
-  docker run -d --name=tnbaccount --network=host -v /opt/log:/app/logs tnb/account:${commit_id}
-  docker run -d --name=tnbmessage --network=host -v /opt/log:/app/logs tnb/message:${commit_id}
-  docker run -d --name=tnbfile --network=host -v /opt/log:/app/logs tnb/file:${commit_id}
-  docker run -d --name=tnbuser --network=host -v /opt/log:/app/logs tnb/user:${commit_id}
-  docker run -d --name=tnbcontent --network=host -v /opt/log:/app/logs tnb/content:${commit_id}
-  docker run -d --name=tnbsearch --network=host -v /opt/log:/app/logs tnb/search:${commit_id}
-}
-
-function shutdown() {
-  docker stop tnbeureka && docker rm tnbeureka
-  docker stop tnbgateway && docker rm tnbgateway
-  docker stop tnbaccount && docker rm tnbaccount
-  docker stop tnbmessage && docker rm tnbmessage
-  docker stop tnbfile && docker rm tnbfile
-  docker stop tnbuser && docker rm tnbuser
-  docker stop tnbcontent && docker rm tnbcontent
-  docker stop tnbsearch && docker rm tnbsearch
-}
-
-start
-#shutdown

zzz/run_thirdparty.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-###############################################################################
-# 第三方依赖 docker 镜像
-###############################################################################
-
-set -e
-
-image='registry.cn-chengdu.aliyuncs.com/reghao/mysql:5.7.32'
-docker run -d --name=mysql57 --restart=always \
-    -p 3307:3306 \
-    -e MYSQL_ROOT_PASSWORD=Root@123456 \
-    ${image}
-
-image='registry.cn-chengdu.aliyuncs.com/reghao/redis:6.0.16-bullseye'
-docker run -d --name=redis --network=host --restart=always ${image}
-
-image='registry.cn-chengdu.aliyuncs.com/reghao/rabbitmq:3.8.9-management-alpine'
-docker run -d --name=rabbitmq --network=host --restart=always \
-    -e RABBITMQ_DEFAULT_USER=dev \
-    -e RABBITMQ_DEFAULT_PASS=Dev@123456 \
-    ${image}
-
-image='registry.cn-chengdu.aliyuncs.com/reghao/zookeeper:3.8.4'
-docker run -d --name=zk --network=host --restart=always ${image}
-
-image='registry.cn-chengdu.aliyuncs.com/reghao/nacos_nacos-server:v2.4.1'
-docker run -d --name=nacos --network=host --restart=always \
-  --env MODE=standalone \
-  ${image}
-
-image='registry.cn-chengdu.aliyuncs.com/reghao/elasticsearch:7.17.18'
-docker run -d --name=es --network=host \
-    -e "discovery.type=single-node" \
-    ${image}

zzz/shutdown.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-app_name0='tnb-eureka'
-app_name1='tnb-gateway'
-app_name2='tnb-account'
-app_name3='tnb-user'
-app_name4='tnb-message'
-app_name5='tnb-file'
-app_name6='tnb-content'
-app_name7='tnb-data'
-
-for((i=0; i<=7; i++));
-do
-  app_name=$(eval echo \${app_name$i})
-	pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
-    if [[ -z ${pid} ]];
-    then
-        echo ${app_name}" killed"
-    else
-        echo "kill "${app_name}" with pid "${pid}
-        kill -15 ${pid}
-    fi
-done

zzz/start.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-proj_dir=`pwd`
-cd ${proj_dir}
-
-###############################################################################
-# 启动 tnb 项目应用
-###############################################################################
-java -jar ${proj_dir}/eureka/eureka-server/target/tnb-eureka.jar > tnb-eureka.log 2>&1 &
-echo 'sleep 10s to wait EurekaServer started...'
-sleep 10
-
-java -jar ${proj_dir}/gateway/target/tnb-gateway.jar > tnb-gateway.log 2>&1 &
-java -jar ${proj_dir}/account/account-service/target/tnb-account.jar > tnb-account.log 2>&1 &
-java -jar ${proj_dir}/user/user-service/target/tnb-user.jar > tnb-user.log 2>&1 &
-java -jar ${proj_dir}/file/file-service/target/tnb-file.jar > tnb-file.log 2>&1 &
-java -jar ${proj_dir}/content/content-service/target/tnb-content.jar > tnb-content.log 2>&1 &
-#java -jar ${proj_dir}/data/data-service/target/tnb-data.jar > tnb-data.log 2>&1 &
-java -jar ${proj_dir}/search/search-service/target/tnb-search.jar > tnb-search.log 2>&1 &
-
-export SERVER_ADDRESS=127.0.0.1
-java -jar ${proj_dir}/message/message-service/target/tnb-message.jar > tnb-message.log 2>&1 &