diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index 95b5e913..ed8f6358 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -1,31 +1,31 @@ spring: datasource: druid: - url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false - username: ${MYSQL_USER:root} - password: ${MYSQL_PASSWORD:Data@123456} + url: jdbc:mysql://192.168.31.189:33069/visor?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false + username: dream + password: info_dream initial-size: 0 min-idle: 1 max-active: 5 stat-view-servlet: enabled: false redis: - host: ${REDIS_HOST:127.0.0.1} - port: ${REDIS_PORT:6379} - password: ${REDIS_PASSWORD:Data@123456} - database: ${REDIS_DATABASE:1} - data-version: ${REDIS_DATA_VERSION:2} + host: 192.168.31.189 + port: 6379 + password: admin + database: 1 + data-version: 2 mock: false redisson: threads: 2 netty-threads: 2 minimum-idle-size: 2 influxdb: - enabled: ${INFLUXDB_ENABLED:true} - url: http://${INFLUXDB_HOST:127.0.0.1}:${INFLUXDB_PORT:8086} - org: ${INFLUXDB_ORG:orion-visor} - bucket: ${INFLUXDB_BUCKET:metrics} - token: ${INFLUXDB_TOKEN:Data@123456} + enabled: true + url: http://192.168.31.182:8086 + org: orion-visor + bucket: metrics + token: 3774e79ac55aff6d1afc0f94bfaf131d boot: admin: client: @@ -34,9 +34,9 @@ spring: enabled: false guacd: - host: ${GUACD_HOST:127.0.0.1} - port: ${GUACD_PORT:4822} - drive-path: ${GUACD_DRIVE_PATH:/home/guacd/drive} + host: 192.168.31.182 + port: 4822 + drive-path: /mnt/guacd-drives management: endpoints: diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index 6e2b95a4..ed8f6358 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -1,125 +1,86 @@ spring: datasource: druid: - url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false - username: ${MYSQL_USER:root} - password: ${MYSQL_PASSWORD:Data@123456} - # 初始连接数 - initial-size: 5 - # 最小连接池数量 - min-idle: 5 - # 最大连接池数量 - max-active: 20 - # 控制台 + url: jdbc:mysql://192.168.31.189:33069/visor?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false + username: dream + password: info_dream + initial-size: 0 + min-idle: 1 + max-active: 5 stat-view-servlet: - enabled: true - login-username: ${DRUID_USERNAME:admin} - login-password: ${DRUID_PASSWORD:admin} - web-stat-filter: - enabled: true - filter: - stat: - enabled: true + enabled: false redis: - host: ${REDIS_HOST:127.0.0.1} - port: ${REDIS_PORT:6379} - password: ${REDIS_PASSWORD:Data@123456} - database: ${REDIS_DATABASE:0} - data-version: ${REDIS_DATA_VERSION:2} + host: 192.168.31.189 + port: 6379 + password: admin + database: 1 + data-version: 2 + mock: false redisson: - threads: 4 - netty-threads: 4 - minimum-idle-size: 4 + threads: 2 + netty-threads: 2 + minimum-idle-size: 2 influxdb: - enabled: ${INFLUXDB_ENABLED:true} - url: http://${INFLUXDB_HOST:127.0.0.1}:${INFLUXDB_PORT:8086} - org: ${INFLUXDB_ORG:orion-visor} - bucket: ${INFLUXDB_BUCKET:metrics} - token: ${INFLUXDB_TOKEN:Data@123456} - quartz: - properties: - org: - quartz: - threadPool: - threadCount: 10 + enabled: true + url: http://192.168.31.182:8086 + org: orion-visor + bucket: metrics + token: 3774e79ac55aff6d1afc0f94bfaf131d boot: admin: client: - enabled: true + enabled: false server: - enabled: true + enabled: false guacd: - host: ${GUACD_HOST:127.0.0.1} - port: ${GUACD_PORT:4822} - drive-path: ${GUACD_DRIVE_PATH:/usr/share/guacd/drive} + host: 192.168.31.182 + port: 4822 + drive-path: /mnt/guacd-drives management: endpoints: - enabled-by-default: true + enabled-by-default: false + web: + exposure: + include: shutdown -springdoc: - api-docs: - enabled: false - swagger-ui: - enabled: false - -knife4j: - enable: false - production: true - -orion: - # 是否为演示模式 - demo: ${DEMO_MODE:false} - api: - # 是否允许跨域 - cors: ${API_CORS:true} - # 服务端主机地址 - host: ${API_HOST:0.0.0.0} - # 服务端接口地址 默认自动生成 - url: ${API_URL:} - # 获取 IP 的请求头 - ip-headers: ${API_IP_HEADERS:X-Forwarded-For,X-Real-IP} - # 对外服务 - expose: - # 暴露接口请求头值 - token: ${API_EXPOSE_TOKEN:pmqeHOyZaumHm0Wt} - logging: - printer: - mode: PRETTY - encrypt: - aes: - # 加密密钥 - secret-key: ${SECRET_KEY:uQeacXV8b3isvKLK} +mybatis-plus: + configuration: + # 日志打印 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl app: executors: # 默认异步线程池 asyncExecutor: mdc: true - core-pool-size: 8 - max-pool-size: 16 - queue-capacity: 100 + core-pool-size: 2 + max-pool-size: 4 + queue-capacity: 30 allow-core-timeout: false thread-name-prefix: async-executor- # 指标存储异步线程池 metricsExecutor: mdc: true - core-pool-size: 4 - max-pool-size: 4 + core-pool-size: 2 + max-pool-size: 2 queue-capacity: 1000 allow-core-timeout: true thread-name-prefix: metrics-task- # 推送异步线程池 pushExecutor: mdc: true - core-pool-size: 4 - max-pool-size: 4 + core-pool-size: 1 + max-pool-size: 1 queue-capacity: 1000 allow-core-timeout: true thread-name-prefix: message-push- # 探针安装线程池 agentInstallExecutor: + core-pool-size: 2 + max-pool-size: 2 + queue-capacity: 200 allow-core-timeout: true thread-name-prefix: agent-install- # 终端标准输出线程池 diff --git a/orion-visor-ui/pnpm-workspace.yaml b/orion-visor-ui/pnpm-workspace.yaml new file mode 100644 index 00000000..aa9259f8 --- /dev/null +++ b/orion-visor-ui/pnpm-workspace.yaml @@ -0,0 +1,10 @@ +onlyBuiltDependencies: + - '@parcel/watcher' + - cwebp-bin + - esbuild + - gifsicle + - jpegtran-bin + - mozjpeg + - optipng-bin + - pngquant-bin + - vue-demi diff --git a/orion-visor-ui/src/assets/images/login-brand.png b/orion-visor-ui/src/assets/images/login-brand.png new file mode 100644 index 00000000..aa3ee21c Binary files /dev/null and b/orion-visor-ui/src/assets/images/login-brand.png differ diff --git a/orion-visor-ui/src/assets/images/login_sutra_1.png b/orion-visor-ui/src/assets/images/login_sutra_1.png new file mode 100644 index 00000000..35fe010a Binary files /dev/null and b/orion-visor-ui/src/assets/images/login_sutra_1.png differ diff --git a/orion-visor-ui/src/components/app/app-footer/index.vue b/orion-visor-ui/src/components/app/app-footer/index.vue index 448efe08..18f61356 100644 --- a/orion-visor-ui/src/components/app/app-footer/index.vue +++ b/orion-visor-ui/src/components/app/app-footer/index.vue @@ -1,16 +1,8 @@ - - + + .footer { + font-size: 12px; + bottom: 10px; + max-width: 90%; + font-weight: 500; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + } +} + \ No newline at end of file diff --git a/orion-visor-ui/src/views/authentication/login/locale/zh-CN.ts b/orion-visor-ui/src/views/authentication/login/locale/zh-CN.ts index 6b646abc..7e15aea4 100644 --- a/orion-visor-ui/src/views/authentication/login/locale/zh-CN.ts +++ b/orion-visor-ui/src/views/authentication/login/locale/zh-CN.ts @@ -1,5 +1,5 @@ export default { - 'login.form.title': '登录 Orion Visor', + 'login.form.title': '登录 MyWorker 系统运维', 'login.form.sub.title': '一站式服务器运维解决方案', 'login.form.userName.errMsg': '用户名不能为空', 'login.form.password.errMsg': '密码不能为空',