From 55912873dd6b13ded745c802414e94904e11acce Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 21:24:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?:recycle:=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-blog/src/utils/validate.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aurora-vue/aurora-blog/src/utils/validate.ts b/aurora-vue/aurora-blog/src/utils/validate.ts index c4caeee..ed54c49 100644 --- a/aurora-vue/aurora-blog/src/utils/validate.ts +++ b/aurora-vue/aurora-blog/src/utils/validate.ts @@ -4,7 +4,3 @@ export function isExternal(path: string): boolean { export function isExternalIcon(path: string): boolean { return /^(\/)+([a-zA-Z0-9\s_\\.\-():/])+(.svg|.png|.jpg)$/g.test(path) || /^(https?:|mailto:|tel:)/.test(path) } -export function validUsername(str: string): boolean { - const validMap = ['admin', 'editor'] - return validMap.indexOf(str.trim()) >= 0 -} From f47a79eeaa7fe464d951a3c02a081c24cf1ffc1a Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 21:26:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?:sparkles:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-admin/jsconfig.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/aurora-vue/aurora-admin/jsconfig.json b/aurora-vue/aurora-admin/jsconfig.json index 4aafc5f..b6bd4c8 100644 --- a/aurora-vue/aurora-admin/jsconfig.json +++ b/aurora-vue/aurora-admin/jsconfig.json @@ -5,15 +5,8 @@ "baseUrl": "./", "moduleResolution": "node", "paths": { - "@/*": [ - "src/*" - ] + "@/*": ["src/*"] }, - "lib": [ - "esnext", - "dom", - "dom.iterable", - "scripthost" - ] + "lib": ["esnext", "dom", "dom.iterable", "scripthost"] } } From 97e52e7cb9e6cac17f5cc776b88c7b455de71bb2 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 21:34:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/aurora-springboot/src/main/resources/application.yml b/aurora-springboot/src/main/resources/application.yml index 1a21bf8..56245d8 100644 --- a/aurora-springboot/src/main/resources/application.yml +++ b/aurora-springboot/src/main/resources/application.yml @@ -10,20 +10,14 @@ spring: password: 密码 hikari: minimum-idle: 10 - # 空闲连接存活最大时间，默认600000（10分钟） idle-timeout: 180000 - # 连接池最大连接数，默认是10 maximum-pool-size: 100 - # 此属性控制从池返回的连接的默认自动提交行为,默认值：true auto-commit: true - # 连接池名称 pool-name: MyHikariCP - # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟 max-lifetime: 60000 - # 数据库连接超时时间,默认30秒，即30000 connection-timeout: 30000 connection-test-query: SELECT 1 - # redis配置 + redis: host: redis的ip port: 6379 @@ -36,7 +30,6 @@ spring: max-wait: 10000 min-idle: 10 - # rabbitmq配置 rabbitmq: host: rabbitmq的ip port: 5672 @@ -46,12 +39,13 @@ spring: simple: retry: enabled: true - max-attempts: 3 #最大重试次数 - initial-interval: 3000 #重试间隔时间（单位毫秒） + max-attempts: 3 + initial-interval: 3000 + elasticsearch: rest: uris: es的ip:9200 - # 配置邮箱 + mail: host: smtp.163.com username: 邮箱 @@ -71,6 +65,7 @@ spring: starttls: enable: true required: true + servlet: multipart: max-file-size: 100MB From abc57f0925edb60d389ca61fa128e0adffec7895 Mon Sep 17 00:00:00 2001 From: linhaojun857 Date: Fri, 4 Nov 2022 21:43:31 +0800 Subject: [PATCH 4/6] :sparkles: update README.md --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 343fc97..00d559d 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # Aurora---前后端分离博客 +## 前言 + +- 开源不易，希望大家star支持一下 + ## 在线地址 - 前台链接：[www.linhaojun.top](https://www.linhaojun.top) - 后台链接：[admin.linhaojun.top](https://admin.linhaojun.top) - 演示账号：test@163.com，密码：123456 -## 交流群 - -- QQ群：338371628 - ## 相关技术 ### 前端： @@ -33,7 +33,10 @@ ## 部署 - 详见项目部署文档 -- 如有问题，加群询问 + +## 交流群 + +- QQ群：338371628 ## 鸣谢 From 0169f5effa45ad1ba87512c013a8d6465091dba9 Mon Sep 17 00:00:00 2001 From: linhaojun857 Date: Fri, 4 Nov 2022 21:49:38 +0800 Subject: [PATCH 5/6] :sparkles: update aurora.sql --- aurora.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurora.sql b/aurora.sql index 580159b..90fba02 100644 --- a/aurora.sql +++ b/aurora.sql @@ -764,7 +764,7 @@ CREATE TABLE `t_user_info` ( -- ---------------------------- -- Records of t_user_info -- ---------------------------- -INSERT INTO `t_user_info` VALUES (1, 'admin@163.com', '演示账号', 'https://static.linhaojun.top/avatar/2af2e2db20740e712f0a011a6f8c9af5.jpg', '演示账号', 'https://www.linhaojun.top', 0, 0, '2022-08-19 21:42:04', '2022-08-24 17:11:35'); +INSERT INTO `t_user_info` VALUES (1, 'admin@163.com', '演示账号', 'https://static.linhaojun.top/avatar/2af2e2db20740e712f0a011a6f8c9af5.jpg', '演示账号的用户简介', 'https://www.linhaojun.top', 0, 0, '2022-08-19 21:42:04', '2022-08-24 17:11:35'); -- ---------------------------- -- Table structure for t_user_role From 24b7a66faa9cbafb7315e75c560b1b0e6da54def Mon Sep 17 00:00:00 2001 From: linhaojun857 Date: Fri, 4 Nov 2022 21:51:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=83=A8=E7=BD=B2=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 项目部署文档.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/项目部署文档.md b/项目部署文档.md index f4ecd6c..69c4ce2 100644 --- a/项目部署文档.md +++ b/项目部署文档.md @@ -134,7 +134,7 @@ mkdir -p /home/elasticsearch/config/ 1. 启动成功，但是访问失败的话，查看一下安全组中映射端口是否已经打开。如果是本地虚拟机，可能与防火墙相关（我用的云服务器，没有测试，如果有问题，还是需要大家自行去百度||谷歌一下）。 -2. -e ES_JAVA_OPTS="-Xms64m -Xmx128m"：配置内存大小出现了问题。（可试着调一下，docker玩不坏的，莫慌） +2. -e ES_JAVA_OPTS="-Xms64m -Xmx128m"：配置内存大小出现了问题。 3. 最后就还有可能是配置文件中出现了问题。 @@ -176,7 +176,7 @@ postman post请求分词测试：`http://服务器IP地址:9200/_analyze` ```json { - "tokenizer":"ik_smart",// 分词器不同，这个地方也会有变化 具体的可能还需要去学习。 + "tokenizer":"ik_smart", "text":"我爱技术" } ``` @@ -226,7 +226,7 @@ docker run --name maxwell --restart=always -d zendesk/maxwell bin/maxwell --u 此处省略，操作比较简单，就是配置一些简单的ip+端口+用户名+密码，前提是服务器上对应的端口已经打开 -阿里云oss具体情况详见百度(如果有多余服务器空间，推荐minio作为对象存储，本人曾经被人恶意盗刷大量流量) +阿里云oss具体情况详见百度 QQ互联具体情况详见百度