deploy

deploy.sh

@@ -3,12 +3,22 @@
 # 指定目录
 export directory="$PWD"
 
+
+export APP_PATH= "$directory"/php/app/
+
+
+export docker_compose_dir="$directory"/edge/
+
+APP_PATH_escaped_dir=$(echo "$APP_PATH" | sed 's/\//\\\//g')
+docker_compose_escaped_dir=$(echo "$docker_compose_dir" | sed 's/\//\\\//g')
+
 # 切换到目录
 cd "$directory"/edge || exit 1
 
 
-
 # 替换.env中的admin = master为admin = ADMIN_HOST
-sed -i "s/APP_DIR=\"\s*.*\"/APP_DIR=\"{$directory}/php/app/\"/g" .env
+
+sed -i "s/${APP_DIR}/{$APP_PATH_escaped_dir}/g" .env
+sed -i "s/${docker_compose_dir}/{$docker_compose_escaped_dir}/g" .env
 #启动服务
-docker-compose up -d docker-job
+docker run -d -v /var/run/docker.sock:/var/run/docker.sock -v "$directory"/edge:/www/docker/edge --name edge-upgrade-service registry.cn-hangzhou.aliyuncs.com/minong/edge-upgrade-service:v22

edge/docker-compose.yaml

@@ -47,7 +47,7 @@ services:
     ports:
       - '8888:8888'
     volumes:
-      - ./edgeframe-server/config.docker.yaml:/go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml
+      - ${docker_compose_dir}/edgeframe-server/config.docker.yaml:/go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml
       - ${APP_DIR}/public/authorisation.lock:/go/src/github.com/flipped-aurora/gin-vue-admin/server/authorisation.lock
     environment:
       MOD: local
@@ -87,8 +87,8 @@ services:
       - '8000:80'
       - '8080:8080'
     volumes:
-      - $PWD/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
-      - $PWD/nginx/my.conf:/etc/nginx/conf.d/my.conf
+      - ${docker_compose_dir}/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ${docker_compose_dir}/nginx/my.conf:/etc/nginx/conf.d/my.conf
       - ${APP_DIR}:/var/www/html
     depends_on:
       - mysql

edge/edgeframe-server/config.docker.yaml

