Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update deps and fix issues #200

Merged
merged 2 commits into from Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions README.md
Expand Up @@ -59,6 +59,9 @@ docker compose up -d --build
### dev

1. jvue-mysql
```bash
docker start jvue-mysql
```

2. jvue-server

Expand All @@ -72,10 +75,20 @@ cd ./jvue-server/src/main/java/com/terwergreen/jvueserver

```bash
cd ./jvue-front
yarn config set registry https://registry.npmmirror.com/ --global && \
yarn config set disturl https://npmmirror.com/package/dist --global && \
yarn config set sass_binary_site https://cdn.npmmirror.com/binaries/node-sass --global && \
yarn config set electron_mirror https://registry.npmmirror.com/binary.html?path=electron/ --global && \
yarn config set puppeteer_download_host https://registry.npmmirror.com/binary.html --global && \
yarn config set chromedriver_cdnurl https://cdn.npmmirror.com/binaries/chromedriver --global && \
yarn config set operadriver_cdnurl https://cdn.npmmirror.com/binaries/operadriver --global && \
yarn config set phantomjs_cdnurl https://cdn.npmmirror.com/binaries/phantomjs --global && \
yarn config set selenium_cdnurl https://cdn.npmmirror.com/binaries/selenium --global && \
yarn config set node_inspector_cdnurl https://cdn.npmmirror.com/binaries/node-inspector --global
yarn
yarn dev
```
or somplely
or simplely dev front project without step2

