diff --git a/.gitignore b/.gitignore index 82eca336..1a42e490 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ /nbbuild/ /dist/ /nbdist/ -/.nb-gradle/ \ No newline at end of file +/.nb-gradle/ +/catalina.base_IS_UNDEFINED/ diff --git a/src/main/java/com/zcloud/FHmainApplication.java b/src/main/java/com/zcloud/FHmainApplication.java index 6d28eafb..1251f755 100644 --- a/src/main/java/com/zcloud/FHmainApplication.java +++ b/src/main/java/com/zcloud/FHmainApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Conditional; import org.springframework.scheduling.annotation.EnableScheduling; /** @@ -17,7 +18,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication//去除冲突 @MapperScan("com.zcloud.mapper") @EnableCaching -@EnableScheduling // 2.开启定时任务 +@EnableScheduling +// 2.开启定时任务 public class FHmainApplication { public static void main(String[] args) { SpringApplication.run(FHmainApplication.class, args); diff --git a/src/main/java/com/zcloud/util/Smb.java b/src/main/java/com/zcloud/util/Smb.java index f793b7cd..9c6819d8 100644 --- a/src/main/java/com/zcloud/util/Smb.java +++ b/src/main/java/com/zcloud/util/Smb.java @@ -4,6 +4,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Vector; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.multipart.MultipartFile; import com.jcraft.jsch.Channel; @@ -16,6 +17,17 @@ import com.jcraft.jsch.SftpException; public class Smb { + @Value("${smb.host}") + private static String host; + @Value("${smb.port}") + private static Integer port ; + @Value("${smb.user}") + private static String user; + @Value("${smb.password}") + private static String password; + @Value("${smb.basePath}") + private static String basePath; + // private static String host = "39.103.224.166"; // // private static Integer port = 22; @@ -25,15 +37,15 @@ public class Smb { // private static String password = "Zcloud@zcloud88888"; // // private static String basePath = "/mnt/qgfile/file/"; - private static String host = "192.168.192.201"; - - private static Integer port = Integer.valueOf(22); - - private static String user = "root"; - - private static String password = "SJSKAQHBGLXT@20220311"; - - private static String basePath = "/mnt/qask/file/"; +// private static String host = "192.168.192.201"; +// +// private static Integer port = Integer.valueOf(22); +// +// private static String user = "root"; +// +// private static String password = "SJSKAQHBGLXT@20220311"; +// +// private static String basePath = "/mnt/qask/file/"; public static final String SMBBAES_PATH = basePath; diff --git a/src/main/resources/application-2.properties b/src/main/resources/application-dev.properties similarity index 54% rename from src/main/resources/application-2.properties rename to src/main/resources/application-dev.properties index 9ffd3872..5bb49ecc 100644 --- a/src/main/resources/application-2.properties +++ b/src/main/resources/application-dev.properties @@ -1,37 +1,27 @@ -spring.application.name=qa-prevention-gwj -server.port=8091 -#数据源 172.24.151.16 39.103.224.166 39.101.130.96 192.168.192.202 gwjsjkzcloud888888 + + datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root datasource.no1.password=Mysql@zcloud88888 -datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver +datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root datasource.no2.password=Mysql@zcloud88888 -#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -#datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -#datasource.no1.username=root -#datasource.no1.password=gwjsjkzcloud888888 -#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -#datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -#datasource.no2.username=root -#datasource.no2.password=gwjsjkzcloud888888 - -#druid连接池 +#druid??? spring.datasource.type: com.alibaba.druid.pool.DruidDataSource -#最大活跃数 +#????? spring.datasource.maxActive: 20 -#初始化数量 +#????? spring.datasource.initialSize: 1 -#最大连接等待超时时间 +#?????????? spring.datasource.maxWait: 60000 -#打开PSCache，并且指定每个连接PSCache的大小 +#??PSCache?????????PSCache??? spring.datasource.poolPreparedStatements: true spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20 -#通过connectionProperties属性来打开mergeSql功能；慢SQL记录 +#??connectionProperties?????mergeSql????SQL?? #connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.datasource.minIdle: 1 spring.datasource.timeBetweenEvictionRunsMillis: 60000 @@ -40,34 +30,42 @@ spring.datasource.validationQuery: select 1 from dual spring.datasource.testWhileIdle: true spring.datasource.testOnBorrow: false spring.datasource.testOnReturn: false -#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙 +#?????????filters????????sql?????,'wall'????? filters: stat, wall, log4j -#缓存配置文件位置 +#???????? spring.cache.ehcache.cofnig=ehcache.xml -#配置这句话,控制台输出sql语句 +#?????,?????sql?? logging.level.com.zcloud.mapper=debug -#上传文件大小限制 +#???????? spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=500MB -#activiti模型检测 +#activiti???? spring.activiti.check-process-definitions=false -#字符 +#?? spring.http.encoding.charset=UTF-8 spring.http.encoding.force=true spring.http.encoding.enabled=true -# 关闭springboot启动时的banner +# ??springboot????banner spring.main.banner-mode=off -#jar包部署时去掉注释 +#jar???????? #web.upload-path=h:/ #web.front-path=h:/ #spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} -preventionxgf.api.url=http://192.168.0.45:8088/ -qa-regulatory-gwj.api.url=http://192.168.0.45:8092/ - +#preventionxgf.api.url=http://192.168.0.79:8088 +# +#qa-regulatory-gwj.api.url=http://192.168.0.79:8008 +preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ +qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ +#????? +smb.host=39.103.224.166 +smb.port=22 +smb.user=root +smb.password=Zcloud@zcloud88888 +smb.basePath=/mnt/qgfile/file/ diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties new file mode 100644 index 00000000..5bb49ecc --- /dev/null +++ b/src/main/resources/application-local.properties @@ -0,0 +1,71 @@ + + +datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver +datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.username=root +datasource.no1.password=Mysql@zcloud88888 +datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver +datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.username=root +datasource.no2.password=Mysql@zcloud88888 + + +#druid??? +spring.datasource.type: com.alibaba.druid.pool.DruidDataSource +#????? +spring.datasource.maxActive: 20 +#????? +spring.datasource.initialSize: 1 +#?????????? +spring.datasource.maxWait: 60000 +#??PSCache?????????PSCache??? +spring.datasource.poolPreparedStatements: true +spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20 +#??connectionProperties?????mergeSql????SQL?? +#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.minIdle: 1 +spring.datasource.timeBetweenEvictionRunsMillis: 60000 +spring.datasource.minEvictableIdleTimeMillis: 300000 +spring.datasource.validationQuery: select 1 from dual +spring.datasource.testWhileIdle: true +spring.datasource.testOnBorrow: false +spring.datasource.testOnReturn: false +#?????????filters????????sql?????,'wall'????? +filters: stat, wall, log4j + +#???????? +spring.cache.ehcache.cofnig=ehcache.xml + +#?????,?????sql?? +logging.level.com.zcloud.mapper=debug + +#???????? +spring.servlet.multipart.max-file-size=500MB +spring.servlet.multipart.max-request-size=500MB + +#activiti???? +spring.activiti.check-process-definitions=false + +#?? +spring.http.encoding.charset=UTF-8 +spring.http.encoding.force=true +spring.http.encoding.enabled=true +# ??springboot????banner +spring.main.banner-mode=off +#jar???????? +#web.upload-path=h:/ +#web.front-path=h:/ +#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} + +#preventionxgf.api.url=http://192.168.0.79:8088 +# +#qa-regulatory-gwj.api.url=http://192.168.0.79:8008 + +preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ +qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ +#????? +smb.host=39.103.224.166 +smb.port=22 +smb.user=root +smb.password=Zcloud@zcloud88888 +smb.basePath=/mnt/qgfile/file/ diff --git a/src/main/resources/application3.properties b/src/main/resources/application-master.properties similarity index 76% rename from src/main/resources/application3.properties rename to src/main/resources/application-master.properties index bc934404..d0201a70 100644 --- a/src/main/resources/application3.properties +++ b/src/main/resources/application-master.properties @@ -1,16 +1,4 @@ -spring.application.name=qa-prevention-gwj -server.port=8091 -#数据源 172.24.151.16 39.103.224.166 39.101.130.96 192.168.192.202 gwjsjkzcloud888888 -#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -#datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -#datasource.no1.username=root -#datasource.no1.password=Mysql@zcloud88888 -#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -#datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -#datasource.no2.username=root -#datasource.no2.password=Mysql@zcloud88888 - - +# ?????? datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root @@ -70,3 +58,10 @@ spring.main.banner-mode=off preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/ +#????? +smb.host=192.168.192.201 +smb.port=22 +smb.user=root +smb.password=SJSKAQHBGLXT@20220311 +smb.basePath=/mnt/qask/file/ + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bc934404..9f55743c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,72 +1,12 @@ spring.application.name=qa-prevention-gwj server.port=8091 -#数据源 172.24.151.16 39.103.224.166 39.101.130.96 192.168.192.202 gwjsjkzcloud888888 -#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -#datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -#datasource.no1.username=root -#datasource.no1.password=Mysql@zcloud88888 -#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -#datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -#datasource.no2.username=root -#datasource.no2.password=Mysql@zcloud88888 + +#?? +spring.profiles.active=local +#?? +#spring.profiles.active=dev +#?? +#spring.profiles.active=master -datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no1.username=root -datasource.no1.password=gwjsjkzcloud888888 -datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no2.username=root -datasource.no2.password=gwjsjkzcloud888888 - -#druid连接池 -spring.datasource.type: com.alibaba.druid.pool.DruidDataSource -#最大活跃数 -spring.datasource.maxActive: 20 -#初始化数量 -spring.datasource.initialSize: 1 -#最大连接等待超时时间 -spring.datasource.maxWait: 60000 -#打开PSCache，并且指定每个连接PSCache的大小 -spring.datasource.poolPreparedStatements: true -spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20 -#通过connectionProperties属性来打开mergeSql功能；慢SQL记录 -#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 -spring.datasource.minIdle: 1 -spring.datasource.timeBetweenEvictionRunsMillis: 60000 -spring.datasource.minEvictableIdleTimeMillis: 300000 -spring.datasource.validationQuery: select 1 from dual -spring.datasource.testWhileIdle: true -spring.datasource.testOnBorrow: false -spring.datasource.testOnReturn: false -#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙 -filters: stat, wall, log4j - -#缓存配置文件位置 -spring.cache.ehcache.cofnig=ehcache.xml - -#配置这句话,控制台输出sql语句 -logging.level.com.zcloud.mapper=debug - -#上传文件大小限制 -spring.servlet.multipart.max-file-size=500MB -spring.servlet.multipart.max-request-size=500MB - -#activiti模型检测 -spring.activiti.check-process-definitions=false - -#字符 -spring.http.encoding.charset=UTF-8 -spring.http.encoding.force=true -spring.http.encoding.enabled=true -# 关闭springboot启动时的banner -spring.main.banner-mode=off -#jar包部署时去掉注释 -#web.upload-path=h:/ -#web.front-path=h:/ -#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} - -preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/ diff --git a/untitled1/src/Main.java b/untitled1/src/Main.java deleted file mode 100644 index 3e59c38f..00000000 --- a/untitled1/src/Main.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file