From 970e7b9336aeb7e35c2bbef18bb1d6c1be0f41f7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 八月 2024 09:29:06 +0800
Subject: [PATCH] 8.20合并代码
---
system-run/src/main/resources/application-dev.yml | 9 ++++++---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 31 ++++++++++++++++++++++++++++++-
system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 2 +-
3 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
index 5d18f38..4db8694 100644
--- a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
+++ b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
@@ -20,7 +20,7 @@
public static String database_username = "root";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/performance-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String model_name = "/cnas-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰�
public static String tablePrefix = "device_"; // 璁剧疆杩囨护琛ㄥ墠缂�
public static void main(String[] args) {
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 13e6c40..6ccc686 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -10,7 +10,7 @@
# 鏁版嵁搴撳浠借矾寰�
backup:
# 鏁版嵁搴撳浠借矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- path: #D:\Download\log
+ path: D:\Download\log
# 鏁版嵁搴撳浠藉ぉ鏁�
destiny: 7
# 鏁版嵁搴撳浠藉伐鍏疯矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
@@ -37,7 +37,10 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/11?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# url: jdbc:mysql://10.1.200.86:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# url: jdbc:mysql://10.16.173.59:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# url: jdbc:mysql://10.1.13.77:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
# url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: root
password: 123456
@@ -67,7 +70,7 @@
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
- password:
+ password: 123456
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
timeout: 50
# redis杩炴帴姹犻厤缃�
diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
index 903f8a8..5840ba6 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -1,13 +1,42 @@
package com.yuanchu.mom;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.mom.exception.ErrorException;
+import org.apache.el.lang.ExpressionBuilder;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.time.temporal.WeekFields;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
@SpringBootTest
class SystemRunApplicationTest {
@Test
- void contextLoads() {
+ void contextLoads() {
+ String b=null;
+ BigDecimal decimal1 = new BigDecimal("20");
+ BigDecimal decimal2 = new BigDecimal(b == null ?"0":b);
+ BigDecimal decimal3 = new BigDecimal("10");
+ if (decimal1.compareTo(decimal2)>0 && decimal1.compareTo(decimal3)>0){
+ System.out.println("鈭�");
+ }
+
}
+
+
}
--
Gitblit v1.9.3