文本编辑器和文件上传

common/src/main/java/com/antai/sport/http/server/common/service/CommonSmsService.java

@@ -18,9 +18,9 @@ import java.util.Map;
 @Service
 public class CommonSmsService {
     Logger logger = LoggerFactory.getLogger(CommonSmsService.class);
-    @Value("${aliyun.sms.sign}")
+    @Value("${aliyun.sms.sign:null}")
     private String sign;
-    @Value("${aliyun.sms.template-code.login}")
+    @Value("${aliyun.sms.template-code.login:null}")
     private String loginTemplateCode;
 
     @Resource

common/src/main/java/com/antai/sport/http/server/common/util/SmsUtil.java

@@ -26,13 +26,13 @@ import java.util.Map;
 @Service
 @Slf4j
 public class SmsUtil {
-    @Value("${aliyun.access-key-id}")
+    @Value("${aliyun.access-key-id:null}")
     private String accessKeyId;
-    @Value("${aliyun.access-key-secret}")
+    @Value("${aliyun.access-key-secret:null}")
     private String accessKeySecret;
-    @Value("${aliyun.sms.region-id}")
+    @Value("${aliyun.sms.region-id:null}")
     private String regionId;
-    @Value("${aliyun.sms.time-out}")
+    @Value("${aliyun.sms.time-out:null}")
     private String timeOut;
     static final String PRODUCT = "Dysmsapi";
     static final String DOMAIN = "dysmsapi.aliyuncs.com";

mobile-api/src/main/resources/application-dev.yaml

@@ -11,4 +11,14 @@ spring:
 swagger:
   enable: true
 
-game-server-address: http://8.141.144.99:3333/close?MatchId=force
+game-server-address: http://8.141.144.99:3333/close?MatchId=force
\ No newline at end of file
+
+aliyun:
+  access-key-id: LTAI4FivP3A9hfXzF5Z2KKNM
+  access-key-secret: W1erPY4SLOoPK0YwwptLZCSfZ61K4c
+  sms:
+    sign: 安泰实业
+    region-id: cn-qingdao
+    time-out: 1000
+    template-code:
+      login: SMS_136440120 #登录确认验证码
\ No newline at end of file

mobile-api/src/main/resources/application-local.yaml

@@ -10,4 +10,14 @@ spring:
 swagger:
   enable: true
 
-game-server-address: http://127.0.0.1:3333/close?MatchId=force
+game-server-address: http://127.0.0.1:3333/close?MatchId=force
\ No newline at end of file
+
+aliyun:
+  access-key-id: LTAI4FivP3A9hfXzF5Z2KKNM
+  access-key-secret: W1erPY4SLOoPK0YwwptLZCSfZ61K4c
+  sms:
+    sign: 安泰实业
+    region-id: cn-qingdao
+    time-out: 1000
+    template-code:
+      login: SMS_136440120 #登录确认验证码
\ No newline at end of file

mobile-api/src/main/resources/application-prod.yaml

@@ -4,8 +4,21 @@ spring:
       - common-db-prod
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 172.18.83.254
     port: 6379
-    password: ENC(yKZoKLWfAj6BRglq4C2HWWjsL64maeCm)
+    password: ENC(UgcvbmfTyoBY7fyKdpGFyiKZj7ICxY21K1P8o7UITfI=)
 
-game-server-address: http://8.141.144.99:3333/close?MatchId=force
+game-server-address: http://127.0.0.1:3333/close?MatchId=force
\ No newline at end of file
+
+swagger:
+  enable: true
+
+aliyun:
+  access-key-id: LTAI4FivP3A9hfXzF5Z2KKNM
+  access-key-secret: W1erPY4SLOoPK0YwwptLZCSfZ61K4c
+  sms:
+    sign: 安泰实业
+    region-id: cn-qingdao
+    time-out: 1000
+    template-code:
+      login: SMS_136440120 #登录确认验证码
\ No newline at end of file

mobile-api/src/main/resources/application-test.yaml

@@ -11,4 +11,14 @@ spring:
 swagger:
   enable: true
 
-game-server-address: http://39.106.215.44:3333/close?MatchId=force
+game-server-address: http://39.106.215.44:3333/close?MatchId=force
\ No newline at end of file
+
+aliyun:
+  access-key-id: LTAI4FivP3A9hfXzF5Z2KKNM
+  access-key-secret: W1erPY4SLOoPK0YwwptLZCSfZ61K4c
+  sms:
+    sign: 安泰实业
+    region-id: cn-qingdao
+    time-out: 1000
+    template-code:
+      login: SMS_136440120 #登录确认验证码
\ No newline at end of file

mobile-api/src/main/resources/application.yaml

@@ -66,16 +66,6 @@ swagger:
   ignored-parameter-list:
     - com.antai.sport.http.server.repository.sport.entity.SportUser
 
-aliyun:
-  access-key-id: LTAI4FivP3A9hfXzF5Z2KKNM
-  access-key-secret: W1erPY4SLOoPK0YwwptLZCSfZ61K4c
-  sms:
-    sign: 安泰实业
-    region-id: cn-qingdao
-    time-out: 1000
-    template-code:
-      login: SMS_136440120 #登录确认验证码
-
 mybatis-plus:
   global-config:
     db-config:

profile/src/main/resources/application-common-db-prod.yml

@@ -3,8 +3,8 @@ spring:
     include:
       - common-db
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/antaisport${project.mysql-url-params}
+    url: jdbc:mysql://172.18.83.254:3306/antaisport${project.mysql-url-params}
     username: root
-    password: ENC(eeesjD8BM2hklNwdDv4FCDoaVZF9c8+2)
+    password: ENC(vQgVFzEziSR9FmgW4qrF3el0Lu9IWgnlaHiDt91uO4U=)
 
 

server-api/src/main/java/com/antai/sport/http/server/server/api/business/user/service/SportUserService.java

@@ -30,6 +30,13 @@ public class SportUserService {
         RespUserHomeInfo resp = new RespUserHomeInfo();
         SportUser sportUser = sportUserMapper.selectById(userId);
         SportUserSummary sportUserSummary = sportUserSummaryBusinessMapper.selectBySportTypeAndUserId(userId, SportType.BICYCLE);
+        if(sportUserSummary == null){
+            sportUserSummary = new SportUserSummary();
+            sportUserSummary.setViews(0);
+            sportUserSummary.setTotalDistance(BigDecimal.ZERO);
+            sportUserSummary.setTotalClimbDistance(BigDecimal.ZERO);
+            sportUserSummary.setTotalDuration(0);
+        }
         resp.setId(sportUser.getId());
         resp.setAvatar(sportUser.getAvatar());
         resp.setNickname(sportUser.getNickname());

server-api/src/main/resources/application-dev.yaml

@@ -9,6 +9,4 @@ spring:
     password: 123456
 
 swagger:
-  enable: true
-
+  enable: true
\ No newline at end of file
-game-server-address: http://8.141.144.99:3333/close?MatchId=force
\ No newline at end of file

server-api/src/main/resources/application-local.yaml

@@ -8,6 +8,4 @@ spring:
     port: 6379
 
 swagger:
-  enable: true
-
+  enable: true
\ No newline at end of file
-game-server-address: http://127.0.0.1:3333/close?MatchId=force
\ No newline at end of file

server-api/src/main/resources/application-prod.yaml

@@ -4,8 +4,9 @@ spring:
       - common-db-prod
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 172.18.83.254
     port: 6379
-    password: ENC(yKZoKLWfAj6BRglq4C2HWWjsL64maeCm)
+    password: ENC(UgcvbmfTyoBY7fyKdpGFyiKZj7ICxY21K1P8o7UITfI=)
 
-game-server-address: http://8.141.144.99:3333/close?MatchId=force
+swagger:
\ No newline at end of file
+  enable: true
\ No newline at end of file

server-api/src/main/resources/application-test.yaml

@@ -9,6 +9,4 @@ spring:
     password: ENC(yKZoKLWfAj6BRglq4C2HWWjsL64maeCm)
 
 swagger:
-  enable: true
-
+  enable: true
\ No newline at end of file
-game-server-address: http://8.141.144.99:3333/close?MatchId=force
\ No newline at end of file

server-api/src/main/resources/application.yaml

@@ -42,16 +42,6 @@ swagger:
   description: 接口文档
   service-website: https://www.antaikeji.top/
 
-aliyun:
-  access-key-id: LTAI4FivP3A9hfXzF5Z2KKNM
-  access-key-secret: W1erPY4SLOoPK0YwwptLZCSfZ61K4c
-  sms:
-    sign: 安泰实业
-    region-id: cn-qingdao
-    time-out: 1000
-    template-code:
-      login: SMS_136440120 #登录确认验证码
-
 mybatis-plus:
   global-config:
     db-config: