Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

# Conflicts:
#	hai-user/target/hai-user-1.0-SNAPSHOT.jar
#	hai-user/target/hai-user-1.0-SNAPSHOT.jar.original

hai-user/target/classes/application.yml

@@ -1,102 +0,0 @@
-server:
-  port: 9305
-  servlet:
-    context-path: /user
-
-#配置是否为debug模式，debug模式下，不开启权限校验
-debug: false
-
-#datasource数据源设置
-spring:
-  datasource:
-    url: jdbc:mysql://139.159.177.244:3306/hsg_order?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: 0
-    host: 139.159.177.244
-    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.159.177.244:8083/mqtt
-    #用户名
-    username: printer_provider
-    #密码
-    password: 123654
-    #客户端id(不能重复)
-    # client:
-      # id: provider-id
-    #MQTT默认的消息推送主题，实际可在调用接口是指定
-    # default:
-      # topic: topic
-rocketmq:
-  name-server: 139.159.177.244:9876
-  producer:
-    #必须指定group
-    group: default-group
-
-  #配置日期返回至前台为时间戳
-  jackson:
-    serialization:
-      write-dates-as-timestamps: true
-mybatis:
-  mapperLocations:
-    - classpath*:sqlmap*/*.xml
-  type-aliases-package:
-    org.springboot.sample.entity
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    #开启MyBatis的二级缓存
-    cache-enabled: true
-
-jetcache:
-  statIntervalMinutes: 15
-  areaInCacheName: false
-  local:
-    default:
-      type: linkedhashmap
-      keyConvertor: fastjson
-  remote:
-    default:
-      type: redis
-      host: 139.159.177.244
-      port: 36379
-      password: HF123456.Redis
-      keyConvertor: fastjson
-      broadcastChannel: projectA
-      valueEncoder: java
-      valueDecoder: java
-      poolConfig:
-        minIdle: 5
-        maxIdle: 20
-        maxTotal: 50
-
-pagehelper:
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql

hai-user/target/classes/config.properties

@@ -1,5 +0,0 @@
-
-wxMiniAppId=wx8d49e2f83025229d
-wxMiniAppSecret=d8d6dcaef77d3b659258a01b5ddba5df
-
-fileUrl=/home/project/hsg/filesystem

hai-user/target/classes/logback.xml

@@ -1,93 +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.hai" level="INFO">
-        <appender-ref ref="baselog" />   
-    </logger>
-    <logger name="com.hai.dao" level="DEBUG">
-        <appender-ref ref="daolog" />
-    </logger>
-    <logger name="com.hai" level="ERROR">
-        <appender-ref ref="errorlog" />   
-    </logger>
-
-
-    <appender name="ChongQingCNPC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>log/ChongQingCNPCService.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>log/ChongQingCNPCService.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>
-    <logger name="com.hai.config.ChongQingCNPCService" level="INFO">
-        <appender-ref ref="ChongQingCNPC" />
-    </logger>
-</configuration>

hai-user/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.8.2
-version=1.0-SNAPSHOT
-groupId=com.hsg
-artifactId=hai-user

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

@@ -1,20 +0,0 @@
-com/web/config/ConfigListener.class
-com/web/config/SysConfig.class
-com/web/type/LoginType.class
-com/web/controller/LoginController.class
-com/web/controller/UserController.class
-com/web/config/AuthConfig$1.class
-com/web/controller/TestController.class
-com/web/config/SentinelFilterConfig.class
-com/web/config/WxMaConfiguration.class
-com/web/config/RedisConfig.class
-com/web/controller/SmsController.class
-com/web/config/SysConst.class
-com/web/controller/DiscountController.class
-com/web/config/CorsConfig.class
-com/UserApplication.class
-com/web/controller/LoginLogController.class
-com/web/config/MultipartConfig.class
-com/web/config/SwaggerConfig.class
-com/web/config/AuthConfig.class
-com/web/controller/WechatController.class

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

@@ -1,19 +0,0 @@
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/RedisConfig.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/LoginController.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/WxMaConfiguration.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/SentinelFilterConfig.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/SwaggerConfig.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/AuthConfig.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/ConfigListener.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/SysConst.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/TestController.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/UserApplication.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/SmsController.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/UserController.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/MultipartConfig.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/LoginLogController.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/WechatController.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/type/LoginType.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/CorsConfig.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/SysConfig.java
-/Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/DiscountController.java