From 9114d6ed71ba97f0e200d8ee4205f757c85216d5 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 10 Apr 2025 10:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=8C=96=E7=89=88=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E8=8B=A5=E5=B9=B2=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 40 ++----------- src/main/java/com/zcloud/BusApplication.java | 36 ++++++++++++ .../zcloud/SpringBootStartApplication.java | 6 +- src/main/resources/application-dev.properties | 58 ++++++------------- src/main/resources/application-gs.properties | 48 +++++++++++++++ src/main/resources/application.properties | 16 ++--- 6 files changed, 113 insertions(+), 91 deletions(-) create mode 100644 src/main/java/com/zcloud/BusApplication.java create mode 100644 src/main/resources/application-gs.properties diff --git a/pom.xml b/pom.xml index d856c9f..3534303 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 com.zcloud - integrated_whb + integrated_mini_bus 0.0.1-SNAPSHOT war - integrated_whb - integrated_whb for Spring Boot + integrated_mini_bus + integrated_mini_bus for Spring Boot org.springframework.boot @@ -46,7 +46,6 @@ - org.springframework.boot spring-boot-starter-test @@ -62,7 +61,6 @@ spring-boot-devtools true - javax.servlet @@ -192,18 +190,16 @@ batik-xml ${batik.version} - com.aliyun aliyun-java-sdk-core 3.3.1 - + com.aliyun aliyun-java-sdk-dysmsapi 1.0.0 - com.aliyun vod20170321 @@ -260,7 +256,6 @@ org.freemarker freemarker - com.alibaba @@ -277,7 +272,6 @@ - org.apache.shiro @@ -295,13 +289,11 @@ ${shiro.version} - org.springframework.boot spring-boot-starter-cache - org.springframework.boot @@ -324,55 +316,46 @@ mybatis-spring-boot-starter 1.3.2 - mysql mysql-connector-java - com.hynnet sqljdbc4-chs 4.0.2206.100 - org.java-websocket Java-WebSocket 1.3.7 - commons-codec commons-codec - - commons-fileupload commons-fileupload 1.3.3 - com.aliyun.oss aliyun-sdk-oss 3.10.2 - com.alibaba fastjson 1.2.44 - com.aliyun @@ -389,41 +372,35 @@ aliyun-java-sdk-facebody 1.2.26 - com.gitee.qdbp.thirdparty ueditor 1.4.3.3 - com.sun.mail javax.mail 1.6.2 - com.belerweb pinyin4j 2.5.1 - org.quartz-scheduler quartz - org.fusesource sigar 1.6.4 - net.sf.json-lib @@ -431,7 +408,6 @@ 2.4 jdk15 - org.apache.poi @@ -468,36 +444,30 @@ poi-scratchpad 4.1.2 - org.apache.httpcomponents httpcore - org.apache.httpcomponents httpclient - dom4j dom4j 1.6.1 - com.alibaba easyexcel 2.2.6 - com.google.guava guava 32.1.1-jre - org.projectlombok lombok @@ -537,7 +507,7 @@ --> - integrated_whb + integrated_mini_bus org.springframework.boot diff --git a/src/main/java/com/zcloud/BusApplication.java b/src/main/java/com/zcloud/BusApplication.java new file mode 100644 index 0000000..2ab261d --- /dev/null +++ b/src/main/java/com/zcloud/BusApplication.java @@ -0,0 +1,36 @@ +package com.zcloud; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.service.remote.RemoteCorpService; +import org.mybatis.spring.annotation.MapperScan; +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.cloud.openfeign.EnableFeignClients; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.web.bind.annotation.PostMapping; + +import javax.annotation.Resource; + +/** + * 说明：启动类 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +@SpringBootApplication//去除冲突 +@MapperScan("com.zcloud.mapper") +@EnableCaching +@EnableScheduling // 2.开启定时任务 +@EnableFeignClients +public class BusApplication { + + public static void main(String[] args) { + SpringApplication.run(BusApplication.class, args); + } + + + +} diff --git a/src/main/java/com/zcloud/SpringBootStartApplication.java b/src/main/java/com/zcloud/SpringBootStartApplication.java index 1cffc08..634f168 100644 --- a/src/main/java/com/zcloud/SpringBootStartApplication.java +++ b/src/main/java/com/zcloud/SpringBootStartApplication.java @@ -9,9 +9,9 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * 官网：www.qdkjchina.com */ public class SpringBootStartApplication extends SpringBootServletInitializer { - + @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return builder.sources(FHmainApplication.class); //这里要指向原先用main方法执行的FHmainApplication启动类 + return builder.sources(BusApplication.class); //这里要指向原先用main方法执行的FHmainApplication启动类 } -} \ No newline at end of file +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index d32d1e5..db06629 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,64 +1,40 @@ #01.00.02_gateMachine -datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver +datasource.no1.driver-class-name=com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.100.115.58:33080/integrated_whb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root datasource.no1.password=Mysql@zcloud33080 -#数据源2(默认没用，俩地址写一样即可) -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.100.115.58:33080/integrated_admin?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root datasource.no2.password=Mysql@zcloud33080 -#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.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.maxActive=20 +spring.datasource.initialSize=1 +spring.datasource.maxWait=60000 +spring.datasource.poolPreparedStatements=true +spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 +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=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.servlet.encoding.charset=UTF-8 spring.servlet.encoding.force=true spring.servlet.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} config.basicInfo.id=011de03c1d0a412ca78e2e5d4637ea81 config.basic.url=http://192.168.0.7:8082/zcouldProperty - customer.id=LAZ-20221129-3 customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 #开发 @@ -69,4 +45,4 @@ spring.redis.host=192.168.20.230 spring.redis.password=Redis@redis230 spring.redis.database=0 spring.redis.port=16379 -zf.biCount.url = http://192.168.0.25:10002/ \ No newline at end of file +zf.biCount.url = http://192.168.0.25:10002/ diff --git a/src/main/resources/application-gs.properties b/src/main/resources/application-gs.properties new file mode 100644 index 0000000..79f899b --- /dev/null +++ b/src/main/resources/application-gs.properties @@ -0,0 +1,48 @@ +datasource.no1.driver-class-name=com.mysql.cj.jdbc.Driver +datasource.no1.url=jdbc:mysql://39.100.115.58:33080/integrated_mini_bus?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.username=root +datasource.no1.password=Mysql@zcloud33080 +datasource.no2.driver-class-name=com.mysql.cj.jdbc.Driver +datasource.no2.url=jdbc:mysql://39.100.115.58:33080/integrated_mini_admin?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.username=root +datasource.no2.password=Mysql@zcloud33080 + + +spring.servlet.multipart.max-file-size=500MB +spring.servlet.multipart.max-request-size=500MB +spring.main.banner-mode=off +spring.redis.host=192.168.20.230 +spring.redis.password=Redis@redis230 +spring.redis.database=0 +spring.redis.port=16379 +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.maxActive= 20 +spring.datasource.initialSize= 1 +spring.datasource.maxWait= 60000 +spring.datasource.poolPreparedStatements= true +spring.datasource.maxPoolPreparedStatementPerConnectionSize= 20 +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 +spring.cache.ehcache.cofnig=ehcache.xml +spring.activiti.check-process-definitions=false +spring.servlet.encoding.charset=UTF-8 +spring.servlet.encoding.force=true +spring.servlet.encoding.enabled=true + +filters= stat, wall, log4j + +logging.level.com.zcloud.mapper=debug + +config.basicInfo.id=011de03c1d0a412ca78e2e5d4637ea81 +config.basic.url=http://192.168.0.7:8082/zcouldProperty +customer.id=LAZ-20221129-3 +customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 +customer.url=https://api.qhdsafety.com/sync/ +customer.domain=yth.qhdsafety.com + +zf.biCount.url = http://192.168.0.25:10002/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 68a9186..1393ae9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,15 +1,7 @@ -spring.application.name=integrated_whb +spring.application.name=integrated_mini_bus server.port=8199 -#?? -#spring.profiles.active=local -#????31???? -spring.profiles.active=dev - -#spring.profiles.active=master - - +spring.profiles.active=gs management.endpoints.web.exposure.include=prometheus management.metrics.tags.application=\u4e00\u4f53\u5316\u5371\u5316\u7248 - -zf.biCount.url = http://47.92.102.56:10001/ -server.tomcat.max-http-form-post-size= -1 \ No newline at end of file +zf.biCount.url=http://47.92.102.56:10001/ +server.tomcat.max-http-form-post-size=-1