integrated_mini
/
integrated_mini_bus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

危化版企业若干代码格式调整

main
liujun 2025-04-10 10:26:41 +08:00
parent bd89419e3e
commit 9114d6ed71
6 changed files with 113 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pom.xml
View File

@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zcloud</groupId>
<artifactId>integrated_whb</artifactId>
<artifactId>integrated_mini_bus</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging><!-- 以war运行是改成war -->
<name>integrated_whb</name>
<description>integrated_whb for Spring Boot</description>
<name>integrated_mini_bus</name>
<description>integrated_mini_bus for Spring Boot</description>
<parent>
<groupId>org.springframework.boot</groupId>
@ -46,7 +46,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@ -62,7 +61,6 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<!-- war包方式部署时，解开注释 -->
<dependency>
<groupId>javax.servlet</groupId>
@ -192,7 +190,6 @@
<artifactId>batik-xml</artifactId>
<version>${batik.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
@ -203,7 +200,6 @@
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>vod20170321</artifactId>
@ -260,7 +256,6 @@
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>
<!-- druid 数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
@ -277,7 +272,6 @@
</exclusion>
</exclusions>
</dependency>
<!--shiro start-->
<dependency>
<groupId>org.apache.shiro</groupId>
@ -295,13 +289,11 @@
<version>${shiro.version}</version>
</dependency>
<!--shiro end-->
<!-- Spring Boot缓存启动器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<!-- unipush-->
<dependency>
<groupId>org.springframework.boot</groupId>
@ -324,55 +316,46 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
<!-- mysql数据库驱动 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- sqlserver数据库驱动 -->
<dependency>
<groupId>com.hynnet</groupId>
<artifactId>sqljdbc4-chs</artifactId>
<version>4.0.2206.100</version>
</dependency>
<!-- websocket即时通讯 -->
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
<version>1.3.7</version>
</dependency>
<!-- BASE64处理 -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<!-- 上传文件依赖 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<!-- OSS -->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.10.2</version>
</dependency>
<!-- alibabajson处理 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.44</version>
</dependency>
<!--人脸识别 -->
<dependency>
<groupId>com.aliyun</groupId>
@ -389,41 +372,35 @@
<artifactId>aliyun-java-sdk-facebody</artifactId>
<version>1.2.26</version>
</dependency>
<!-- 百度富文本编辑器 ueditor -->
<dependency>
<groupId>com.gitee.qdbp.thirdparty</groupId>
<artifactId>ueditor</artifactId>
<version>1.4.3.3</version>
</dependency>
<!-- 电子邮件依赖 -->
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
</dependency>
<!-- 根据汉字解析出拼音 -->
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.1</version>
</dependency>
<!-- quartz定时任务 -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
<!-- 服务器硬件使用情况检查 -->
<dependency>
<groupId>org.fusesource</groupId>
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.sf.json-lib/json-lib -->
<dependency>
<groupId>net.sf.json-lib</groupId>
@ -431,7 +408,6 @@
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
<dependency>
<groupId>org.apache.poi</groupId>
@ -468,36 +444,30 @@
<artifactId>poi-scratchpad</artifactId>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.2.6</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.1-jre</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@ -537,7 +507,7 @@
</includes>
</resource>
</resources> -->
<finalName>integrated_whb</finalName>
<finalName>integrated_mini_bus</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

36
src/main/java/com/zcloud/BusApplication.java Normal file
View File

@ -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);
}
}

2
src/main/java/com/zcloud/SpringBootStartApplication.java
View File

@ -12,6 +12,6 @@ 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启动类
}
}

56
src/main/resources/application-dev.properties
View File

@ -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
#开发

48
src/main/resources/application-gs.properties Normal file
View File

@ -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/

16
src/main/resources/application.properties
View File

@ -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
zf.biCount.url=http://47.92.102.56:10001/
server.tomcat.max-http-form-post-size=-1