瀏覽代碼

添加打包配置

yq 3 年之前
父節點
當前提交
a59330d5d0
共有 3 個文件被更改,包括 14 次插入112 次删除
  1. 6 0
      pom.xml
  2. 6 6
      src/main/java/com/usky/controller/sys/UserController.java
  3. 2 106
      src/main/resources/application.yml

+ 6 - 0
pom.xml

@@ -137,6 +137,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
@@ -182,6 +187,7 @@
         </dependency>
     </dependencies>
     <build>
+        <finalName>commonManage</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

+ 6 - 6
src/main/java/com/usky/controller/sys/UserController.java

@@ -66,9 +66,9 @@ public class UserController {
         if (ListUtil.isNotBlank(sysUserVOList)) {
             return Result.error("登录名已存在");
         }
-        if (!Validator.isMobile(userVO.getPhonenumber())) {
-            return Result.error("手机号格式异常");
-        }
+//        if (!Validator.isMobile(userVO.getPhonenumber())) {
+//            return Result.error("手机号格式异常");
+//        }
         List<SysUserVO> phone = userService.listAll(new SysUserVO(), null, null, userVO.getPhonenumber(), null, null, null);
         if (ListUtil.isNotBlank(phone)) {
             return Result.error("手机号已存在");
@@ -157,9 +157,9 @@ public class UserController {
     ) {
         if (StringUtils.isNotBlank(phonenumber)) {
             //用户手机号校验
-            if (!Validator.isMobile(phonenumber)) {
-                return Result.error("手机号格式错误");
-            }
+//            if (!Validator.isMobile(phonenumber)) {
+//                return Result.error("手机号格式错误");
+//            }
             List<SysUserDTO> user = userService.queryUserByPhone(phonenumber);
             if (ListUtil.isNotBlank(user)) {
                 return Result.error("手机号已存在!");

+ 2 - 106
src/main/resources/application.yml

@@ -1,107 +1,3 @@
-#开发环境
-server:
-  port: 8080
 spring:
-  redis:
-    database: 1
-    host: 47.111.81.118
-   # host: 172.16.120.184
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: uskyredis
-   # password:
-    port: 6379
-  jackson:
-    time-zone: GMT+8
-  application:
-    name: JX_Cover
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      maxWait: 60000
-      timeBetweenEvictionRunsMillis: 60000
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      poolPreparedStatements: true
-      aopPatterns: com.usky.*
-     # filters: stat,slf4j
-      maxPoolPreparedStatementPerConnectionSize: 20
-      useGlobalDataSourceStat: false
-      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
-      db-type: com.alibaba.druid.pool.DruidDataSource
-      url: jdbc:mysql://47.111.81.118:3306/jx_cover?useunicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-      username: root
-      password: Yt2021
-  jpa:
-    database-platform: org.hibernate.dialect.MySQLDialect
-    hibernate:
-      ddl-auto: update
-    database: mysql
-    show-sql: true
-    open-in-view: false #懒加载时使用,建议false
-
-swagger:
-  enable: true
-
-cron:
-  #测试每隔十秒执行一次定时任务
-  test: 0/10 * * * * ?
-  #每一小时入库一次视频数据
-  rk: 0 0 0/12 * * ?
-  #请求每十秒执行一次
-  req: 0/10 * * * * ?
-sms:
-  accessKeyID: LTAI5tCTtstCUtCPBrmFAUCk # 你自己的accessKeyId
-  accessKeySecret: V6X2hMOEbepkTPdjeqjESs3Pc0jgPk # 你自己的AccessKeySecret
-  signName: 上海永天科技股份有限公司 # 签名名称
-  #verifyCodeTemplate: SMS_164095840 # 模板名称
-  verifyCodeTemplate: SMS_220385321 # 模板名称
-  domain: dysmsapi.aliyuncs.com # 域名
-  action: SendSMS # API类型,发送短信
-  version: 2017-05-25 # API版本,固定值
-  regionID: cn-hangzhou # 区域id
-
-mqtt:
-  config:
-    channel1:
-      consumer-enable: true
-      producer-enable: true
-      url: [tcp://124.71.175.91:1883]
-     # url: [tcp://47.98.201.73:1883]
-      topics: [/2usky/10012/861050040560669/#,/2usky/10012/861050040560321/#,/2usky/10012/861050040533286/#]
-      qos: [0,0,0]
-      username: wjzn2021
-      password: wjzn2021
-      #username: usky
-     # password: usky
-      timeout: 60
-      kep-alive-interval: 60
-      async: true
-      client-id-append-ip: true
-      consumer-client-id: consumer_client_test1
-      producer-client-id: producer_client_test1
-      consumer-will:
-        qos: 1
-        topic: will_topic
-        payload: '{"id": "consumer_client_test1"}'
-        retained: false
-      producer-will:
-        qos: 1
-        topic: will_topic
-        payload: '{"id": "producer_client_test1"}'
-        retained: false
-
-
-
-
+  profiles:
+    active: dev