youxiw2000 / trash · Commits

Commit 518556bd17b137a836b7b2d89e956aa68fc509d2

Authored by liujun001
1 parent bfaee3cd
build: skipped

修改图片样式

Inline Side-by-side
Showing 7 changed files with 142 additions and 3 deletions
trash-admin/src/main/resources/application-dev.yml
  View file @518556b
... ... @@ -9,7 +9,7 @@ trash:
9 9 # 实例演示开关
10 10 demoEnabled: true
11 11 # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
12   - profile: D:/trash/uploadPath
  12 + profile: /home/trash/uploadPath
13 13 # profile: E:/trash/uploadPath
14 14 # profile: F:/work/project/Documents/uploadPath/trash
15 15 # 获取ip地址开关
... ... @@ -85,7 +85,7 @@ spring:
85 85 # redis 配置
86 86 redis:
87 87 # 地址
88   - host: localhost
  88 + host: 127.0.0.1
89 89 # 端口，默认为6379
90 90 port: 6379
91 91 # 密码
... ...
trash-admin/src/main/resources/application-local.yml 0 → 100644
  View file @518556b
  1 +# 项目相关配置
  2 +trash:
  3 + # 名称
  4 + name: trash
  5 + # 版本
  6 + version: 3.2.0
  7 + # 版权年份
  8 + copyrightYear: 2020
  9 + # 实例演示开关
  10 + demoEnabled: true
  11 + # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
  12 + profile: D:/trash/uploadPath
  13 +# profile: E:/trash/uploadPath
  14 +# profile: F:/work/project/Documents/uploadPath/trash
  15 +# 获取ip地址开关
  16 + addressEnabled: false
  17 + # 验证码类型 math 数组计算 char 字符验证
  18 + captchaType: math
  19 + # 远程服务器地址
  20 + #remotePath: http://175.6.47.84:8008
  21 + #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
  22 + #remotePath: http://cszhatu.natapp1.cc
  23 + remotePath: http://183.66.242.6:14601
  24 + token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  25 +
  26 +
  27 +# 数据源配置
  28 +spring:
  29 + datasource:
  30 + type: com.alibaba.druid.pool.DruidDataSource
  31 + driverClassName: com.mysql.cj.jdbc.Driver
  32 + druid:
  33 + # 主库数据源
  34 + master:
  35 +# url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
  36 + url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
  37 + username: root
  38 + password: root
  39 + # 从库数据源
  40 + slave:
  41 + # 从数据源开关/默认关闭
  42 + enabled: false
  43 + url:
  44 + username:
  45 + password:
  46 + # 初始连接数
  47 + initialSize: 5
  48 + # 最小连接池数量
  49 + minIdle: 10
  50 + # 最大连接池数量
  51 + maxActive: 20
  52 + # 配置获取连接等待超时的时间
  53 + maxWait: 60000
  54 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
  55 + timeBetweenEvictionRunsMillis: 60000
  56 + # 配置一个连接在池中最小生存的时间，单位是毫秒
  57 + minEvictableIdleTimeMillis: 300000
  58 + # 配置一个连接在池中最大生存的时间，单位是毫秒
  59 + maxEvictableIdleTimeMillis: 900000
  60 + # 配置检测连接是否有效
  61 + validationQuery: SELECT 1 FROM DUAL
  62 + testWhileIdle: true
  63 + testOnBorrow: false
  64 + testOnReturn: false
  65 + webStatFilter:
  66 + enabled: false
  67 + statViewServlet:
  68 + enabled: false
  69 + # 设置白名单，不填则允许所有访问
  70 + allow:
  71 + url-pattern: /druid/*
  72 + # 控制台管理用户名和密码
  73 + login-username: youxiw2000
  74 + login-password: Noah5201
  75 + filter:
  76 + stat:
  77 + enabled: true
  78 + # 慢SQL记录
  79 + log-slow-sql: true
  80 + slow-sql-millis: 1000
  81 + merge-sql: true
  82 + wall:
  83 + config:
  84 + multi-statement-allow: true
  85 + # redis 配置
  86 + redis:
  87 + # 地址
  88 + host: 127.0.0.1
  89 + # 端口，默认为6379
  90 + port: 6379
  91 + # 密码
  92 + password:
  93 + # 连接超时时间
  94 + timeout: 10s
  95 + database: 11
  96 + lettuce:
  97 + pool:
  98 + # 连接池中的最小空闲连接
  99 + min-idle: 0
  100 + # 连接池中的最大空闲连接
  101 + max-idle: 8
  102 + # 连接池的最大数据库连接数
  103 + max-active: 8
  104 + #连接池最大阻塞等待时间（使用负值表示没有限制）
  105 + max-wait: -1ms
  106 +# 开发环境配置
  107 +server:
  108 + # 服务器的HTTP端口，默认为8080
  109 + port: 8080
  110 + servlet:
  111 + # 应用的访问路径
  112 + context-path: /workflow
  113 + tomcat:
  114 + # tomcat的URI编码
  115 + uri-encoding: UTF-8
  116 + # tomcat最大线程数，默认为200
  117 + max-threads: 800
  118 + # Tomcat启动初始化的线程数，默认值25
  119 + min-spare-threads: 30
  120 +#华为OBS存储
  121 +huawei:
  122 + enabled: false
  123 + endPoint:
  124 + ak:
  125 + sk:
  126 + url:
  127 + bucketName:
  128 +#nginx静态文件
  129 +nginx:
  130 + enabled: false
  131 + path:
  132 + url:
  133 +
  134 +# 生成二维码 前端地址
  135 +front:
  136 + url: "http://61.169.120.202:5173/pages/order/guest/index?orderId="
0 137 \ No newline at end of file
... ...
trash-admin/src/main/resources/logback.xml
  View file @518556b
... ... @@ -2,7 +2,7 @@
2 2 <configuration>
3 3 <!-- 日志存放路径 -->
4 4 <!-- <property name="log.path" value="/home/trash/logs" />-->
5   - <property name="log.path" value="C:/work/project/logs/trash" />
  5 + <property name="log.path" value="logs/trash" />
6 6 <!-- 日志输出格式 -->
7 7 <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
8 8  
... ...
trash-admin/src/main/resources/static/car_1.png
View file @518556b

51.5 KB | W: | H:

76.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
trash-admin/src/main/resources/static/car_2.png
View file @518556b

74.2 KB | W: | H:

50.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
trash-admin/src/main/resources/static/goubiche.png 0 → 100644
View file @518556b

254 KB
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @518556b
... ... @@ -29,6 +29,7 @@ import com.trash.garbage.pojo.vo.OrderDetailVo;
29 29 import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
30 30 import com.trash.garbage.service.GarOrderService;
31 31 import com.trash.garbage.service.GarUserService;
  32 +import lombok.extern.slf4j.Slf4j;
32 33 import org.apache.commons.lang3.ArrayUtils;
33 34 import org.springframework.beans.factory.annotation.Autowired;
34 35 import org.springframework.security.access.prepost.PreAuthorize;
... ... @@ -49,6 +50,7 @@ import java.util.Objects;
49 50 */
50 51 @RestController
51 52 @RequestMapping("/order")
  53 +@Slf4j
52 54 public class GarbageOrderController {
53 55  
54 56 @Autowired
... ... @@ -92,6 +94,7 @@ public class GarbageOrderController {
92 94 // 上传并返回新文件名称
93 95 fileName = FileUploadUtils.upload(filePath, file);
94 96 } catch (IOException e) {
  97 + log.error("上传图片异常",e);
95 98 throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
96 99 }
97 100 String url = serverConfig.getUrl() + fileName;
... ...