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

2.0 #3

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
a42bac4
修改部分配置与目录
59799517 Oct 19, 2022
bc8149b
增加同步到歌单功能
a13087635768 Oct 26, 2022
e7f5835
修改部分错误,增加数据库部分
a13087635768 Oct 26, 2022
98ebe88
开发2.0版本 支持多类型歌曲搜索与下载
a13087635768 Nov 23, 2022
5397112
####此版本无法运行####
a13087635768 Dec 7, 2022
847a350
设置启动支持tomcat 开始添加咪咕支持
a13087635768 Mar 24, 2023
92f270b
咪咕添加完成
a13087635768 Mar 29, 2023
afc9a87
修改了点BUG
a13087635768 Apr 4, 2023
4628a50
修改了点BUG
a13087635768 Apr 7, 2023
981d1ce
第二版的后端基本完成(有可能修改下载架构避免过多的下载失败问题)
a13087635768 Jun 1, 2023
7c1cbfe
重写下载器代码避免下载失败问题(取消初始化后自启动未下载信息),修改新的加密参数解决下载flac失败问题
a13087635768 Jun 2, 2023
78355e6
修改说明
a13087635768 Jun 2, 2023
5cdd348
基本修改完毕
a13087635768 Jun 7, 2023
c5159fc
修改数据位置
a13087635768 Jun 9, 2023
dcbde50
修改说明
a13087635768 Jun 12, 2023
47f2594
新增加aria2下载支持(未启用)
Sep 6, 2023
da7063c
修改QQ部分报错问题
Sep 18, 2023
9acad29
修改QQ缺少参数,获取参数失败问题
Sep 21, 2023
83b7377
增加前段,可正常使用
Sep 21, 2023
db9b18c
Merge remote-tracking branch 'gitee/2.0' into 2.0
Sep 21, 2023
afb329e
修改前段 增加退出功能 修改拦截器
Sep 22, 2023
2454122
修改前段
Sep 22, 2023
98eada6
修改dockerfile文件 和pom配置
Sep 27, 2023
0362f9b
修改说明 和dockerfile
Sep 27, 2023
123554d
pom 使用 163加速
Sep 27, 2023
4c81931
pom 加速
Sep 27, 2023
1141512
跳过测试
Sep 27, 2023
a858580
修改docker文件
Sep 27, 2023
7ae7634
修改docker文件与数据库文件
Sep 27, 2023
4e791ac
修改QQ加密 配置文件
Sep 28, 2023
68cf9ff
修改docker配置
Nov 4, 2023
f6e0202
增加 dockerFile支持pwa支持 和ngixn java端口分离
Nov 7, 2023
de537ad
修改dockerFile编译方法
Nov 10, 2023
2ba1597
daockerFile有问题 还是用以前的吧
Jan 18, 2024
4356d28
qq老大哥项目被警告了 后续看情况
Jan 19, 2024
00c6050
修改配置文件
Jan 19, 2024
03ccafd
修改配置文件
Jan 19, 2024
fa0dc94
修改配置文件
Jan 19, 2024
99208e3
修复酷我flac问题,启用后新的获取方式 返回json更方便也不用加密了 好像原版的酷我安卓APP业取消了加密
Jan 22, 2024
a413eb8
忘了改默认的数据库位置了
Jan 22, 2024
e1b7ce9
关闭部分日志
Jan 22, 2024
783007c
修改token过期时间 增加获取歌曲详情信息接口 修改酷我歌曲时长 增加获取现在版本功能接口
Jan 29, 2024
ea4201a
修改 文本解析下载功能 修改说明文件
Jan 30, 2024
4d634d1
修改 版本号
Jan 30, 2024
e000e64
增加网易支持
Feb 23, 2024
6c26b1f
更新前端代码
Feb 23, 2024
30cca04
更新说明
Feb 23, 2024
9476fcd
歌曲时长修复为毫秒
Feb 25, 2024
703e7f5
修改版本号
Feb 25, 2024
e0c5bab
添加启动版本号显示
Feb 26, 2024
dad61e8
修复网易下载报错问题
Feb 29, 2024
bb78346
修改版本
Feb 29, 2024
509527f
2.1.9修复网易地址 修复网易报错问题 删除Aria2下载 没用到这个功能后续需要再加上
a13087635768 Jun 6, 2024
27f02b8
2.1.9修复网易地址 修复网易报错问题 删除Aria2下载 没用到这个功能后续需要再加上
a13087635768 Jun 6, 2024
8552c54
1.修改音源
a13087635768 Jun 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions CentOS-Base.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# CentOS-Base.repo
#
# The mirror system uses the connecting IP address of the client and the
# update status of each mirror to pick mirrors that are updated to and
# geographically close to the client. You should use this for CentOS updates
# unless you are manually picking other mirrors.
#
# If the mirrorlist= does not work for you, as a fall back you can try the
# remarked out baseurl= line instead.
#
#

