Parcourir la source

update build.sh

reghao il y a 2 semaines
Parent
commit
dd43bd239b

+ 33 - 59
build.sh

@@ -4,9 +4,13 @@ set -e
 
 env='test'
 base_dir=`pwd`
+docker_prefix='registry.cn-chengdu.aliyuncs.com/tnb028'
 proj_dir="${base_dir}/tmp/proj"
 bin_dir="${base_dir}/tmp/bin"
 
+###############################################################################
+# 创建构建目录
+###############################################################################
 create_dirs() {
     if [ -d ${proj_dir} ]; then
         rm -rf ${proj_dir}
@@ -20,48 +24,42 @@ create_dirs() {
 }
 
 ###############################################################################
-# clone 项目
+# 构建前端应用
 ###############################################################################
-clone_proj() {
+build_front() {
     cd ${proj_dir}
-    # git clone --depth=1 https://github.com/reghao/ik-analyzer-solr.git
-    # git clone --depth=1 https://github.com/reghao/jieba-analysis.git
-    # git clone --depth=1 https://git.reghao.cn/reghao/jutil
-
-    git -c http.sslVerify=false clone --depth=1 https://git.reghao.cn/reghao/oss
-    git -c http.sslVerify=false clone --depth=1 https://git.reghao.cn/reghao/tnb
-    git -c http.sslVerify=false clone --depth=1 https://git.reghao.cn/reghao/tnbapp
-}
+    git clone --depth=1 https://git.reghao.cn/reghao/tnbapp
 
-###############################################################################
-# 安装依赖
-###############################################################################
-build_dependencies() {
-    cd ${proj_dir}/jutil
-    mvn clean install -Dmaven.test.skip
-
-    cd ${proj_dir}/ik-analyzer-solr
-    mvn clean install -Dmaven.test.skip
-
-    cd ${proj_dir}/jieba-analysis
-    mvn clean install -Dmaven.test.skip
+    ###############################################################################
+    # 构建 tnbapp 项目
+    ###############################################################################
+    cd ${proj_dir}/tnbapp
+    npm --registry http://registry.npm.taobao.org i
+    npm run build
+    # if [ ! -d ${bin_dir}/tnbapp ]; then
+    #     mkdir ${bin_dir}/tnbapp
+    # fi
+    # cp -r dist/* ${bin_dir}/tnbapp
+    commit_id=`git rev-parse HEAD | cut -c 1-8`
+    docker build -t ${docker_prefix}/tnbapp .
+    docker push ${docker_prefix}/tnbapp
 }
 
 ###############################################################################
 # 构建 oss 应用
 ###############################################################################
 build_oss() {
+    cd ${proj_dir}
+    git clone --depth=1 https://git.reghao.cn/reghao/oss
+
     ###############################################################################
     # 构建 oss 项目 jar 包
     ###############################################################################
     cd ${proj_dir}/oss
     mvn clean install -Dmaven.test.skip -pl oss-sdk -am
     mvn clean package -Dmaven.test.skip -P${env}
-
-    cp oss-mgr/target/oss-mgr.jar ${bin_dir}
+    # cp oss-mgr/target/oss-mgr.jar ${bin_dir}
     # cp oss-store/bin/oss-store.jar ${bin_dir}
-
-    docker_prefix='registry.cn-chengdu.aliyuncs.com/tnb028'
     cd ${proj_dir}/oss/oss-mgr
     docker build -t ${docker_prefix}/oss-mgr .
     docker push ${docker_prefix}/oss-mgr
@@ -71,6 +69,9 @@ build_oss() {
 # 构建后端应用
 ###############################################################################
 build_backend() {
+    cd ${proj_dir}
+    git clone --depth=1 https://git.reghao.cn/reghao/tnb
+
     ###############################################################################
     # 构建 tnb 项目 jar 包
     ###############################################################################
@@ -87,30 +88,12 @@ build_backend() {
     cp search/search-service/target/tnb-search.jar ${bin_dir}
 }
 
-###############################################################################
-# 构建前端应用
-###############################################################################
-build_front() {
-    ###############################################################################
-    # 构建 tnbapp 项目
-    ###############################################################################
-    cd ${proj_dir}/tnbapp
-    npm --registry http://registry.npm.taobao.org i
-    npm run build
-
-    if [ ! -d ${bin_dir}/tnbapp ]; then
-        mkdir ${bin_dir}/tnbapp
-    fi
-    cp -r dist/* ${bin_dir}/tnbapp
-}
-
 ###############################################################################
 # 构建 tnb 应用 docker 镜像
 ###############################################################################
 build_image() {
   cd ${proj_dir}/tnb
 #   commit_id=`git rev-parse HEAD | cut -c 1-8`
-  docker_prefix='registry.cn-chengdu.aliyuncs.com/tnb028'
 
   cd ${proj_dir}/tnb/gateway/
   docker build -t ${docker_prefix}/tnbgateway .
@@ -140,29 +123,20 @@ build_image() {
   docker build -t ${docker_prefix}/tnbsearch .
   docker push ${docker_prefix}/tnbsearch
 
-  cd ${proj_dir}/tnbapp
-  commit_id=`git rev-parse HEAD | cut -c 1-8`
-  docker build -t ${docker_prefix}/tnbapp .
-  docker push ${docker_prefix}/tnbapp
+  cd ${proj_dir}/tnb/admin/
+  docker build -t ${docker_prefix}/tnbadmin .
+  docker push ${docker_prefix}/tnbadmin
 }
 
 echo "创建 proj 目录和 bin 目录..."
 create_dirs
 
-echo "clone 项目..."
-clone_proj
-
-# echo "构建依赖..."
-# build_dependencies
+echo "构建前端应用..."
+build_front
 
 echo "构建 oss 应用..."
 build_oss
 
-echo "构建后端应用..."
+echo "构建后端应用和 docker 镜像..."
 build_backend
-
-echo "构建前端应用..."
-build_front
-
-echo "构建 docker 镜像..."
 build_image

+ 8 - 11
docker_app.sh

@@ -7,27 +7,24 @@
 set -e
 
 function start() {
-  docker run -d --name=tnbeureka --network=host -v /opt/log:/app/logs tnb/eureka
-  docker run -d --name=tnbgateway --network=host -v /opt/log:/app/logs tnb/gateway
-  docker run -d --name=tnbaccount --network=host -v /opt/log:/app/logs tnb/account
-  docker run -d --name=tnbfile --network=host -v /opt/log:/app/logs tnb/file
-  docker run -d --name=tnbuser --network=host -v /opt/log:/app/logs tnb/user
-  docker run -d --name=tnbcontent --network=host -v /opt/log:/app/logs tnb/content
-  docker run -d --name=tnbsearch --network=host -v /opt/log:/app/logs tnb/search
-  docker run -d --name=tnbadmin --network=host -v /opt/log:/app/logs tnb/admin
+  docker run -d --name=tnbgateway --network=host tnb/gateway
+  docker run -d --name=tnbauth --network=host tnb/account
+  docker run -d --name=tnbfile --network=host tnb/file
+  docker run -d --name=tnbuser --network=host tnb/user
+  docker run -d --name=tnbcontent --network=host tnb/content
+  docker run -d --name=tnbsearch --network=host tnb/search
+  docker run -d --name=tnbadmin --network=host tnb/admin
 
   docker run -d --name=tnbmessage --network=host \
     -e NODE_ADDRESS=127.0.0.1 \
-    -v /opt/log:/app/logs \
     tnb/message
 
   docker run -d --name=tnbapp --network=host tnb/tnbapp
 }
 
 function shutdown() {
-  docker stop tnbeureka && docker rm tnbeureka
   docker stop tnbgateway && docker rm tnbgateway
-  docker stop tnbaccount && docker rm tnbaccount
+  docker stop tnbauth && docker rm tnbauth
   docker stop tnbmessage && docker rm tnbmessage
   docker stop tnbfile && docker rm tnbfile
   docker stop tnbuser && docker rm tnbuser

+ 14 - 0
nginx/conf.d/default.conf

@@ -0,0 +1,14 @@
+server {
+    listen 80 default_server;
+    server_name _;
+    return 403;
+}
+
+server {
+    listen 443 ssl default_server;
+    server_name _;
+
+    ssl_certificate /etc/nginx/ssl/nginx.crt;
+    ssl_certificate_key /etc/nginx/ssl/nginx.key;
+    return 403;
+}

+ 126 - 0
nginx/conf.d/devops.conf

@@ -0,0 +1,126 @@
+################################################################################
+# git.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name git.reghao.cn;
+   return 301 https://git.reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name git.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/git.reghao.cn.access.log main;
+
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      #proxy_pass http://127.0.0.1:3000;
+      proxy_pass http://192.168.0.210:3000;
+   }
+}
+
+################################################################################
+# grafana.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name prometheus.reghao.cn;
+   return 301 https://prom.reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name prometheus.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/prom.reghao.cn.access.log main;
+
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://127.0.0.1:9090;
+   }
+}
+
+server {
+   listen 80;
+   server_name grafana.reghao.cn;
+   access_log /var/log/nginx/grafana.reghao.cn.access.log main;
+
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://192.168.0.210:13000;
+   }
+}
+
+################################################################################
+# devops.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name devops.reghao.cn;
+   access_log off;
+   return 301 https://devops.reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name devops.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/devops.reghao.cn.access.log main;
+
+   # api.reghao.cn
+   location /api {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_send_timeout 600;
+      proxy_read_timeout 600;
+      proxy_connect_timeout 600;
+
+      proxy_pass http://bnt_slb;
+   }
+   location /bgws {
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection $connection_upgrade;
+      proxy_cache off;
+      proxy_http_version 1.1;
+      proxy_buffering off;
+      proxy_read_timeout 100s;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://bnt_slb;
+   }
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://devopsapp_slb;
+   }
+}
+
+upstream bnt_slb {
+    #server 192.168.0.208:4030;
+    server 192.168.0.10:4030;
+}
+
+upstream devopsapp_slb {
+    #server 192.168.0.208:4040;
+    server 192.168.0.10:4040;
+}

+ 85 - 0
nginx/conf.d/live.reghao.cn.conf

@@ -0,0 +1,85 @@
+################################################################################
+# live.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name live.reghao.cn;
+   access_log off;
+   return 301 https://$host$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name live.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/live.reghao.cn.access.log main;
+
+   location / {
+      if ($request_method = 'OPTIONS') {
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization';
+        return 204;
+      }
+
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://192.168.0.210:8080;
+   }
+}
+
+################################################################################
+# tnb.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name tnb.reghao.cn;
+   access_log off;
+   return 301 https://$host$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name tnb.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/tnb.reghao.cn.access.log main;
+
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://192.168.0.10:8090;
+      #proxy_pass http://192.168.0.10:4050;
+   }
+}
+
+################################################################################
+# m.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name m.reghao.cn;
+   access_log off;
+   return 301 https://m.reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name m.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/m.reghao.cn.access.log main;
+
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://192.168.0.210:4050;
+   }
+}

+ 93 - 0
nginx/conf.d/oss.reghao.cn.conf

@@ -0,0 +1,93 @@
+################################################################################
+# ossconsole.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name ossconsole.reghao.cn;
+   access_log off;
+   return 301 https://ossconsole.reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name ossconsole.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/ossconsole.reghao.cn.access.log main;
+
+   location / {
+      if ($request_method = 'OPTIONS') {
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization';
+        return 204;
+      }
+
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://192.168.0.10:8010;
+      #proxy_pass http://192.168.0.210:8010;
+   }
+}
+
+################################################################################
+# oss.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name oss.reghao.cn;
+   access_log off;
+   return 301 https://oss.reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name oss.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/oss.reghao.cn.access.log main;
+
+   location / {
+      if ($request_method = 'OPTIONS') {
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization';
+        return 204;
+      }
+
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      #proxy_pass http://192.168.0.10:8020;
+      proxy_pass http://192.168.0.210:8020;
+   }
+}
+
+################################################################################
+# oss1.reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name oss1.reghao.cn;
+   access_log off;
+   return 301 https://oss1.reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name oss1.reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/oss1.reghao.cn.access.log main;
+
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://192.168.0.204:8020;
+   }
+}

+ 105 - 0
nginx/conf.d/reghao.cn.conf

@@ -0,0 +1,105 @@
+################################################################################
+# reghao.cn
+################################################################################
+server {
+   listen 80;
+   server_name reghao.cn;
+   access_log off;
+   return 301 https://reghao.cn$request_uri;
+}
+
+server {
+   listen 443 ssl;
+   server_name reghao.cn;
+   include conf.d/ssl_common.conf;
+   access_log /var/log/nginx/reghao.cn.access.log main;
+
+   # api.reghao.cn
+   location /api {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_send_timeout 600;
+      proxy_read_timeout 600;
+      proxy_connect_timeout 600;
+
+      proxy_pass http://gateway_slb;
+   }
+   location /api1 {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_send_timeout 600;
+      proxy_read_timeout 600;
+      proxy_connect_timeout 600;
+
+      proxy_pass http://ai_slb;
+   }
+   location /api/data {
+      proxy_http_version 1.1;
+      proxy_set_header Connection "";
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_read_timeout 86400s;
+      proxy_buffering off;
+      proxy_cache off;
+      chunked_transfer_encoding off;
+
+      proxy_pass http://gateway_slb;
+   }
+   location /ws {
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection $connection_upgrade;
+      proxy_cache off;
+      proxy_http_version 1.1;
+      proxy_buffering off;
+      proxy_read_timeout 100s;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://gateway_slb;
+   }
+   location /file {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://gateway_slb;
+   }
+   location /live {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://live_slb;
+   }
+   location / {
+      proxy_set_header HOST $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_pass http://app_slb;
+   }
+}
+
+upstream gateway_slb {
+    server 192.168.0.10:6000;
+    #server 192.168.0.210:6000;
+}
+upstream ai_slb {
+    server 192.168.0.10:7070;
+}
+upstream live_slb {
+    server 192.168.0.10:8080;
+}
+upstream app_slb {
+    server 192.168.0.10:8000;
+    #server 192.168.0.210:4040;
+}

+ 10 - 0
nginx/conf.d/ssl_common.conf

@@ -0,0 +1,10 @@
+# 公共证书路径
+ssl_certificate     /etc/nginx/ssl/reghao.cn/fullchain.cer;
+ssl_certificate_key /etc/nginx/ssl/reghao.cn/reghao.cn.key;
+
+# 公共安全加固参数
+ssl_protocols TLSv1.2 TLSv1.3;
+ssl_ciphers HIGH:!aNULL:!MD5;
+ssl_prefer_server_ciphers on;
+ssl_session_cache shared:SSL:10m;
+ssl_session_timeout 10m;

+ 53 - 0
nginx/nginx.conf

@@ -0,0 +1,53 @@
+user root root;
+worker_processes 1;
+worker_rlimit_nofile 20000;
+error_log  /var/log/nginx/error.log notice;
+
+events {
+    use epoll;
+    worker_connections 20000;
+    multi_accept on;
+}
+
+http {
+    include mime.types;
+    default_type application/octet-stream;
+
+    log_format main
+	    	 '{"time_iso8601":"$time_iso8601",'
+                 '"remote_addr":"$remote_addr",'
+                 '"request":"$request",'
+                 '"status":$status,'
+                 '"request_method": "$request_method",'
+                 '"body_bytes_sent":$body_bytes_sent,'
+                 '"request_time":$request_time,'
+                 '"upstream_response_time":$upstream_response_time,'
+                 '"upstream_addr":"$upstream_addr",'
+                 '"host":"$host",'
+                 '"url":"$uri",'
+                 '"http_x_forwarded_for":"$http_x_forwarded_for",'
+                 '"http_referer":"$http_referer",'
+                 '"http_user_agent":"$http_user_agent"}';
+
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    server_tokens off;
+    keepalive_timeout 60;
+    client_max_body_size 6120m;
+    proxy_connect_timeout 600;
+    proxy_send_timeout 600;
+    proxy_read_timeout 600;
+    proxy_buffer_size 16k; 
+    proxy_buffers 4 64k; 
+    proxy_busy_buffers_size 128k; 
+    proxy_temp_file_write_size 128k;
+
+
+    map $http_connection $connection_upgrade {
+        "~*Upgrade" $http_connection;
+        default keep-alive;
+    }
+
+    include conf.d/*.conf;
+}

+ 22 - 0
nginx/ssl/nginx.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn0CFDH+6P5V2CtUlUd9yekvzatGEIg+MA0GCSqGSIb3DQEBCwUAMIGG
+MQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQ2hlbmdkdTEQMA4GA1UEBwwHQ2hlbmdk
+dTEMMAoGA1UECgwDdG5iMRUwEwYDVQQLDAx0bmIgU29mdHdhcmUxDjAMBgNVBAMM
+BW5naW54MR4wHAYJKoZIhvcNAQkBFg9hZG1pbkByZWdoYW8uY24wHhcNMjMwNDA2
+MTMzMDI4WhcNMzMwNDAzMTMzMDI4WjCBhjELMAkGA1UEBhMCQ04xEDAOBgNVBAgM
+B0NoZW5nZHUxEDAOBgNVBAcMB0NoZW5nZHUxDDAKBgNVBAoMA3RuYjEVMBMGA1UE
+CwwMdG5iIFNvZnR3YXJlMQ4wDAYDVQQDDAVuZ2lueDEeMBwGCSqGSIb3DQEJARYP
+YWRtaW5AcmVnaGFvLmNuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+yTyxclyKj+L0v9wOmqTla9kVwmI/0rz8evjn4E7VJTHXSVObCncjRFXBUGkG4rky
+fp0QLf0CliZ7mFoeH2e663OFNY6ZU6pjedXXikKy8Sl5QbLiNc0/4FjLWk66ZpwS
+p6GBPNgijQD1bsFLAcO5Hr12kFodc3MFS5vY9uP7mEzDYjNKd24WtJgZcnV1InV0
+cgyupywOIgvoxqUgX8OR249kq1X/tbWnIYDq9Rhk+J6B7wn7r/NuQR9KEYOKOImE
+scrFikb9jcK2gw0K66C5Jpx/CIme//QLQJfKm223H7t2sxg0gveyObgLanO05KJ/
+kEi3OKvd2PAfSTSXAf5AvQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCh0lvak4Eq
+M7R5JOsjHKlglfKPQ9VSD2wPADA416iuwNAGrAUOCSSEwAEBa0nsFyGXE8Tx4gXC
+1trgRIsg/7bWari1mAdgf8G7Q3eOm+i/7t6v8bkxKS7atC6ibTvnRPrHzpA1nNnK
+v/WGMwxwbCfqYGRVVjGQ+B3btj1352BmsW/dC7ho3Ps5TzgpgzJKAofJJwn21FHH
+h/iORRIXB11gPUgr9ZlWxLwKVxPCoH76ni2NPT28r1NIT9x+TyMp41BpEQOhTBeR
+yF5yziPRm/QIqItoycqbMTcEPPU/2pfM4TMpQ44T7xJT8X3nBE0noOPwLO53jR0G
+E7Kigb+jrmGa
+-----END CERTIFICATE-----

+ 27 - 0
nginx/ssl/nginx.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyTyxclyKj+L0v9wOmqTla9kVwmI/0rz8evjn4E7VJTHXSVOb
+CncjRFXBUGkG4rkyfp0QLf0CliZ7mFoeH2e663OFNY6ZU6pjedXXikKy8Sl5QbLi
+Nc0/4FjLWk66ZpwSp6GBPNgijQD1bsFLAcO5Hr12kFodc3MFS5vY9uP7mEzDYjNK
+d24WtJgZcnV1InV0cgyupywOIgvoxqUgX8OR249kq1X/tbWnIYDq9Rhk+J6B7wn7
+r/NuQR9KEYOKOImEscrFikb9jcK2gw0K66C5Jpx/CIme//QLQJfKm223H7t2sxg0
+gveyObgLanO05KJ/kEi3OKvd2PAfSTSXAf5AvQIDAQABAoIBACkF5maZ1uVeLuat
+xYxg8SP7LSRjQv+C5zVqaFqht3HNp0WbdY+8mcPkd3Qc9PpjJpgJDLNTUKOrVKbK
+ODnOu5wkAJPabgdQRNchcL8OucvP2Jg8D0FIhi0F7O6L/hPM3UCu+9mbde+osl/R
+p6jEbYiGtxTWSgqu9/Vh3+j0sOVq4+yX+pJQbbYCqC9zGZrLlXbiNE1GhTh0dIWU
+pq4HdIKn+Nx6071u6QHivo5mAmOurIx5cr+bQy7cczXGp2rsTCrwuhUSHonm6a7C
+jitF2OJ3TzR4InF2Y3H4wyfYB8IsGMBJLuT9qFAGgsfoJuWjMNIdh9rFVc85Q0g/
+5NKMsUECgYEA8lT0k/5u6l5FeAIIXElT+QcIifRv7KWf8tx4zWZyeapKZy3jQYQT
+yOqDSyvVuEFLwlJENLJjoGtkEL5uFHJj61sYEQyiZmA8lsoX2zcziY9GmEgoFcyN
+fUmuGWbO4y2Jaa1g2v08STrwTE5QpjVidPUdbO4EplQrFG2SU2ZRFFcCgYEA1JZe
+J2fseI3O1TZD10dnEoSfXliylCtMIi1yTC145vHfmImkGWYCA0vrhu5FHL29viwj
+6hMPmOhwrwLgKu/FgF3PHxJpCyTVxI64in8A4Y8N0kqC0kqIL2AlEmHH6w0Z7YNh
+Num+1ZJFZLJ2KlHavniObuxHPnuXAaGgyYosBwsCgYBPvkEVij55hTga+6BAriih
+4/ydWQCTwRTXWFGwVawJ+U2ukl0cLBhOn01BKVWU4nfJpESpiqJaIby1/dQ/ijzz
+L/DFe4Dda4HEpRAgpROiirFSXzxBoCRXPC28UiZ2f3+edN1QctCp0GlO0t6bMyoJ
+Drf2JoUFLuFWQZBLPXok1QKBgBuFK8MmLPKeSPxI/hdMYwd+q7LnAJc107FI+Nbr
+vA8JmMyCZP/0uKX8mgzpo4DI/1szE6MlvIsq7At779EfIQ4xFrMLCxYqOpIrd7BW
+KKMKhduHUdAvXdnkNGhgyCShmY2pyFf3goDbYqhagfmQhyTJLoclh0OLdEz9w3bT
+sEdpAoGBAM5e/ckUR1Hz47MTsq05f8uc0xv0Jw14LwarADMTimoRwfjRBH9ytz/a
+GshDygGKWj5z+adtN6Cg8DovAG8mHlBZD+Bbyv9WcRgOhqFCP7JIebWF6r3oYsTI
+repUo8/B991XS95l1aK8OdKUBrgsp8btbApfICB1nnMI0an8cpKH
+-----END RSA PRIVATE KEY-----

+ 61 - 0
nginx/ssl/reghao.cn/fullchain.cer

@@ -0,0 +1,61 @@
+-----BEGIN CERTIFICATE-----
+MIIDgzCCAymgAwIBAgIRAKX8kVbur3JAKEENhb/SagEwCgYIKoZIzj0EAwIwRjEL
+MAkGA1UEBhMCQVQxFTATBgNVBAoTDFplcm9TU0wgR21iSDEgMB4GA1UEAxMXWmVy
+b1NTTCBFQ0MgRFYgU1NMIENBIDIwHhcNMjYwNTMxMDAwMDAwWhcNMjYwODI5MjM1
+OTU5WjAUMRIwEAYDVQQDEwlyZWdoYW8uY24wWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAARRnntnq+TO/ZB1axO4jD9hOAn1wDnmzMN9pS7+/mtjnaAq3Af6MYdeMpkN
+LlQWOh6g8oY0GKo1UijN9L2/xcXFo4ICKDCCAiQwHwYDVR0jBBgwFoAUlEWf2lFH
+cdVzrqwdqwhyEm2tfGIwHQYDVR0OBBYEFM7btFzDChnFIRCeiIPCz7YDhjRLMA4G
+A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMB
+MBMGA1UdIAQMMAowCAYGZ4EMAQIBMG4GCCsGAQUFBwEBBGIwYDA5BggrBgEFBQcw
+AoYtaHR0cDovL2NydC5zZWN0aWdvLmNvbS9aZXJvU1NMRUNDRFZTU0xDQTIuY3J0
+MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTCCAQUGCisGAQQB
+1nkCBAIEgfYEgfMA8QB2ANdtfRDRp/V3wsfpX9cAv/mCyTNaZeHQswFzF8DIxWl3
+AAABnnyAltIAAAQDAEcwRQIgNSmgkEEpADYDUQQHxhdNyxczJpS5PZcbYBweDgn0
+MgMCIQDuSfuaqOKbL/7KByI7/EScKEIjL/wN+XAk32O4ImlhjAB3AMijxH/Hs625
+NWsBP2p6Em3jOk5DpcZG+ZetOXWZHc+aAAABnnyAlyMAAAQDAEgwRgIhAO57zhCD
+VmSoVyi1yPSDQpyTA+f68FSB8VjQ7G0yChRqAiEAgfjq5MbRKPCsqZdJ/mVgW1M4
+HUGrbe9WQw1v5r1xatYwIQYDVR0RBBowGIIJcmVnaGFvLmNuggsqLnJlZ2hhby5j
+bjAKBggqhkjOPQQDAgNIADBFAiAodE1nmxmxA9mPIdLCYV33t8GQXSaVnrwYnGC6
+BeBwRAIhAMDhf7dXXXLCCkCmQp3YfQeObmiM0qqf+DaM9wWDjQ/j
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDNTCCArugAwIBAgIRAMThxbsA8CePNHvk+F1j/MowCgYIKoZIzj0EAwMwXzEL
+MAkGA1UEBhMCR0IxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE2MDQGA1UEAxMt
+U2VjdGlnbyBQdWJsaWMgU2VydmVyIEF1dGhlbnRpY2F0aW9uIFJvb3QgRTQ2MB4X
+DTI1MDkyNDAwMDAwMFoXDTM1MDkyMzIzNTk1OVowRjELMAkGA1UEBhMCQVQxFTAT
+BgNVBAoTDFplcm9TU0wgR21iSDEgMB4GA1UEAxMXWmVyb1NTTCBFQ0MgRFYgU1NM
+IENBIDIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATjn4qR1IOXAceCMsej8Qyr
+4PrFw+PwjPm2vrAfijBj4u2C++Y3pZqpeLi1z05b2owKKJzQk1AtL+m1fEoFeDka
+o4IBbzCCAWswHwYDVR0jBBgwFoAU0SLaTFnxS18mOKqd1u7rDcP7qWEwHQYDVR0O
+BBYEFJRFn9pRR3HVc66sHasIchJtrXxiMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMB
+Af8ECDAGAQH/AgEAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBMGA1UdIAQMMAowCAYG
+Z4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuc2VjdGlnby5jb20v
+U2VjdGlnb1B1YmxpY1NlcnZlckF1dGhlbnRpY2F0aW9uUm9vdEU0Ni5jcmwwgYQG
+CCsGAQUFBwEBBHgwdjBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5zZWN0aWdvLmNv
+bS9TZWN0aWdvUHVibGljU2VydmVyQXV0aGVudGljYXRpb25Sb290RTQ2LnA3YzAj
+BggrBgEFBQcwAYYXaHR0cDovL29jc3Auc2VjdGlnby5jb20wCgYIKoZIzj0EAwMD
+aAAwZQIwXKxxvuUkvPftBuaOFx73U3FxmFtKxP1Fd/+8Jq/ut2XgDrJ1vEUDdJb3
+iSDXVe9AAjEA8iUwhrRHdZrIWqfgGmDMBbuXRZ4GoQbLpwxgcPhKo3OZR7SecTp4
+juWAOpuawM2n
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDRjCCAsugAwIBAgIQGp6v7G3o4ZtcGTFBto2Q3TAKBggqhkjOPQQDAzCBiDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
+eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
+JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMjEwMzIy
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjBfMQswCQYDVQQGEwJHQjEYMBYGA1UEChMP
+U2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBTZXJ2ZXIg
+QXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAR2
++pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccCWvkEN/U0
+NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+6xnOQ6Oj
+ggEgMIIBHDAfBgNVHSMEGDAWgBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAdBgNVHQ4E
+FgQU0SLaTFnxS18mOKqd1u7rDcP7qWEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBEGA1UdIAQK
+MAgwBgYEVR0gADBQBgNVHR8ESTBHMEWgQ6BBhj9odHRwOi8vY3JsLnVzZXJ0cnVz
+dC5jb20vVVNFUlRydXN0RUNDQ2VydGlmaWNhdGlvbkF1dGhvcml0eS5jcmwwNQYI
+KwYBBQUHAQEEKTAnMCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3Qu
+Y29tMAoGCCqGSM49BAMDA2kAMGYCMQCMCyBit99vX2ba6xEkDe+YO7vC0twjbkv9
+PKpqGGuZ61JZryjFsp+DFpEclCVy4noCMQCwvZDXD/m2Ko1HA5Bkmz7YQOFAiNDD
+49IWa2wdT7R3DtODaSXH/BiXv8fwB9su4tU=
+-----END CERTIFICATE-----

+ 21 - 0
nginx/ssl/reghao.cn/reghao.cn.cer

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDgzCCAymgAwIBAgIRAKX8kVbur3JAKEENhb/SagEwCgYIKoZIzj0EAwIwRjEL
+MAkGA1UEBhMCQVQxFTATBgNVBAoTDFplcm9TU0wgR21iSDEgMB4GA1UEAxMXWmVy
+b1NTTCBFQ0MgRFYgU1NMIENBIDIwHhcNMjYwNTMxMDAwMDAwWhcNMjYwODI5MjM1
+OTU5WjAUMRIwEAYDVQQDEwlyZWdoYW8uY24wWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAARRnntnq+TO/ZB1axO4jD9hOAn1wDnmzMN9pS7+/mtjnaAq3Af6MYdeMpkN
+LlQWOh6g8oY0GKo1UijN9L2/xcXFo4ICKDCCAiQwHwYDVR0jBBgwFoAUlEWf2lFH
+cdVzrqwdqwhyEm2tfGIwHQYDVR0OBBYEFM7btFzDChnFIRCeiIPCz7YDhjRLMA4G
+A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMB
+MBMGA1UdIAQMMAowCAYGZ4EMAQIBMG4GCCsGAQUFBwEBBGIwYDA5BggrBgEFBQcw
+AoYtaHR0cDovL2NydC5zZWN0aWdvLmNvbS9aZXJvU1NMRUNDRFZTU0xDQTIuY3J0
+MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTCCAQUGCisGAQQB
+1nkCBAIEgfYEgfMA8QB2ANdtfRDRp/V3wsfpX9cAv/mCyTNaZeHQswFzF8DIxWl3
+AAABnnyAltIAAAQDAEcwRQIgNSmgkEEpADYDUQQHxhdNyxczJpS5PZcbYBweDgn0
+MgMCIQDuSfuaqOKbL/7KByI7/EScKEIjL/wN+XAk32O4ImlhjAB3AMijxH/Hs625
+NWsBP2p6Em3jOk5DpcZG+ZetOXWZHc+aAAABnnyAlyMAAAQDAEgwRgIhAO57zhCD
+VmSoVyi1yPSDQpyTA+f68FSB8VjQ7G0yChRqAiEAgfjq5MbRKPCsqZdJ/mVgW1M4
+HUGrbe9WQw1v5r1xatYwIQYDVR0RBBowGIIJcmVnaGFvLmNuggsqLnJlZ2hhby5j
+bjAKBggqhkjOPQQDAgNIADBFAiAodE1nmxmxA9mPIdLCYV33t8GQXSaVnrwYnGC6
+BeBwRAIhAMDhf7dXXXLCCkCmQp3YfQeObmiM0qqf+DaM9wWDjQ/j
+-----END CERTIFICATE-----

+ 5 - 0
nginx/ssl/reghao.cn/reghao.cn.key

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMgt69vvDTBFpipJ1VTlayYj1Qp78RNiEJsE27XLY3E1oAoGCCqGSM49
+AwEHoUQDQgAEUZ57Z6vkzv2QdWsTuIw/YTgJ9cA55szDfaUu/v5rY52gKtwH+jGH
+XjKZDS5UFjoeoPKGNBiqNVIozfS9v8XFxQ==
+-----END EC PRIVATE KEY-----

+ 4 - 6
shutdown.sh

@@ -4,18 +4,16 @@
 # 结束应用进程
 ###############################################################################
 
-app_name0='tnb-eureka'
 app_name1='tnb-gateway'
-app_name2='tnb-account'
+app_name2='tnb-auth'
 app_name3='tnb-user'
 app_name4='tnb-message'
 app_name5='tnb-file'
 app_name6='tnb-content'
 app_name7='tnb-search'
-app_name8='oss-store1'
-app_name9='tnb-admin'
+app_name8='tnb-admin'
 
-for((i=0; i<=9; i++));
+for((i=1; i<=8; i++));
 do
     app_name=$(eval echo \${app_name$i})
 	pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
@@ -26,4 +24,4 @@ do
         echo "kill "${app_name}" with pid "${pid}
         kill -15 ${pid}
     fi
-done
+done

+ 2 - 8
start.sh

@@ -14,13 +14,7 @@ nohup java -jar tnb-user.jar > tnb-user.log 2>&1 &
 nohup java -jar tnb-file.jar > tnb-file.log 2>&1 &
 nohup java -jar tnb-content.jar > tnb-content.log 2>&1 &
 nohup java -jar tnb-search.jar > tnb-search.log 2>&1 &
-#nohup java -jar tnb-admin.jar > tnb-admin.log 2>&1 &
+nohup java -jar tnb-admin.jar > tnb-admin.log 2>&1 &
 
 export NODE_ADDRESS=127.0.0.1
-nohup java -jar tnb-message.jar > tnb-message.log 2>&1 &
-
-###############################################################################
-# 启动 oss-store 应用
-###############################################################################
-cd oss-store
-#bash start.sh
+nohup java -jar tnb-message.jar > tnb-message.log 2>&1 &

+ 7 - 0
start_dockerapp.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+image='registry.cn-chengdu.aliyuncs.com/tnb028/tnbauth'
+
+docker run -d --name=dockerapp --network=host \
+    -e "DUBBO_STATUS_REPORT_IP=192.168.0.147" \
+    ${image}