```bash
./dev.sh
Expand All @@ -90,4 +103,4 @@ Have fun and enjoy!

You can contribute simplely by create a pull request for me

For detailed explanation on how things work, please visit [author's blog](https://blog.terwergreen.com).
For detailed explanation on how things work, please visit [author's blog](https://terwer.space).
2 changes: 1 addition & 1 deletion dev.sh
@@ -1,6 +1,6 @@
#!/bin/sh

# sudo n 14
# sudo n 18

cd jvue-server
./mvnw clean spring-boot:run -Dspring-boot.run.profiles=dev -DskipTests &
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-with-rds.yml
Expand Up @@ -23,7 +23,7 @@ services:
context: ./
dockerfile: ./jvue-server/Dockerfile
ports:
- "8002:8002"
- "8008:8008"
working_dir: /app
command: mvn clean spring-boot:run -Dspring-boot.run.profiles=rds -DskipTests
volumes:
Expand Down
6 changes: 5 additions & 1 deletion docker-compose.yml
Expand Up @@ -40,13 +40,15 @@ services:
- ./jvue-mysql/init:/docker-entrypoint-initdb.d/
restart: "no"
jvue-server:
depends_on:
- jvue-mysql
image: jvue/server:4.0.1
container_name: jvue-server
build:
context: ./
dockerfile: ./jvue-server/Dockerfile
ports:
- "8002:8002"
- "8008:8008"
working_dir: /app
command: mvn clean spring-boot:run -Dspring-boot.run.profiles=docker -DskipTests
volumes:
Expand All @@ -55,6 +57,8 @@ services:
- ./data/server/logs:/logs
restart: "no"
jvue-front:
depends_on:
- jvue-server
container_name: jvue-front
image: jvue/front:4.0.1
build:
Expand Down
10 changes: 9 additions & 1 deletion jvue-front/Dockerfile
@@ -1,12 +1,18 @@
# 依赖的镜像
FROM node:14-alpine
FROM node:18-alpine3.18

# 工作目录
WORKDIR /app

# 安装依赖
COPY ./jvue-front/package.json ./

#python
RUN apk add --no-cache --virtual .gyp \
python3 \
make \
g++

# yarn 已经有了,没必要重复安装
RUN yarn config set registry https://registry.npmmirror.com/ --global && \
yarn config set disturl https://npmmirror.com/package/dist --global && \
Expand All @@ -21,6 +27,8 @@ RUN yarn config set registry https://registry.npmmirror.com/ --global && \

RUN yarn

RUN apk del .gyp

RUN yarn build

COPY ./jvue-front .
Expand Down
4 changes: 2 additions & 2 deletions jvue-front/components/themes/default/Aside.vue
Expand Up @@ -40,8 +40,8 @@
</div>
</template>
<script>
import { getLogger } from "../../../util/logger";
import { inBrowser } from "../../../util/dom";
import { getLogger } from "~/util/logger";
import { inBrowser } from "~/util/dom";
const logger = getLogger("components/themes/default/Aside");

export default {
Expand Down
21 changes: 19 additions & 2 deletions jvue-front/components/themes/default/Body.vue
@@ -1,5 +1,17 @@
<template>
<el-row>
<el-col :xs="24" :md="24">
<PostList :keyword="keyword" :post-list="postListArray" />
<p v-if="showNores" class="nores">~ 我是有底线滴 ~</p>
<div id="pagination">
<div class="loadmore-default">
<a id="btn-loadmore" href="javascript:void(0);" @click="loadmore">
{{ loadText }}
</a>
</div>
</div>
</el-col>
<!--
<el-col :xs="24" :md="16">
<PostList :keyword="keyword" :post-list="postListArray" />
<p v-if="showNores" class="nores">~ 我是有底线滴 ~</p>
Expand All @@ -14,15 +26,16 @@
<el-col :xs="24" :md="8">
<Aside />
</el-col>
-->
</el-row>
</template>

<script>
import PostList from "./PostList";
import Aside from "./Aside";

export default {
name: "Body",
components: { Aside, PostList },
components: { PostList },
props: {
type: {
type: String,
Expand Down Expand Up @@ -52,6 +65,9 @@ export default {
this.postListArray = this.postList;
}
},
mounted() {
this.loadmore();
},
methods: {
async loadmore() {
this.showNores = false;
Expand Down Expand Up @@ -88,6 +104,7 @@ export default {
color: #999;
text-align: center;
}

#pagination {
padding: 10px;
}
Expand Down
16 changes: 2 additions & 14 deletions jvue-front/components/themes/default/Footer.vue
Expand Up @@ -34,7 +34,6 @@
如果您有相关合作事宜,可以通过以下方式联系我,我会在收到消息后第一时间回复处理!
</div>
<div class="page">
<br />
Github:https://github.com/terwer
</div>
<div class="page">
Expand All @@ -53,17 +52,6 @@
<div class="footertit">
<h2>更多信息</h2>
</div>
<div class="page">
<a
href="https://v.yunaq.com/certificate?domain=www.anquan.org&amp;from=label&amp;code=90040"
target="_blank"
>
<img
alt="anquan"
src="https://aqyzmedia.yunaq.com/labels/label_sm_90040.png"
/>
</a>
</div>
<!-- 运行信息 -->
<div class="page">博客已稳定运行: 2年303天22时22分48秒<br /></div>
<div class="page">
Expand Down Expand Up @@ -136,7 +124,7 @@ a {
margin-top: 10px;
.footer-main {
padding: 0 !important;
text-align: center;
//text-align: center;
}
}
.dingyue {
Expand Down Expand Up @@ -174,6 +162,6 @@ a {
width: 25%;
height: auto;
display: block;
margin: auto;
//margin: auto;
}
</style>
2 changes: 0 additions & 2 deletions jvue-front/layouts/default.vue
Expand Up @@ -6,8 +6,6 @@

<style>
html {
font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI",
Roboto, "Helvetica Neue", Arial, sans-serif;
font-size: 16px;
word-spacing: 1px;
-ms-text-size-adjust: 100%;
Expand Down
3 changes: 2 additions & 1 deletion jvue-front/nuxt.config.js
Expand Up @@ -62,7 +62,8 @@ module.exports = {
*/
axios: {
// See https://github.com/nuxt-community/axios-module#options
baseURL: development ? "http://localhost:8002/api" : "http://localhost/api"
baseURL: "http://localhost:8008/api"
// baseURL: development ? "http://localhost:8008/api" : "http://localhost/api"
},

/*
Expand Down
3 changes: 2 additions & 1 deletion jvue-front/package.json
Expand Up @@ -19,6 +19,7 @@
"express": "^4.16.4",
"font-awesome": "^4.7.0",
"highlight.js": "^11.6.0",
"node-fetch-native": "^1.4.1",
"nuxt": "^2.15.8"
},
"devDependencies": {
Expand All @@ -39,7 +40,7 @@
"eslint-plugin-promise": ">=4.0.1",
"eslint-plugin-standard": ">=4.0.0",
"eslint-plugin-vue": "^7.0.0",
"node-sass": "^6.0.1",
"node-sass": "^8.0.0",
"nodemon": "^1.18.9",
"prettier": "^1.16.4",
"qs": "^6.6.0",
Expand Down
23 changes: 15 additions & 8 deletions jvue-front/pages/about.vue
Expand Up @@ -27,7 +27,8 @@
</span>
<span>
方的灯塔是关注与分享互联网及服务端开发技术的个人博客,致力于Java后端开发及服务端技术、软件架构、微服务技术分享。同时也记录个人的一路点滴,所蕴含的包括前端、后端、数据库等知识,欢迎关注。
方的灯塔致力于Java技术栈、后端开发、软件架构、微服务、AI
大模型、自然语言处理等相关技术分享。同时也记录个人的一路点滴,欢迎关注。
</span>
</div>
<div>
Expand All @@ -40,10 +41,12 @@
</div>
<h3>作者简历</h3>
<div>
2014年7月1日毕业于湖北省长江大学软件工程,在CRM客户关系管理、电子商务、互联网金融、互联网K12教育等领域有丰富的工作经验。
</div>
<div>
专注于项目架构、性能优化、算法研究。在Web开发领域有深入研究,精通Java,目前专注于服务端开发。业余时间喜欢探索移动互联网。
<p>
2014年7月1日毕业于湖北省长江大学软件工程,目前专注于服务端项目架构、人工智能、自然语言处理等领域的研究。
</p>
<p>
在Web开发领域有深入研究,精通Java服务端开发、AI大模型、自然语言处理等技术。
</p>
</div>
<div>作者邮箱:youweics@163.com</div>
</div>
Expand Down Expand Up @@ -78,6 +81,7 @@ import Header from "../components/themes/default/Header";
import Footer from "../components/themes/default/Footer";
import FriendLink from "../components/themes/default/FriendLink";
import Artalk from "../components/themes/default/Artalk";

const logger = getLogger("pages/index");

export default {
Expand All @@ -92,10 +96,10 @@ export default {
return { siteConfigObj };
},
data() {
const baseUrl = this.$axios.defaults.baseURL;

return {
message:
"https://v4.terwergreen.com:8002/api/tool/counter?t=" +
new Date().getTime()
message: `${baseUrl}/tool/counter?t=${new Date().getTime()}`
};
},
head() {
Expand All @@ -119,17 +123,20 @@ export default {
</script>

<style lang="scss" scoped>
@import "./webfont.css";
@import "./common.css";
@import "./default.css";
</style>

<style lang="scss" scoped>
.visit {
font-size: 24px;

img {
vertical-align: text-top;
}
}

.about {
margin: 40px 20px 20px 20px;
}
Expand Down
6 changes: 5 additions & 1 deletion jvue-front/pages/common.css
Expand Up @@ -2,8 +2,12 @@
* 所有主题公共样式
* 注意:每个主题都要引用这个样式
*/
:root {
--g-font-family: "Open Sans", "LXGW WenKai", "JetBrains Mono", "-apple-system",
"Microsoft YaHei", "Times New Roman", "方正北魏楷书_GBK";
}
body {
font-family: "LXGW WenKai","Wenquanyi Micro Hei","Wenquanyi Micro Hei Mono","Microsoft YaHei", "PT Sans", "-apple-system", "Liberation Mono", monospace, dejavu sans mono,Fira Code,Microsoft Yahei,Consolas,Courier New,monospace,Menlo,Monaco !important;
font-family: var(--g-font-family) !important;
color: #666 !important;
}
body,
Expand Down
2 changes: 0 additions & 2 deletions jvue-front/pages/default.vue
Expand Up @@ -48,8 +48,6 @@ export default {
}

.title {
font-family: "Quicksand", "Source Sans Pro", -apple-system, BlinkMacSystemFont,
"Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
display: block;
font-weight: 300;
font-size: 100px;
Expand Down
8 changes: 8 additions & 0 deletions jvue-front/pages/essay/index.vue
Expand Up @@ -188,6 +188,9 @@ export default {
]
};
},
mounted() {
this.loadmore();
},
methods: {
async loadmore() {
this.showNores = false;
Expand Down Expand Up @@ -256,20 +259,25 @@ export default {
.essay {
color: #333333;
}

.read-more a {
color: #1e9fff;
cursor: pointer;

h2 {
font-size: 14px;
padding-left: 10px;
}
}

.load-more {
color: #ffb800;
}

.loadmore-btn {
cursor: pointer;
}

.like em {
font-style: normal;
font-size: 12px;
Expand Down
1 change: 1 addition & 0 deletions jvue-front/pages/index.vue
Expand Up @@ -86,6 +86,7 @@ export default {
</script>

<style lang="scss">
@import "./webfont.css";
@import "./common.css";
@import "./default.css";
</style>