[base]
name=CentOS-$releasever - Base - mirrors.aliyun.com
failovermethod=priority
baseurl=http://mirrors.aliyun.com/centos/$releasever/os/$basearch/
http://mirrors.aliyuncs.com/centos/$releasever/os/$basearch/
http://mirrors.cloud.aliyuncs.com/centos/$releasever/os/$basearch/
gpgcheck=1
gpgkey=http://mirrors.aliyun.com/centos/RPM-GPG-KEY-CentOS-7

#released updates
[updates]
name=CentOS-$releasever - Updates - mirrors.aliyun.com
failovermethod=priority
baseurl=http://mirrors.aliyun.com/centos/$releasever/updates/$basearch/
http://mirrors.aliyuncs.com/centos/$releasever/updates/$basearch/
http://mirrors.cloud.aliyuncs.com/centos/$releasever/updates/$basearch/
gpgcheck=1
gpgkey=http://mirrors.aliyun.com/centos/RPM-GPG-KEY-CentOS-7

#additional packages that may be useful
[extras]
name=CentOS-$releasever - Extras - mirrors.aliyun.com
failovermethod=priority
baseurl=http://mirrors.aliyun.com/centos/$releasever/extras/$basearch/
http://mirrors.aliyuncs.com/centos/$releasever/extras/$basearch/
http://mirrors.cloud.aliyuncs.com/centos/$releasever/extras/$basearch/
gpgcheck=1
gpgkey=http://mirrors.aliyun.com/centos/RPM-GPG-KEY-CentOS-7

#additional packages that extend functionality of existing packages
[centosplus]
name=CentOS-$releasever - Plus - mirrors.aliyun.com
failovermethod=priority
baseurl=http://mirrors.aliyun.com/centos/$releasever/centosplus/$basearch/
http://mirrors.aliyuncs.com/centos/$releasever/centosplus/$basearch/
http://mirrors.cloud.aliyuncs.com/centos/$releasever/centosplus/$basearch/
gpgcheck=1
enabled=0
gpgkey=http://mirrors.aliyun.com/centos/RPM-GPG-KEY-CentOS-7

#contrib - packages by Centos Users
[contrib]
name=CentOS-$releasever - Contrib - mirrors.aliyun.com
failovermethod=priority
baseurl=http://mirrors.aliyun.com/centos/$releasever/contrib/$basearch/
http://mirrors.aliyuncs.com/centos/$releasever/contrib/$basearch/
http://mirrors.cloud.aliyuncs.com/centos/$releasever/contrib/$basearch/
gpgcheck=1
enabled=0
gpgkey=http://mirrors.aliyun.com/centos/RPM-GPG-KEY-CentOS-7

[nginx]
name=nginx repo
baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
gpgcheck=0
enabled=1
30 changes: 24 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
FROM openjdk:17.0.2-jdk-oracle
EXPOSE 8083
ARG JAR_FILE
FROM maven:3.9.4-eclipse-temurin-17-alpine AS builder
MAINTAINER SQ

WORKDIR /build/

COPY pom.xml /build/
COPY src /build/src/
COPY src/main/resources/sqlite/sqmusic.db /cache/sqmusic.db

RUN mvn clean package

From eclipse-temurin:17-jre-alpine

WORKDIR /app

COPY --from=builder /build/target/MusicServer2.0.jar /app/app.jar

EXPOSE 8099

VOLUME ["/music"]
VOLUME ["/sqmusic"]
ADD ./simple-MusicServer-0.0.1-SNAPSHOT.jar /app.jar
ENTRYPOINT ["java", "-jar","/app.jar"]

VOLUME ["/cache"]

CMD ["java", "-jar", "app.jar"]

