<%= webpackConfig.name %>

commit 9f8c25fc7ddabac2fe7e0ab036e878e642c7d060 Author: 最孬拳击手 <2218834824@qq.com> Date: Thu Feb 29 17:31:01 2024 +0800 first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..343c56d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e6dd92d --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..be5f5c6 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..1f19f73 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..ab07054 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# 用于自动化部署的测试项目 diff --git a/devops/build/build.sh b/devops/build/build.sh new file mode 100644 index 0000000..861a8ff --- /dev/null +++ b/devops/build/build.sh @@ -0,0 +1,57 @@ +#!/bin/bash +echo "==============build begin 当前环境:【$ENV】==============" +if [[ "$ENV" = "" ]]; then + ENV=$env +fi + +if [[ $ENV == 'test' ]]; then + HUB_USERNAME=wlf19941002 + HUB_PASSWORD=901002wei + UCLOUD_HUB=registry.cn-hangzhou.aliyuncs.com/weilingfeng-dev + elif [[ $ENV == 'prod' ]]; then + HUB_USERNAME=wlf19941002 + HUB_PASSWORD=901002wei + UCLOUD_HUB=registry.cn-hangzhou.aliyuncs.com/weilingfeng-prod + else + echo 'Please enter right environment! eg: test || prod(master or v/V*.*.* branch)' + exit 1 +fi + +#编译后将包拷贝至新建的publish目录下，gitlab上可以在对应节点下载包。 +mvn clean package -Dmaven.test.skip=true || exit 1 && \ + echo 'build successful!' + +# 构建 TAG 变量 +TAG="${CI_COMMIT_SHA:0:4}${CI_PIPELINE_ID:0:4}" + +# 打印 TAG 变量的值 +echo "TAG value: $TAG" + +ZHN_AUTH=zhn-auth +ZHN_GATEWAY=zhn-gateway +ZHN_SYSTEM=zhn-system + +#构建镜像 +docker build -f zhn-gateway/Dockerfile -t $UCLOUD_HUB/${ZHN_GATEWAY}:$TAG . +docker build -f zhn-auth/Dockerfile -t $UCLOUD_HUB/${ZHN_AUTH}:$TAG . +docker build -f zhn-modules/zhn-system/Dockerfile -t $UCLOUD_HUB/${ZHN_SYSTEM}:$TAG . +#镜像仓库登录 +docker login registry.cn-hangzhou.aliyuncs.com --username $HUB_USERNAME --password $HUB_PASSWORD + +#推送镜像 +docker push $UCLOUD_HUB/${ZHN_AUTH}:$TAG +docker push $UCLOUD_HUB/${ZHN_GATEWAY}:$TAG +docker push $UCLOUD_HUB/${ZHN_SYSTEM}:$TAG + +#删除镜像 +docker rmi -f $UCLOUD_HUB/${ZHN_AUTH}:$TAG +docker rmi -f $UCLOUD_HUB/${ZHN_GATEWAY}:$TAG +docker push $UCLOUD_HUB/${ZHN_SYSTEM}:$TAG + +#删除none 镜像 +docker image prune -f --filter "dangling=true" + +echo "$UCLOUD_HUB/${ZHN_AUTH}:$TAG" +echo "$UCLOUD_HUB/${ZHN_GATEWAY}:$TAG" +echo "$UCLOUD_HUB/${ZHN_SYSTEM}:$TAG" +echo "==============build end!!!================" diff --git a/devops/release/deploy.sh b/devops/release/deploy.sh new file mode 100644 index 0000000..dea326b --- /dev/null +++ b/devops/release/deploy.sh @@ -0,0 +1,47 @@ +#!/bin/bash +echo "==============deploy begin!!!================" + +UCLOUD_HUB=registry.cn-hangzhou.aliyuncs.com/weilingfeng-dev +UCLOUD_HUB=registry.cn-hangzhou.aliyuncs.com/weilingfeng-prod + +TAG="${CI_COMMIT_SHA:0:4}${CI_PIPELINE_ID:0:4}" + +ZHN_GATEWAY=zhn-gateway +ZHN_AUTH=zhn-auth +ZHN_SYSTEM=zhn-system + +#停止 +if [ -n "$(docker ps -a -q -f name=$ZHN_GATEWAY)" ]; then + docker rm -f $ZHN_GATEWAY + echo "$ZHN_GATEWAY 已经停止" +fi + +if [ -n "$(docker ps -a -q -f name=$ZHN_AUTH)" ]; then + docker rm -f $ZHN_AUTH + echo "$ZHN_AUTH 已经停止" +fi + +if [ -n "$(docker ps -a -q -f name=$ZHN_SYSTEM)" ]; then + docker rm -f $ZHN_SYSTEM + echo "$ZHN_SYSTEM 已经停止" +fi + +#删除所有镜像 +docker images | grep "zhn-gateway" | awk '{print $3}' | while read image_id; do docker rmi -f "$image_id"; done +docker images | grep "zhn-auth" | awk '{print $3}' | while read image_id; do docker rmi -f "$image_id"; done +docker images | grep "zhn-system" | awk '{print $3}' | while read image_id; do docker rmi -f "$image_id"; done + + +#拉取镜像 +docker pull $UCLOUD_HUB/${ZHN_AUTH}:$TAG || exit 1 +docker pull $UCLOUD_HUB/${ZHN_SYSTEM}:$TAG || exit 1 +docker pull $UCLOUD_HUB/${ZHN_GATEWAY}:$TAG || exit 1 + +#发布 +docker run -itd -p 8080:8080 --name=zhn-gateway --restart=always $UCLOUD_HUB/${ZHN_GATEWAY}:$TAG || exit 1 +docker run -itd -p 9200:9200 --name=zhn-auth --restart=always $UCLOUD_HUB/${ZHN_AUTH}:$TAG || exit 1 +docker run -itd -p 9201:9201 --name=zhn-system --restart=always $UCLOUD_HUB/${ZHN_SYSTEM}:$TAG || exit 1 + +echo "==============deploy success end!!!==================" + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..1713842 --- /dev/null +++ b/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + com.zhn + zhn-dev + pom + 1.0.0 + + zhn-common + zhn-gateway + zhn-auth + zhn-modules + + + + + + spring-boot-starter-parent + org.springframework.boot + 2.6.2 + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + 2021.0.0 + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2021.1 + pom + import + + + + com.alibaba.nacos + nacos-client + 2.0.4 + + + + com.zhn + zhn-common + 1.0.0 + + + + + + \ No newline at end of file diff --git a/zhn-auth/Dockerfile b/zhn-auth/Dockerfile new file mode 100644 index 0000000..da9260e --- /dev/null +++ b/zhn-auth/Dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ex_weilingfeng@163.com + +# 挂载目录 +VOLUME /home/zhn +# 创建目录 +RUN mkdir -p /home/zhn +# 指定路径 +WORKDIR /home/zhn +# 复制jar文件到路径 +COPY zhn-auth/target/zhn-auth.jar /home/zhn/zhn-auth.jar +# 启动网关服务 +ENTRYPOINT ["java","-jar","zhn-auth.jar"] diff --git a/zhn-auth/pom.xml b/zhn-auth/pom.xml new file mode 100644 index 0000000..eaba2e3 --- /dev/null +++ b/zhn-auth/pom.xml @@ -0,0 +1,49 @@ + + + + zhn-dev + com.zhn + 1.0.0 + + 4.0.0 + + zhn-auth + + + + + com.zhn + zhn-common + + + + org.springframework.boot + spring-boot-starter-web + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + + + + diff --git a/zhn-auth/src/main/java/com/zhn/auth/AuthMian.java b/zhn-auth/src/main/java/com/zhn/auth/AuthMian.java new file mode 100644 index 0000000..50ed9b8 --- /dev/null +++ b/zhn-auth/src/main/java/com/zhn/auth/AuthMian.java @@ -0,0 +1,16 @@ +package com.zhn.auth; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author zhang + */ +@SpringBootApplication +@EnableFeignClients +public class AuthMian { + public static void main(String[] args) { + SpringApplication.run(AuthMian.class, args); + } +} diff --git a/zhn-auth/src/main/java/com/zhn/auth/controller/AuthController.java b/zhn-auth/src/main/java/com/zhn/auth/controller/AuthController.java new file mode 100644 index 0000000..990ef22 --- /dev/null +++ b/zhn-auth/src/main/java/com/zhn/auth/controller/AuthController.java @@ -0,0 +1,32 @@ +package com.zhn.auth.controller; + + +import com.zhn.auth.service.AuthService; +import com.zhn.common.domain.User; +import com.zhn.common.domain.request.RequestUser; +import com.zhn.common.domain.response.RespJwt; +import com.zhn.common.result.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; + +@RestController +public class AuthController { + @Autowired + AuthService authService; + @PostMapping("/login") + Result login(@RequestBody RequestUser requestUser){ + + return authService.login(requestUser); + } + + + @GetMapping("/user/info") + Result userinfo(HttpServletRequest request){ + return authService.userinfo(request); + + } + + +} diff --git a/zhn-auth/src/main/java/com/zhn/auth/feign/AuthFeignSystem.java b/zhn-auth/src/main/java/com/zhn/auth/feign/AuthFeignSystem.java new file mode 100644 index 0000000..aace3a0 --- /dev/null +++ b/zhn-auth/src/main/java/com/zhn/auth/feign/AuthFeignSystem.java @@ -0,0 +1,17 @@ +package com.zhn.auth.feign; + + +import com.zhn.common.domain.User; +import com.zhn.common.result.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +@FeignClient("zhn-system") +public interface AuthFeignSystem { + @GetMapping("/user/byphone/{phone}") + Result byphone(@PathVariable String phone); + + + +} diff --git a/zhn-auth/src/main/java/com/zhn/auth/service/AuthService.java b/zhn-auth/src/main/java/com/zhn/auth/service/AuthService.java new file mode 100644 index 0000000..a470a86 --- /dev/null +++ b/zhn-auth/src/main/java/com/zhn/auth/service/AuthService.java @@ -0,0 +1,14 @@ +package com.zhn.auth.service; + +import com.zhn.common.domain.User; +import com.zhn.common.domain.request.RequestUser; +import com.zhn.common.domain.response.RespJwt; +import com.zhn.common.result.Result; + +import javax.servlet.http.HttpServletRequest; + +public interface AuthService { + Result login(RequestUser requestUser); + + Result userinfo(HttpServletRequest request); +} diff --git a/zhn-auth/src/main/java/com/zhn/auth/service/impl/AuthServiceImpl.java b/zhn-auth/src/main/java/com/zhn/auth/service/impl/AuthServiceImpl.java new file mode 100644 index 0000000..28054bf --- /dev/null +++ b/zhn-auth/src/main/java/com/zhn/auth/service/impl/AuthServiceImpl.java @@ -0,0 +1,85 @@ +package com.zhn.auth.service.impl; + + +import com.alibaba.fastjson.JSONObject; +import com.zhn.auth.feign.AuthFeignSystem; +import com.zhn.auth.service.AuthService; +import com.zhn.common.constants.JwtConstants; +import com.zhn.common.constants.TokenConstants; +import com.zhn.common.domain.User; +import com.zhn.common.domain.request.RequestUser; +import com.zhn.common.domain.response.RespJwt; +import com.zhn.common.result.Result; +import com.zhn.common.utils.JwtUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.TimeoutUtils; +import org.springframework.stereotype.Service; + + +import com.zhn.auth.service.AuthService; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +@Service +public class AuthServiceImpl implements AuthService { + + @Autowired + AuthFeignSystem authFeignSystem; + + @Autowired + RedisTemplate redisTemplate; + + @Override + public Result login(RequestUser requestUser) { + String phone = requestUser.getPhone(); + String password = requestUser.getPassword(); + if (null == phone || null == password) { + return Result.error("联系管理员"); + } + if ("".equals(phone) || "".equals(password)) { + + return Result.error("请输入手机号+密码"); + } + Result byphone = authFeignSystem.byphone(phone); + User data = byphone.getData(); + if (null == data) { + return Result.error("先注册手机号,在登录"); + } + HashMap map = new HashMap<>(); + String userkey = UUID.randomUUID().toString().replaceAll("-", ""); + map.put(JwtConstants.USER_KEY, userkey); + map.put(JwtConstants.DETAILS_USER_ID, data.getId()); + String token = JwtUtils.createToken(map); + redisTemplate.opsForValue().set( + TokenConstants.LOGIN_TOKEN_KEY + userkey, + JSONObject.toJSONString(data), + TokenConstants.EXPIRATION, + TimeUnit.MINUTES + ); + RespJwt respJwt = new RespJwt(); + respJwt.setToken(token); + respJwt.setEidTime("720MIN"); + + return Result.success(respJwt); + } + + /* + * 前台每次请求都会来到这里进行解析user + * + * */ + @Override + public Result userinfo(HttpServletRequest request) { + String token = request.getHeader(TokenConstants.TOKEN); + String userKey = JwtUtils.getUserKey(token); + String s = redisTemplate.opsForValue().get( + TokenConstants.LOGIN_TOKEN_KEY + userKey + ); + User user = JSONObject.parseObject(s, User.class); + return Result.success(user); + } + +} diff --git a/zhn-auth/src/main/resources/bootstrap.yml b/zhn-auth/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..c0dda39 --- /dev/null +++ b/zhn-auth/src/main/resources/bootstrap.yml @@ -0,0 +1,31 @@ +# Tomcat +server: + port: 9001 +# Spring +spring: + main: + allow-bean-definition-overriding: true + allow-circular-references: true + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: zhn-auth + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.2.51:8848 + config: + # 配置中心地址 + server-addr: 192.168.2.51:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zhn-auth/src/main/resources/mapper/AuthMapper.xml b/zhn-auth/src/main/resources/mapper/AuthMapper.xml new file mode 100644 index 0000000..697c9a5 --- /dev/null +++ b/zhn-auth/src/main/resources/mapper/AuthMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/zhn-auth/target/classes/bootstrap.yml b/zhn-auth/target/classes/bootstrap.yml new file mode 100644 index 0000000..c0dda39 --- /dev/null +++ b/zhn-auth/target/classes/bootstrap.yml @@ -0,0 +1,31 @@ +# Tomcat +server: + port: 9001 +# Spring +spring: + main: + allow-bean-definition-overriding: true + allow-circular-references: true + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: zhn-auth + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.2.51:8848 + config: + # 配置中心地址 + server-addr: 192.168.2.51:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zhn-auth/target/classes/com/zhn/auth/AuthMian.class b/zhn-auth/target/classes/com/zhn/auth/AuthMian.class new file mode 100644 index 0000000..c3c4112 Binary files /dev/null and b/zhn-auth/target/classes/com/zhn/auth/AuthMian.class differ diff --git a/zhn-auth/target/classes/com/zhn/auth/controller/AuthController.class b/zhn-auth/target/classes/com/zhn/auth/controller/AuthController.class new file mode 100644 index 0000000..9e0f05e Binary files /dev/null and b/zhn-auth/target/classes/com/zhn/auth/controller/AuthController.class differ diff --git a/zhn-auth/target/classes/com/zhn/auth/feign/AuthFeignSystem.class b/zhn-auth/target/classes/com/zhn/auth/feign/AuthFeignSystem.class new file mode 100644 index 0000000..e9d13aa Binary files /dev/null and b/zhn-auth/target/classes/com/zhn/auth/feign/AuthFeignSystem.class differ diff --git a/zhn-auth/target/classes/com/zhn/auth/service/AuthService.class b/zhn-auth/target/classes/com/zhn/auth/service/AuthService.class new file mode 100644 index 0000000..ad22348 Binary files /dev/null and b/zhn-auth/target/classes/com/zhn/auth/service/AuthService.class differ diff --git a/zhn-auth/target/classes/com/zhn/auth/service/impl/AuthServiceImpl.class b/zhn-auth/target/classes/com/zhn/auth/service/impl/AuthServiceImpl.class new file mode 100644 index 0000000..93f58b5 Binary files /dev/null and b/zhn-auth/target/classes/com/zhn/auth/service/impl/AuthServiceImpl.class differ diff --git a/zhn-auth/target/classes/mapper/AuthMapper.xml b/zhn-auth/target/classes/mapper/AuthMapper.xml new file mode 100644 index 0000000..697c9a5 --- /dev/null +++ b/zhn-auth/target/classes/mapper/AuthMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/zhn-common/pom.xml b/zhn-common/pom.xml new file mode 100644 index 0000000..9e449e9 --- /dev/null +++ b/zhn-common/pom.xml @@ -0,0 +1,96 @@ + + + + zhn-dev + com.zhn + 1.0.0 + + 4.0.0 + + zhn-common + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + com.alibaba + fastjson + 1.2.80 + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.apache.commons + commons-lang3 + + + + org.projectlombok + lombok + + + + cn.hutool + hutool-all + 5.8.3 + + + + com.aliyun + dysmsapi20170525 + 2.0.1 + + + + com.aliyun.oss + aliyun-sdk-oss + 3.12.0 + + + + \ No newline at end of file diff --git a/zhn-common/src/main/java/com/zhn/common/constants/Constants.java b/zhn-common/src/main/java/com/zhn/common/constants/Constants.java new file mode 100644 index 0000000..512b656 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/constants/Constants.java @@ -0,0 +1,18 @@ +package com.zhn.common.constants; + +/** + * @description: 系统常量 + * @author zhn + */ +public class Constants { + /** + * 成功标记 + */ + public static final Integer SUCCESS = 200; + public static final String SUCCESS_MSG = "操作成功"; + /** + * 失败标记 + */ + public static final Integer ERROR = 500; + public static final String ERROR_MSG = "操作异常"; +} diff --git a/zhn-common/src/main/java/com/zhn/common/constants/JwtConstants.java b/zhn-common/src/main/java/com/zhn/common/constants/JwtConstants.java new file mode 100644 index 0000000..e240c98 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/constants/JwtConstants.java @@ -0,0 +1,29 @@ +package com.zhn.common.constants; + +/** + * @author zhn + * @description: Jwt常量 + */ +public class JwtConstants { + + /** + * 用户ID字段 + */ + public static final String DETAILS_USER_ID = "user_id"; + + /** + * 用户名字段 + */ + public static final String DETAILS_USERNAME = "username"; + + /** + * 用户标识 + */ + public static final String USER_KEY = "user_key"; + + /** + * 令牌秘钥 + */ + public final static String SECRET = "abcdefghijklmnopqrstuvwxyz"; + +} diff --git a/zhn-common/src/main/java/com/zhn/common/constants/TokenConstants.java b/zhn-common/src/main/java/com/zhn/common/constants/TokenConstants.java new file mode 100644 index 0000000..0add0a0 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/constants/TokenConstants.java @@ -0,0 +1,24 @@ +package com.zhn.common.constants; + +/** + * @author zhn + * @description: 令牌常量 + */ +public class TokenConstants { + /** + * 缓存有效期，默认720（分钟） + */ + public final static long EXPIRATION = 720; + /** + * 缓存刷新时间，默认120（分钟） + */ + public final static long REFRESH_TIME = 120; + /** + * 权限缓存前缀 + */ + public final static String LOGIN_TOKEN_KEY = "login_tokens:"; + /** + * token标识 + */ + public static final String TOKEN = "token"; +} diff --git a/zhn-common/src/main/java/com/zhn/common/domain/User.java b/zhn-common/src/main/java/com/zhn/common/domain/User.java new file mode 100644 index 0000000..2ec948c --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/domain/User.java @@ -0,0 +1,22 @@ +package com.zhn.common.domain; + +import lombok.Data; + +import java.util.Date; + +@Data +public class User { + + private String id; + private String username; + private String password; + private String tel; + private String name; + private String avatar; + /** + * 最后登录时间 + */ + private Date lastLoginTime; + private String balance; + +} diff --git a/zhn-common/src/main/java/com/zhn/common/domain/request/RequestUser.java b/zhn-common/src/main/java/com/zhn/common/domain/request/RequestUser.java new file mode 100644 index 0000000..39050e1 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/domain/request/RequestUser.java @@ -0,0 +1,21 @@ +package com.zhn.common.domain.request; + + +import lombok.Data; + +@Data +public class RequestUser { + private String id; + private String avctie; + private String name; + private String username; + private String password; + private String phone; + private String emil; + private String lastLoginTime; + private String balance; + + + + +} diff --git a/zhn-common/src/main/java/com/zhn/common/domain/response/RespJwt.java b/zhn-common/src/main/java/com/zhn/common/domain/response/RespJwt.java new file mode 100644 index 0000000..76969c3 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/domain/response/RespJwt.java @@ -0,0 +1,15 @@ +package com.zhn.common.domain.response; + +import lombok.Data; + +/** + * @ClassName:RespJwt + * @author:zhn + * @create: 2023-08-03 09:01 + * @Description: 用户登录token返回实体类 + */ +@Data +public class RespJwt { + private String token; + private String eidTime; +} diff --git a/zhn-common/src/main/java/com/zhn/common/domain/response/ResponseUser.java b/zhn-common/src/main/java/com/zhn/common/domain/response/ResponseUser.java new file mode 100644 index 0000000..03f7a61 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/domain/response/ResponseUser.java @@ -0,0 +1,23 @@ +package com.zhn.common.domain.response; + + +import lombok.Data; + +import java.util.Date; + +@Data +public class ResponseUser { + private String id; + private String username; + private String password; + private String tel; + private String name; + private String avatar; + + /** + * 最后登录时间 + */ + private Date lastLoginTime; + private String balance; + +} diff --git a/zhn-common/src/main/java/com/zhn/common/result/PageResult.java b/zhn-common/src/main/java/com/zhn/common/result/PageResult.java new file mode 100644 index 0000000..35768fc --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/result/PageResult.java @@ -0,0 +1,34 @@ +package com.zhn.common.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhn + * @description: 列表返回结果集 + */ +@Data +public class PageResult implements Serializable { + /** + * 总条数 + */ + private long total; + /** + * 结果集合 + */ + private List list; + public PageResult() { + } + public PageResult(long total, List list) { + this.total = total; + this.list = list; + } + public static PageResult toPageResult(long total, List list){ + return new PageResult(total , list); + } + public static Result> toResult(long total, List list){ + return Result.success(PageResult.toPageResult(total,list)); + } +} diff --git a/zhn-common/src/main/java/com/zhn/common/result/Result.java b/zhn-common/src/main/java/com/zhn/common/result/Result.java new file mode 100644 index 0000000..47f249d --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/result/Result.java @@ -0,0 +1,76 @@ +package com.zhn.common.result; + +import com.zhn.common.constants.Constants; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhn + * @description: 响应信息主体 + */ +@Data +public class Result implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 成功 + */ + public static final int SUCCESS = Constants.SUCCESS; + /** + * 失败 + */ + public static final int FAIL = Constants.ERROR; + /** + * 返回状态码 + */ + private int code; + /** + * 响应信息 + */ + private String msg; + /** + * 响应数据 + */ + private T data; + + public static Result success() { + return restResult(null, SUCCESS, Constants.SUCCESS_MSG); + } + + public static Result success(T data) { + return restResult(data, SUCCESS, Constants.SUCCESS_MSG); + } + + public static Result success(T data, String msg) { + return restResult(data, SUCCESS, msg); + } + + public static Result error() { + return restResult(null, FAIL, Constants.ERROR_MSG); + } + + public static Result error(String msg) { + return restResult(null, FAIL, msg); + } + + public static Result error(T data) { + return restResult(data, FAIL, Constants.ERROR_MSG); + } + + public static Result error(T data, String msg) { + return restResult(data, FAIL, msg); + } + + public static Result error(int code, String msg) { + return restResult(null, code, msg); + } + + private static Result restResult(T data, int code, String msg) { + Result apiResult = new Result<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; + } +} diff --git a/zhn-common/src/main/java/com/zhn/common/utils/JwtUtils.java b/zhn-common/src/main/java/com/zhn/common/utils/JwtUtils.java new file mode 100644 index 0000000..b1cd22e --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/utils/JwtUtils.java @@ -0,0 +1,109 @@ +package com.zhn.common.utils; + +import com.zhn.common.constants.JwtConstants; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; + +import java.util.Map; + +/** + * @description: Jwt工具类 + * @author zhn + */ +public class JwtUtils { + + /** + * 秘钥 + */ + public static String secret = JwtConstants.SECRET; + + /** + * 从数据声明生成令牌 + * + * @param claims 数据声明 + * @return 令牌 + */ + public static String createToken(Map claims){ + String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact(); + return token; + } + + /** + * 从令牌中获取数据声明 + * + * @param token 令牌 + * @return 数据声明 + */ + public static Claims parseToken(String token){ + return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody(); + } + /** + * 根据令牌获取用户标识 + * + * @param token 令牌 + * @return 用户ID + */ + public static String getUserKey(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.USER_KEY); + } + /** + * 根据令牌获取用户标识 + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserKey(Claims claims){ + return getValue(claims, JwtConstants.USER_KEY); + } + /** + * 根据令牌获取用户ID + * + * @param token 令牌 + * @return 用户ID + */ + public static String getUserId(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.DETAILS_USER_ID); + } + /** + * 根据身份信息获取用户ID + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserId(Claims claims){ + return getValue(claims, JwtConstants.DETAILS_USER_ID); + } + /** + * 根据令牌获取用户名 + * + * @param token 令牌 + * @return 用户名 + */ + public static String getUserName(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.DETAILS_USERNAME); + } + /** + * 根据身份信息获取用户名 + * + * @param claims 身份信息 + * @return 用户名 + */ + public static String getUserName(Claims claims){ + return getValue(claims, JwtConstants.DETAILS_USERNAME); + } + /** + * 根据身份信息获取键值 + * + * @param claims 身份信息 + * @param key 键 + * @return 值 + */ + public static String getValue(Claims claims, String key){ + Object obj = claims.get(key); + return obj == null ? "" : obj.toString(); + } +} diff --git a/zhn-common/src/main/java/com/zhn/common/utils/Msg/HttpUtils.java b/zhn-common/src/main/java/com/zhn/common/utils/Msg/HttpUtils.java new file mode 100644 index 0000000..8a8e974 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/utils/Msg/HttpUtils.java @@ -0,0 +1,318 @@ +package com.zhn.common.utils.Msg; + +import com.zhn.common.utils.StringUtils; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.ssl.SSLSocketFactory; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class HttpUtils { + + /** + * get + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @return + * @throws Exception + */ + public static HttpResponse doGet(String host, String path, String method, + Map headers, + Map querys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpGet request = new HttpGet(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + return httpClient.execute(request); + } + + /** + * post form + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param bodys + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + Map bodys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (bodys != null) { + List nameValuePairList = new ArrayList(); + + for (String key : bodys.keySet()) { + nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key))); + } + UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8"); + formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8"); + request.setEntity(formEntity); + } + + return httpClient.execute(request); + } + + /** + * Post String + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + String body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (StringUtils.isNotBlank(body)) { + request.setEntity(new StringEntity(body, "utf-8")); + } + + return httpClient.execute(request); + } + + /** + * Post stream + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + byte[] body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (body != null) { + request.setEntity(new ByteArrayEntity(body)); + } + + return httpClient.execute(request); + } + + /** + * Put String + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPut(String host, String path, String method, + Map headers, + Map querys, + String body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPut request = new HttpPut(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (StringUtils.isNotBlank(body)) { + request.setEntity(new StringEntity(body, "utf-8")); + } + + return httpClient.execute(request); + } + + /** + * Put stream + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPut(String host, String path, String method, + Map headers, + Map querys, + byte[] body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPut request = new HttpPut(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (body != null) { + request.setEntity(new ByteArrayEntity(body)); + } + + return httpClient.execute(request); + } + + /** + * Delete + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @return + * @throws Exception + */ + public static HttpResponse doDelete(String host, String path, String method, + Map headers, + Map querys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpDelete request = new HttpDelete(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + return httpClient.execute(request); + } + + private static String buildUrl(String host, String path, Map querys) throws UnsupportedEncodingException { + StringBuilder sbUrl = new StringBuilder(); + sbUrl.append(host); + if (!StringUtils.isBlank(path)) { + sbUrl.append(path); + } + if (null != querys) { + StringBuilder sbQuery = new StringBuilder(); + for (Map.Entry query : querys.entrySet()) { + if (0 < sbQuery.length()) { + sbQuery.append("&"); + } + if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) { + sbQuery.append(query.getValue()); + } + if (!StringUtils.isBlank(query.getKey())) { + sbQuery.append(query.getKey()); + if (!StringUtils.isBlank(query.getValue())) { + sbQuery.append("="); + sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8")); + } + } + } + if (0 < sbQuery.length()) { + sbUrl.append("?").append(sbQuery); + } + } + + return sbUrl.toString(); + } + + private static HttpClient wrapClient(String host) { + HttpClient httpClient = new DefaultHttpClient(); + if (host.startsWith("https://")) { + sslClient(httpClient); + } + + return httpClient; + } + + private static void sslClient(HttpClient httpClient) { + try { + SSLContext ctx = SSLContext.getInstance("TLS"); + X509TrustManager tm = new X509TrustManager() { + @Override + public X509Certificate[] getAcceptedIssuers() { + return null; + } + + @Override + public void checkClientTrusted(X509Certificate[] xcs, String str) { + + } + + @Override + public void checkServerTrusted(X509Certificate[] xcs, String str) { + + } + }; + ctx.init(null, new TrustManager[]{tm}, null); + SSLSocketFactory ssf = new SSLSocketFactory(ctx); + ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + ClientConnectionManager ccm = httpClient.getConnectionManager(); + SchemeRegistry registry = ccm.getSchemeRegistry(); + registry.register(new Scheme("https", 443, ssf)); + } catch (KeyManagementException ex) { + throw new RuntimeException(ex); + } catch (NoSuchAlgorithmException ex) { + throw new RuntimeException(ex); + } + } +} diff --git a/zhn-common/src/main/java/com/zhn/common/utils/Msg/MsgUtil.java b/zhn-common/src/main/java/com/zhn/common/utils/Msg/MsgUtil.java new file mode 100644 index 0000000..5b9c4c8 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/utils/Msg/MsgUtil.java @@ -0,0 +1,41 @@ +package com.zhn.common.utils.Msg; + + + +import org.apache.http.HttpResponse; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author + * @version 1.0.0 + * @ClassName MsgUtil.java + * @Description TODO + * @createTime 2022年05月26日 15:49:00 + */ +public class MsgUtil { + + + public static void sendMsg(String phone,String code){ + String host = "http://dingxin.market.alicloudapi.com"; + String path = "/dx/sendSms"; + String method = "POST"; + String appcode = "6519301ba878422488063fe815c9910"; + Map headers = new HashMap(); + headers.put("Authorization", "APPCODE " + appcode); + Map querys = new HashMap(); + querys.put("mobile", phone); + querys.put("param", "code:"+code); + querys.put("tpl_id", "TP1711063"); + Map bodys = new HashMap(); + + try { + + HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys); + System.out.println(response.toString()); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/zhn-common/src/main/java/com/zhn/common/utils/OssUtil.java b/zhn-common/src/main/java/com/zhn/common/utils/OssUtil.java new file mode 100644 index 0000000..187b6ca --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/utils/OssUtil.java @@ -0,0 +1,153 @@ +package com.zhn.common.utils; + +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.PutObjectRequest; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.time.LocalDateTime; +import java.util.UUID; + +/** + * Oss服务调用 + */ +@Log4j2 +public class OssUtil { + + /** + * Endpoint 存储对象概述阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限访问路径前缀存储对象概述 + */ + private static String endPoint = "oss-cn-shanghai.aliyuncs.com"; + private static String accessKeyId = "LTAI5tGupmX9LkM6mEcmrbX7"; + private static String accessKeySecret = "4phVRUQpFcEk7Olar6E8mDfTA5JOlc"; + private static String accessPre = "https://liuxiaoting.oss-cn-shanghai.aliyuncs.com/"; + + /** + * bucket名称 + * @return + */ + private static String bucketName = "liuxiaoting"; + + private static OSS ossClient ; + + static { + ossClient = new OSSClientBuilder().build( + endPoint, + accessKeyId, + accessKeySecret); + log.info("oss服务连接成功！"); + } + + /** + * 默认路径上传本地文件 + * @param filePath + */ + public static String uploadFile(String filePath){ + return uploadFileForBucket(bucketName,getOssFilePath(filePath) ,filePath); + } + + /** + * 默认路径上传multipartFile文件 + * @param multipartFile + */ + public static String uploadMultipartFile(MultipartFile multipartFile) { + return uploadMultipartFile(bucketName,getOssFilePath(multipartFile.getOriginalFilename()),multipartFile); + } + /** + * 上传 multipartFile 类型文件 + * @param bucketName + * @param ossPath + * @param multipartFile + */ + public static String uploadMultipartFile(String bucketName , String ossPath , MultipartFile multipartFile){ + InputStream inputStream = null; + try { + inputStream = multipartFile.getInputStream(); + } catch (IOException e) { + e.printStackTrace(); + } + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre+ossPath; + } + + /** + * 使用File上传PutObject上传文件 ** 程序默认使用次方法上传 + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileForBucket(String bucketName , String ossPath , String filePath) { + // 创建PutObjectRequest对象。 + PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath)); + + // 上传 + ossClient.putObject(putObjectRequest); + return accessPre+ossPath; + } + + /** + * 使用文件流上传到指定的bucket实例 + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileInputStreamForBucket(String bucketName , String ossPath , String filePath){ + + // 填写本地文件的完整路径。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件流。 + InputStream inputStream = null; + try { + inputStream = new FileInputStream(filePath); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + // 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。 + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre+ossPath; + } + + public static void uploadFileInputStreamForBucket(String bucketName , String ossPath , InputStream inputStream ){ + ossClient.putObject(bucketName, ossPath, inputStream); + } + + /** + * 下载 + * @param ossFilePath + * @param filePath + */ + public static void downloadFile(String ossFilePath , String filePath ){ + downloadFileForBucket(bucketName , ossFilePath , filePath); + } + /** + * 下载 + * @param bucketName 实例名称 + * @param ossFilePath oss存储路径 + * @param filePath 本地文件路径 + */ + public static void downloadFileForBucket(String bucketName , String ossFilePath , String filePath ){ + ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath)); + } + + /** + * + * @return + */ + public static String getOssDefaultPath(){ + LocalDateTime now = LocalDateTime.now(); + String url = + now.getYear()+"/"+ + now.getMonth()+"/"+ + now.getDayOfMonth()+"/"+ + now.getHour()+"/"+ + now.getMinute()+"/"; + return url; + } + + public static String getOssFilePath(String filePath){ + String fileSuf = filePath.substring(filePath.indexOf(".") + 1); + return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf; + } + +} diff --git a/zhn-common/src/main/java/com/zhn/common/utils/StringUtils.java b/zhn-common/src/main/java/com/zhn/common/utils/StringUtils.java new file mode 100644 index 0000000..c478c79 --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/utils/StringUtils.java @@ -0,0 +1,68 @@ +package com.zhn.common.utils; + +import org.springframework.util.AntPathMatcher; + +import java.util.Collection; +import java.util.List; + +/** + * @author zhn + * @description: 字符串处理工具类 + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils { + + /** + * * 判断一个对象是否为空 + * + * @param object Object + * @return true：为空 false：非空 + */ + public static boolean isNull(Object object) { + return object == null; + } + + /** + * * 判断一个Collection是否为空，包含List，Set，Queue + * + * @param coll 要判断的Collection + * @return true：为空 false：非空 + */ + public static boolean isEmpty(Collection coll) { + return isNull(coll) || coll.isEmpty(); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) { + if (isEmpty(str) || isEmpty(strs)) { + return false; + } + for (String pattern : strs) { + if (isMatch(pattern, str)) + { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串，不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + * @return + */ + public static boolean isMatch(String pattern, String url) { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } +} diff --git a/zhn-common/src/main/java/com/zhn/common/utils/TelSmsUtils.java b/zhn-common/src/main/java/com/zhn/common/utils/TelSmsUtils.java new file mode 100644 index 0000000..ba898de --- /dev/null +++ b/zhn-common/src/main/java/com/zhn/common/utils/TelSmsUtils.java @@ -0,0 +1,87 @@ +package com.zhn.common.utils; + +import com.alibaba.fastjson.JSONObject; +import com.aliyun.dysmsapi20170525.Client; +import com.aliyun.dysmsapi20170525.models.SendSmsRequest; +import com.aliyun.dysmsapi20170525.models.SendSmsResponse; +import com.aliyun.teaopenapi.models.Config; +import lombok.extern.log4j.Log4j2; + +import java.util.Map; + +/** + * 短信工具类 + */ +@Log4j2 +public class TelSmsUtils { + + /** + * 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 + */ + private static String accessKeyId = "LTAIEVXszCmcd1T5"; + private static String accessKeySecret = "2zHwciQXln8wExSEnkIYtRTSwLeRNd"; + + /** + * 短信访问域名 + */ + private static String endpoint = "dysmsapi.aliyuncs.com"; + /** + * 短信签名 + */ + private static String signName = "登录验证"; + + /** + * 实例化短信对象 + */ + private static Client client; + + static { + log.info("初始化短信服务开始"); + long startTime = System.currentTimeMillis(); + try { + client = initClient(); + log.info("初始化短信成功：{}",signName); + } catch (Exception e) { + e.printStackTrace(); + } + log.info("初始化短信服务结束：耗时：{}MS",(System.currentTimeMillis()-startTime)); + } + /** + * 初始化短信对象 + * @return + * @throws Exception + */ + private static Client initClient() throws Exception{ + Config config = new Config() + // 您的AccessKey ID + .setAccessKeyId(accessKeyId) + // 您的AccessKey Secret + .setAccessKeySecret(accessKeySecret); + // 访问的域名 + config.endpoint = endpoint; + return new Client(config); + } + + /** + * 发送单条短信 + * @param tel + * @param templateCode SMS_153991546 + * @param sendDataMap + */ + public static String sendSms(String tel , String templateCode , Map sendDataMap){ + SendSmsRequest sendSmsRequest = new SendSmsRequest() + .setPhoneNumbers(tel) + .setSignName(signName) + .setTemplateCode(templateCode) + .setTemplateParam(JSONObject.toJSONString(sendDataMap)); + SendSmsResponse sendSmsResponse = null; + try { + log.info("发送短信验证码：消息内容是：【{}】", JSONObject.toJSONString(sendDataMap)); + sendSmsResponse = client.sendSms(sendSmsRequest); + } catch (Exception e) { + log.error("短信发送异常，手机号：【{}】，短信内容：【{}】，异常信息：【{}】", tel, sendDataMap, e); + } + return JSONObject.toJSONString(sendSmsResponse.getBody()); + } + +} diff --git a/zhn-common/src/main/resources/date.txt b/zhn-common/src/main/resources/date.txt new file mode 100644 index 0000000..b6760bd --- /dev/null +++ b/zhn-common/src/main/resources/date.txt @@ -0,0 +1 @@ +数据源文件 \ No newline at end of file diff --git a/zhn-common/target/classes/com/zhn/common/constants/Constants.class b/zhn-common/target/classes/com/zhn/common/constants/Constants.class new file mode 100644 index 0000000..b7806dd Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/constants/Constants.class differ diff --git a/zhn-common/target/classes/com/zhn/common/constants/JwtConstants.class b/zhn-common/target/classes/com/zhn/common/constants/JwtConstants.class new file mode 100644 index 0000000..d120512 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/constants/JwtConstants.class differ diff --git a/zhn-common/target/classes/com/zhn/common/constants/TokenConstants.class b/zhn-common/target/classes/com/zhn/common/constants/TokenConstants.class new file mode 100644 index 0000000..1602059 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/constants/TokenConstants.class differ diff --git a/zhn-common/target/classes/com/zhn/common/domain/User.class b/zhn-common/target/classes/com/zhn/common/domain/User.class new file mode 100644 index 0000000..733a280 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/domain/User.class differ diff --git a/zhn-common/target/classes/com/zhn/common/domain/request/RequestUser.class b/zhn-common/target/classes/com/zhn/common/domain/request/RequestUser.class new file mode 100644 index 0000000..7e62762 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/domain/request/RequestUser.class differ diff --git a/zhn-common/target/classes/com/zhn/common/domain/response/RespJwt.class b/zhn-common/target/classes/com/zhn/common/domain/response/RespJwt.class new file mode 100644 index 0000000..9073e00 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/domain/response/RespJwt.class differ diff --git a/zhn-common/target/classes/com/zhn/common/domain/response/ResponseUser.class b/zhn-common/target/classes/com/zhn/common/domain/response/ResponseUser.class new file mode 100644 index 0000000..8273946 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/domain/response/ResponseUser.class differ diff --git a/zhn-common/target/classes/com/zhn/common/result/PageResult.class b/zhn-common/target/classes/com/zhn/common/result/PageResult.class new file mode 100644 index 0000000..ce69870 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/result/PageResult.class differ diff --git a/zhn-common/target/classes/com/zhn/common/result/Result.class b/zhn-common/target/classes/com/zhn/common/result/Result.class new file mode 100644 index 0000000..2829784 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/result/Result.class differ diff --git a/zhn-common/target/classes/com/zhn/common/utils/JwtUtils.class b/zhn-common/target/classes/com/zhn/common/utils/JwtUtils.class new file mode 100644 index 0000000..41fef9d Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/utils/JwtUtils.class differ diff --git a/zhn-common/target/classes/com/zhn/common/utils/Msg/HttpUtils$1.class b/zhn-common/target/classes/com/zhn/common/utils/Msg/HttpUtils$1.class new file mode 100644 index 0000000..434cde3 Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/utils/Msg/HttpUtils$1.class differ diff --git a/zhn-common/target/classes/com/zhn/common/utils/Msg/HttpUtils.class b/zhn-common/target/classes/com/zhn/common/utils/Msg/HttpUtils.class new file mode 100644 index 0000000..7bba45f Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/utils/Msg/HttpUtils.class differ diff --git a/zhn-common/target/classes/com/zhn/common/utils/Msg/MsgUtil.class b/zhn-common/target/classes/com/zhn/common/utils/Msg/MsgUtil.class new file mode 100644 index 0000000..751bc8d Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/utils/Msg/MsgUtil.class differ diff --git a/zhn-common/target/classes/com/zhn/common/utils/OssUtil.class b/zhn-common/target/classes/com/zhn/common/utils/OssUtil.class new file mode 100644 index 0000000..d9814db Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/utils/OssUtil.class differ diff --git a/zhn-common/target/classes/com/zhn/common/utils/StringUtils.class b/zhn-common/target/classes/com/zhn/common/utils/StringUtils.class new file mode 100644 index 0000000..f8b57bd Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/utils/StringUtils.class differ diff --git a/zhn-common/target/classes/com/zhn/common/utils/TelSmsUtils.class b/zhn-common/target/classes/com/zhn/common/utils/TelSmsUtils.class new file mode 100644 index 0000000..db6530a Binary files /dev/null and b/zhn-common/target/classes/com/zhn/common/utils/TelSmsUtils.class differ diff --git a/zhn-common/target/classes/date.txt b/zhn-common/target/classes/date.txt new file mode 100644 index 0000000..b6760bd --- /dev/null +++ b/zhn-common/target/classes/date.txt @@ -0,0 +1 @@ +数据源文件 \ No newline at end of file diff --git a/zhn-gateway/Dockerfile b/zhn-gateway/Dockerfile new file mode 100644 index 0000000..8f51fc2 --- /dev/null +++ b/zhn-gateway/Dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ex_weilingfeng@163.com + +# 挂载目录 +VOLUME /home/zhn +# 创建目录 +RUN mkdir -p /home/zhn +# 指定路径 +WORKDIR /home/zhn +# 复制jar文件到路径 +COPY zhn-gateway/target/zhn-gateway.jar /home/zhn/zhn-gateway.jar +# 启动网关服务 +ENTRYPOINT ["java","-jar","zhn-gateway.jar"] \ No newline at end of file diff --git a/zhn-gateway/pom.xml b/zhn-gateway/pom.xml new file mode 100644 index 0000000..8429d15 --- /dev/null +++ b/zhn-gateway/pom.xml @@ -0,0 +1,54 @@ + + + + zhn-dev + com.zhn + 1.0.0 + + 4.0.0 + + zhn-gateway + + + + + com.zhn + zhn-common + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + com.alibaba.csp + sentinel-spring-cloud-gateway-adapter + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/zhn-gateway/src/main/java/com/zhn/gateway/GatewayMian.java b/zhn-gateway/src/main/java/com/zhn/gateway/GatewayMian.java new file mode 100644 index 0000000..8752176 --- /dev/null +++ b/zhn-gateway/src/main/java/com/zhn/gateway/GatewayMian.java @@ -0,0 +1,14 @@ +package com.zhn.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author zhang + */ +@SpringBootApplication +public class GatewayMian { + public static void main(String[] args) { + SpringApplication.run(GatewayMian.class,args); + } +} diff --git a/zhn-gateway/src/main/java/com/zhn/gateway/config/IgnoreWhiteConfig.java b/zhn-gateway/src/main/java/com/zhn/gateway/config/IgnoreWhiteConfig.java new file mode 100644 index 0000000..54d7f1f --- /dev/null +++ b/zhn-gateway/src/main/java/com/zhn/gateway/config/IgnoreWhiteConfig.java @@ -0,0 +1,32 @@ +package com.zhn.gateway.config; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.extern.log4j.Log4j2; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: 放行白名单配置 + * @author zhn + */ +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "ignore") +@Data +@Log4j2 +public class IgnoreWhiteConfig { + /** + * 放行白名单配置，网关不校验此处的白名单 + */ + private List whites = new ArrayList<>(); + + public void setWhites(List whites) { + log.info("加载网关路径白名单:{}", JSONObject.toJSONString(whites)); + this.whites = whites; + } +} diff --git a/zhn-gateway/src/main/java/com/zhn/gateway/constants/Constants.java b/zhn-gateway/src/main/java/com/zhn/gateway/constants/Constants.java new file mode 100644 index 0000000..8b1a582 --- /dev/null +++ b/zhn-gateway/src/main/java/com/zhn/gateway/constants/Constants.java @@ -0,0 +1,4 @@ +package com.zhn.gateway.constants; + +public class Constants { +} diff --git a/zhn-gateway/src/main/java/com/zhn/gateway/filters/AuthFilters.java b/zhn-gateway/src/main/java/com/zhn/gateway/filters/AuthFilters.java new file mode 100644 index 0000000..a0b50a7 --- /dev/null +++ b/zhn-gateway/src/main/java/com/zhn/gateway/filters/AuthFilters.java @@ -0,0 +1,72 @@ +package com.zhn.gateway.filters; + +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.zhn.common.constants.TokenConstants; +import com.zhn.common.domain.User; +import com.zhn.common.utils.JwtUtils; +import com.zhn.common.utils.StringUtils; +import com.zhn.gateway.config.IgnoreWhiteConfig; +import com.zhn.gateway.utils.GatewayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +import java.util.Date; +import java.util.List; +import java.util.concurrent.TimeUnit; + +@Component +public class AuthFilters implements GlobalFilter, Ordered { + + @Autowired + private IgnoreWhiteConfig ignoreWhitesConfig; + + @Autowired + private RedisTemplate redisTemplate; + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + List whites = ignoreWhitesConfig.getWhites(); + ServerHttpRequest request = exchange.getRequest(); + String path = request.getURI().getPath(); + if (StringUtils.matches(path, whites)) { + return chain.filter(exchange); + } + String token = request.getHeaders().getFirst(TokenConstants.TOKEN); + if (StringUtils.isEmpty(token)) { + return GatewayUtils.errorResponse(exchange, "token不能为空！", HttpStatus.UNAUTHORIZED); + } + try { + JwtUtils.parseToken(token); + } catch (Exception e) { + return GatewayUtils.errorResponse(exchange, "token不合法！"); + } + String userKey = JwtUtils.getUserKey(token); + Boolean hasKey = redisTemplate.hasKey(TokenConstants.LOGIN_TOKEN_KEY + userKey); + if (null == hasKey || !hasKey) { + return GatewayUtils.errorResponse(exchange, "token过期！"); + } + String jsonStr = redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY + userKey); + User user = JSONObject.parseObject(jsonStr, User.class); + Date lastLoginTime = user.getLastLoginTime(); + long between = DateUtil.between(lastLoginTime, new Date(), DateUnit.MINUTE); + if (between >= 10) { + redisTemplate.expire(TokenConstants.LOGIN_TOKEN_KEY + userKey, 15, TimeUnit.MINUTES); + } + // 验证通过放行 + return chain.filter(exchange); + } + + @Override + public int getOrder() { + return 0; + } +} diff --git a/zhn-gateway/src/main/java/com/zhn/gateway/utils/GatewayUtils.java b/zhn-gateway/src/main/java/com/zhn/gateway/utils/GatewayUtils.java new file mode 100644 index 0000000..bfa7346 --- /dev/null +++ b/zhn-gateway/src/main/java/com/zhn/gateway/utils/GatewayUtils.java @@ -0,0 +1,98 @@ +package com.zhn.gateway.utils; + +import com.alibaba.fastjson.JSONObject; +import com.zhn.common.result.Result; +import com.zhn.common.utils.StringUtils; +import lombok.extern.log4j.Log4j2; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +/** + * @author zhn + * @description: 网关处理工具类 + */ +@Log4j2 +public class GatewayUtils { + /** + * 添加请求头参数 + * @param mutate 修改对象 + * @param key 键 + * @param value 值 + */ + public static void addHeader(ServerHttpRequest.Builder mutate, String key, Object value) { + if (StringUtils.isEmpty(key)){ + log.warn("添加请求头参数键不可以为空"); + return; + } + if (value == null) { + log.warn("添加请求头参数：[{}]值为空",key); + return; + } + String valueStr = value.toString(); + mutate.header(key, valueStr); + log.info("添加请求头参数成功 - 键:[{}] , 值:[{}]", key , value); + } + + /** + * 删除请求头参数 + * @param mutate 修改对象 + * @param key 键 + */ + public static void removeHeader(ServerHttpRequest.Builder mutate, String key) { + if (StringUtils.isEmpty(key)){ + log.warn("删除请求头参数键不可以为空"); + return; + } + mutate.headers(httpHeaders -> httpHeaders.remove(key)).build(); + log.info("删除请求头参数 - 键:[{}]",key); + } + + /** + * 错误结果响应 + * @param exchange 响应上下文 + * @param msg 响应消息 + * @return + */ + public static Mono errorResponse(ServerWebExchange exchange, String msg, HttpStatus httpStatus) { + ServerHttpResponse response = exchange.getResponse(); + //设置HTTP响应头状态 + response.setStatusCode(httpStatus); + //设置HTTP响应头文本格式 + response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json"); + //定义响应内容 + Result result = Result.error(msg); + String resultJson = JSONObject.toJSONString(result); + log.error("[鉴权异常处理]请求路径:[{}]，异常信息：[{}]，响应结果：[{}]", exchange.getRequest().getPath(), msg, resultJson); + DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes()); + //进行响应 + return response.writeWith(Mono.just(dataBuffer)); + } + + /** + * 错误结果响应 + * @param exchange 响应上下文 + * @param msg 响应消息 + * @return + */ + public static Mono errorResponse(ServerWebExchange exchange, String msg) { + ServerHttpResponse response = exchange.getResponse(); + //设置HTTP响应头状态 + response.setStatusCode(HttpStatus.OK); + //设置HTTP响应头文本格式 + response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json"); + //定义响应内容 + Result result = Result.error(msg); + String resultJson = JSONObject.toJSONString(result); + log.error("[鉴权异常处理]请求路径:[{}]，异常信息：[{}]，响应结果：[{}]", exchange.getRequest().getPath(), msg, resultJson); + DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes()); + //进行响应 + return response.writeWith(Mono.just(dataBuffer)); + } + + +} diff --git a/zhn-gateway/src/main/resources/bootstrap.yml b/zhn-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..ea9921e --- /dev/null +++ b/zhn-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 18080 +# Spring +spring: + application: + # 应用名称 + name: zhn-gateway + profiles: + # 环境配置 + active: dev + main: + # 允许使用循环引用 + allow-circular-references: true + # 允许定义相同的bean对象去覆盖原有的 + allow-bean-definition-overriding: true + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.2.51:8848 + config: + # 配置中心地址 + server-addr: 192.168.2.51:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zhn-gateway/target/classes/bootstrap.yml b/zhn-gateway/target/classes/bootstrap.yml new file mode 100644 index 0000000..ea9921e --- /dev/null +++ b/zhn-gateway/target/classes/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 18080 +# Spring +spring: + application: + # 应用名称 + name: zhn-gateway + profiles: + # 环境配置 + active: dev + main: + # 允许使用循环引用 + allow-circular-references: true + # 允许定义相同的bean对象去覆盖原有的 + allow-bean-definition-overriding: true + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.2.51:8848 + config: + # 配置中心地址 + server-addr: 192.168.2.51:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zhn-gateway/target/classes/com/zhn/gateway/GatewayMian.class b/zhn-gateway/target/classes/com/zhn/gateway/GatewayMian.class new file mode 100644 index 0000000..7618151 Binary files /dev/null and b/zhn-gateway/target/classes/com/zhn/gateway/GatewayMian.class differ diff --git a/zhn-gateway/target/classes/com/zhn/gateway/config/IgnoreWhiteConfig.class b/zhn-gateway/target/classes/com/zhn/gateway/config/IgnoreWhiteConfig.class new file mode 100644 index 0000000..956d651 Binary files /dev/null and b/zhn-gateway/target/classes/com/zhn/gateway/config/IgnoreWhiteConfig.class differ diff --git a/zhn-gateway/target/classes/com/zhn/gateway/constants/Constants.class b/zhn-gateway/target/classes/com/zhn/gateway/constants/Constants.class new file mode 100644 index 0000000..e9086f4 Binary files /dev/null and b/zhn-gateway/target/classes/com/zhn/gateway/constants/Constants.class differ diff --git a/zhn-gateway/target/classes/com/zhn/gateway/filters/AuthFilters.class b/zhn-gateway/target/classes/com/zhn/gateway/filters/AuthFilters.class new file mode 100644 index 0000000..fd617ff Binary files /dev/null and b/zhn-gateway/target/classes/com/zhn/gateway/filters/AuthFilters.class differ diff --git a/zhn-gateway/target/classes/com/zhn/gateway/utils/GatewayUtils.class b/zhn-gateway/target/classes/com/zhn/gateway/utils/GatewayUtils.class new file mode 100644 index 0000000..3e74818 Binary files /dev/null and b/zhn-gateway/target/classes/com/zhn/gateway/utils/GatewayUtils.class differ diff --git a/zhn-modules/pom.xml b/zhn-modules/pom.xml new file mode 100644 index 0000000..cba07cf --- /dev/null +++ b/zhn-modules/pom.xml @@ -0,0 +1,19 @@ + + + + zhn-dev + com.zhn + 1.0.0 + + 4.0.0 + + zhn-modules + pom + + zhn-system + + + + \ No newline at end of file diff --git a/zhn-modules/zhn-system/Dockerfile b/zhn-modules/zhn-system/Dockerfile new file mode 100644 index 0000000..1dc0431 --- /dev/null +++ b/zhn-modules/zhn-system/Dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ex_weilingfeng + +# 挂载目录 +VOLUME /home/zhn +# 创建目录 +RUN mkdir -p /home/zhn +# 指定路径 +WORKDIR /home/zhn +# 复制jar文件到路径 +COPY zhn-modules/zhn-system/target/zhn-modules-system.jar /home/zhn/zhn-modules-system.jar +# 启动系统服务 +ENTRYPOINT ["java","-jar","zhn-modules-system.jar"] \ No newline at end of file diff --git a/zhn-modules/zhn-system/pom.xml b/zhn-modules/zhn-system/pom.xml new file mode 100644 index 0000000..b655529 --- /dev/null +++ b/zhn-modules/zhn-system/pom.xml @@ -0,0 +1,100 @@ + + + + zhn-modules + com.zhn + 1.0.0 + + 4.0.0 + + zhn-system + + + + + com.zhn + zhn-common + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-websocket + + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-amqp + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + 2.9.10 + + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + + + + org.redisson + redisson + 2.7.0 + + + org.springframework.boot + spring-boot-starter-websocket + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + diff --git a/zhn-modules/zhn-system/src/main/java/com/zhn/system/SystemMian.java b/zhn-modules/zhn-system/src/main/java/com/zhn/system/SystemMian.java new file mode 100644 index 0000000..b41b75c --- /dev/null +++ b/zhn-modules/zhn-system/src/main/java/com/zhn/system/SystemMian.java @@ -0,0 +1,15 @@ +package com.zhn.system; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.scheduling.annotation.EnableScheduling; + +@SpringBootApplication +@EnableFeignClients +@EnableScheduling +public class SystemMian { + public static void main(String[] args) { + SpringApplication.run(SystemMian.class, args); + } +} diff --git a/zhn-modules/zhn-system/src/main/java/com/zhn/system/controller/UserController.java b/zhn-modules/zhn-system/src/main/java/com/zhn/system/controller/UserController.java new file mode 100644 index 0000000..4e75dc2 --- /dev/null +++ b/zhn-modules/zhn-system/src/main/java/com/zhn/system/controller/UserController.java @@ -0,0 +1,42 @@ +package com.zhn.system.controller; + + +import com.zhn.common.domain.User; +import com.zhn.common.domain.request.RequestUser; +import com.zhn.common.result.Result; +import com.zhn.system.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 作者:zhn + * \/\n + * 描述:用户控制层 + */ + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@RequestMapping("/user") +public class UserController { + + + @Autowired + UserService userService; + @GetMapping("/byphone/{phone}") + Result byphone(@PathVariable String phone){ + + return userService.byphone(phone); + } + + + @PostMapping("/updateUser") + Result updateUser(@RequestBody RequestUser requestUser){ + + return userService.updateUser(requestUser); + } + + +} diff --git a/zhn-modules/zhn-system/src/main/java/com/zhn/system/mapper/UserMapper.java b/zhn-modules/zhn-system/src/main/java/com/zhn/system/mapper/UserMapper.java new file mode 100644 index 0000000..dddf2ef --- /dev/null +++ b/zhn-modules/zhn-system/src/main/java/com/zhn/system/mapper/UserMapper.java @@ -0,0 +1,15 @@ +package com.zhn.system.mapper; + + +import com.zhn.common.domain.User; +import com.zhn.common.domain.request.RequestUser; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface UserMapper { + User byphone(@Param("phone") String phone); + int updatemenoy(RequestUser requestUser); + + +} diff --git a/zhn-modules/zhn-system/src/main/java/com/zhn/system/service/UserService.java b/zhn-modules/zhn-system/src/main/java/com/zhn/system/service/UserService.java new file mode 100644 index 0000000..3a901ce --- /dev/null +++ b/zhn-modules/zhn-system/src/main/java/com/zhn/system/service/UserService.java @@ -0,0 +1,11 @@ +package com.zhn.system.service; + +import com.zhn.common.domain.User; +import com.zhn.common.domain.request.RequestUser; +import com.zhn.common.result.Result; + +public interface UserService { + Result byphone(String phone); + + Result updateUser(RequestUser requestUser); +} diff --git a/zhn-modules/zhn-system/src/main/java/com/zhn/system/service/impl/UserServiceImpl.java b/zhn-modules/zhn-system/src/main/java/com/zhn/system/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..128a871 --- /dev/null +++ b/zhn-modules/zhn-system/src/main/java/com/zhn/system/service/impl/UserServiceImpl.java @@ -0,0 +1,28 @@ +package com.zhn.system.service.impl; + + +import com.zhn.common.domain.User; +import com.zhn.common.domain.request.RequestUser; +import com.zhn.common.result.Result; +import com.zhn.system.mapper.UserMapper; +import com.zhn.system.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class UserServiceImpl implements UserService { + @Autowired + UserMapper userMapper; + + @Override + public Result byphone(String phone) { + User user = userMapper.byphone(phone); + + return Result.success(user); + } + @Override + public Result updateUser(RequestUser requestUser) { + return null; + } + +} diff --git a/zhn-modules/zhn-system/src/main/resources/bootstrap.yml b/zhn-modules/zhn-system/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..2ea14ff --- /dev/null +++ b/zhn-modules/zhn-system/src/main/resources/bootstrap.yml @@ -0,0 +1,42 @@ +server: + port: 9002 + +spring: + main: + allow-bean-definition-overriding: true + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + name: zhn-system + profiles: + active: dev + cloud: + nacos: + discovery: + server-addr: 192.168.2.51:8848 + config: + server-addr: 192.168.2.51:8848 + file-extension: yml + shared-configs: + - "application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}" + rabbitmq: + host: 124.222.164.80 + port: 5672 + username: guest + password: guest + virtualHost: / + listener: + simple: + prefetch: 1 + acknowledge-mode: manual + retry: + enabled: true + publisher-confirm-type: correlated + publisher-returns: true + +es: + host: 124.222.164.80 + port: 9200 + scheme: http diff --git a/zhn-modules/zhn-system/src/main/resources/mappers/UserMapper.xml b/zhn-modules/zhn-system/src/main/resources/mappers/UserMapper.xml new file mode 100644 index 0000000..6b5cbc5 --- /dev/null +++ b/zhn-modules/zhn-system/src/main/resources/mappers/UserMapper.xml @@ -0,0 +1,22 @@ + + + + + update user + set balance = #{balance} + where username = #{username}; + + + + + + + diff --git a/zhn-modules/zhn-system/target/classes/bootstrap.yml b/zhn-modules/zhn-system/target/classes/bootstrap.yml new file mode 100644 index 0000000..2ea14ff --- /dev/null +++ b/zhn-modules/zhn-system/target/classes/bootstrap.yml @@ -0,0 +1,42 @@ +server: + port: 9002 + +spring: + main: + allow-bean-definition-overriding: true + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + name: zhn-system + profiles: + active: dev + cloud: + nacos: + discovery: + server-addr: 192.168.2.51:8848 + config: + server-addr: 192.168.2.51:8848 + file-extension: yml + shared-configs: + - "application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}" + rabbitmq: + host: 124.222.164.80 + port: 5672 + username: guest + password: guest + virtualHost: / + listener: + simple: + prefetch: 1 + acknowledge-mode: manual + retry: + enabled: true + publisher-confirm-type: correlated + publisher-returns: true + +es: + host: 124.222.164.80 + port: 9200 + scheme: http diff --git a/zhn-modules/zhn-system/target/classes/com/zhn/system/SystemMian.class b/zhn-modules/zhn-system/target/classes/com/zhn/system/SystemMian.class new file mode 100644 index 0000000..6111c4a Binary files /dev/null and b/zhn-modules/zhn-system/target/classes/com/zhn/system/SystemMian.class differ diff --git a/zhn-modules/zhn-system/target/classes/com/zhn/system/controller/UserController.class b/zhn-modules/zhn-system/target/classes/com/zhn/system/controller/UserController.class new file mode 100644 index 0000000..1f00ce5 Binary files /dev/null and b/zhn-modules/zhn-system/target/classes/com/zhn/system/controller/UserController.class differ diff --git a/zhn-modules/zhn-system/target/classes/com/zhn/system/mapper/UserMapper.class b/zhn-modules/zhn-system/target/classes/com/zhn/system/mapper/UserMapper.class new file mode 100644 index 0000000..8e09d51 Binary files /dev/null and b/zhn-modules/zhn-system/target/classes/com/zhn/system/mapper/UserMapper.class differ diff --git a/zhn-modules/zhn-system/target/classes/com/zhn/system/service/UserService.class b/zhn-modules/zhn-system/target/classes/com/zhn/system/service/UserService.class new file mode 100644 index 0000000..b326d5a Binary files /dev/null and b/zhn-modules/zhn-system/target/classes/com/zhn/system/service/UserService.class differ diff --git a/zhn-modules/zhn-system/target/classes/com/zhn/system/service/impl/UserServiceImpl.class b/zhn-modules/zhn-system/target/classes/com/zhn/system/service/impl/UserServiceImpl.class new file mode 100644 index 0000000..80be7e2 Binary files /dev/null and b/zhn-modules/zhn-system/target/classes/com/zhn/system/service/impl/UserServiceImpl.class differ diff --git a/zhn-modules/zhn-system/target/classes/mappers/UserMapper.xml b/zhn-modules/zhn-system/target/classes/mappers/UserMapper.xml new file mode 100644 index 0000000..6b5cbc5 --- /dev/null +++ b/zhn-modules/zhn-system/target/classes/mappers/UserMapper.xml @@ -0,0 +1,22 @@ + + + + + update user + set balance = #{balance} + where username = #{username}; + + + + + + + diff --git a/zhn-vue-ui/.editorconfig b/zhn-vue-ui/.editorconfig new file mode 100644 index 0000000..ea6e20f --- /dev/null +++ b/zhn-vue-ui/.editorconfig @@ -0,0 +1,14 @@ +# http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/zhn-vue-ui/.env.development b/zhn-vue-ui/.env.development new file mode 100644 index 0000000..de583d0 --- /dev/null +++ b/zhn-vue-ui/.env.development @@ -0,0 +1,5 @@ +# just a flag +ENV = 'development' + +# base api +VUE_APP_BASE_API = '/dev-api' diff --git a/zhn-vue-ui/.env.production b/zhn-vue-ui/.env.production new file mode 100644 index 0000000..80c8103 --- /dev/null +++ b/zhn-vue-ui/.env.production @@ -0,0 +1,6 @@ +# just a flag +ENV = 'production' + +# base api +VUE_APP_BASE_API = '/prod-api' + diff --git a/zhn-vue-ui/.env.staging b/zhn-vue-ui/.env.staging new file mode 100644 index 0000000..a8793a0 --- /dev/null +++ b/zhn-vue-ui/.env.staging @@ -0,0 +1,8 @@ +NODE_ENV = production + +# just a flag +ENV = 'staging' + +# base api +VUE_APP_BASE_API = '/stage-api' + diff --git a/zhn-vue-ui/.eslintignore b/zhn-vue-ui/.eslintignore new file mode 100644 index 0000000..36d5749 --- /dev/null +++ b/zhn-vue-ui/.eslintignore @@ -0,0 +1,5 @@ +build/*.js +src/assets +public +dist +* diff --git a/zhn-vue-ui/.eslintrc.js b/zhn-vue-ui/.eslintrc.js new file mode 100644 index 0000000..c977505 --- /dev/null +++ b/zhn-vue-ui/.eslintrc.js @@ -0,0 +1,198 @@ +module.exports = { + root: true, + parserOptions: { + parser: 'babel-eslint', + sourceType: 'module' + }, + env: { + browser: true, + node: true, + es6: true, + }, + extends: ['plugin:vue/recommended', 'eslint:recommended'], + + // add your custom rules here + //it is base on https://github.com/vuejs/eslint-config-vue + rules: { + "vue/max-attributes-per-line": [2, { + "singleline": 10, + "multiline": { + "max": 1, + "allowFirstLine": false + } + }], + "vue/singleline-html-element-content-newline": "off", + "vue/multiline-html-element-content-newline":"off", + "vue/name-property-casing": ["error", "PascalCase"], + "vue/no-v-html": "off", + 'accessor-pairs': 2, + 'arrow-spacing': [2, { + 'before': true, + 'after': true + }], + 'block-spacing': [2, 'always'], + 'brace-style': [2, '1tbs', { + 'allowSingleLine': true + }], + 'camelcase': [0, { + 'properties': 'always' + }], + 'comma-dangle': [2, 'never'], + 'comma-spacing': [2, { + 'before': false, + 'after': true + }], + 'comma-style': [2, 'last'], + 'constructor-super': 2, + 'curly': [2, 'multi-line'], + 'dot-location': [2, 'property'], + 'eol-last': 2, + 'eqeqeq': ["error", "always", {"null": "ignore"}], + 'generator-star-spacing': [2, { + 'before': true, + 'after': true + }], + 'handle-callback-err': [2, '^(err|error)$'], + 'indent': [2, 2, { + 'SwitchCase': 1 + }], + 'jsx-quotes': [2, 'prefer-single'], + 'key-spacing': [2, { + 'beforeColon': false, + 'afterColon': true + }], + 'keyword-spacing': [2, { + 'before': true, + 'after': true + }], + 'new-cap': [2, { + 'newIsCap': true, + 'capIsNew': false + }], + 'new-parens': 2, + 'no-array-constructor': 2, + 'no-caller': 2, + 'no-console': 'off', + 'no-class-assign': 2, + 'no-cond-assign': 2, + 'no-const-assign': 2, + 'no-control-regex': 0, + 'no-delete-var': 2, + 'no-dupe-args': 2, + 'no-dupe-class-members': 2, + 'no-dupe-keys': 2, + 'no-duplicate-case': 2, + 'no-empty-character-class': 2, + 'no-empty-pattern': 2, + 'no-eval': 2, + 'no-ex-assign': 2, + 'no-extend-native': 2, + 'no-extra-bind': 2, + 'no-extra-boolean-cast': 2, + 'no-extra-parens': [2, 'functions'], + 'no-fallthrough': 2, + 'no-floating-decimal': 2, + 'no-func-assign': 2, + 'no-implied-eval': 2, + 'no-inner-declarations': [2, 'functions'], + 'no-invalid-regexp': 2, + 'no-irregular-whitespace': 2, + 'no-iterator': 2, + 'no-label-var': 2, + 'no-labels': [2, { + 'allowLoop': false, + 'allowSwitch': false + }], + 'no-lone-blocks': 2, + 'no-mixed-spaces-and-tabs': 2, + 'no-multi-spaces': 2, + 'no-multi-str': 2, + 'no-multiple-empty-lines': [2, { + 'max': 1 + }], + 'no-native-reassign': 2, + 'no-negated-in-lhs': 2, + 'no-new-object': 2, + 'no-new-require': 2, + 'no-new-symbol': 2, + 'no-new-wrappers': 2, + 'no-obj-calls': 2, + 'no-octal': 2, + 'no-octal-escape': 2, + 'no-path-concat': 2, + 'no-proto': 2, + 'no-redeclare': 2, + 'no-regex-spaces': 2, + 'no-return-assign': [2, 'except-parens'], + 'no-self-assign': 2, + 'no-self-compare': 2, + 'no-sequences': 2, + 'no-shadow-restricted-names': 2, + 'no-spaced-func': 2, + 'no-sparse-arrays': 2, + 'no-this-before-super': 2, + 'no-throw-literal': 2, + 'no-trailing-spaces': 2, + 'no-undef': 2, + 'no-undef-init': 2, + 'no-unexpected-multiline': 2, + 'no-unmodified-loop-condition': 2, + 'no-unneeded-ternary': [2, { + 'defaultAssignment': false + }], + 'no-unreachable': 2, + 'no-unsafe-finally': 2, + 'no-unused-vars': [2, { + 'vars': 'all', + 'args': 'none' + }], + 'no-useless-call': 2, + 'no-useless-computed-key': 2, + 'no-useless-constructor': 2, + 'no-useless-escape': 0, + 'no-whitespace-before-property': 2, + 'no-with': 2, + 'one-var': [2, { + 'initialized': 'never' + }], + 'operator-linebreak': [2, 'after', { + 'overrides': { + '?': 'before', + ':': 'before' + } + }], + 'padded-blocks': [2, 'never'], + 'quotes': [2, 'single', { + 'avoidEscape': true, + 'allowTemplateLiterals': true + }], + 'semi': [2, 'never'], + 'semi-spacing': [2, { + 'before': false, + 'after': true + }], + 'space-before-blocks': [2, 'always'], + 'space-before-function-paren': [2, 'never'], + 'space-in-parens': [2, 'never'], + 'space-infix-ops': 2, + 'space-unary-ops': [2, { + 'words': true, + 'nonwords': false + }], + 'spaced-comment': [2, 'always', { + 'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] + }], + 'template-curly-spacing': [2, 'never'], + 'use-isnan': 2, + 'valid-typeof': 2, + 'wrap-iife': [2, 'any'], + 'yield-star-spacing': [2, 'both'], + 'yoda': [2, 'never'], + 'prefer-const': 2, + 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, + 'object-curly-spacing': [2, 'always', { + objectsInObjects: false + }], + 'array-bracket-spacing': [2, 'never'] + } +} diff --git a/zhn-vue-ui/.gitignore b/zhn-vue-ui/.gitignore new file mode 100644 index 0000000..9ad28d2 --- /dev/null +++ b/zhn-vue-ui/.gitignore @@ -0,0 +1,16 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +package-lock.json +tests/**/coverage/ + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln diff --git a/zhn-vue-ui/.travis.yml b/zhn-vue-ui/.travis.yml new file mode 100644 index 0000000..f4be7a0 --- /dev/null +++ b/zhn-vue-ui/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +node_js: 10 +script: npm run test +notifications: + email: false diff --git a/zhn-vue-ui/LICENSE b/zhn-vue-ui/LICENSE new file mode 100644 index 0000000..6151575 --- /dev/null +++ b/zhn-vue-ui/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017-present PanJiaChen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/zhn-vue-ui/README-zh.md b/zhn-vue-ui/README-zh.md new file mode 100644 index 0000000..1beec9b --- /dev/null +++ b/zhn-vue-ui/README-zh.md @@ -0,0 +1,111 @@ +# vue-admin-template + +> 这是一个极简的 vue admin 管理后台。它只包含了 Element UI & axios & iconfont & permission control & lint，这些搭建后台必要的东西。 + +[线上地址](http://panjiachen.github.io/vue-admin-template) + +[国内访问](https://panjiachen.gitee.io/vue-admin-template) + +目前版本为 `v4.0+` 基于 `vue-cli` 进行构建，若你想使用旧版本，可以切换分支到[tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0)，它不依赖 `vue-cli`。 + +

