From d715a0130a4a6d8c57c381d5fd1582adc1de2814 Mon Sep 17 00:00:00 2001
From: 邓实川 <544939826@qq.com>
Date: Sat, 18 Apr 2020 09:57:51 +0800
Subject: [PATCH] maven仓库优化，测试
---
pom.xml | 12 +++++++++---
src/main/java/cn/timer/api/utils/Encrypt.java | 12 ++++++------
src/main/java/cn/timer/api/utils/Md5.java | 10 +++++-----
src/main/resources/application-dev.yml | 3 ++-
4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 09c3ad3..6398133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
@@ -193,17 +194,17 @@
<artifactId>commons-lang3</artifactId>
</dependency>
- <dependency>
+ <!-- Apache shiro -->
+ <!-- <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
<version>${shiro.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId>
<version>${shiro.version}</version>
- </dependency>
+ </dependency> -->
<!-- redis starter -->
<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -431,6 +432,11 @@
<overwrite>true</overwrite>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/src/main/java/cn/timer/api/utils/Encrypt.java b/src/main/java/cn/timer/api/utils/Encrypt.java
index d29f334..ca4b7ee 100644
--- a/src/main/java/cn/timer/api/utils/Encrypt.java
+++ b/src/main/java/cn/timer/api/utils/Encrypt.java
@@ -2,7 +2,7 @@ package cn.timer.api.utils;
import java.io.UnsupportedEncodingException;
-import org.apache.shiro.crypto.hash.SimpleHash;
+//import org.apache.shiro.crypto.hash.SimpleHash;
/**
*
@@ -30,11 +30,11 @@ public class Encrypt {
* @param salt
* @return
*/
- public static String md5(String password, String salt) {
-
- Object tokenCredentials = new SimpleHash("md5", password, salt, 2).toHex();
- return (String) tokenCredentials;
- }
+// public static String md5(String password, String salt) {
+//
+// Object tokenCredentials = new SimpleHash("md5", password, salt, 2).toHex();
+// return (String) tokenCredentials;
+// }
public static String myEncode(String str) throws UnsupportedEncodingException {
byte[] strBytes = str.getBytes("utf-8");
diff --git a/src/main/java/cn/timer/api/utils/Md5.java b/src/main/java/cn/timer/api/utils/Md5.java
index d1a7138..a3a09f9 100644
--- a/src/main/java/cn/timer/api/utils/Md5.java
+++ b/src/main/java/cn/timer/api/utils/Md5.java
@@ -4,7 +4,7 @@ import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.apache.shiro.crypto.hash.SimpleHash;
+//import org.apache.shiro.crypto.hash.SimpleHash;
/**
*
@@ -16,10 +16,10 @@ import org.apache.shiro.crypto.hash.SimpleHash;
*/
public class Md5 {
- public static String md5password(String name, String password) {
- Object tokenCredentials = new SimpleHash("md5", password, name, 56).toHex();
- return (String) tokenCredentials;
- }
+// public static String md5password(String name, String password) {
+// Object tokenCredentials = new SimpleHash("md5", password, name, 56).toHex();
+// return (String) tokenCredentials;
+// }
// 写一个md5加密的方法
public static String md5(String plainText) {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 26ea40d..b14390e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -104,8 +104,9 @@ info:
encoding: '@project.build.sourceEncoding@'
java:
version: '@java.version@'
+ git:
+ mode: full
##############################
-
# mybatis-plus
mybatis-plus:
mapper-locations: classpath:mapping/**/*Mapper.xml # dao到xml文件映射
--
libgit2 0.26.0