root/allLikeMall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Branch_csl #4

Merged
root merged 10 commits from Branch_csl into master 2024-08-12 10:47:51 +08:00
Conversation 0 Commits 10 Files Changed 7 +290 -119
7 changed files with 290 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
.drone.yml Normal file
View File

@ -0,0 +1,98 @@
kind: pipeline # 定义对象类型，还有secret和signature两种类型
type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
name: filesystem-drone # 定义流水线名称
steps: # 定义流水线执行步骤，这些步骤将顺序执行
- name: package # 流水线名称
image: maven:3-jdk-8 # 定义创建容器的Docker镜像
volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
- name: maven-cache
path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载
- name: maven-build
path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
commands: # 定义在Docker容器中执行的shell命令
- mvn package -Dmaven.test.skip=true # 应用打包命令
# - cd yudao-server/target/
# - ls
- cp yudao-server/target/yudao-server.jar /app/build/yudao-server.jar
- cp yudao-server/Dockerfile /app/build/Dockerfile
- cp yudao-server/run.sh /app/build/run.sh
- name: copy package
image: appleboy/drone-ssh # SSH工具镜像
settings:
host: 101.43.112.107 # 远程连接地址
username: root # 远程连接账号
password:
from_secret: ssh_password # 从Secret中读取SSH密码
port: 22 # 远程连接端口
command_timeout: 5m # 远程执行命令超时时间
script:
# - ls
- scp -r /zymail/maven/build root@1.14.205.126:/zymail
# - ssh root@1.14.205.126
# - ls
# - chmod +x run.sh # 更改为可执行脚本
# - ./run.sh # 运行脚本打包应用镜像并运行
- name: build-start
image: appleboy/drone-ssh # SSH工具镜像
settings:
host: 1.14.205.126 # 远程连接地址
username: root # 远程连接账号
password:
from_secret: ssh_password # 从Secret中读取SSH密码
port: 22 # 远程连接端口
command_timeout: 5m # 远程执行命令超时时间
script:
# - ls
- cd /zymail/build
- chmod +x run.sh # 更改为可执行脚本
- ./run.sh # 运行脚本打包应用镜像并运行
volumes: # 定义流水线挂载目录，用于共享数据
- name: maven-build
host:
path: /zymail/maven/build # 从宿主机中挂载的目录
- name: maven-cache
host:
path: /zymail/maven/cache # 从宿主机中挂载的目录

40
pom.xml
View File

@ -131,35 +131,29 @@
</plugins>
</build>
<!-- 使用 huawei / aliyun 的 Maven 源，提升下载速度 -->
<repositories>
<repository>
<id>huaweicloud</id>
<name>huawei</name>
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
</repository>
<repository>
<id>aliyunmaven</id>
<name>aliyun</name>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public</url>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<enabled>false</enabled>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>

BIN
yudao-admin-vue3/src/assets/imgs/login-back-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 313 KiB

BIN
yudao-admin-vue3/src/assets/imgs/login-back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB

113
yudao-admin-vue3/src/views/Login/Login.vue
View File

@ -1,37 +1,26 @@
<template>
<div
:class="prefixCls"
class="relative h-[100%] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px lt-xl:px-10px"
>
<div :class="prefixCls" class="relative h-[100%] lt-md:px-10px lt-sm:px-10px">
<div class="relative mx-auto h-full flex">
<div
:class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`"
>
<!-- <div :class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`"> -->
<!-- 左上角的 logo + 系统标题 -->
<div class="relative flex items-center text-white">
<!-- <div class="relative flex items-center text-white">
<img alt="" class="mr-10px w-48px" src="@/assets/imgs/zy-logo.jpg" />
<span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
</div>
</div> -->
<!-- 左边的背景图 + 欢迎语 -->
<div class="h-[calc(100%-60px)] flex items-center justify-center">
<TransitionGroup
appear
enter-active-class="animate__animated animate__bounceInLeft"
tag="div"
>
<!-- <div class="h-[calc(100%-60px)] flex items-center justify-center">
<TransitionGroup appear enter-active-class="animate__animated animate__bounceInLeft" tag="div">
<img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
<div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div>
<div key="3" class="mt-5 text-14px font-normal text-white">
{{ t('login.message') }}
</div>
</TransitionGroup>
</div>
</div>
<div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
</div> -->
<!-- </div> -->
<div class="login relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
<!-- 右上角的主题、语言选择 -->
<div
class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
>
<div class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end">
<div class="flex items-center at-2xl:hidden at-xl:hidden">
<img alt="" class="mr-10px w-48px" src="@/assets/imgs/logo.png" />
<span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
@ -43,9 +32,13 @@
</div>
<!-- 右边的登录界面 -->
<Transition appear enter-active-class="animate__animated animate__bounceInRight">
<div
class="m-auto h-full w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
>
<!-- at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px -->
<div class="login-cont m-auto h-full w-[100%] flex items-center ">
<div class="xia">
<div class="left">
<img src="@/assets/imgs/login-back-left.png" alt="" />
</div>
<div class="right">
<!-- 账号登录 -->
<LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
<!-- 手机登录 -->
@ -57,6 +50,8 @@
<!-- 三方登录 -->
<SSOLoginVue class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
</div>
</div>
</div>
</Transition>
</div>
</div>
@ -81,6 +76,9 @@ const prefixCls = getPrefixCls('login')
</script>
<style lang="scss" scoped>
$prefix-cls: #{$namespace}-login;
.#{$prefix-cls} {
@ -101,4 +99,71 @@ $prefix-cls: #{$namespace}-login;
}
}
}
.login{
background:url('@/assets/imgs/login-back.png') no-repeat;
background-size:cover;
.login-cont{
width: 800px;
height: 100%;
background: transparent;
border-radius: 21px;
display: flex;
overflow: hidden;
.xia{
display:flex;
.left{
width: 50%;
display: flex;
img{
width: 100%;
}
}
.right{
flex:1;
background: white;
}
}
}
}
@media screen and (min-width:1001px){
::v-deep .el-form-item__content{
h2{
color:black;
}
}
}
@media screen and (max-width:1000px){
.login{
background:transparent;
background-size:cover;
.login-cont{
width: 100%;
height: 100%;
border-radius: 21px;
display:flex;
background: transparent;
.xia{
.left{
width: 50%;
display: flex;
display:none;
img{
width: 100%;
}
}
.right{
flex:1;
background: transparent !important;
}
}
}
}
}
</style>

6
yudao-server/Dockerfile
View File

@ -1,12 +1,10 @@
## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性
## 感谢复旦核博士的建议！灰子哥，牛皮！
FROM eclipse-temurin:8-jre
FROM openjdk:8-jre
## 创建目录，并使用它作为工作目录
RUN mkdir -p /yudao-server
WORKDIR /yudao-server
## 将后端项目的 Jar 文件，复制到镜像中
COPY ./target/yudao-server.jar app.jar
ADD yudao-server.jar app.jar
## 设置 TZ 时区
ENV TZ=Asia/Shanghai

16
yudao-server/run.sh Normal file
View File

@ -0,0 +1,16 @@
app_name='zymall'
# 定义应用版本
app_version='1.0.0'
# 定义应用环境
#profile_active='prod'
echo '----stop container----'
docker stop ${app_name}
echo '----rm container----'
docker rm ${app_name}
#echo '----rm image----'
#docker rmi ${group_name}/${app_name}:${app_version}
# 打包编译docker镜像
echo '----build image----'
docker buildx build -f Dockerfile -t ${app_name}:${app_version} .
echo '----start container----'
docker run -d -p 6127:6127 --name ${app_name} ${app_name}:${app_version}