diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index 773711b..39df8cf 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -100,13 +100,13 @@ public class LoginController extends BaseController { Map map = new HashMap(); // 2023-04-17 新增需求如果当前时间大于10月1号,则不允许登录(房嘉恺) // 2024-11-15 由于商务原因恢复系统登录限制(王鹏) - Date today = new Date(); - Date limit_date = DateUtil.fomatDateTime("2025-01-08 00:00:00"); - if (today.getTime() > limit_date.getTime()){ - errInfo = "error"; - map.put("msg", "系统开小差,请联系管理员"); - return map; - } +// Date today = new Date(); +// Date limit_date = DateUtil.fomatDateTime("2025-01-08 00:00:00"); +// if (today.getTime() > limit_date.getTime()){ +// errInfo = "error"; +// map.put("msg", "系统开小差,请联系管理员"); +// return map; +// } PageData pd = new PageData(); pd = this.getPageData(); String source = pd.getString("SOURCE"); diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index 423cf87..6c7621e 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -49,10 +49,11 @@ public class Const { public static final String ISSUPERVISE = "ISSUPERVISE"; //是否监管部门 public static final String CORP_TRAINTYPE = "CORP_TRAINTYPE"; //是否监管部门 - public static final String FILEURL = "/mnt/wlaq/file/"; //文件服务器地址 -// public static final String HTTPFILEURL = "http://36.133.193.8:8086/wlaqfile"; //文件服务器地址(测试) + public static final String FILEURL = "/home/proj/wlaq/apache-tomcat-8.5.100-file/webapps/wlaq/"; //文件服务器地址(测试) + public static final String HTTPFILEURL = "http://192.168.20.240:8463/wlaq/"; //文件服务器地址(测试) +// public static final String FILEURL = "/mnt/wlaq/file/"; //文件服务器地址 // public static final String HTTPFILEURL = "http://192.168.10.69:8080/file/"; //文件服务器地址(正式内网) - public static final String HTTPFILEURL = "https://wlqy.zcloudchina.com/file"; //文件服务器地址 +// public static final String HTTPFILEURL = "https://wlqy.zcloudchina.com/file"; //文件服务器地址 public static final Integer NOTICEWIDTHMAX = 700; // 公告上传图片,最大宽度 diff --git a/src/main/java/com/zcloud/util/Smb.java b/src/main/java/com/zcloud/util/Smb.java index 92714f2..743b18f 100644 --- a/src/main/java/com/zcloud/util/Smb.java +++ b/src/main/java/com/zcloud/util/Smb.java @@ -16,19 +16,19 @@ import org.springframework.web.multipart.MultipartFile; public class Smb { // 正式 - private static String host="192.168.10.69"; - private static Integer port=22; - private static String user="root"; - private static String password="wljt@123456"; - private static String basePath="/mnt/wlaq/file/"; - - //测试 -// private static String host="36.133.193.8"; +// private static String host="192.168.10.69"; // private static Integer port=22; // private static String user="root"; -// private static String password="Zykj@zcloud88888"; +// private static String password="wljt@123456"; // private static String basePath="/mnt/wlaq/file/"; + //测试 + private static String host="192.168.20.240"; + private static Integer port=22; + private static String user="root"; + private static String password="Zcloud@zcloud240"; + private static String basePath="/home/proj/wlaq/apache-tomcat-8.5.100-file/webapps/wlaq/"; + public static void sshSftp(MultipartFile file, String fileName,String path) throws Exception { System.out.println("(文件:" + file.getOriginalFilename() + ")上传开始:" + DateUtil.date2Str(new Date()) + ", 文件大小:" + file.getSize()); Session session = null; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7db4609..c76f055 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,9 +1,9 @@ spring.application.name=qa-prevention-wlaq -server.port=7062 +server.port=8462 -#开发 +#\u5F00\u53D1 spring.profiles.active=dev -##测试(运维) +##\u6D4B\u8BD5\uFF08\u8FD0\u7EF4\uFF09 #spring.profiles.active=test -##正式 +##\u6B63\u5F0F #spring.profiles.active=pro