修改图片样式

liujun001
1 parent bfaee3cd
Showing 7 changed files with 142 additions and 3 deletions
trash-admin/src/main/resources/application-dev.yml
trash-admin/src/main/resources/application-local.yml
trash-admin/src/main/resources/logback.xml
trash-admin/src/main/resources/static/car_1.png
trash-admin/src/main/resources/static/car_2.png
trash-admin/src/main/resources/static/goubiche.png
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
@@ -9,7 +9,7 @@ trash:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
-    profile: D:/trash/uploadPath
+    profile: /home/trash/uploadPath
 #    profile: E:/trash/uploadPath
 #    profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
@@ -85,7 +85,7 @@ spring:
         # redis 配置
     redis:
         # 地址
-        host: localhost
+        host: 127.0.0.1
         # 端口，默认为6379
         port: 6379
         # 密码
+# 项目相关配置
+trash:
+    # 名称
+    name: trash
+    # 版本
+    version: 3.2.0
+    # 版权年份
+    copyrightYear: 2020
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
+    profile: D:/trash/uploadPath
+#    profile: E:/trash/uploadPath
+#    profile: F:/work/project/Documents/uploadPath/trash
+#     获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数组计算 char 字符验证
+    captchaType: math
+    # 远程服务器地址
+    #remotePath: http://175.6.47.84:8008
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    #remotePath: http://cszhatu.natapp1.cc
+    remotePath: http://183.66.242.6:14601
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+   
+    
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+#                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: root
+                password: root
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: false
+            statViewServlet:
+                enabled: false
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: youxiw2000
+                login-password: Noah5201
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+        # redis 配置
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 6379
+        # 密码
+        password: 
+        # 连接超时时间
+        timeout: 10s
+        database: 11
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8080
+    servlet:
+        # 应用的访问路径
+        context-path: /workflow
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # tomcat最大线程数，默认为200
+        max-threads: 800
+        # Tomcat启动初始化的线程数，默认值25
+        min-spare-threads: 30
+#华为OBS存储
+huawei:
+    enabled: false
+    endPoint:
+    ak:
+    sk:
+    url:
+    bucketName:
+#nginx静态文件
+nginx:
+    enabled: false
+    path:
+    url:
+
+# 生成二维码 前端地址
+front:
+    url: "http://61.169.120.202:5173/pages/order/guest/index?orderId="
 \ No newline at end of file
@@ -2,7 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
 <!--	<property name="log.path" value="/home/trash/logs" />-->
-    <property name="log.path" value="C:/work/project/logs/trash" />
+    <property name="log.path" value="logs/trash" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -29,6 +29,7 @@ import com.trash.garbage.pojo.vo.OrderDetailVo;
 import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
 import com.trash.garbage.service.GarOrderService;
 import com.trash.garbage.service.GarUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -49,6 +50,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/order")
+@Slf4j
 public class GarbageOrderController {
     @Autowired
@@ -92,6 +94,7 @@ public class GarbageOrderController {
             // 上传并返回新文件名称
             fileName = FileUploadUtils.upload(filePath, file);
         } catch (IOException e) {
+            log.error("上传图片异常",e);
             throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
         }
         String url = serverConfig.getUrl() + fileName;