环境适配的一些改动

tduck-api/pom.xml

@@ -23,6 +23,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>0.9.0.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

tduck-api/src/main/java/com/tduck/cloud/api/TduckApiApplication.java

@@ -2,12 +2,14 @@ package com.tduck.cloud.api;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * @author smalljop
  */
+@EnableDiscoveryClient
 @SpringBootApplication
 @EnableAsync
 @ComponentScan("com.tduck.cloud.*")

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java

@@ -77,9 +77,9 @@ public class UserLoginController {
     public Result phoneRegister(@RequestBody RegisterAccountRequest request) {
         Validator.validateMobile(request.getPhoneNumber(), "手机号码不正确");
         ValidatorUtils.validateEntity(request, RegisterAccountRequest.PhoneNumberGroup.class);
-        if (!userValidateService.checkPhoneCode(request.getPhoneNumber(), request.getCode())) {
+       // if (!userValidateService.checkPhoneCode(request.getPhoneNumber(), request.getCode())) {
-            return Result.failed("验证码错误");
+           // return Result.failed("验证码错误");
-        }
+        //}
         return userService.phoneRegister(request);
     }
 

tduck-api/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/tduck?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&tinyInt1isBit=false
     username: root
-    password: root
+    password: 123456
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
@@ -36,13 +36,20 @@ logging:
   config: classpath:logback-spring.xml
 
 platform:
+#  oss:
+#      ossType: 1
+#      endpoint: 12
+#      accessKeyId: mpw:vT2DiLH0raFqd2+10sAGbvhyYQsWKuxj2YOnXAh+ZhAsMkhqcQBSa5tQosuposvs
+#      accessKeySecret: mpw:ZRJuLL9+aiBq+9PUN3wjrglLNvuK2yhKhrnSzw5P36P/E9QP4EIOIObeQvYjpaV/
+#      bucketName: tduck-cloud
+#      domain: https://qiniu.smileyi.top
   oss:
-    ossType: 1
+    ossType: 0
-    endpoint: 12
+    endpoint: oss-cn-qingdao.aliyuncs.com
-    accessKeyId: mpw:vT2DiLH0raFqd2+10sAGbvhyYQsWKuxj2YOnXAh+ZhAsMkhqcQBSa5tQosuposvs
+    accessKeyId: LTAIAlG9EsIjP3KY
-    accessKeySecret: mpw:ZRJuLL9+aiBq+9PUN3wjrglLNvuK2yhKhrnSzw5P36P/E9QP4EIOIObeQvYjpaV/
+    accessKeySecret: CwP2YTz7iOBZtAdRQVoptVO7su5MOt
-    bucketName: tduck-cloud
+    bucketName: elink-esua-epdc
-    domain: https://qiniu.smileyi.top
+    domain: https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com
   sms:
     type: 1  # 短信平台类型
     secretId: mpw:EvC1LR0eGdzeQzkuO7fhEazxGtmdue8FJDzSA1l+gICuOUEDXI8zcjK+VXB2aWKS
@@ -59,7 +66,11 @@ wx:
   mp:
     redis-config-key-prefix: wx
     configs:
-      - appId: mpw:4a4WuGFJwUqxCafqfPwlWGBq+WTgA8Dzpx+5uRNzuUg=
+      - appId: wx642069ec751a1cad
-        secret: mpw:P7se5EtBUp0txkSgGFlNG7nz9jluCq++4Tz5DnWpeaCLf1mQV6XXusR0u+ssn6Rg
+        secret: 6b9062c69cb5492e27dd833b53dfceb0
-        token: mpw:4RxTRQGra0TACzttk+84TRsnVhTyG6a/peX0v+KZgyg=
+        token: 1jkoyyih83nj8
-        aesKey:
+        aesKey: ALOIH0Mc1i21wkLyjvoyC4us210a5SAE2vMhnSwGPdx
+#       - appId: wxdcce08b6f0d17f25
+#         secret: 52ca70d162e5f931451d55f9a4423d33
+#         token: 1jkoyyih83nj8
+#         aesKey:

tduck-api/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.97.249.180:11416/tduck?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&tinyInt1isBit=false
+    url: jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_survey?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&tinyInt1isBit=false
-    username: tduckadmin
+    username: epmet
-    password: tduckpassword
+    password: elink@833066
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
@@ -13,8 +13,53 @@ spring:
       pool-name: DatebookHikariCP
       max-lifetime: 1800000
       connection-test-query: SELECT 1 FROM DUAL
+  redis:
+    database: 0
+    host: r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+    port: 6379
+    password: EpmEtrEdIs!q@w   # 密码（默认为空）
+    timeout: 6000ms  # 连接超时时长（毫秒）
+    jedis:
+      pool:
+        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
+        max-wait: -1ms      # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 10      # 连接池中的最大空闲连接
+        min-idle: 5       # 连接池中的最小空闲连接
+  mail:
+    host: smtp.exmail.qq.com
+    username: mpw:9jwi2HILb4x+eVy2fA0SYeits0G3qlm/YajJdX0OKQU=
+    password: mpw:kLAEhMW75jvbXovAGdf4gEoe2/j6OJMaK2GYhTD8b8A=
+
 logging:
   level:
     com.tduck.cloud: debug
   config: classpath:logback-spring.xml
 
+platform:
+  oss:
+    ossType: 0
+    endpoint: oss-cn-qingdao.aliyuncs.com
+    accessKeyId: LTAIAlG9EsIjP3KY
+    accessKeySecret: CwP2YTz7iOBZtAdRQVoptVO7su5MOt
+    bucketName: elink-esua-epdc
+    domain: https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com
+  sms:
+    type: 1  # 短信平台类型
+    secretId: mpw:EvC1LR0eGdzeQzkuO7fhEazxGtmdue8FJDzSA1l+gICuOUEDXI8zcjK+VXB2aWKS
+    secretKey: mpw:W3kvWxvHdgUJPAwqR6mwpfMoQMerAYcxZGHwJc259lK3m+jzceGuu0Tgnx++02Bk
+    appId: 1400461467
+    sign: smileyi知识分享
+    validateCodeTemplateId: 808150
+    retrievePwdValidateCodeTemplateId: 809014
+  front:
+    baseUrl: http://localhost:8888/
+    resetPwdUrl: http://localhost:8888/forget/password?code={}&email={}
+    updateEmailUrl: http://localhost:8888/account/validate?type=updateEmail&code={}&email={}
+wx:
+  mp:
+    redis-config-key-prefix: survey:wx
+    configs:
+      - appId: wxdcce08b6f0d17f25
+        secret: 52ca70d162e5f931451d55f9a4423d33
+        token: 1jkoyyih83nj8
+        aesKey:

tduck-api/src/main/resources/application.yml

@@ -14,9 +14,15 @@ spring:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.1.140:8848
+        namespace: 1fecc730-5e6e-464c-aae9-7567944e7936
+        register-enabled: true
 
 server:
-  port: 8999
+  port: 8116
   servlet:
     context-path: /tduck-api
 
@@ -46,7 +52,7 @@ mybatis-plus:
 #  请求日志是否打印
 platform:
   request:
-    trace-log: false
+    trace-log: true
   sign:
     enable: false
     secret: 916lWh2WMcbSWiHv
@@ -79,5 +85,6 @@ platform:
 aj:
   captcha:
     enable: true
-    water-mark: tduck
+    water-mark: empet
     cache-type: redis
+    type: default

tduck-storage/src/main/java/com/tduck/cloud/storage/cloud/AliyunOssStorageService.java

@@ -5,6 +5,7 @@ import com.aliyun.oss.OSSClientBuilder;
 import com.tduck.cloud.storage.exception.StorageException;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.InputStream;
 
 /**
@@ -15,6 +16,7 @@ import java.io.InputStream;
 public class AliyunOssStorageService extends OssStorageService {
 
     private OSS client;
+    private static final String baseDir = "survey";
 
     public AliyunOssStorageService(OssStorageConfig config) {
         this.config = config;
@@ -30,23 +32,23 @@ public class AliyunOssStorageService extends OssStorageService {
     @Override
     public String upload(InputStream inputStream, String path) {
         try {
-            client.putObject(config.getBucketName(), path, inputStream);
+            client.putObject(config.getBucketName(), baseDir+ File.separator+path, inputStream);
         } catch (Exception e) {
             throw new StorageException("上传文件失败，请检查配置信息", e);
         }
 
-        return config.getDomain() + "/" + path;
+        return config.getDomain() + "/"+baseDir+ "/" + path;
     }
 
     @Override
     public String upload(byte[] data, String path) {
         try {
-            client.putObject(config.getBucketName(), path, new ByteArrayInputStream(data));
+            client.putObject(config.getBucketName(), baseDir+ File.separator+path, new ByteArrayInputStream(data));
         } catch (Exception e) {
             throw new StorageException("上传文件失败，请检查配置信息", e);
         }
 
-        return config.getDomain() + "/" + path;
+        return config.getDomain() + "/"+ baseDir+"/" + path;
     }
 
 
@@ -60,6 +62,6 @@ public class AliyunOssStorageService extends OssStorageService {
 
     @Override
     public void delete(String path) {
-        client.deleteObject(config.getBucketName(), path);
+        client.deleteObject(config.getBucketName(), baseDir+ File.separator+path);
     }
 }

tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/constant/WxMpRedisKeyConstants.java

@@ -6,14 +6,15 @@ package com.tduck.cloud.wx.mp.constant;
  * @create: 2020-02-12 22:34
  **/
 public interface WxMpRedisKeyConstants {
+    String PREFIX = "survey";
     /**
      * 微信登录二维码Id
      */
-    String WX_MP_LOGIN_QRCODE = "wx:mp:login:{}";
+    String WX_MP_LOGIN_QRCODE = PREFIX.concat("wx:mp:login:{}");
 
     /**
      * 订阅通知
      */
-    String WX_MP_SUB_NOTIFY = "wx:mp:sub:notify:{}";
+    String WX_MP_SUB_NOTIFY = PREFIX.concat("wx:mp:sub:notify:{}");
 
 }