@@ -0,0 +1,228 @@
+aliyun-oss:
+  endpoint: yourEndpoint
+  access-key-id: yourAccessKeyId
+  access-key-secret: yourAccessKeySecret
+  bucket-name: yourBucketName
+  bucket-url: yourBucketUrl
+  base-path: yourBasePath
+autocode:
+  server-model: /model/%s
+  server-router: /router/%s
+  server: /server
+  server-api: /api/v1/%s
+  server-plug: /plugin/%s
+  server-initialize: /initialize
+  root: D:\go\project\meinong
+  web-table: /view
+  web: /web/src
+  server-service: /service/%s
+  server-request: /model/%s/request/
+  web-api: /api
+  web-form: /view
+  transfer-restart: true
+aws-s3:
+  bucket: xxxxx-10005608
+  region: ap-shanghai
+  endpoint: ""
+  secret-id: your-secret-id
+  secret-key: your-secret-key
+  base-url: https://gin.vue.admin
+  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+  s3-force-path-style: false
+  disable-ssl: false
+captcha:
+  key-long: 6
+  img-width: 240
+  img-height: 80
+  open-captcha: 0
+  open-captcha-timeout: 3600
+cors:
+  mode: strict-whitelist
+  whitelist:
+    - allow-origin: example1.com
+      allow-methods: POST, GET
+      allow-headers: Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id
+      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+      allow-credentials: true
+    - allow-origin: example2.com
+      allow-methods: GET, POST
+      allow-headers: content-type
+      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+      allow-credentials: true
+db-list:
+  - type: ""
+    alias-name: ""
+    prefix: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    path: ""
+    engine: ""
+    log-mode: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    singular: false
+    log-zap: false
+    disable: true
+email:
+  to: xxx@qq.com
+  from: xxx@163.com
+  host: smtp.163.com
+  secret: xxx
+  nickname: test
+  port: 465
+  is-ssl: true
+excel:
+  dir: ./resource/excel/
+hua-wei-obs:
+  path: you-path
+  bucket: you-bucket
+  endpoint: you-endpoint
+  access-key: you-access-key
+  secret-key: you-secret-key
+jwt:
+  signing-key: 8a2aec08-6779-4c02-be51-34ff3b76fd57
+  expires-time: 7d
+  buffer-time: 1d
+  issuer: qmPlus
+local:
+  path: uploads/file
+  store-path: uploads/file
+mssql:
+  prefix: ""
+  port: ""
+  config: ""
+  db-name: ""
+  username: ""
+  password: ""
+  path: ""
+  engine: ""
+  log-mode: ""
+  max-idle-conns: 10
+  max-open-conns: 100
+  singular: false
+  log-zap: false
+mysql:
+  prefix: ""
+  port: "3306"
+  config: charset=utf8mb4&parseTime=True&loc=Local
+  db-name: edgedb
+  username: edgedb
+  password: edgedb
+  path: mysql
+  engine: ""
+  log-mode: error
+  max-idle-conns: 10
+  max-open-conns: 100
+  singular: false
+  log-zap: false
+oracle:
+  prefix: ""
+  port: ""
+  config: ""
+  db-name: ""
+  username: ""
+  password: ""
+  path: ""
+  engine: ""
+  log-mode: ""
+  max-idle-conns: 10
+  max-open-conns: 100
+  singular: false
+  log-zap: false
+pgsql:
+  prefix: ""
+  port: ""
+  config: ""
+  db-name: ""
+  username: ""
+  password: ""
+  path: ""
+  engine: ""
+  log-mode: ""
+  max-idle-conns: 10
+  max-open-conns: 100
+  singular: false
+  log-zap: false
+qiniu:
+  zone: ZoneHuaDong
+  bucket: ""
+  img-path: ""
+  access-key: ""
+  secret-key: ""
+  use-https: false
+  use-cdn-domains: false
+redis:
+  addr: redis:6379
+  password: ""
+  db: 0
+sqlite:
+  prefix: ""
+  port: ""
+  config: ""
+  db-name: ""
+  username: ""
+  password: ""
+  path: ""
+  engine: ""
+  log-mode: ""
+  max-idle-conns: 10
+  max-open-conns: 100
+  singular: false
+  log-zap: false
+system:
+  env: public
+  db-type: mysql
+  oss-type: local
+  router-prefix: ""
+  addr: 8888
+  iplimit-count: 15000
+  iplimit-time: 3600
+  use-multipoint: false
+  use-redis: true
+  mod: local
+  company_key: ssssss
+tencent-cos:
+  bucket: xxxxx-10005608
+  region: ap-shanghai
+  secret-id: your-secret-id
+  secret-key: your-secret-key
+  base-url: https://gin.vue.admin
+  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+timer:
+  spec: '@daily'
+  detail:
+    - tableName: sys_operation_records
+      compareField: created_at
+      interval: 2160h
+    - tableName: jwt_blacklists
+      compareField: created_at
+      interval: 168h
+  start: true
+  with_seconds: false
+zap:
+  level: info
+  prefix: '[github.com/flipped-aurora/gin-vue-admin/server]'
+  format: console
+  director: log
+  encode-level: LowercaseColorLevelEncoder
+  stacktrace-key: stacktrace
+  max-age: 0
+  show-line: true
+  log-in-console: true
+mongodb:
+  dbname: edgedb
+  local_db: edgedb
+  cloud_db: edgedb2
+  user: admin
+  password: admin123
+  hosts:
+    - mongodb:27017
+kafka:
+  needNotify: true
+  notifyUrl: "http://sync-server-web/api/xiekeyun/callBack"
+  notifyMax: 10
+  hosts:
+    - 47.99.98.85:9092