+ SPONSORED BY +

+ + + +

+ +## Extra + +如果你想要根据用户角色来动态生成侧边栏和 router，你可以使用该分支[permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control) + +## 相关项目 + +- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) + +- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin) + +- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) + +- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312) + +写了一个系列的教程配套文章，如何从零构建后一个完整的后台项目: + +- [手摸手，带你用 vue 撸后台系列一(基础篇)](https://juejin.im/post/59097cd7a22b9d0065fb61d2) +- [手摸手，带你用 vue 撸后台系列二(登录权限篇)](https://juejin.im/post/591aa14f570c35006961acac) +- [手摸手，带你用 vue 撸后台系列三 (实战篇)](https://juejin.im/post/593121aa0ce4630057f70d35) +- [手摸手，带你用 vue 撸后台系列四(vueAdmin 一个极简的后台基础模板,专门针对本项目的文章,算作是一篇文档)](https://juejin.im/post/595b4d776fb9a06bbe7dba56) +- [手摸手，带你封装一个 vue component](https://segmentfault.com/a/1190000009090836) + +## Build Setup + +```bash +# 克隆项目 +git clone https://github.com/PanJiaChen/vue-admin-template.git + +# 进入项目目录 +cd vue-admin-template + +# 安装依赖 +npm install + +# 建议不要直接使用 cnpm 安装以来，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 +npm install --registry=https://registry.npm.taobao.org + +# 启动服务 +npm run dev +``` + +浏览器访问 [http://localhost:9528](http://localhost:9528) + +## 发布 + +```bash +# 构建测试环境 +npm run build:stage + +# 构建生产环境 +npm run build:prod +``` + +## 其它 + +```bash +# 预览发布环境效果 +npm run preview + +# 预览发布环境效果 + 静态资源分析 +npm run preview -- --report + +# 代码格式检查 +npm run lint + +# 代码格式检查并自动修复 +npm run lint -- --fix +``` + +更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/zh/) + +## 购买贴纸 + +你也可以通过购买[官方授权的贴纸](https://smallsticker.com/product/vue-element-admin) 的方式来支持 vue-element-admin - 每售出一张贴纸，我们将获得 2 元的捐赠。 + +## Demo + +![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif) + +## Browsers support + +Modern browsers and Internet Explorer 10+. + +| [

](http://godban.github.io/browsers-support-badges/)
IE / Edge | [

](http://godban.github.io/browsers-support-badges/)
Firefox | [

](http://godban.github.io/browsers-support-badges/)
Chrome | [

+ SPONSORED BY +

+ + + +

+ +## Build Setup + +```bash +# clone the project +git clone https://github.com/PanJiaChen/vue-admin-template.git + +# enter the project directory +cd vue-admin-template + +# install dependency +npm install + +# develop +npm run dev +``` + +This will automatically open http://localhost:9528 + +## Build + +```bash +# build for test environment +npm run build:stage + +# build for production environment +npm run build:prod +``` + +## Advanced + +```bash +# preview the release environment effect +npm run preview + +# preview the release environment effect + static resource analysis +npm run preview -- --report + +# code format check +npm run lint + +# code format check and auto fix +npm run lint -- --fix +``` + +Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information + +## Demo + +![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif) + +## Extra + +If you want router permission && generate menu by user roles , you can use this branch [permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control) + +For `typescript` version, you can use [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Credits: [@Armour](https://github.com/Armour)) + +## Related Project + +- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) + +- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin) + +- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) + +- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312) + +## Browsers support + +Modern browsers and Internet Explorer 10+. + +| [

](http://godban.github.io/browsers-support-badges/)
IE / Edge | [

](http://godban.github.io/browsers-support-badges/)
Firefox | [

](http://godban.github.io/browsers-support-badges/)
Chrome | [

](http://godban.github.io/browsers-support-badges/)
Safari | +| --------- | --------- | --------- | --------- | +| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions + +## License + +[MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license. + +Copyright (c) 2017-present PanJiaChen diff --git a/zhn-vue-ui/babel.config.js b/zhn-vue-ui/babel.config.js new file mode 100644 index 0000000..fb82b27 --- /dev/null +++ b/zhn-vue-ui/babel.config.js @@ -0,0 +1,14 @@ +module.exports = { + presets: [ + // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app + '@vue/cli-plugin-babel/preset' + ], + 'env': { + 'development': { + // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). + // This plugin can significantly increase the speed of hot updates, when you have a large number of pages. + // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html + 'plugins': ['dynamic-import-node'] + } + } +} diff --git a/zhn-vue-ui/build/index.js b/zhn-vue-ui/build/index.js new file mode 100644 index 0000000..0c57de2 --- /dev/null +++ b/zhn-vue-ui/build/index.js @@ -0,0 +1,35 @@ +const { run } = require('runjs') +const chalk = require('chalk') +const config = require('../vue.config.js') +const rawArgv = process.argv.slice(2) +const args = rawArgv.join(' ') + +if (process.env.npm_config_preview || rawArgv.includes('--preview')) { + const report = rawArgv.includes('--report') + + run(`vue-cli-service build ${args}`) + + const port = 9526 + const publicPath = config.publicPath + + var connect = require('connect') + var serveStatic = require('serve-static') + const app = connect() + + app.use( + publicPath, + serveStatic('./dist', { + index: ['index.html', '/'] + }) + ) + + app.listen(port, function () { + console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) + if (report) { + console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) + } + + }) +} else { + run(`vue-cli-service build ${args}`) +} diff --git a/zhn-vue-ui/jest.config.js b/zhn-vue-ui/jest.config.js new file mode 100644 index 0000000..143cdc8 --- /dev/null +++ b/zhn-vue-ui/jest.config.js @@ -0,0 +1,24 @@ +module.exports = { + moduleFileExtensions: ['js', 'jsx', 'json', 'vue'], + transform: { + '^.+\\.vue$': 'vue-jest', + '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': + 'jest-transform-stub', + '^.+\\.jsx?$': 'babel-jest' + }, + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + snapshotSerializers: ['jest-serializer-vue'], + testMatch: [ + '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)' + ], + collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'], + coverageDirectory: '/tests/unit/coverage', + // 'collectCoverage': true, + 'coverageReporters': [ + 'lcov', + 'text-summary' + ], + testURL: 'http://localhost/' +} diff --git a/zhn-vue-ui/jsconfig.json b/zhn-vue-ui/jsconfig.json new file mode 100644 index 0000000..ed079e2 --- /dev/null +++ b/zhn-vue-ui/jsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": "./", + "paths": { + "@/*": ["src/*"] + } + }, + "exclude": ["node_modules", "dist"] +} diff --git a/zhn-vue-ui/package.json b/zhn-vue-ui/package.json new file mode 100644 index 0000000..2413824 --- /dev/null +++ b/zhn-vue-ui/package.json @@ -0,0 +1,62 @@ +{ + "name": "vue-admin-template", + "version": "4.4.0", + "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", + "author": "Pan ", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml", + "lint": "eslint --ext .js,.vue src", + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "test:ci": "npm run lint && npm run test:unit" + }, + "dependencies": { + "axios": "0.18.1", + "core-js": "3.6.5", + "element-ui": "2.13.2", + "js-cookie": "2.2.0", + "normalize.css": "7.0.0", + "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", + "vue": "2.6.10", + "vue-router": "3.0.6", + "vuex": "3.1.0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "4.4.4", + "@vue/cli-plugin-eslint": "4.4.4", + "@vue/cli-plugin-unit-jest": "4.4.4", + "@vue/cli-service": "4.4.4", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "9.5.1", + "babel-eslint": "10.1.0", + "babel-jest": "23.6.0", + "babel-plugin-dynamic-import-node": "2.3.3", + "chalk": "2.4.2", + "connect": "3.6.6", + "eslint": "6.7.2", + "eslint-plugin-vue": "6.2.2", + "html-webpack-plugin": "3.2.0", + "mockjs": "1.0.1-beta3", + "runjs": "4.3.2", + "sass": "1.26.8", + "sass-loader": "8.0.2", + "script-ext-html-webpack-plugin": "2.1.3", + "serve-static": "1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.2", + "vue-template-compiler": "2.6.10" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ], + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "license": "MIT" +} diff --git a/zhn-vue-ui/postcss.config.js b/zhn-vue-ui/postcss.config.js new file mode 100644 index 0000000..10473ef --- /dev/null +++ b/zhn-vue-ui/postcss.config.js @@ -0,0 +1,8 @@ +// https://github.com/michael-ciniawsky/postcss-load-config + +module.exports = { + 'plugins': { + // to edit target browsers: use "browserslist" field in package.json + 'autoprefixer': {} + } +} diff --git a/zhn-vue-ui/public/favicon.ico b/zhn-vue-ui/public/favicon.ico new file mode 100644 index 0000000..34b63ac Binary files /dev/null and b/zhn-vue-ui/public/favicon.ico differ diff --git a/zhn-vue-ui/public/index.html b/zhn-vue-ui/public/index.html new file mode 100644 index 0000000..fa2be91 --- /dev/null +++ b/zhn-vue-ui/public/index.html @@ -0,0 +1,17 @@ + + + + + + + + <%= webpackConfig.name %> + + + +

+ + + diff --git a/zhn-vue-ui/src/App.vue b/zhn-vue-ui/src/App.vue new file mode 100644 index 0000000..ec9032c --- /dev/null +++ b/zhn-vue-ui/src/App.vue @@ -0,0 +1,11 @@ + + + diff --git a/zhn-vue-ui/src/api/table.js b/zhn-vue-ui/src/api/table.js new file mode 100644 index 0000000..2752f52 --- /dev/null +++ b/zhn-vue-ui/src/api/table.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/vue-admin-template/table/list', + method: 'get', + params + }) +} diff --git a/zhn-vue-ui/src/api/user.js b/zhn-vue-ui/src/api/user.js new file mode 100644 index 0000000..b4d4434 --- /dev/null +++ b/zhn-vue-ui/src/api/user.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function login(data) { + return request({ + url: '/login', + method: 'post', + data + }) +} + +export function getInfo(token) { + return request({ + url: '/auth/user/info', + method: 'get', + params: { token } + }) +} + +export function logout() { + return request({ + url: '/auth/user/logout', + method: 'post' + }) +} diff --git a/zhn-vue-ui/src/assets/404_images/404.png b/zhn-vue-ui/src/assets/404_images/404.png new file mode 100644 index 0000000..3d8e230 Binary files /dev/null and b/zhn-vue-ui/src/assets/404_images/404.png differ diff --git a/zhn-vue-ui/src/assets/404_images/404_cloud.png b/zhn-vue-ui/src/assets/404_images/404_cloud.png new file mode 100644 index 0000000..c6281d0 Binary files /dev/null and b/zhn-vue-ui/src/assets/404_images/404_cloud.png differ diff --git a/zhn-vue-ui/src/components/Breadcrumb/index.vue b/zhn-vue-ui/src/components/Breadcrumb/index.vue new file mode 100644 index 0000000..29f9a04 --- /dev/null +++ b/zhn-vue-ui/src/components/Breadcrumb/index.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/zhn-vue-ui/src/components/Hamburger/index.vue b/zhn-vue-ui/src/components/Hamburger/index.vue new file mode 100644 index 0000000..368b002 --- /dev/null +++ b/zhn-vue-ui/src/components/Hamburger/index.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/zhn-vue-ui/src/components/SvgIcon/index.vue b/zhn-vue-ui/src/components/SvgIcon/index.vue new file mode 100644 index 0000000..b07ded2 --- /dev/null +++ b/zhn-vue-ui/src/components/SvgIcon/index.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/zhn-vue-ui/src/icons/index.js b/zhn-vue-ui/src/icons/index.js new file mode 100644 index 0000000..2c6b309 --- /dev/null +++ b/zhn-vue-ui/src/icons/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/zhn-vue-ui/src/icons/svg/dashboard.svg b/zhn-vue-ui/src/icons/svg/dashboard.svg new file mode 100644 index 0000000..5317d37 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/example.svg b/zhn-vue-ui/src/icons/svg/example.svg new file mode 100644 index 0000000..46f42b5 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/example.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/eye-open.svg b/zhn-vue-ui/src/icons/svg/eye-open.svg new file mode 100644 index 0000000..88dcc98 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/eye-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/eye.svg b/zhn-vue-ui/src/icons/svg/eye.svg new file mode 100644 index 0000000..16ed2d8 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/form.svg b/zhn-vue-ui/src/icons/svg/form.svg new file mode 100644 index 0000000..dcbaa18 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/link.svg b/zhn-vue-ui/src/icons/svg/link.svg new file mode 100644 index 0000000..48197ba --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/nested.svg b/zhn-vue-ui/src/icons/svg/nested.svg new file mode 100644 index 0000000..06713a8 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/password.svg b/zhn-vue-ui/src/icons/svg/password.svg new file mode 100644 index 0000000..e291d85 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/table.svg b/zhn-vue-ui/src/icons/svg/table.svg new file mode 100644 index 0000000..0e3dc9d --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/tree.svg b/zhn-vue-ui/src/icons/svg/tree.svg new file mode 100644 index 0000000..dd4b7dd --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svg/user.svg b/zhn-vue-ui/src/icons/svg/user.svg new file mode 100644 index 0000000..0ba0716 --- /dev/null +++ b/zhn-vue-ui/src/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/zhn-vue-ui/src/icons/svgo.yml b/zhn-vue-ui/src/icons/svgo.yml new file mode 100644 index 0000000..d11906a --- /dev/null +++ b/zhn-vue-ui/src/icons/svgo.yml @@ -0,0 +1,22 @@ +# replace default config + +# multipass: true +# full: true + +plugins: + + # - name + # + # or: + # - name: false + # - name: true + # + # or: + # - name: + # param1: 1 + # param2: 2 + +- removeAttrs: + attrs: + - 'fill' + - 'fill-rule' diff --git a/zhn-vue-ui/src/layout/components/AppMain.vue b/zhn-vue-ui/src/layout/components/AppMain.vue new file mode 100644 index 0000000..f6a3286 --- /dev/null +++ b/zhn-vue-ui/src/layout/components/AppMain.vue @@ -0,0 +1,40 @@ + + + + + + + diff --git a/zhn-vue-ui/src/layout/components/Navbar.vue b/zhn-vue-ui/src/layout/components/Navbar.vue new file mode 100644 index 0000000..2d7c925 --- /dev/null +++ b/zhn-vue-ui/src/layout/components/Navbar.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/zhn-vue-ui/src/layout/components/Sidebar/FixiOSBug.js b/zhn-vue-ui/src/layout/components/Sidebar/FixiOSBug.js new file mode 100644 index 0000000..bc14856 --- /dev/null +++ b/zhn-vue-ui/src/layout/components/Sidebar/FixiOSBug.js @@ -0,0 +1,26 @@ +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + // https://github.com/PanJiaChen/vue-element-admin/issues/1135 + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/zhn-vue-ui/src/layout/components/Sidebar/Item.vue b/zhn-vue-ui/src/layout/components/Sidebar/Item.vue new file mode 100644 index 0000000..eacd224 --- /dev/null +++ b/zhn-vue-ui/src/layout/components/Sidebar/Item.vue @@ -0,0 +1,42 @@ + + + + diff --git a/zhn-vue-ui/src/layout/components/Sidebar/Link.vue b/zhn-vue-ui/src/layout/components/Sidebar/Link.vue new file mode 100644 index 0000000..81a90a5 --- /dev/null +++ b/zhn-vue-ui/src/layout/components/Sidebar/Link.vue @@ -0,0 +1,44 @@ + + + diff --git a/zhn-vue-ui/src/layout/components/Sidebar/Logo.vue b/zhn-vue-ui/src/layout/components/Sidebar/Logo.vue new file mode 100644 index 0000000..9a4ef26 --- /dev/null +++ b/zhn-vue-ui/src/layout/components/Sidebar/Logo.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/zhn-vue-ui/src/layout/components/Sidebar/SidebarItem.vue b/zhn-vue-ui/src/layout/components/Sidebar/SidebarItem.vue new file mode 100644 index 0000000..1c082bb --- /dev/null +++ b/zhn-vue-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -0,0 +1,95 @@ + + + diff --git a/zhn-vue-ui/src/layout/components/Sidebar/index.vue b/zhn-vue-ui/src/layout/components/Sidebar/index.vue new file mode 100644 index 0000000..db74ac8 --- /dev/null +++ b/zhn-vue-ui/src/layout/components/Sidebar/index.vue @@ -0,0 +1,57 @@ + + + + diff --git a/zhn-vue-ui/src/layout/components/index.js b/zhn-vue-ui/src/layout/components/index.js new file mode 100644 index 0000000..97ee3cd --- /dev/null +++ b/zhn-vue-ui/src/layout/components/index.js @@ -0,0 +1,3 @@ +export { default as Navbar } from './Navbar' +export { default as Sidebar } from './Sidebar' +export { default as AppMain } from './AppMain' diff --git a/zhn-vue-ui/src/layout/index.vue b/zhn-vue-ui/src/layout/index.vue new file mode 100644 index 0000000..efef63e --- /dev/null +++ b/zhn-vue-ui/src/layout/index.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/zhn-vue-ui/src/layout/mixin/ResizeHandler.js b/zhn-vue-ui/src/layout/mixin/ResizeHandler.js new file mode 100644 index 0000000..e8d0df8 --- /dev/null +++ b/zhn-vue-ui/src/layout/mixin/ResizeHandler.js @@ -0,0 +1,45 @@ +import store from '@/store' + +const { body } = document +const WIDTH = 992 // refer to Bootstrap's responsive design + +export default { + watch: { + $route(route) { + if (this.device === 'mobile' && this.sidebar.opened) { + store.dispatch('app/closeSideBar', { withoutAnimation: false }) + } + } + }, + beforeMount() { + window.addEventListener('resize', this.$_resizeHandler) + }, + beforeDestroy() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + mounted() { + const isMobile = this.$_isMobile() + if (isMobile) { + store.dispatch('app/toggleDevice', 'mobile') + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_isMobile() { + const rect = body.getBoundingClientRect() + return rect.width - 1 < WIDTH + }, + $_resizeHandler() { + if (!document.hidden) { + const isMobile = this.$_isMobile() + store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') + + if (isMobile) { + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + } + } + } +} diff --git a/zhn-vue-ui/src/main.js b/zhn-vue-ui/src/main.js new file mode 100644 index 0000000..7a1bf73 --- /dev/null +++ b/zhn-vue-ui/src/main.js @@ -0,0 +1,42 @@ +import Vue from 'vue' + +import 'normalize.css/normalize.css' // A modern alternative to CSS resets + +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' +import locale from 'element-ui/lib/locale/lang/en' // lang i18n + +import '@/styles/index.scss' // global css + +import App from './App' +import store from './store' +import router from './router' + +import '@/icons' // icon +import '@/permission' // permission control + +/** + 如果您不想使用模拟服务器 + 你想使用 MockJs 作为模拟 API + 你可以执行： mockXHR（） + 目前 MockJs 将在生产环境中使用, + 请在上线前将其删除 ! ! ! + */ +if (process.env.NODE_ENV === 'production') { + const { mockXHR } = require('../mock') + mockXHR() +} + +// set ElementUI lang to EN +Vue.use(ElementUI, { locale }) +// 如果想要中文版 element-ui，按如下方式声明 +// Vue.use(ElementUI) +//生产提示 +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/zhn-vue-ui/src/permission.js b/zhn-vue-ui/src/permission.js new file mode 100644 index 0000000..e5fbcbe --- /dev/null +++ b/zhn-vue-ui/src/permission.js @@ -0,0 +1,67 @@ +import router from './router' +import store from './store' +import { Message } from 'element-ui' +import NProgress from 'nprogress' // progress bar +import 'nprogress/nprogress.css' // progress bar style +import { getToken } from '@/utils/auth' // get token from cookie +import getPageTitle from '@/utils/get-page-title' + +NProgress.configure({ showSpinner: false }) // NProgress Configuration + +const whiteList = ['/login'] // 无重定向白名单 + +router.beforeEach(async(to, from, next) => { + // start progress bar + NProgress.start() + + // set page title + document.title = getPageTitle(to.meta.title) + + // determine whether the user has logged in + const hasToken = getToken() + +// 判断是否有 token + if (!hasToken) { + if (whiteList.includes(to.path)) { + // 白名单中的路由直接访问 + next() + } else { + // 其他路由跳转到登录页面 + next(`/login?redirect=${to.path}`) + NProgress.done() + } + return + } + + // 判断是否已经登录 + if (to.path === '/login') { + // 如果已经登录，重定向到首页 + next({ path: '/' }) + NProgress.done() + return + } + + // 判断是否已经获取用户信息 + const hasGetUserInfo = store.getters.name + if (hasGetUserInfo) { + next() + } else { + try { + // 获取用户信息 + await store.dispatch('user/getInfo') + next() + } catch (error) { + // 如果获取用户信息失败，删除 token 并跳转到登录页面 + await store.dispatch('user/resetToken') + Message.error(error || 'Has Error') + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } +}) + + +router.afterEach(() => { + // finish progress bar + NProgress.done() +}) diff --git a/zhn-vue-ui/src/router/index.js b/zhn-vue-ui/src/router/index.js new file mode 100644 index 0000000..cfe6032 --- /dev/null +++ b/zhn-vue-ui/src/router/index.js @@ -0,0 +1,103 @@ +//引用vue +import Vue from 'vue' +//引用路由器 +import Router from 'vue-router' +//Router注册到vue中使用 +Vue.use(Router) + +/* Layout */ +import Layout from '@/layout' +//常量路线 +export const constantRoutes = [ + { + path: '/login', + component: () => import('@/views/login/index'), + hidden: true + }, + + { + path: '/404', + component: () => import('@/views/404'), + hidden: true + }, + + { + path: '/', + component: Layout, + redirect: '/dashboard', + children: [{ + path: 'dashboard', + name: 'Dashboard', + component: () => import('@/views/dashboard/index'), + meta: { + title: '首页', + icon: 'dashboard', + guest: true + } + }] + }, + +/* { + path: '/example', + component: Layout, + redirect: '/example/table', + name: 'Example', + meta: { + title: '沭云管理平台', + icon: 'el-icon-s-help', + guest: true + }, + children: [ + { + path: 'e-commerce', + name: 'E-commerce', + component: () => import('@/views/e-commerce/index'), + meta: { + title: '电商系统', + icon: 'e-commerce', + guest: true + } + }, + { + path: 'loan', + name: 'Loan', + component: () => import('@/views/loan/index'), + meta: { + title: '贷款系统', + icon: 'loan', + guest: true + } + }, + { + path: '/interest-calculation', + name: 'Interest-calculation', + component: () => import('@/views/loan/interest-calculation'), + meta: { + title: '利率界面', + icon: 'interest-calculation', + guest: true + } + } + ] + },*/ + // 404 page must be placed at the end !!! + { path: '*', redirect: '/404', hidden: true } +] +//创建路由器 +const createRouter = () => new Router({ + //模式：“历史记录”, + // 需要服务支持 + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes +}) + +//一处创建多处引用 +const router = createRouter() + +// 重置路由器 +export function resetRouter() { + const newRouter = createRouter() + router.matcher = newRouter.matcher +} + +export default router diff --git a/zhn-vue-ui/src/settings.js b/zhn-vue-ui/src/settings.js new file mode 100644 index 0000000..3842c5c --- /dev/null +++ b/zhn-vue-ui/src/settings.js @@ -0,0 +1,16 @@ +module.exports = { + + title: 'Vue Admin Template', + + /** + * @type {boolean} true | false + * @description Whether fix the header + */ + fixedHeader: false, + + /** + * @type {boolean} true | false + * @description Whether show the logo in sidebar + */ + sidebarLogo: true +} diff --git a/zhn-vue-ui/src/store/getters.js b/zhn-vue-ui/src/store/getters.js new file mode 100644 index 0000000..8cbd54c --- /dev/null +++ b/zhn-vue-ui/src/store/getters.js @@ -0,0 +1,11 @@ +const getters = { + sidebar: state => state.app.sidebar, + device: state => state.app.device, + token: state => state.user.token, + name: state => state.user.name, + avatar: state => state.user.avatar, + phone: state => state.user.phone, + emil: state => state.user.emil + +} +export default getters diff --git a/zhn-vue-ui/src/store/index.js b/zhn-vue-ui/src/store/index.js new file mode 100644 index 0000000..6be466a --- /dev/null +++ b/zhn-vue-ui/src/store/index.js @@ -0,0 +1,19 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import getters from './getters' +import app from './modules/app' +import settings from './modules/settings' +import user from './modules/user' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + modules: { + app, + settings, + user + }, + getters +}) + +export default store diff --git a/zhn-vue-ui/src/store/modules/app.js b/zhn-vue-ui/src/store/modules/app.js new file mode 100644 index 0000000..7ea7e33 --- /dev/null +++ b/zhn-vue-ui/src/store/modules/app.js @@ -0,0 +1,48 @@ +import Cookies from 'js-cookie' + +const state = { + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false + }, + device: 'desktop' +} + +const mutations = { + TOGGLE_SIDEBAR: state => { + state.sidebar.opened = !state.sidebar.opened + state.sidebar.withoutAnimation = false + if (state.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + CLOSE_SIDEBAR: (state, withoutAnimation) => { + Cookies.set('sidebarStatus', 0) + state.sidebar.opened = false + state.sidebar.withoutAnimation = withoutAnimation + }, + TOGGLE_DEVICE: (state, device) => { + state.device = device + } +} + +const actions = { + toggleSideBar({ commit }) { + commit('TOGGLE_SIDEBAR') + }, + closeSideBar({ commit }, { withoutAnimation }) { + commit('CLOSE_SIDEBAR', withoutAnimation) + }, + toggleDevice({ commit }, device) { + commit('TOGGLE_DEVICE', device) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/zhn-vue-ui/src/store/modules/settings.js b/zhn-vue-ui/src/store/modules/settings.js new file mode 100644 index 0000000..b3f33f8 --- /dev/null +++ b/zhn-vue-ui/src/store/modules/settings.js @@ -0,0 +1,32 @@ +import defaultSettings from '@/settings' + +const { showSettings, fixedHeader, sidebarLogo } = defaultSettings + +const state = { + showSettings: showSettings, + fixedHeader: fixedHeader, + sidebarLogo: sidebarLogo +} + +const mutations = { + CHANGE_SETTING: (state, { key, value }) => { + // eslint-disable-next-line no-prototype-builtins + if (state.hasOwnProperty(key)) { + state[key] = value + } + } +} + +const actions = { + changeSetting({ commit }, data) { + commit('CHANGE_SETTING', data) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/zhn-vue-ui/src/store/modules/user.js b/zhn-vue-ui/src/store/modules/user.js new file mode 100644 index 0000000..5bb71dc --- /dev/null +++ b/zhn-vue-ui/src/store/modules/user.js @@ -0,0 +1,101 @@ +import { login, logout, getInfo } from '@/api/user' +import { getToken, setToken, removeToken } from '@/utils/auth' +import { resetRouter } from '@/router' + +const getDefaultState = () => { + return { + token: getToken(), + name: '', + phone: '', + emil: '', + avatar: '' + } +} + +const state = getDefaultState() + +const mutations = { + RESET_STATE: (state) => { + Object.assign(state, getDefaultState()) + }, + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + }, + SET_EMIL: (state, emil)=>{ + state.emil =emil + }, + SET_PHONE: (state, phone)=>{ + state.phone =phone + } +} + +const actions = { + // user login + login({ commit }, userInfo) { + const { phone, password } = userInfo + return new Promise((resolve, reject) => { + login({ phone: phone.trim(), password: password }).then(response => { + const { data } = response + commit('SET_TOKEN', data.token) + setToken(data.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + getInfo({ commit, state }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + const { data } = response + if (!data) { + return reject('验证失败，请重新登录.') + } + const { name, avatar ,phone,emil} = data + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + commit('SET_PHONE', phone) + commit('SET_EMIL', emil) + resolve(data) + }).catch(error => { + reject(error) + }) + }) + }, + + // 用户注销 + logout({ commit, state }) { + return new Promise((resolve, reject) => { + removeToken() + resetRouter() + console.log("删除") + commit('RESET_STATE') + resolve() + }) + }, + + // remove token + resetToken({ commit }) { + return new Promise(resolve => { + removeToken() // must remove token first + commit('RESET_STATE') + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/zhn-vue-ui/src/styles/element-ui.scss b/zhn-vue-ui/src/styles/element-ui.scss new file mode 100644 index 0000000..0062411 --- /dev/null +++ b/zhn-vue-ui/src/styles/element-ui.scss @@ -0,0 +1,49 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} diff --git a/zhn-vue-ui/src/styles/index.scss b/zhn-vue-ui/src/styles/index.scss new file mode 100644 index 0000000..3b4da51 --- /dev/null +++ b/zhn-vue-ui/src/styles/index.scss @@ -0,0 +1,65 @@ +@import './variables.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +// main-container global css +.app-container { + padding: 20px; +} diff --git a/zhn-vue-ui/src/styles/mixin.scss b/zhn-vue-ui/src/styles/mixin.scss new file mode 100644 index 0000000..36b74bb --- /dev/null +++ b/zhn-vue-ui/src/styles/mixin.scss @@ -0,0 +1,28 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} diff --git a/zhn-vue-ui/src/styles/sidebar.scss b/zhn-vue-ui/src/styles/sidebar.scss new file mode 100644 index 0000000..94760cc --- /dev/null +++ b/zhn-vue-ui/src/styles/sidebar.scss @@ -0,0 +1,226 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $sideBarWidth; + position: relative; + } + + .sidebar-container { + transition: width 0.28s; + width: $sideBarWidth !important; + background-color: $menuBg; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: $menuHover !important; + } + } + + .is-active>.el-submenu__title { + color: $subMenuActiveText !important; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $sideBarWidth !important; + background-color: $subMenuBg !important; + + &:hover { + background-color: $subMenuHover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + + .el-submenu__icon-arrow { + display: none; + } + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $sideBarWidth !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $sideBarWidth !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$sideBarWidth, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: $menuHover !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/zhn-vue-ui/src/styles/transition.scss b/zhn-vue-ui/src/styles/transition.scss new file mode 100644 index 0000000..4cb27cc --- /dev/null +++ b/zhn-vue-ui/src/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/zhn-vue-ui/src/styles/variables.scss b/zhn-vue-ui/src/styles/variables.scss new file mode 100644 index 0000000..be55772 --- /dev/null +++ b/zhn-vue-ui/src/styles/variables.scss @@ -0,0 +1,25 @@ +// sidebar +$menuText:#bfcbd9; +$menuActiveText:#409EFF; +$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 + +$menuBg:#304156; +$menuHover:#263445; + +$subMenuBg:#1f2d3d; +$subMenuHover:#001528; + +$sideBarWidth: 210px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuText: $menuText; + menuActiveText: $menuActiveText; + subMenuActiveText: $subMenuActiveText; + menuBg: $menuBg; + menuHover: $menuHover; + subMenuBg: $subMenuBg; + subMenuHover: $subMenuHover; + sideBarWidth: $sideBarWidth; +} diff --git a/zhn-vue-ui/src/utils/auth.js b/zhn-vue-ui/src/utils/auth.js new file mode 100644 index 0000000..059af18 --- /dev/null +++ b/zhn-vue-ui/src/utils/auth.js @@ -0,0 +1,15 @@ +import Cookies from 'js-cookie' + +const TokenKey = 'vue_admin_template_token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/zhn-vue-ui/src/utils/get-page-title.js b/zhn-vue-ui/src/utils/get-page-title.js new file mode 100644 index 0000000..a6de99d --- /dev/null +++ b/zhn-vue-ui/src/utils/get-page-title.js @@ -0,0 +1,10 @@ +import defaultSettings from '@/settings' + +const title = defaultSettings.title || 'Vue Admin Template' + +export default function getPageTitle(pageTitle) { + if (pageTitle) { + return `${pageTitle} - ${title}` + } + return `${title}` +} diff --git a/zhn-vue-ui/src/utils/index.js b/zhn-vue-ui/src/utils/index.js new file mode 100644 index 0000000..4830c04 --- /dev/null +++ b/zhn-vue-ui/src/utils/index.js @@ -0,0 +1,117 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * Parse the time to string + * @param {(Object|string|number)} time + * @param {string} cFormat + * @returns {string | null} + */ +export function parseTime(time, cFormat) { + if (arguments.length === 0 || !time) { + return null + } + const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string')) { + if ((/^[0-9]+$/.test(time))) { + // support "1548221490638" + time = parseInt(time) + } else { + // support safari + // https://stackoverflow.com/questions/4310953/invalid-date-in-safari + time = time.replace(new RegExp(/-/gm), '/') + } + } + + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { + const value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } + return value.toString().padStart(2, '0') + }) + return time_str +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} diff --git a/zhn-vue-ui/src/utils/request.js b/zhn-vue-ui/src/utils/request.js new file mode 100644 index 0000000..b505065 --- /dev/null +++ b/zhn-vue-ui/src/utils/request.js @@ -0,0 +1,85 @@ +import axios from 'axios' +import { MessageBox, Message } from 'element-ui' +import store from '@/store' +import { getToken } from '@/utils/auth' + +// create an axios instance +const service = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + // withCredentials: true, // send cookies when cross-domain requests + timeout: 50000 // request timeout +}) + +// request interceptor +service.interceptors.request.use( + config => { + // do something before request is sent + + if (store.getters.token) { + // let each request carry token + // ['X-Token'] is a custom headers key + // please modify it according to the actual situation + config.headers['token'] = getToken() + } + return config + }, + error => { + // do something with request error + console.log(error) // for debug + return Promise.reject(error) + } +) + +// response interceptor +service.interceptors.response.use( + /** + * If you want to get http information such as headers or status + * Please return response => response + */ + + /** + * Determine the request status by custom code + * Here is just an example + * You can also judge the status by HTTP Status Code + */ + response => { + const res = response.data + + // if the custom code is not 20000, it is judged as an error. + if (res.code !== 200) { + Message({ + message: res.msg || 'Error', + type: 'error', + duration: 5 * 1000 + }) + + // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; + if (res.code === 508 || res.code === 512 || res.code === 514) { + // to re-login + MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { + confirmButtonText: 'Re-Login', + cancelButtonText: 'Cancel', + type: 'warning' + }).then(() => { + store.dispatch('user/resetToken').then(() => { + location.reload() + }) + }) + } + return Promise.reject(new Error(res.msg || 'Error')) + } else { + return res + } + }, + error => { + console.log('err' + error) // for debug + Message({ + message: error.msg, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) + +export default service diff --git a/zhn-vue-ui/src/utils/validate.js b/zhn-vue-ui/src/utils/validate.js new file mode 100644 index 0000000..8d962ad --- /dev/null +++ b/zhn-vue-ui/src/utils/validate.js @@ -0,0 +1,20 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} diff --git a/zhn-vue-ui/src/views/404.vue b/zhn-vue-ui/src/views/404.vue new file mode 100644 index 0000000..1791f55 --- /dev/null +++ b/zhn-vue-ui/src/views/404.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/zhn-vue-ui/src/views/dashboard/index.vue b/zhn-vue-ui/src/views/dashboard/index.vue new file mode 100644 index 0000000..d8b2104 --- /dev/null +++ b/zhn-vue-ui/src/views/dashboard/index.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/zhn-vue-ui/src/views/login/index.vue b/zhn-vue-ui/src/views/login/index.vue new file mode 100644 index 0000000..8da0e11 --- /dev/null +++ b/zhn-vue-ui/src/views/login/index.vue @@ -0,0 +1,197 @@ + + + + + + diff --git a/zhn-vue-ui/tests/unit/.eslintrc.js b/zhn-vue-ui/tests/unit/.eslintrc.js new file mode 100644 index 0000000..958d51b --- /dev/null +++ b/zhn-vue-ui/tests/unit/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + jest: true + } +} diff --git a/zhn-vue-ui/tests/unit/components/Breadcrumb.spec.js b/zhn-vue-ui/tests/unit/components/Breadcrumb.spec.js new file mode 100644 index 0000000..1d94c8f --- /dev/null +++ b/zhn-vue-ui/tests/unit/components/Breadcrumb.spec.js @@ -0,0 +1,98 @@ +import { mount, createLocalVue } from '@vue/test-utils' +import VueRouter from 'vue-router' +import ElementUI from 'element-ui' +import Breadcrumb from '@/components/Breadcrumb/index.vue' + +const localVue = createLocalVue() +localVue.use(VueRouter) +localVue.use(ElementUI) + +const routes = [ + { + path: '/', + name: 'home', + children: [{ + path: 'dashboard', + name: 'dashboard' + }] + }, + { + path: '/menu', + name: 'menu', + children: [{ + path: 'menu1', + name: 'menu1', + meta: { title: 'menu1' }, + children: [{ + path: 'menu1-1', + name: 'menu1-1', + meta: { title: 'menu1-1' } + }, + { + path: 'menu1-2', + name: 'menu1-2', + redirect: 'noredirect', + meta: { title: 'menu1-2' }, + children: [{ + path: 'menu1-2-1', + name: 'menu1-2-1', + meta: { title: 'menu1-2-1' } + }, + { + path: 'menu1-2-2', + name: 'menu1-2-2' + }] + }] + }] + }] + +const router = new VueRouter({ + routes +}) + +describe('Breadcrumb.vue', () => { + const wrapper = mount(Breadcrumb, { + localVue, + router + }) + it('dashboard', () => { + router.push('/dashboard') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(1) + }) + it('normal route', () => { + router.push('/menu/menu1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(2) + }) + it('nested route', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(4) + }) + it('no meta.title', () => { + router.push('/menu/menu1/menu1-2/menu1-2-2') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(3) + }) + // it('click link', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-2') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const second = breadcrumbArray.at(1) + // console.log(breadcrumbArray) + // const href = second.find('a').attributes().href + // expect(href).toBe('#/menu/menu1') + // }) + // it('noRedirect', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-1') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const redirectBreadcrumb = breadcrumbArray.at(2) + // expect(redirectBreadcrumb.contains('a')).toBe(false) + // }) + it('last breadcrumb', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + const redirectBreadcrumb = breadcrumbArray.at(3) + expect(redirectBreadcrumb.contains('a')).toBe(false) + }) +}) diff --git a/zhn-vue-ui/tests/unit/components/Hamburger.spec.js b/zhn-vue-ui/tests/unit/components/Hamburger.spec.js new file mode 100644 index 0000000..01ea303 --- /dev/null +++ b/zhn-vue-ui/tests/unit/components/Hamburger.spec.js @@ -0,0 +1,18 @@ +import { shallowMount } from '@vue/test-utils' +import Hamburger from '@/components/Hamburger/index.vue' +describe('Hamburger.vue', () => { + it('toggle click', () => { + const wrapper = shallowMount(Hamburger) + const mockFn = jest.fn() + wrapper.vm.$on('toggleClick', mockFn) + wrapper.find('.hamburger').trigger('click') + expect(mockFn).toBeCalled() + }) + it('prop isActive', () => { + const wrapper = shallowMount(Hamburger) + wrapper.setProps({ isActive: true }) + expect(wrapper.contains('.is-active')).toBe(true) + wrapper.setProps({ isActive: false }) + expect(wrapper.contains('.is-active')).toBe(false) + }) +}) diff --git a/zhn-vue-ui/tests/unit/components/SvgIcon.spec.js b/zhn-vue-ui/tests/unit/components/SvgIcon.spec.js new file mode 100644 index 0000000..31467a9 --- /dev/null +++ b/zhn-vue-ui/tests/unit/components/SvgIcon.spec.js @@ -0,0 +1,22 @@ +import { shallowMount } from '@vue/test-utils' +import SvgIcon from '@/components/SvgIcon/index.vue' +describe('SvgIcon.vue', () => { + it('iconClass', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.find('use').attributes().href).toBe('#icon-test') + }) + it('className', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.classes().length).toBe(1) + wrapper.setProps({ className: 'test' }) + expect(wrapper.classes().includes('test')).toBe(true) + }) +}) diff --git a/zhn-vue-ui/tests/unit/utils/formatTime.spec.js b/zhn-vue-ui/tests/unit/utils/formatTime.spec.js new file mode 100644 index 0000000..24e165b --- /dev/null +++ b/zhn-vue-ui/tests/unit/utils/formatTime.spec.js @@ -0,0 +1,30 @@ +import { formatTime } from '@/utils/index.js' + +describe('Utils:formatTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + const retrofit = 5 * 1000 + + it('ten digits timestamp', () => { + expect(formatTime((d / 1000).toFixed(0))).toBe('7月13日17时54分') + }) + it('test now', () => { + expect(formatTime(+new Date() - 1)).toBe('刚刚') + }) + it('less two minute', () => { + expect(formatTime(+new Date() - 60 * 2 * 1000 + retrofit)).toBe('2分钟前') + }) + it('less two hour', () => { + expect(formatTime(+new Date() - 60 * 60 * 2 * 1000 + retrofit)).toBe('2小时前') + }) + it('less one day', () => { + expect(formatTime(+new Date() - 60 * 60 * 24 * 1 * 1000)).toBe('1天前') + }) + it('more than one day', () => { + expect(formatTime(d)).toBe('7月13日17时54分') + }) + it('format', () => { + expect(formatTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(formatTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(formatTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) +}) diff --git a/zhn-vue-ui/tests/unit/utils/param2Obj.spec.js b/zhn-vue-ui/tests/unit/utils/param2Obj.spec.js new file mode 100644 index 0000000..e106ed8 --- /dev/null +++ b/zhn-vue-ui/tests/unit/utils/param2Obj.spec.js @@ -0,0 +1,14 @@ +import { param2Obj } from '@/utils/index.js' +describe('Utils:param2Obj', () => { + const url = 'https://github.com/PanJiaChen/vue-element-admin?name=bill&age=29&sex=1&field=dGVzdA==&key=%E6%B5%8B%E8%AF%95' + + it('param2Obj test', () => { + expect(param2Obj(url)).toEqual({ + name: 'bill', + age: '29', + sex: '1', + field: window.btoa('test'), + key: '测试' + }) + }) +}) diff --git a/zhn-vue-ui/tests/unit/utils/parseTime.spec.js b/zhn-vue-ui/tests/unit/utils/parseTime.spec.js new file mode 100644 index 0000000..56045af --- /dev/null +++ b/zhn-vue-ui/tests/unit/utils/parseTime.spec.js @@ -0,0 +1,35 @@ +import { parseTime } from '@/utils/index.js' + +describe('Utils:parseTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + it('timestamp', () => { + expect(parseTime(d)).toBe('2018-07-13 17:54:01') + }) + it('timestamp string', () => { + expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01') + }) + it('ten digits timestamp', () => { + expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01') + }) + it('new Date', () => { + expect(parseTime(new Date(d))).toBe('2018-07-13 17:54:01') + }) + it('format', () => { + expect(parseTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(parseTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(parseTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) + it('get the day of the week', () => { + expect(parseTime(d, '{a}')).toBe('五') // 星期五 + }) + it('get the day of the week', () => { + expect(parseTime(+d + 1000 * 60 * 60 * 24 * 2, '{a}')).toBe('日') // 星期日 + }) + it('empty argument', () => { + expect(parseTime()).toBeNull() + }) + + it('null', () => { + expect(parseTime(null)).toBeNull() + }) +}) diff --git a/zhn-vue-ui/tests/unit/utils/validate.spec.js b/zhn-vue-ui/tests/unit/utils/validate.spec.js new file mode 100644 index 0000000..f774905 --- /dev/null +++ b/zhn-vue-ui/tests/unit/utils/validate.spec.js @@ -0,0 +1,17 @@ +import { validUsername, isExternal } from '@/utils/validate.js' + +describe('Utils:validate', () => { + it('validUsername', () => { + expect(validUsername('admin')).toBe(true) + expect(validUsername('editor')).toBe(true) + expect(validUsername('xxxx')).toBe(false) + }) + it('isExternal', () => { + expect(isExternal('https://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('http://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('github.com/PanJiaChen/vue-element-admin')).toBe(false) + expect(isExternal('/dashboard')).toBe(false) + expect(isExternal('./dashboard')).toBe(false) + expect(isExternal('dashboard')).toBe(false) + }) +}) diff --git a/zhn-vue-ui/vue.config.js b/zhn-vue-ui/vue.config.js new file mode 100644 index 0000000..dd87a99 --- /dev/null +++ b/zhn-vue-ui/vue.config.js @@ -0,0 +1,117 @@ +'use strict' +const path = require('path') +const defaultSettings = require('./src/settings.js') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const name = defaultSettings.title || 'vue Admin Template' + +const port = process.env.port || process.env.npm_config_port || 9528 + +module.exports = { + + publicPath: '/', + outputDir: 'dist', + assetsDir: 'static', + lintOnSave: process.env.NODE_ENV === 'development', + productionSourceMap: false, + devServer: { + port: port, + open: true, + overlay: { + warnings: false, + errors: true + }, + proxy: { + [process.env.VUE_APP_BASE_API]: { + target: 'http://127.0.0.1:18080', + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } + } + }, + configureWebpack: { + name: name, + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + // it can improve the speed of the first screen, it is recommended to turn on preload + config.plugin('preload').tap(() => [ + { + rel: 'preload', + // to ignore runtime.js + // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171 + fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/], + include: 'initial' + } + ]) + + // when there are many pages, it will cause too many meaningless requests + config.plugins.delete('prefetch') + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk + config.optimization.runtimeChunk('single') + } + ) + } +}

{{ title }}

{{ title }}

{{ title }}

{{ title }}

Login Form