physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add date

Browse Source
This commit is contained in:
ls
2024-10-12 17:13:27 +08:00
parent 16403e2aae
commit 20636f7b87
8 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
physical-launcher/src/main/java/org/jeecg/JeecgSystemApplication.java → physical-launcher/src/main/java/org/jeecg/PhysicalApplication.java
View File

@@ -9,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Import;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import java.net.InetAddress; import java.net.InetAddress;
@@ -23,15 +22,15 @@ import java.net.UnknownHostException;
@SpringBootApplication @SpringBootApplication
@ImportAutoConfiguration(JustAuthAutoConfiguration.class) // spring boot 3.x justauth 兼容性处理 @ImportAutoConfiguration(JustAuthAutoConfiguration.class) // spring boot 3.x justauth 兼容性处理
//@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class}) //@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
public class JeecgSystemApplication extends SpringBootServletInitializer { public class PhysicalApplication extends SpringBootServletInitializer {
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(JeecgSystemApplication.class); return application.sources(PhysicalApplication.class);
} }
public static void main(String[] args) throws UnknownHostException { public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args); ConfigurableApplicationContext application = SpringApplication.run(PhysicalApplication.class, args);
Environment env = application.getEnvironment(); Environment env = application.getEnvironment();
String ip = InetAddress.getLocalHost().getHostAddress(); String ip = InetAddress.getLocalHost().getHostAddress();
String port = env.getProperty("server.port"); String port = env.getProperty("server.port");

4
physical-launcher/src/main/resources/application-dev.yml
View File

@@ -166,7 +166,8 @@ spring:
slow-sql-millis: 5000 slow-sql-millis: 5000
datasource: datasource:
master: master:
url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai # url: jdbc:mysql://127.0.0.1:3306/physical-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.50.100:23306/physical-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root username: root
password: 123456 password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
@@ -242,6 +243,7 @@ jeecg:
# minio文件上传 # minio文件上传
minio: minio:
minio_url: http://127.0.0.1:9000 minio_url: http://127.0.0.1:9000
minio_public_url: http://58.215.212.230:8005/oss/
minio_name: root minio_name: root
minio_pass: 12345678 minio_pass: 12345678
bucketName: physical bucketName: physical

1
physical-launcher/src/main/resources/application-prod.yml
View File

@@ -246,6 +246,7 @@ jeecg:
# minio文件上传 # minio文件上传
minio: minio:
minio_url: http://physical-minio:9000 minio_url: http://physical-minio:9000
minio_public_url: http://58.215.212.230:8005/oss/
minio_name: root minio_name: root
minio_pass: 12345678 minio_pass: 12345678
bucketName: physical bucketName: physical

4
physical-launcher/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java
View File

@@ -2,7 +2,7 @@ package org.jeecg.modules.message.test;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ClientException;
import org.jeecg.JeecgSystemApplication; import org.jeecg.PhysicalApplication;
import org.jeecg.common.api.dto.message.BusMessageDTO; import org.jeecg.common.api.dto.message.BusMessageDTO;
import org.jeecg.common.api.dto.message.BusTemplateMessageDTO; import org.jeecg.common.api.dto.message.BusTemplateMessageDTO;
import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.dto.message.MessageDTO;
@@ -28,7 +28,7 @@ import java.util.Map;
* @Author: lsq * @Author: lsq
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = PhysicalApplication.class)
public class SendMessageTest { public class SendMessageTest {
@Autowired @Autowired

4
physical-launcher/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java
View File

@@ -1,7 +1,7 @@
package org.jeecg.modules.system.test; package org.jeecg.modules.system.test;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.jeecg.JeecgSystemApplication; import org.jeecg.PhysicalApplication;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.RedisUtil;
@@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* 系统用户单元测试 * 系统用户单元测试
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = PhysicalApplication.class)
public class InsertDemoTest { public class InsertDemoTest {
/** /**
* 测试地址：实际使用时替换成你自己的地址 * 测试地址：实际使用时替换成你自己的地址

4
physical-launcher/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java
View File

@@ -1,6 +1,6 @@
package org.jeecg.modules.system.test; package org.jeecg.modules.system.test;
import org.jeecg.JeecgSystemApplication; import org.jeecg.PhysicalApplication;
import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.JeecgBaseConfig;
import org.jeecg.config.firewall.SqlInjection.IDictTableWhiteListHandler; import org.jeecg.config.firewall.SqlInjection.IDictTableWhiteListHandler;
@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* @Author: sunjianlei * @Author: sunjianlei
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = PhysicalApplication.class)
public class SysTableWhiteCheckTest { public class SysTableWhiteCheckTest {
@Autowired @Autowired

4
physical-launcher/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
View File

@@ -1,7 +1,7 @@
package org.jeecg.modules.system.test; package org.jeecg.modules.system.test;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.jeecg.JeecgSystemApplication; import org.jeecg.PhysicalApplication;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.RedisUtil;
@@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* 系统用户单元测试 * 系统用户单元测试
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = PhysicalApplication.class)
public class SysUserTest { public class SysUserTest {
/** /**
* 测试地址：实际使用时替换成你自己的地址 * 测试地址：实际使用时替换成你自己的地址

15
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
View File

@@ -1,18 +1,15 @@
package org.jeecg.modules.database.entity; package org.jeecg.modules.database.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@@ -67,9 +64,13 @@ public class Experiment implements Serializable {
@Schema(description = "试验类型") @Schema(description = "试验类型")
private String type; private String type;
/**试验日期*/ /**试验日期*/
@Excel(name = "试验日期", width = 15) @Excel(name = "试验开始日期", width = 15)
@Schema(description = "试验日期") @Schema(description = "试验开始日期")
private String experimentDate; private Date startDate;
/**试验日期*/
@Excel(name = "试验结束日期", width = 15)
@Schema(description = "试验结束日期")
private Date endDate;
/**辐射源类型*/ /**辐射源类型*/
@Excel(name = "辐射源类型", width = 15) @Excel(name = "辐射源类型", width = 15)
@Schema(description = "辐射源类型") @Schema(description = "辐射源类型")