From 095f29eda5225e595538acf01bff67bb626b9ea8 Mon Sep 17 00:00:00 2001 From: jlzhou <12020042@qq.com> Date: Fri, 11 Oct 2024 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=B8=BAbase2024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- admin-ui/vite.config.js | 2 +- ruoyi-admin/Dockerfile | 2 +- .../src/main/resources/application-dev.yml | 6 ++-- .../resources/application-local.yml.template | 6 ++-- .../src/main/resources/application.yml | 2 +- .../java/com/ruoyi/common/event/QaEvent.java | 2 +- ruoyi.sql | 12 +++---- script/docker/db-admin.sh | 2 +- script/docker/db-backup.sh | 2 +- script/docker/docker-compose.yml | 36 +++++++++---------- script/docker/mongo.sh | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index c3193b2..8554a6e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 某某系统 -> 全局文本替换： qanything，192.168.3.205 +> 全局文本替换： base2024，192.168.3.222 diff --git a/admin-ui/vite.config.js b/admin-ui/vite.config.js index fc44d3a..ce0034e 100644 --- a/admin-ui/vite.config.js +++ b/admin-ui/vite.config.js @@ -40,7 +40,7 @@ export default defineConfig(({ mode, command }) => { changeOrigin: true }, '/files': { - target: 'http://192.168.3.205:9000', + target: 'http://192.168.3.222:9000', changeOrigin: true } } diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index eeb8330..3224e4a 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t registry.cn-hangzhou.aliyuncs.com/awl/qanything-api:0.1 . +# docker build -t registry.cn-hangzhou.aliyuncs.com/awl/base2024-api:0.1 . FROM registry.cn-hangzhou.aliyuncs.com/awl/openjdk:8u342-jre #FROM openjdk:17-alpine diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 1b74de8..2132d60 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -23,7 +23,7 @@ spring.servlet.multipart.location: /tmp/${ruoyi.name} spring: data: mongodb: - host: 192.168.3.205 + host: 192.168.3.222 port: 27017 database: ${ruoyi.name} username: ${ruoyi.name} @@ -47,7 +47,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://192.168.3.205:3306/${ruoyi.name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.3.222:3306/${ruoyi.name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: ${ruoyi.name} password: ${ruoyi.name}1415926 @@ -79,7 +79,7 @@ spring: enabled: false redis: # 地址 - host: 192.168.3.205 + host: 192.168.3.222 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/ruoyi-admin/src/main/resources/application-local.yml.template b/ruoyi-admin/src/main/resources/application-local.yml.template index 1b74de8..2132d60 100644 --- a/ruoyi-admin/src/main/resources/application-local.yml.template +++ b/ruoyi-admin/src/main/resources/application-local.yml.template @@ -23,7 +23,7 @@ spring.servlet.multipart.location: /tmp/${ruoyi.name} spring: data: mongodb: - host: 192.168.3.205 + host: 192.168.3.222 port: 27017 database: ${ruoyi.name} username: ${ruoyi.name} @@ -47,7 +47,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://192.168.3.205:3306/${ruoyi.name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.3.222:3306/${ruoyi.name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: ${ruoyi.name} password: ${ruoyi.name}1415926 @@ -79,7 +79,7 @@ spring: enabled: false redis: # 地址 - host: 192.168.3.205 + host: 192.168.3.222 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index fcea5ff..f778ffb 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ ruoyi: # 是否是开发模式 dev: false # 名称 - name: qanything + name: base2024 # 版本 version: ${ruoyi-vue-plus.version} # 版权年份 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/event/QaEvent.java b/ruoyi-common/src/main/java/com/ruoyi/common/event/QaEvent.java index dec1825..84c6e72 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/event/QaEvent.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/event/QaEvent.java @@ -3,7 +3,7 @@ package com.ruoyi.common.event; import org.springframework.context.ApplicationEvent; /** - * 需要触发QAnything知识库的增删改查事件 + * 需要触发base2024知识库的增删改查事件 */ public class QaEvent extends ApplicationEvent { diff --git a/ruoyi.sql b/ruoyi.sql index 7a6f7f1..be25fdd 100644 --- a/ruoyi.sql +++ b/ruoyi.sql @@ -1,11 +1,11 @@ /* Navicat Premium Data Transfer - Source Server : db-qanything + Source Server : db-base2024 Source Server Type : MariaDB Source Server Version : 100618 - Source Host : 192.168.3.205:3306 - Source Schema : qanything + Source Host : 192.168.3.222:3306 + Source Schema : base2024 Target Server Type : MariaDB Target Server Version : 100618 @@ -522,9 +522,9 @@ INSERT INTO `sys_oper_log` VALUES (1821360541508059138, '菜单管理', 2, 'com. INSERT INTO `sys_oper_log` VALUES (1821360574403985410, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', '', '/system/menu', '0:0:0:0:0:0:0:1', '内网IP', '{\"createBy\":\"admin\",\"createTime\":\"2023-08-16 10:35:07\",\"updateBy\":\"admin\",\"updateTime\":\"2024-08-08 09:39:34\",\"parentId\":0,\"children\":[],\"menuId\":3,\"menuName\":\"系统工具\",\"orderNum\":3,\"path\":\"tool\",\"queryParam\":\"\",\"isFrame\":\"1\",\"isCache\":\"0\",\"menuType\":\"M\",\"visible\":\"0\",\"status\":\"1\",\"perms\":\"\",\"icon\":\"tool\",\"remark\":\"系统工具目录\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:39:34'); INSERT INTO `sys_oper_log` VALUES (1821360595618775042, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', '', '/system/menu', '0:0:0:0:0:0:0:1', '内网IP', '{\"createBy\":\"admin\",\"createTime\":\"2023-08-16 10:35:07\",\"updateBy\":\"admin\",\"updateTime\":\"2024-08-08 09:39:39\",\"parentId\":0,\"children\":[],\"menuId\":4,\"menuName\":\"PLUS官网\",\"orderNum\":4,\"path\":\"https://gitee.com/dromara/RuoYi-Vue-Plus\",\"queryParam\":\"\",\"isFrame\":\"0\",\"isCache\":\"0\",\"menuType\":\"M\",\"visible\":\"0\",\"status\":\"1\",\"perms\":\"\",\"icon\":\"guide\",\"remark\":\"RuoYi-Vue-Plus官网地址\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:39:39'); INSERT INTO `sys_oper_log` VALUES (1821360623364096002, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', '', '/system/menu', '0:0:0:0:0:0:0:1', '内网IP', '{\"createBy\":\"admin\",\"createTime\":\"2023-08-16 10:35:31\",\"updateBy\":\"admin\",\"updateTime\":\"2024-08-08 09:39:46\",\"parentId\":0,\"children\":[],\"menuId\":5,\"menuName\":\"测试菜单\",\"orderNum\":5,\"path\":\"demo\",\"isFrame\":\"1\",\"isCache\":\"0\",\"menuType\":\"M\",\"visible\":\"0\",\"status\":\"0\",\"icon\":\"star\",\"remark\":\"\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:39:46'); -INSERT INTO `sys_oper_log` VALUES (1821361980343074818, '对象存储配置', 2, 'com.ruoyi.web.controller.system.SysOssConfigController.edit()', 'PUT', 1, 'admin', '', '/system/oss/config', '0:0:0:0:0:0:0:1', '内网IP', '{\"ossConfigId\":1,\"configKey\":\"minio\",\"accessKey\":\"qanything\",\"secretKey\":\"qanything1415926\",\"bucketName\":\"files\",\"prefix\":\"\",\"endpoint\":\"minio:9000\",\"domain\":\"{root}\",\"isHttps\":\"N\",\"status\":\"1\",\"region\":\"\",\"ext1\":\"\",\"remark\":\"\",\"accessPolicy\":\"1\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:45:10'); +INSERT INTO `sys_oper_log` VALUES (1821361980343074818, '对象存储配置', 2, 'com.ruoyi.web.controller.system.SysOssConfigController.edit()', 'PUT', 1, 'admin', '', '/system/oss/config', '0:0:0:0:0:0:0:1', '内网IP', '{\"ossConfigId\":1,\"configKey\":\"minio\",\"accessKey\":\"base2024\",\"secretKey\":\"base20241415926\",\"bucketName\":\"files\",\"prefix\":\"\",\"endpoint\":\"minio:9000\",\"domain\":\"{root}\",\"isHttps\":\"N\",\"status\":\"1\",\"region\":\"\",\"ext1\":\"\",\"remark\":\"\",\"accessPolicy\":\"1\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:45:10'); INSERT INTO `sys_oper_log` VALUES (1821363034124206082, '对象存储配置', 2, 'com.ruoyi.web.controller.system.SysOssConfigController.edit()', 'PUT', 1, 'admin', '', '/system/oss/config', '0:0:0:0:0:0:0:1', '内网IP', '{\"ossConfigId\":5,\"configKey\":\"minio\",\"accessKey\":\"ruoyi\",\"secretKey\":\"ruoyi123\",\"bucketName\":\"ruoyi\",\"prefix\":\"image\",\"endpoint\":\"127.0.0.1:9000\",\"domain\":\"\",\"isHttps\":\"N\",\"status\":\"1\",\"region\":\"\",\"ext1\":\"\",\"accessPolicy\":\"1\"}', '', 1, '操作配置\'minio\'失败, 配置key已存在!', '2024-08-08 09:49:21'); -INSERT INTO `sys_oper_log` VALUES (1821363350076932097, '对象存储配置', 2, 'com.ruoyi.web.controller.system.SysOssConfigController.edit()', 'PUT', 1, 'admin', '', '/system/oss/config', '0:0:0:0:0:0:0:1', '内网IP', '{\"ossConfigId\":1,\"configKey\":\"minio\",\"accessKey\":\"qanything\",\"secretKey\":\"qanything1415926\",\"bucketName\":\"files\",\"prefix\":\"\",\"endpoint\":\"192.168.3.205:9000\",\"domain\":\"{root}\",\"isHttps\":\"N\",\"status\":\"1\",\"region\":\"\",\"ext1\":\"\",\"remark\":\"正式环境中访问站点修改为minio:9000\",\"accessPolicy\":\"1\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:50:36'); +INSERT INTO `sys_oper_log` VALUES (1821363350076932097, '对象存储配置', 2, 'com.ruoyi.web.controller.system.SysOssConfigController.edit()', 'PUT', 1, 'admin', '', '/system/oss/config', '0:0:0:0:0:0:0:1', '内网IP', '{\"ossConfigId\":1,\"configKey\":\"minio\",\"accessKey\":\"base2024\",\"secretKey\":\"base20241415926\",\"bucketName\":\"files\",\"prefix\":\"\",\"endpoint\":\"192.168.3.222:9000\",\"domain\":\"{root}\",\"isHttps\":\"N\",\"status\":\"1\",\"region\":\"\",\"ext1\":\"\",\"remark\":\"正式环境中访问站点修改为minio:9000\",\"accessPolicy\":\"1\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:50:36'); INSERT INTO `sys_oper_log` VALUES (1821363384180817922, '对象存储状态修改', 2, 'com.ruoyi.web.controller.system.SysOssConfigController.changeStatus()', 'PUT', 1, 'admin', '', '/system/oss/config/changeStatus', '0:0:0:0:0:0:0:1', '内网IP', '{\"ossConfigId\":1,\"configKey\":\"minio\",\"status\":\"0\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:50:44'); INSERT INTO `sys_oper_log` VALUES (1821363440749395970, 'OSS对象存储', 3, 'com.ruoyi.web.controller.system.SysOssController.remove()', 'DELETE', 1, 'admin', '', '/system/oss/1775490828442058754', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, '', '2024-08-08 09:50:58'); INSERT INTO `sys_oper_log` VALUES (1821363698090905602, 'OSS对象存储', 1, 'com.ruoyi.web.controller.system.SysOssController.upload()', 'POST', 1, 'admin', '', '/system/oss/upload', '0:0:0:0:0:0:0:1', '内网IP', '', '{\"code\":200,\"msg\":\"操作成功\",\"data\":{\"ossId\":\"1821363697956687873\",\"url\":\"/files/2024/08/08/1nbvbz3lmyel0.png\",\"fileName\":\"demo1.png\"}}', 0, '', '2024-08-08 09:51:59'); @@ -580,7 +580,7 @@ CREATE TABLE `sys_oss_config` ( -- ---------------------------- -- Records of sys_oss_config -- ---------------------------- -INSERT INTO `sys_oss_config` VALUES (1, 'minio', 'qanything', 'qanything1415926', 'files', '', '192.168.3.205:9000', '{root}', 'N', '', '1', '0', '', 'admin', '2023-04-28 11:22:31', 'admin', '2024-08-08 09:50:44', '正式环境中访问站点修改为minio:9000'); +INSERT INTO `sys_oss_config` VALUES (1, 'minio', 'base2024', 'base20241415926', 'files', '', '192.168.3.222:9000', '{root}', 'N', '', '1', '0', '', 'admin', '2023-04-28 11:22:31', 'admin', '2024-08-08 09:50:44', '正式环境中访问站点修改为minio:9000'); INSERT INTO `sys_oss_config` VALUES (2, 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '', 'N', '', '1', '1', '', 'admin', '2023-08-16 10:35:08', 'admin', '2023-08-16 10:35:08', NULL); INSERT INTO `sys_oss_config` VALUES (3, 'aliyun', 'LTAI5tQMkJBHbYoDcBBrc1Kv', '25MWcjkWRlqTD0pSJrthqXe05CpjWS', 'test-data-resources', 'xxx', 'oss-cn-shenzhen.aliyuncs.com', '', 'Y', '', '1', '1', '', 'admin', '2023-08-16 10:35:08', 'admin', '2024-05-17 08:29:25', ''); INSERT INTO `sys_oss_config` VALUES (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '', 'N', 'ap-beijing', '1', '1', '', 'admin', '2023-08-16 10:35:08', 'admin', '2023-08-16 10:35:08', NULL); diff --git a/script/docker/db-admin.sh b/script/docker/db-admin.sh index 2ea7f79..c8ef97c 100644 --- a/script/docker/db-admin.sh +++ b/script/docker/db-admin.sh @@ -1 +1 @@ -docker-compose exec db mysql -uqanything -pqanything1415926 +docker-compose exec db mysql -ubase2024 -pbase20241415926 diff --git a/script/docker/db-backup.sh b/script/docker/db-backup.sh index 389d154..4954f83 100644 --- a/script/docker/db-backup.sh +++ b/script/docker/db-backup.sh @@ -1,5 +1,5 @@ #!/bin/bash -name="qanything" +name="base2024" # 工程目录 pwd=$(pwd) data_dir=$pwd"/db/backup/" diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index b6d9e2f..a1a5ff8 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -1,7 +1,7 @@ # 网络设置 networks: - qanything-network: - name: qanything-network + base2024-network: + name: base2024-network driver: bridge services: @@ -17,16 +17,16 @@ services: - "27017:27017" environment: TZ: Asia/Shanghai - MONGO_INITDB_ROOT_USERNAME: qanything - MONGO_INITDB_ROOT_PASSWORD: qanything1415926 - MONGO_INITDB_DATABASE: qanything + MONGO_INITDB_ROOT_USERNAME: base2024 + MONGO_INITDB_ROOT_PASSWORD: base20241415926 + MONGO_INITDB_DATABASE: base2024 volumes: - ./mongodb/data/:/data/db/:rw - ./mongodb/logs/:/var/log/mongodb/:rw - ./mongodb/backup/:/data/backup/:rw privileged: true networks: - - qanything-network + - base2024-network # redis @@ -48,7 +48,7 @@ services: command: "redis-server /redis/config/redis.conf" privileged: true networks: - - qanything-network + - base2024-network # 数据库 @@ -60,13 +60,13 @@ services: # 时区上海 TZ: Asia/Shanghai # 登录账号 - MARIADB_USER: qanything + MARIADB_USER: base2024 # 登录密码 - MARIADB_PASSWORD: qanything1415926 + MARIADB_PASSWORD: base20241415926 # root 密码 - MARIADB_ROOT_PASSWORD: qanything1415926 + MARIADB_ROOT_PASSWORD: base20241415926 # 初始化数据库(后续的初始化sql会在这个库执行) - MARIADB_DATABASE: qanything + MARIADB_DATABASE: base2024 ports: - "3306:3306" volumes: @@ -80,7 +80,7 @@ services: --lower_case_table_names=1 privileged: true networks: - - qanything-network + - base2024-network # minio @@ -97,9 +97,9 @@ services: # 时区上海 TZ: Asia/Shanghai # 管理后台用户名 - MINIO_ROOT_USER: qanything + MINIO_ROOT_USER: base2024 # 管理后台密码，最小8个字符 - MINIO_ROOT_PASSWORD: qanything1415926 + MINIO_ROOT_PASSWORD: base20241415926 # https需要指定域名 #MINIO_SERVER_URL: "https://xxx.com:9000" #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001" @@ -117,14 +117,14 @@ services: command: server --address ':9000' --console-address ':9001' /data # 指定容器中的目录 /data privileged: true networks: - - qanything-network + - base2024-network # 主服务 server1: container_name: server1 restart: always - image: registry.cn-hangzhou.aliyuncs.com/awl/qanything-api:0.1 + image: registry.cn-hangzhou.aliyuncs.com/awl/base2024-api:0.1 links: - db - redis @@ -139,7 +139,7 @@ services: - ./server1/upload/:/server/upload/:rw privileged: true networks: - - qanything-network + - base2024-network nginx: image: registry.cn-hangzhou.aliyuncs.com/awl/nginx:1.24.0 @@ -166,6 +166,6 @@ services: privileged: true # network_mode: host networks: - - qanything-network + - base2024-network diff --git a/script/docker/mongo.sh b/script/docker/mongo.sh index 7f36369..ef241ed 100644 --- a/script/docker/mongo.sh +++ b/script/docker/mongo.sh @@ -1 +1 @@ -docker-compose exec mongodb mongo -u qanything -p qanything1415926 -authenticationDatabase admin +docker-compose exec mongodb mongo -u base2024 -p base20241415926 -authenticationDatabase admin