82 changes: 82 additions & 0 deletions Dockerfile_bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
FROM alpine:3.15
CMD ["/bin/sh"]
#接口地址
EXPOSE 8083
#WEB地址
EXPOSE 80
MAINTAINER [email protected]
# 创建工作目录
WORKDIR /root
# 修改软件包源地址(此处使用 清华大学的源地址)
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
# 更新软件包
RUN apk update upgrade
RUN apk add --no-cache ca-certificates tzdata tree curl tini
# 安装 glibc 库,主要为了解决中文乱码, 但是有部分java工程可能会依赖. 比如: aws kinesis 等
COPY glibc-2.35-r0.apk glibc-2.35-r0.apk
COPY glibc-bin-2.35-r0.apk glibc-bin-2.35-r0.apk
COPY glibc-i18n-2.35-r0.apk glibc-i18n-2.35-r0.apk
COPY sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
RUN apk add glibc-2.35-r0.apk glibc-bin-2.35-r0.apk glibc-i18n-2.35-r0.apk
RUN cat locale.md | xargs -i /usr/glibc-compat/bin/localedef -i {} -f UTF-8 {}.UTF-8 && \
rm -rf *.apk && \
rm -rf /var/cache/apk/* && \
rm -rf locale.md
# tzdata 是可以配置时区,这里默认使用上海时区
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone
RUN { echo '#!/bin/sh'; echo 'set -e'; echo; echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; } > /usr/local/bin/docker-java-home
RUN chmod +x /usr/local/bin/docker-java-home
# 支持使用中文
ENV LANG=zh_CN.UTF-8
ENV LANGUAGE=zh_CN.UTF-8


# 以下为安装jdk 17 的命令 , 目前alpine:3.15 里面软件包最新版本 jdk版本 11.0.15
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk/jre/bin:/usr/lib/java-17-openjdk/bin
RUN apk add --no-cache openjdk17 && [ "$JAVA_HOME" = "$(docker-java-home)" ]

COPY apache-tomcat-10.1.7.tar.gz /apps/tomcat


ENV TZ "Asia/Shanghai"
ENV TERM xterm
ENV TOMCAT_MAJOR_VERSION 10
ENV TOMCAT_MINOR_VERSION 8.5.70
ENV CATALINA_HOME /apps/tomcat
ENV APP_DIR ${CATALINA_HOME}/webapps
RUN mkdir /apps
ADD apache-tomcat-8.5.70.tar.gz /apps
RUN ln -s /apps/apache-tomcat-8.5.70 /apps/tomcat


RUN apk add --no-cache nginx
COPY ./www /etc/nginx/html
COPY ./nginx.conf /etc/nginx/nginx.conf

# 以下为安装jdk 1.8 的命令 , 目前alpine:3.15 里面软件包最新版本 jdk版本 1.8.0_322
# ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
# ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
# RUN apk add --no-cache openjdk8 && [ "$JAVA_HOME" = "$(docker-java-home)" ]
#添加nginx
#ADD nginx-1.22.1.tar.gz /nginx/nginx-1.22.1.tar.gz

#拷贝文件到Nginx下



#启动web页面

#启动java
ARG JAR_FILE
VOLUME ["/music"]
VOLUME ["/config"]
ADD ./simple-MusicServer-1.0.2-Beta.jar /app.jar

COPY ./entrypoint.sh entrypoint.sh
RUN chmod +x entrypoint.sh
#执行启动命令
#ENTRYPOINT ["tini","java","-Dfile.encoding=utf-8", "-jar","/app.jar"]
#ENTRYPOINT ["tini","java","-Dfile.encoding=utf-8", "-jar","/app.jar"]
#ENTRYPOINT [ "service","nginx", "start" ]
ENTRYPOINT ["sh","./entrypoint.sh"]
57 changes: 57 additions & 0 deletions Dockerfile_dddd
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#编译jar包
FROM maven:3.9.4-eclipse-temurin-17-alpine AS builder

MAINTAINER SQ

WORKDIR /build/


#复制源码信息
COPY pom.xml /build/
COPY src /build/src/
COPY src/main/resources/sqlite/sqmusic.db /cache/sqmusic.db

#打包
RUN mvn clean package


#运行镜像
FROM centos:7

# 时区与字符设置UTF-8并配置环境
ENV TZ=Asia/Shanghai
ENV LANG=C.UTF-8
ENV TimeZone=Asia/Shanghai


#
#RUN yum makecache
RUN yum update -y wget

RUN rpm -ivh http://nginx.org/packages/centos/7/noarch/RPMS/nginx-release-centos-7-0.el7.ngx.noarch.rpm
RUN yum install -y nginx

RUN yum install -y wget
RUN wget https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm
RUN yum install -y ./jdk-17_linux-x64_bin.rpm

#RUN wget http://nginx.org/packages/centos/7/x86_64/RPMS/nginx-1.18.0-1.el7.ngx.x86_64.rpm
#RUN yum install -y ./nginx-1.18.0-1.el7.ngx.x86_64.rpm

COPY src/main/resources/static /html/
RUN rm /etc/nginx/nginx.conf
COPY --from=builder /build/target/MusicServer2.0.jar /app/app.jar
RUN echo "worker_processes 1;events { worker_connections 1024;}http { include mime.types; default_type application/octet-stream; sendfile on; keepalive_timeout 65; server { listen 80; server_name localhost; location / { root /html; index index.html index.htm; } location /sqmusic-api/ { proxy_pass http://localhost:8099/; proxy_http_version 1.1; } error_page 500 502 503 504 /50x.html; location = /50x.html { root html; } }}" > /etc/nginx/nginx.conf

#将启动脚本拷贝到容器里面的/usr/local/project下面
COPY docker-run.sh /usr/local/project/docker-run.sh
#给run.sh可执行权限
RUN chmod 777 /usr/local/project/docker-run.sh

#对外暴露80,8880端口,暴不暴露端口没有什么影响,重要的是要在启动的时候使用-p映射宿主机端口:容器端口,暴露端口你也得使用-p映射端口
#EXPOSE ${apiPort} ${webPort}

#nginx -c -t /software/nginx/nginx.conf

#通过脚本同时启动后端jar包和nginx
CMD ["sh","/usr/local/project/docker-run.sh","8099","80"]
Loading