main
han-l 2 years ago
parent ed15c1339c
commit 7bbdb446be

@ -237,6 +237,7 @@
<include>baseSqlite/**</include>
<include>static/**</include>
<include>sqlite/**</include>
<include>version/**</include>
<include>META-INF/spring.factories</include>
</includes>
</resource>

@ -1,6 +1,7 @@
package com.nmgs;
import com.nmgs.util.PathUtil;
import com.nmgs.util.PropertiesUtil;
import com.trkf.PasswordEncryption.PassWordUtils;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.env.EnvironmentPostProcessor;
@ -13,6 +14,8 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@Configuration
@ -78,7 +81,13 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
configurableEnvironment.getPropertySources().addFirst(propertySource);
//如果公用配置文件没有配置的则使用本项目的配置文件
configurableEnvironment.getPropertySources().addLast(newPropertySource);
} catch (Exception e) {
String appName=Newproperties.getProperty("spring.logback.appName");
String versionPath =PathUtil.versionPath;
File resourceDir = new File(versionPath);
String version = getVersionFileName(resourceDir);
PropertiesUtil propertiesUtil = new PropertiesUtil(PathUtil.applicationTextPath);
propertiesUtil.set(appName+"Version",version);
} catch (Exception e) {
e.printStackTrace();
} finally {
if (fileInputStream != null) {
@ -97,4 +106,23 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
}
}
}
private static String getVersionFileName(File dir) {
String version="";
List<String> fileNames = new ArrayList<>();
if (dir == null || !dir.exists() || !dir.isDirectory()) {
return version;
}
File[] files = dir.listFiles();
if (files != null) {
for (File file : files) {
if (file.isFile() && file.getName().endsWith(".txt")) {
fileNames.add(file.getName());
}
}
}
if (!fileNames.isEmpty()) {
version = fileNames.get(0).replace(".txt", "");
}
return version;
}
}

@ -1,10 +1,5 @@
package com.nmgs.config;
/**
* @author: shuguang
* @date: 20221010 17:13
* @description:
*/
public class Constant {
/**
* 1-sqlserver 2-oracle3-4-mysql

@ -15,11 +15,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
*
* @author ruoyi
*/
@Controller
@RequestMapping("/IpPortText")
@CrossOrigin(origins = "*")

@ -11,11 +11,6 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
/**
* @author: shuguang
* @date: 20230112 15:14
* @description:
*/
public class DateTimeUtil {
/**

@ -8,11 +8,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
*
*
* @author ruoyi
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY = "yyyy";

@ -9,12 +9,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
/**
* @author: shuguang
* @date: 20221013 10:52
* @description:
*/
@Slf4j
public class FileUtil {

@ -17,17 +17,20 @@ public class PathUtil {
public static String sqliteBasePath;
public static String sqliteUntitledPath;
public static String sqlitePath;
public static String versionPath;
static {
try {
projectApplicationPath = URLDecoder.decode(ClassUtils.getDefaultClassLoader().getResource("").getPath(), "UTF-8") + "static/application.properties";
sqliteBasePath = URLDecoder.decode(ClassUtils.getDefaultClassLoader().getResource("").getPath(), "UTF-8") + "baseSqlite/sqlite.sqlite";
sqliteUntitledPath = URLDecoder.decode(ClassUtils.getDefaultClassLoader().getResource("").getPath(), "UTF-8") + "baseSqlite/Untitled.sqlite";
versionPath = URLDecoder.decode(ClassUtils.getDefaultClassLoader().getResource("").getPath(), "UTF-8") + "version/";
} catch (UnsupportedEncodingException e) {
projectApplicationPath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "static/application.properties";
sqliteBasePath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "baseSqlite/sqlite.sqlite";
sqliteUntitledPath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "baseSqlite/Untitled.sqlite";
sqlitePath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "sqlite/";
versionPath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "version/";
}
}

@ -2,11 +2,6 @@ package com.nmgs.util;
import java.util.UUID;
/**
* @author: shuguang
* @date: 20221025 18:01
* @description: uuid
*/
public class UuidUtil {
public static String getUuid() {
return UUID.randomUUID().toString().replace("-","");

@ -1,10 +1,4 @@
package com.nmgs.workorder.common;
/**
* @author: shuguang
* @date: 20221016 17:24
* @description:
*/
public enum MessageEnum {
/**
*

@ -2,14 +2,6 @@ package com.nmgs.workorder.common;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
*
*/
/**
* @author: shuguang
* @date: 20221015 16:27
* @description:
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class PPException extends RuntimeException{

@ -7,11 +7,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
/**
* @author: shuguang
* @date: 20221011 16:27
* @description:
*/
@RestControllerAdvice
@Slf4j
public class PPExceptionHandler {

@ -14,11 +14,6 @@ import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* @author: shuguang
* @date: 20231107 14:39
* @description:
*/
@RestController
public class WorkOrderController {
@Resource

@ -4,11 +4,6 @@ import lombok.Data;
import java.util.Date;
/**
* @author: shuguang
* @date: 20230223 17:33
* @description:
*/
@Data
public class FileInfo {
/**

@ -4,11 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* @author: shuguang
* @date: 20231108 14:33
* @description:
*/
@TableName("NAME_TABLE")
@Data
public class NameTable {

@ -7,11 +7,6 @@ import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author: shuguang
* @date: 20230811 14:09
* @description:
*/
@Data
@AllArgsConstructor
@NoArgsConstructor

@ -2,12 +2,6 @@ package com.nmgs.workorder.entity;
import com.nmgs.workorder.common.MessageEnum;
import lombok.Data;
/**
* @author: shuguang
* @date: 20221016 16:01
* @description:
*/
@Data
public class Result<T> {
private String code;

@ -4,11 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* @author: shuguang
* @date: 20230829 14:29
* @description:
*/
@Data
@TableName("SUBCOMPANY_TABLE")
public class SubCompany {

@ -4,11 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* @author: shuguang
* @date: 20231107 16:05
* @description:
*/
@TableName("GD_UNPROCESSED")
@Data
public class Unprocessed {

@ -4,11 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* @author: shuguang
* @date: 20231116 9:47
* @description:
*/
@TableName("USER_STA_TABLE")
@Data
public class UserStaTable {

@ -6,11 +6,6 @@ import lombok.Data;
import java.util.Date;
/**
* @author: shuguang
* @date: 20231107 16:05
* @description:
*/
@TableName("GD_WORKFEEDBACK")
@Data
public class WorkFeedBack {

@ -7,11 +7,6 @@ import lombok.Data;
import java.util.Date;
/**
* @author: shuguang
* @date: 20231107 16:02
* @description:
*/
@TableName("GD_WORKINFO")
@Data
public class WorkInfo {

@ -26,12 +26,6 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
import java.util.*;
/**
* @author: shuguang
* @date: 20231107 14:45
* @description:
*/
@Service
@Slf4j
public class WorkOrderServiceImpl implements WorkOrderService {

@ -0,0 +1,3 @@
1.0.0
增加版本号
修复车道图片切换问题

@ -1,106 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3f61f33b-1398-438f-b18e-516860fc6663" name="更改" comment="">
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.0e7489d9.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.ce526162.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CentralizedMonitoring/assets/index.ce526162.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../NMGJTManager/target/classes/static/View/assets/index.f1cb4d07.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/artifacts/CentralizedMonitoring_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/artifacts/CentralizedMonitoring_war_exploded.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/jarRepositories.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/javaee.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/javaee.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/lib.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/lib.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/lib1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/lib2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/uiDesigner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/uiDesigner.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/CentralizedMonitoringApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/CentralizedMonitoringApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/Constant.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/Constant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/CorsConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/CorsConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/ErrorConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/ErrorConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/MybatisConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/MybatisConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/RedisSessionConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/RedisSessionConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/ThreadPoolConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/ThreadPoolConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/CarLineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/CarLineController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/GisStaSysInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/GisStaSysInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/IpPortText.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/IpPortText.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/PortInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/PortInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ApplicationRunnerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ApplicationRunnerImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ApplicationStopImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ApplicationStopImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ScheduleService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ThreadTaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ThreadTaskService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/TimeTaskInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/TimeTaskInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/BreakPointUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/CRCUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/DESUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/DateTimeUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/DateTimeUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/FileUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/FileUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/HTTPUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/HTTPUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/JDBCUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/JDBCUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/LogUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/LogUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PathUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PathUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PlateRegexUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PropertiesUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PropertiesUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/SpringUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/SpringUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/TokenUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/TokenUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/UuidUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/UuidUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/WebsocketUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/WebsocketUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/controller/WorkOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/controller/WorkOrderController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/entity/Unprocessed.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/entity/Unprocessed.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/mapper/WorkInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/mapper/WorkInfoMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/service/impl/WorkOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/service/impl/WorkOrderServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/META-INF/spring.factories" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/META-INF/spring.factories" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/logback-spring.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/WEB-INF/web.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/CentralizedMonitoringView.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/CentralizedMonitoringView.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CentralizedMonitoring/assets/index.3afe6177.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/CentralizedMonitoring/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/CentralizedMonitoring/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/components.d.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/element-variables.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/element-variables.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/util/axios/axios.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/axios/axios.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/util/css/loading.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/css/loading.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/util/tool.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/tool.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/util/type.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/type.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/views/CarLine/CarLineView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/CarLine/CarLineView.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/views/CarLine/components/PortInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/CarLine/components/PortInfo.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/views/CarLine/components/Untitled.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/CarLine/components/Untitled.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/views/CarLine/test.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/views/ErrorPage/404.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/ErrorPage/404.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/.idea/NMGJTManager.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/NMGJTManager.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../NMGJTManager/NMGJTManager.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" beforeDir="false" afterPath="$PROJECT_DIR$/../NMGJTManager/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/target/NMGJTManager.war" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/target/maven-archiver/pom.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManager/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../NMGJTManagerView/src/views/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../NMGJTManagerView/src/views/login.vue" afterDir="false" />
</list>
<list default="true" id="3f61f33b-1398-438f-b18e-516860fc6663" name="更改" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -229,7 +130,7 @@
<workItem from="1703744584070" duration="71000" />
<workItem from="1704266777528" duration="22000" />
<workItem from="1704447514285" duration="566000" />
<workItem from="1704674001080" duration="766000" />
<workItem from="1704674001080" duration="775000" />
</task>
<task id="LOCAL-00001" summary="变更">
<created>1699319109952</created>

@ -258,6 +258,7 @@
<includes>
<include>logback-spring.xml</include>
<include>static/**</include>
<include>version/**</include>
<include>META-INF/spring.factories</include>
</includes>
</resource>

@ -1,6 +1,7 @@
package com.nmgs;
import com.nmgs.util.PathUtil;
import com.nmgs.util.PropertiesUtil;
import com.trkf.PasswordEncryption.PassWordUtils;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.env.EnvironmentPostProcessor;
@ -10,6 +11,8 @@ import org.springframework.core.env.PropertiesPropertySource;
import java.io.File;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@Configuration
@ -75,8 +78,32 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
configurableEnvironment.getPropertySources().addFirst(propertySource);
//如果公用配置文件没有配置的则使用本项目的配置文件
configurableEnvironment.getPropertySources().addLast(newPropertySource);
String appName=Newproperties.getProperty("spring.logback.appName");
String versionPath =PathUtil.versionPath;
File resourceDir = new File(versionPath);
String version = getVersionFileName(resourceDir);
new PropertiesUtil(PathUtil.applicationTextPath).set(appName+"Version",version);
} catch (Exception e) {
e.printStackTrace();
}
}
private static String getVersionFileName(File dir) {
String version="";
List<String> fileNames = new ArrayList<>();
if (dir == null || !dir.exists() || !dir.isDirectory()) {
return version;
}
File[] files = dir.listFiles();
if (files != null) {
for (File file : files) {
if (file.isFile() && file.getName().endsWith(".txt")) {
fileNames.add(file.getName());
}
}
}
if (!fileNames.isEmpty()) {
version = fileNames.get(0).replace(".txt", "");
}
return version;
}
}

@ -0,0 +1,92 @@
package com.nmgs.controller;
import com.nmgs.util.PagesUtils;
import com.nmgs.util.PathUtil;
import com.nmgs.util.PropertiesUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
/**
*
*
* @author ruoyi
*/
@Controller
@RequestMapping("/system/version")
@CrossOrigin(origins = "*")
public class SystemVersionControl {
public String textPath = PathUtil.applicationTextPath;
@RequestMapping(value = "/selectVersionAll", method = RequestMethod.POST)
@ResponseBody
public Object selectVersionAll(@RequestBody Map<String, Object> params) {
params.putIfAbsent("systemName", "");
try {
PropertiesUtil propertiesUtil = new PropertiesUtil(textPath);
String[] lines = propertiesUtil.getLines();
List<Map<String, String>> data = new ArrayList<>();
for (String str : lines) {
String[] split = str.split("=");
if (!str.trim().startsWith("#") && split[0].endsWith("Version")) {
String systemName = split[0].replace("Version", "");
Map<String, String> map = new HashMap<>();
if (params.get("systemName") != null && !params.get("systemName").toString().trim().equals("")) {
if (!systemName.contains(params.get("systemName").toString().trim())) {
continue;
}
}
map.put("systemName", systemName);
map.put("version", split[1]);
data.add(map);
}
}
data.sort((o1, o2) -> {
String name1 = o1.get("systemName");//name1是从你list里面拿出来的一个
String name2 = o2.get("systemName"); //name1是从你list里面拿出来的第二个name
return name1.compareTo(name2);
});
return PagesUtils.getPages(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()), data);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
@RequestMapping(value = "/showVersionText", method = RequestMethod.POST)
@ResponseBody
public Object showVersionText(@RequestBody Map<String, Object> params) {
try {
String systemName = params.get("systemName").toString();
String version = params.get("version").toString();
String path=PathUtil.webappsPath+"/"+systemName+"/WEB-INF/classes/version/"+version+".txt";
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(path), StandardCharsets.UTF_8));
String line;
StringBuilder info = new StringBuilder();
while ((line = reader.readLine()) != null) {
info.append(line).append("<br/>");
}
reader.close();
return info;
} catch (Exception e) {
e.printStackTrace();
return "无";
}
}
public Properties getProperties(String mypath) {
try {
Properties properties = new Properties();
BufferedReader bf = new BufferedReader(new InputStreamReader(new FileInputStream(mypath), "UTF-8"));
properties.load(bf);
return properties;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
}

@ -36,11 +36,6 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
/**
* @author: shuguang
* @date: 20221013 10:52
* @description:
*/
//@Slf4j
public class FileUtil {

@ -16,14 +16,17 @@ public class PathUtil {
public static String applicationTextPath = "";
public static String projectApplicationPath;
public static String webPath = "";
public static String versionPath;
static {
try {
projectApplicationPath = URLDecoder.decode(ClassUtils.getDefaultClassLoader().getResource("").getPath(), "UTF-8") + "static/application.properties";
webPath = URLDecoder.decode(ClassUtils.getDefaultClassLoader().getResource("").getPath(), "UTF-8") + "static";
versionPath = URLDecoder.decode(ClassUtils.getDefaultClassLoader().getResource("").getPath(), "UTF-8") + "version";
} catch (UnsupportedEncodingException e) {
projectApplicationPath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "static/application.properties";
webPath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "static";
versionPath = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "version";
}
}

@ -3,11 +3,6 @@ package com.nmgs.util;
import java.util.*;
/**
*
*
* @author ruoyi
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
/** 空字符串 */

@ -5,8 +5,8 @@
<link rel="icon" href="/favicon.ico"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title></title>
<script type="module" crossorigin src="../assets/index.f1cb4d07.js"></script>
<link rel="stylesheet" href="../assets/index.47df6ef2.css">
<script type="module" crossorigin src="../assets/index.78afadb8.js"></script>
<link rel="stylesheet" href="../assets/index.c8fd3820.css">
</head>
<body>
<div id="app"></div>

@ -5,8 +5,8 @@
<link rel="icon" href="/favicon.ico"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title></title>
<script type="module" crossorigin src="../assets/index.f1cb4d07.js"></script>
<link rel="stylesheet" href="../assets/index.47df6ef2.css">
<script type="module" crossorigin src="../assets/index.78afadb8.js"></script>
<link rel="stylesheet" href="../assets/index.c8fd3820.css">
</head>
<body>
<div id="app"></div>

@ -5,8 +5,8 @@
<link rel="icon" href="/favicon.ico"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title></title>
<script type="module" crossorigin src="../assets/index.f1cb4d07.js"></script>
<link rel="stylesheet" href="../assets/index.47df6ef2.css">
<script type="module" crossorigin src="../assets/index.78afadb8.js"></script>
<link rel="stylesheet" href="../assets/index.c8fd3820.css">
</head>
<body>
<div id="app"></div>

@ -0,0 +1,3 @@
artifactId=NMGJTManager
groupId=com.nmgs
version=0.0.1-SNAPSHOT

@ -0,0 +1,65 @@
com\nmgs\util\StringUtils.class
com\nmgs\mapper\CmsModPrmisMapper.class
com\nmgs\controller\SysLoginController.class
com\nmgs\util\userLog\entity\SYSTEMLOG.class
com\nmgs\entity\GTUser.class
com\nmgs\controller\GtUserController.class
com\nmgs\controller\ManagerController.class
com\nmgs\util\FileUtil.class
com\nmgs\config\CaptchaConfig.class
com\nmgs\mapper\GTUserMapper.class
com\nmgs\mapper\OrgMapper.class
com\nmgs\util\PagesUtils.class
com\nmgs\config\JaxWsDynamicClientFactory.class
com\nmgs\entity\MySystemMap.class
com\nmgs\entity\CmsUserPrmisJava.class
com\nmgs\controller\SystemView.class
com\nmgs\entity\CmsMenuTable.class
com\nmgs\controller\SysMenuController.class
com\nmgs\entity\TomcatManagerResponse.class
com\nmgs\util\Main.class
com\nmgs\util\PropertiesUtil.class
com\nmgs\entity\CmsSystemTable.class
com\nmgs\util\WebServiceUtil.class
com\nmgs\entity\AjaxResult$Type.class
com\nmgs\mapper\CmsUserPrmisJavaMapper.class
com\nmgs\controller\UserStaController.class
com\nmgs\util\DateUtils.class
com\nmgs\config\MybatisConfig.class
com\nmgs\entity\UPDCOMWARTASK.class
com\nmgs\util\userLog\mapper\SystemLogMapper.class
com\nmgs\util\userLog\util\SystemLogUtil.class
com\nmgs\config\CorsConfig.class
com\nmgs\service\IFileService.class
com\nmgs\controller\MyFileController.class
com\nmgs\controller\SysCaptchaController.class
com\nmgs\service\ScheduleService.class
com\nmgs\mapper\ManagerMapper.class
com\nmgs\service\ApplicationStopImpl.class
com\nmgs\MyEnvironmentPostProcessor.class
com\nmgs\util\LogUtil.class
com\nmgs\config\ErrorConfig.class
com\nmgs\service\ScheduleService$1.class
com\nmgs\util\GetSERVERINFOUtil.class
com\nmgs\entity\WARJOBTASKTABLE.class
com\nmgs\util\PathUtil.class
com\nmgs\entity\UserTable.class
com\nmgs\controller\SystemControl$1.class
com\nmgs\entity\WebApp.class
com\nmgs\controller\SystemVersionControl.class
com\nmgs\service\impl\FileServiceImpl.class
com\nmgs\config\FilterConfig.class
com\nmgs\config\KaptchaTextCreator.class
com\nmgs\mapper\CmsMenuTableMapper.class
com\nmgs\controller\SystemControl.class
com\nmgs\SsmpBackApplication.class
com\nmgs\entity\AjaxResult.class
com\nmgs\util\userLog\controller\UserLogControl.class
com\nmgs\service\ApplicationRunnerImpl.class
com\nmgs\util\TokenUtil.class
com\nmgs\entity\FileInfo.class
com\nmgs\entity\UPDCOMWARPLAN.class
com\nmgs\entity\CmsModPrmisTable.class
com\nmgs\config\MapAdapter.class
com\nmgs\config\RedisSessionConfig.class
com\nmgs\util\DESUtil.class

@ -0,0 +1,62 @@
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\TomcatManagerResponse.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\userLog\entity\SYSTEMLOG.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\SysMenuController.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\MybatisConfig.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\SystemVersionControl.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\WARJOBTASKTABLE.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\CaptchaConfig.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\ErrorConfig.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\AjaxResult.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\mapper\ManagerMapper.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\WebServiceUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\service\ScheduleService.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\UserStaController.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\GetSERVERINFOUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\SystemView.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\StringUtils.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\FilterConfig.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\PathUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\FileUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\CmsModPrmisTable.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\CorsConfig.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\MyEnvironmentPostProcessor.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\mapper\CmsModPrmisMapper.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\DateUtils.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\LogUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\DESUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\MapAdapter.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\FileInfo.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\service\IFileService.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\JaxWsDynamicClientFactory.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\Main.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\KaptchaTextCreator.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\SysLoginController.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\UserTable.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\config\RedisSessionConfig.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\CmsSystemTable.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\TokenUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\GtUserController.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\UPDCOMWARTASK.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\GTUser.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\service\ApplicationRunnerImpl.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\service\ApplicationStopImpl.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\SsmpBackApplication.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\mapper\OrgMapper.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\WebApp.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\mapper\CmsMenuTableMapper.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\service\impl\FileServiceImpl.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\userLog\mapper\SystemLogMapper.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\userLog\util\SystemLogUtil.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\SysCaptchaController.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\CmsMenuTable.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\mapper\GTUserMapper.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\SystemControl.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\MyFileController.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\UPDCOMWARPLAN.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\controller\ManagerController.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\mapper\CmsUserPrmisJavaMapper.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\MySystemMap.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\entity\CmsUserPrmisJava.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\PagesUtils.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\userLog\controller\UserLogControl.java
D:\JAVA\JAVAIDE\WorkSpace\CentralizedMonitoring\NMGJTManager\src\main\java\com\nmgs\util\PropertiesUtil.java

File diff suppressed because one or more lines are too long

@ -5,8 +5,8 @@
<link rel="icon" href="/favicon.ico"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title></title>
<script type="module" crossorigin src="./assets/index.f1cb4d07.js"></script>
<link rel="stylesheet" href="./assets/index.47df6ef2.css">
<script type="module" crossorigin src="./assets/index.78afadb8.js"></script>
<link rel="stylesheet" href="./assets/index.c8fd3820.css">
</head>
<body>
<div id="app"></div>

@ -50,7 +50,9 @@ export const uploadSpeedTest = data => post("/system/systemView/uploadSpeedTest"
//配置文件管理
export const selectAll = data => post("/system/systemControl/selectAll", data)
export const saveAll = data => post("/system/systemControl/saveAll", data)
export const selectVersionAll = data => post("/system/version/selectVersionAll", data)
export const showVersionText = data => post("/system/version/showVersionText", data)
//版本管理
//站管理配置
export const selectAllHuman = (data) => post("/system/UserSta/selectAllHumanOfUserSta", data)
export const selectStaTree = () => post("/system/UserSta/selectStaTree", {})

@ -7,6 +7,7 @@ import systemControl from '../../views/systemControl/index.vue';
import user from '../../views/User/index.vue';
import systemShow from '../../views/systemShow/systemShow.vue';
import userSta from '../../views/userSta/index.vue';
import version from '../../views/systemVersion/index.vue';
const routes = [
{
path: '/NMGJTManager/page/login',
@ -41,6 +42,10 @@ const routes = [
path: '/NMGJTManager/page/systemShow',
component: systemShow
},
{
path: '/NMGJTManager/page/version',
component: version
},
{
path: '/',
redirect: '/NMGJTManager/page/menuIndex'

@ -0,0 +1,131 @@
<template>
<div class="intemShow">
<el-row style="width: 100%">
<div style="padding: 10px 0;width: 100%">
<el-input style="width: 172px;float: left" placeholder="程序名称" clearable
v-model="selectForm.systemName"></el-input>
<div>
<el-button type="primary" style="margin-left: 0.5%" @click="network">
<el-icon style="vertical-align: middle;">
<search/>
</el-icon>
<span style="vertical-align: middle;"> 搜索 </span>
</el-button>
</div>
</div>
<div style="height: 78vh;width: 100%">
<el-table :data="tableData" border
highlight-current-row="true"
style="width: 100%"
height="100%"
>
<el-table-column :resizable="false" prop="systemName" label="系统名称"
align="center"></el-table-column>
<el-table-column :resizable="false" prop="version" label="版本" align="center"></el-table-column>
<el-table-column :resizable="false" prop="right" label="操作" width="80" align="center">
<template v-slot="scope">
<el-button style="width: 96%;margin-left: 2%" @click="consoleData(scope.row)" type="primary"
size="default">
<el-icon>
<Document/>
</el-icon>
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-row>
<el-config-provider :locale="locale">
<div style="padding: 2px 0">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pageNum"
:page-sizes="[ 10, 50, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-config-provider>
<el-dialog title="更新日志" v-model="dialogFormVisible" width="30%" top="0.5%" :close-on-click-modal=false>
<el-scrollbar height="400px">
<div v-html="logInfo"></div>
</el-scrollbar>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormVisible=false"> </el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script>
import zhCn from 'element-plus/lib/locale/lang/zh-cn'
import {ElMessage, ElMessageBox} from "element-plus";
import {
selectVersionAll,
showVersionText,
} from "../../api/api.js";
import moment from "moment";
import {Delete, Edit, Search} from '@element-plus/icons-vue'
export default {
name: "systemControl",
data() {
return {
Search,
dialogFormVisible: false,
selectForm: {},
tableData: [],
locale: zhCn,
total: 0,
pageNum: 1,
pageSize: 10,
logInfo: "",
}
},
methods: {
handleSizeChange(val) { //
this.pageSize = val
this.network()
},
handleCurrentChange(val) { //
this.pageNum = val
this.network()
},
reNetwork() { //
this.selectForm = {};
this.network();
},
network() {
this.selectForm.pageNum = this.pageNum
this.selectForm.pageSize = this.pageSize
selectVersionAll(this.selectForm).then((res) => {
this.total = res.total
this.tableData = res.records
})
},
consoleData(row) {
this.dialogFormVisible = true
showVersionText(row).then(res => {
this.logInfo = res
})
},
},
created() {
this.network()
}
}
</script>
<style scoped>
.intemShow {
margin-left: 15px;
}
</style>
Loading…
Cancel
Save