Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f30f17b6 由 sunke
选项

配置文件修改

1 个父辈 258d0897
内嵌 并排
正在显示 5 个修改的文件 包含 55 行增加 和 110 行删除
pom.xml
...@@ -10,11 +10,14 @@ ...@@ -10,11 +10,14 @@
</parent> </parent>
<groupId>com.neotel</groupId> <groupId>com.neotel</groupId>
<artifactId>smf-core</artifactId> <artifactId>smf-core</artifactId>
<version>1.8.1312</version> <version>${app.version}</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>smf-core</name> <name>smf-core</name>
<description>SMF project for Spring Boot</description> <description>SMF project for Spring Boot</description>
<properties> <properties>
<maven.build.timestamp.format>MMd</maven.build.timestamp.format>
<main.version>1.${maven.build.timestamp}</main.version>
<app.version>${main.version}.${current.time}</app.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<jjwt.version>0.11.1</jjwt.version> <jjwt.version>0.11.1</jjwt.version>
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 --> <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
...@@ -23,6 +26,18 @@ ...@@ -23,6 +26,18 @@
<fastjson.version>1.2.70</fastjson.version> <fastjson.version>1.2.70</fastjson.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
</properties> </properties>
<profiles>
<profile>
<id>prod</id>
<properties>
<!--这里定义package.environment这个变量-->
<package.environment>prod</package.environment>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
</profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -201,14 +216,21 @@ ...@@ -201,14 +216,21 @@
<includes> <includes>
<include>*.*</include> <include>*.*</include>
</includes> </includes>
<filtering>true</filtering>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<includes> <includes>
<include>**/*.*</include> <include>**/*.*</include>
</includes> </includes>
<filtering>true</filtering>
</resource> </resource>
</resources> </resources>
<!--<finalName>-->
<!--${project.artifactId}.${project.version}.${current.time}-->
<!--</finalName>-->
<!--</plugins>-->
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -222,6 +244,35 @@ ...@@ -222,6 +244,35 @@
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>utf-8</encoding>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@</delimiter>
</delimiters>
</configuration>
</plugin>
<!--时间的时区-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>timestamp-property</id>
<goals>
<goal>timestamp-property</goal>
</goals>
<configuration>
<name>current.time</name>
<pattern>H</pattern>
<timeZone>GMT+8</timeZone>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/SensorShelfHandler.java
...@@ -157,7 +157,6 @@ public class SensorShelfHandler extends BaseDeviceHandler { ...@@ -157,7 +157,6 @@ public class SensorShelfHandler extends BaseDeviceHandler {
try { try {
outResult = posName; outResult = posName;
super.finishedOutPos(cid,posName); super.finishedOutPos(cid,posName);
inOkList.add(hasReelPosList[0]);
String msg = queueTask.getBarcode()+ "从"+ posName+"出库成功"; String msg = queueTask.getBarcode()+ "从"+ posName+"出库成功";
log.error(msg); log.error(msg);
WebSocketServer.sendGroupMsg(groupId,new SocketMsg(msg, MsgType.INFO)); WebSocketServer.sendGroupMsg(groupId,new SocketMsg(msg, MsgType.INFO));
......
src/main/resources/config/application-dev.yml
...@@ -12,22 +12,6 @@ login: ...@@ -12,22 +12,6 @@ login:
cache-enable: false cache-enable: false
# 是否限制单用户登录 # 是否限制单用户登录
single-login: false single-login: false
# 验证码
login-code:
# 验证码类型配置 查看 LoginProperties 类
code-type: arithmetic
# 登录图形验证码有效时间/分钟
expiration: 20
# 验证码高度
width: 111
# 验证码宽度
height: 36
# 内容长度
length: 2
# 字体名称，为空则使用默认字体
font-name:
# 字体大小
font-size: 25
#jwt #jwt
jwt: jwt:
......
src/main/resources/config/application-prod.yml
#配置数据源
spring:
datasource:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5
# 最小连接数
min-idle: 15
# 最大连接数
max-active: 30
# 获取连接超时时间
max-wait: 5000
# 连接有效性检测时间
time-between-eviction-runs-millis: 60000
# 连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
# 连接在池中最大生存的时间
max-evictable-idle-time-millis: 900000
# 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
test-while-idle: true
# 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
test-on-borrow: true
# 是否在归还到池中前进行检验
test-on-return: false
# 检测连接是否有效
validation-query: select 1
# 配置监控统计
webStatFilter:
enabled: true
stat-view-servlet:
enabled: true
# 控制台管理用户名和密码
url-pattern: /druid/*
reset-enable: false
login-username: admin
login-password: 123456
filter:
stat:
enabled: true
# 记录慢SQL
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# 登录相关配置 # 登录相关配置
login: login:
...@@ -56,22 +6,6 @@ login: ...@@ -56,22 +6,6 @@ login:
cache-enable: true cache-enable: true
# 是否限制单用户登录 # 是否限制单用户登录
single-login: false single-login: false
# 验证码
login-code:
# 验证码类型配置 查看 LoginProperties 类
code-type: arithmetic
# 登录图形验证码有效时间/分钟
expiration: 2
# 验证码高度
width: 111
# 验证码宽度
height: 36
# 内容长度
length: 2
# 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
font-name:
# 字体大小
font-size: 25
#jwt #jwt
jwt: jwt:
...@@ -117,10 +51,7 @@ file: ...@@ -117,10 +51,7 @@ file:
avatar: ~/avatar/ avatar: ~/avatar/
linux: linux:
path: /home/eladmin/file/ path: /home/eladmin/file/
avatar: /home/eladmin/avatar/
windows: windows:
path: C:\eladmin\file\ path: C:\smf\file\
avatar: C:\eladmin\avatar\
# 文件大小 /M # 文件大小 /M
maxSize: 100 maxSize: 100
avatarMaxSize: 5
src/main/resources/config/application.yml
...@@ -15,7 +15,7 @@ spring: ...@@ -15,7 +15,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: dev active: '@package.environment@'
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:
...@@ -27,26 +27,6 @@ spring: ...@@ -27,26 +27,6 @@ spring:
encoding: utf-8 encoding: utf-8
task:
pool:
# 核心线程池大小
core-pool-size: 10
# 最大线程数
max-pool-size: 30
# 活跃时间
keep-alive-seconds: 60
# 队列容量
queue-capacity: 50
#七牛云
qiniu:
# 文件大小 /M
max-size: 15
#邮箱验证码有效时间/秒
code:
expiration: 300
#密码加密传输，前端公钥加密，后端私钥解密 #密码加密传输，前端公钥加密，后端私钥解密
rsa: rsa:
private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!