提交代码

cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java

@@ -96,7 +96,7 @@ public class BsDiscountUserController {
     @RequestMapping(value="/useDiscountList",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "加油优惠券列表")
-    public ResponseData useDiscountList(@RequestParam(name = "use", required = true) Integer useScope,
+    public ResponseData useDiscountList(@RequestParam(name = "useScope", required = true) Integer useScope,
                                         @RequestParam(name = "merNo", required = true) String merNo,
                                         @RequestParam(name = "refuelPrice", required = false) BigDecimal refuelPrice) {
         try {

openapi/target/classes/application.yml

@@ -1,105 +0,0 @@
-server:
-  port: 9805
-  servlet:
-    context-path: /openapi
-
-#配置是否为debug模式，debug模式下，不开启权限校验
-debug: false
-
-#datasource数据源设置
-spring:
-  datasource:
-    url: jdbc:mysql://139.9.154.68:3306/hai_oil?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    username: root
-    password: HF123456.
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.jdbc.Driver
-    filters: stat
-    maxActive: 10
-    initialSize: 5
-    maxWait: 60000
-    minIdle: 5
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
-  redis:
-    database: 2
-    host: 139.9.154.68
-    port: 36379
-    password: HF123456.Redis
-    timeout: 1000
-    jedis:
-      pool:
-        max-active: 20
-        max-wait: -1
-        max-idle: 10
-        min-idle: 0
-  #MQTT配置信息
-  mqtt:
-    #MQTT服务地址
-    url: ws://139.9.154.68:8083/mqtt
-    #用户名
-    username: printer_provider
-    #密码
-    password: 123654
-      #客户端id(不能重复)
-      # client:
-    # id: provider-id
-    #MQTT默认的消息推送主题，实际可在调用接口是指定
-    # default:
-    # topic: topic
-  #配置日期返回至前台为时间戳
-  jackson:
-    serialization:
-      write-dates-as-timestamps: true
-
-rocketmq:
-  name-server: 139.9.154.68:9876
-  producer:
-    access-key: huifukeji
-    secret-key: HF123456.
-    #必须指定group
-    group: default-group
-  consumer:
-    access-key: huifukeji
-    secret-key: HF123456.
-
-jetcache:
-  statIntervalMinutes: 15
-  areaInCacheName: false
-  local:
-    default:
-      type: linkedhashmap
-      keyConvertor: fastjson
-  remote:
-    default:
-      type: redis
-      host: 139.9.154.68
-      port: 36379
-      password: HF123456.Redis
-      database: 2
-      keyConvertor: fastjson
-      broadcastChannel: projectA
-      valueEncoder: java
-      valueDecoder: java
-      poolConfig:
-        minIdle: 5
-        maxIdle: 20
-        maxTotal: 50
-
-mybatis:
-  mapperLocations:
-  - classpath*:sqlmap*/*.xml
-  type-aliases-package:
-    org.springboot.sample.entity
-
-pagehelper:
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql

openapi/target/classes/config.properties

@@ -1 +0,0 @@
-fileUrl=/home/project/oil/filesystem

openapi/target/classes/logback.xml

@@ -1,72 +0,0 @@
-<configuration>    
-    <!-- %m输出的信息,%p日志级别,%t线程名,%d日期,%c类的全名,,,, -->    
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">    
-        <encoder>    
-            <pattern>%d %p (%file:%line\)- %m%n</pattern>  
-            <charset>UTF-8</charset>   
-        </encoder>    
-    </appender>    
-    <appender name="baselog"    
-        class="ch.qos.logback.core.rolling.RollingFileAppender">    
-        <File>log/base.log</File>    
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">    
-            <fileNamePattern>log/base.log.%d.%i</fileNamePattern>    
-            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">    
-                <!-- or whenever the file size reaches 64 MB -->    
-                <maxFileSize>64 MB</maxFileSize>    
-            </timeBasedFileNamingAndTriggeringPolicy>    
-        </rollingPolicy>    
-        <encoder>    
-            <pattern>    
-                %d %p (%file:%line\)- %m%n  
-            </pattern>    
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->   
-        </encoder>    
-    </appender>
-    <appender name="daolog"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>log/dao.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>log/dao.log.%d.%i</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- or whenever the file size reaches 64 MB -->
-                <maxFileSize>64 MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>
-                %d %p (%file:%line\)- %m%n
-            </pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-    </appender>
-    <appender name="errorlog"    
-        class="ch.qos.logback.core.rolling.RollingFileAppender">    
-        <File>log/error.log</File>    
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">    
-            <fileNamePattern>log/error.log.%d.%i</fileNamePattern>    
-            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">    
-                <!-- or whenever the file size reaches 64 MB -->    
-                <maxFileSize>64 MB</maxFileSize>    
-            </timeBasedFileNamingAndTriggeringPolicy>    
-        </rollingPolicy>    
-        <encoder>    
-            <pattern>    
-                %d %p (%file:%line\)- %m%n  
-            </pattern>    
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->   
-        </encoder>    
-    </appender>    
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT" />    
-    </root>    
-    <logger name="com.hfkj" level="DEBUG">
-        <appender-ref ref="baselog" />   
-    </logger>
-    <logger name="com.hfkj.dao" level="DEBUG">
-        <appender-ref ref="daolog" />
-    </logger>
-    <logger name="com.hfkj" level="ERROR">
-        <appender-ref ref="errorlog" />   
-    </logger>
-</configuration>

openapi/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.6.3
-version=1.0-SNAPSHOT
-groupId=com.hfkj
-artifactId=oil-openapi

openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,12 +0,0 @@
-com\openapi\config\RedisConfig.class
-com\openapi\config\SysConst.class
-com\openapi\config\RestExceptionHandler.class
-com\openapi\config\AuthConfig.class
-com\OpenApiApplication.class
-com\openapi\config\SwaggerConfig.class
-com\openapi\controller\BsDiscountController.class
-com\openapi\config\MultipartConfig.class
-com\openapi\config\SysConfig.class
-com\openapi\config\AuthConfig$1.class
-com\openapi\config\ConfigListener.class
-com\openapi\config\CorsConfig.class

openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,11 +0,0 @@
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\SysConfig.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\controller\BsDiscountController.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\SwaggerConfig.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\OpenApiApplication.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\AuthConfig.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\MultipartConfig.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\SysConst.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\ConfigListener.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\CorsConfig.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\RestExceptionHandler.java
-D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\RedisConfig.java