From c2b07efbbeef45cc0166d07adf6b4db9d0c6ca3a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 24 Jun 2020 10:00:19 +0800
Subject: [PATCH] update
---
/dev/null | 30 ------------------------------
pom.xml | 7 -------
2 files changed, 0 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b15421..6642f1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,13 +271,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java b/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
deleted file mode 100644
index e639249..0000000
--- a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.moral;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.moral.common.bean.ResultBean;
-import com.moral.entity.Device;
-import com.moral.entity.DeviceAdjustValue;
-import com.moral.entity.alarm.AlarmConfig;
-import com.moral.entity.charts.*;
-import com.moral.security.auth.login.LoginMode;
-import com.moral.security.model.UserContext;
-import org.junit.Test;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-public class JavaBeanToJsonOutPrint {
- @Test
- public void jsonOutPrintTest(){
-// UserContext userContext = UserContext.create("312", LoginMode.Andriod,1,new ArrayList<>());
-//// adjustValue.setCreateTime(new Date());
-//// adjustValue.setUpdateTime(new Date());
-//// adjustValue.setId(0);
-//// Map<String,Float> value = new HashMap();
-//// value.put("e1", (float) 1.2);
-//// adjustValue.setValue(value);
-// String json = "{\"createTime\":1516342989358,\"deviceId\":null,\"id\":0,\"updateTime\":1516342989358,\"value\":{\"e1\":1.2}}";
-// LineChartCriteria lineChartCriteria = new LineChartCriteria();
-// List<DataCondition> dataConditions = new ArrayList<>();
-// DataCondition dataCondition = new DataCondition();
-// dataCondition.setActualTime(1);
-// dataCondition.setAreaRange(AreaRange.AREA);
-// dataCondition.setAreaRangeId(1);
-// dataCondition.setTimeUnits(TimeUnits.DAY);
-// dataConditions.add(dataCondition);
-// lineChartCriteria.setDataConditions(dataConditions);
-// lineChartCriteria.setSensorKey("e1");
-// TimePeriod timePeriod = new TimePeriod();
-// timePeriod.setEndTime(new Date());
-// timePeriod.setStartTime(new Date());
-// timePeriod.setTimeUnits(TimeUnits.DAY);
-// lineChartCriteria.setTimePeriod(timePeriod);
-// Map map = JSON.parseObject("{\"e1\":0.0}");
- String str = "{\"sensorKey\":\"e1\",\"timePeriod\":{\"startTime\":\"2018-03-09T07:53:53.463Z\",\"endTime\":\"2018-03-09T07:53:53.463Z\",\"timeUnits\":\"DAY\"},\"dataConditions\":[{\"timeUnits\":\"DAY\",\"actualTime\":null,\"areaRange\":\"AREA\",\"areaRangeId\":320583}]}";
- LineChartCriteria lineChartCriteria = JSON.parseObject(str,LineChartCriteria.class);
-// TimePeriod timePeriod = JSON.parseObject(str,TimePeriod.class);
- String json1 = JSON.toJSONString(lineChartCriteria);
- System.out.printf("\n\n\n\n");
- System.out.printf(json1);
- System.out.printf("\n\n\n\n");
- }
-
-}
diff --git a/src/test/java/com/moral/ScreenApiApplicationTests.java b/src/test/java/com/moral/ScreenApiApplicationTests.java
deleted file mode 100644
index 35846f3..0000000
--- a/src/test/java/com/moral/ScreenApiApplicationTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.moral;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class ScreenApiApplicationTests {
-
- @Test
- public void contextLoads() {
- }
- @Resource
- private BCryptPasswordEncoder encoder;
- @Test
- public void testEncoder(){
- String hash = encoder.encode("123456");
- System.out.printf("\n============================\n");
- System.out.printf("hash:"+hash);
-// Boolean result = encoder.matches("123456",hash);
-
-// System.out.printf("result:"+result);
- System.out.printf("\n============================\n");
- }
-}
--
Gitblit v1.8.0