Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/java/com/izouma/nineth/config/Constants.java

@@ -11,9 +11,9 @@ public interface Constants {
 
     String DEFAULT_AVATAR = "https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com/image/avatar_male.png";
 
-    String SMS_SIGN_NAME = "走马信息";
+    String SMS_SIGN_NAME = "身份验证";
 
-    String SMS_TEMPLATE_CODE_GENERIC = "SMS_175485688";
+    String SMS_TEMPLATE_CODE_GENERIC = "SMS_11685095";
 
     String bizId = "a00e36c5";
 

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -84,7 +84,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/collection/all").permitAll()
                 .antMatchers("/collection/get/**").permitAll()
                 .antMatchers("/user/all").permitAll()
-                .antMatchers("/user/get/**").permitAll()
+                .antMatchers("/user/get/*").permitAll()
                 // all other requests need to be authenticated
                 .anyRequest().authenticated().and()
                 // make sure we use stateless session; session won't be used to

src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -17,6 +17,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -49,10 +50,13 @@ public class CollectionService {
     }
 
     public List<CollectionDTO> toDTO(List<Collection> collections) {
+        List<Like> likes = new ArrayList<>();
+        if (SecurityUtils.getAuthenticatedUser() != null) {
+            likes.addAll(likeRepo.findByUserId(SecurityUtils.getAuthenticatedUser().getId()));
+        }
         return collections.stream().parallel().map(collection -> {
             CollectionDTO dto = toDTO(collection, false);
-            if (SecurityUtils.getAuthenticatedUser() != null) {
-                List<Like> likes = likeRepo.findByUserId(SecurityUtils.getAuthenticatedUser().getId());
+            if (!likes.isEmpty()) {
                 dto.setLiked(likes.stream().anyMatch(l -> l.getCollectionId().equals(collection.getId())));
             }
             return dto;

src/main/java/com/izouma/nineth/service/UserService.java

@@ -275,10 +275,13 @@ public class UserService {
     }
 
     public List<UserDTO> toDTO(List<User> users) {
+        List<Follow> follows = new ArrayList<>();
+        if (SecurityUtils.getAuthenticatedUser() != null) {
+            follows.addAll(followRepo.findByUserId(SecurityUtils.getAuthenticatedUser().getId()));
+        }
         return users.stream().parallel().map(user -> {
             UserDTO dto = toDTO(user, false);
-            if (SecurityUtils.getAuthenticatedUser() != null) {
-                List<Follow> follows = followRepo.findByUserId(SecurityUtils.getAuthenticatedUser().getId());
+            if (!follows.isEmpty()) {
                 dto.setFollow(follows.stream().anyMatch(f -> f.getFollowUserId().equals(user.getId())));
             }
             return dto;

src/main/java/com/izouma/nineth/service/sms/AliSmsService.java

@@ -25,10 +25,9 @@ import java.time.ZoneOffset;
 @Service
 @Slf4j
 public class AliSmsService implements SmsService {
-    @Value("${aliyun.access-key-id}")
-    private String        accessKeyId;
-    @Value("${aliyun.access-key-secret}")
-    private String        accessKeySecret;
+    private final String accessKeyId     = "LTAI5tEL3wr9XeiyseqKLrEK";
+    private final String accessKeySecret = "I9JzOThjzeJMcpVf6melaMY3nt7ucU";
+
     @Autowired
     private SmsRecordRepo smsRecordRepo;
 
@@ -54,7 +53,7 @@ public class AliSmsService implements SmsService {
         request.putQueryParameter("PhoneNumbers", phone);
         request.putQueryParameter("SignName", Constants.SMS_SIGN_NAME);
         request.putQueryParameter("TemplateCode", Constants.SMS_TEMPLATE_CODE_GENERIC);
-        request.putQueryParameter("TemplateParam", "{\"code\":\"" + code + "\"}");
+        request.putQueryParameter("TemplateParam", "{\"code\":\"" + code + "\",\"product\":\"用户\"}");
         try {
             CommonResponse response = client.getCommonResponse(request);
             if (response.getHttpStatus() != 200) {

src/main/java/com/izouma/nineth/web/CollectionController.java

@@ -46,8 +46,8 @@ public class CollectionController extends BaseController {
     }
 
     @GetMapping("/get/{id}")
-    public Collection get(@PathVariable Long id) {
-        return collectionRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    public CollectionDTO get(@PathVariable Long id) {
+        return collectionService.toDTO(collectionRepo.findById(id).orElseThrow(new BusinessException("无记录")), true);
     }
 
     @PostMapping("/del/{id}")

src/main/java/com/izouma/nineth/web/UserController.java

@@ -87,10 +87,10 @@ public class UserController extends BaseController {
         return userService.toDTO(userService.all(pageQuery));
     }
 
-//    @PreAuthorize("hasRole('ADMIN')")
+    //    @PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/get/{id}")
-    public User get(@PathVariable Long id) {
-        return userRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    public UserDTO get(@PathVariable Long id) {
+        return userService.toDTO(userRepo.findById(id).orElseThrow(new BusinessException("无记录")), true);
     }
 
     @PreAuthorize("hasRole('ADMIN')")

src/main/resources/application.yaml

@@ -63,15 +63,15 @@ wx:
     msg_aes_key: aesKey
     msg_format: JSON
   pay:
-    appId: wx2375cba2eec2c479
-    mchId: 1529090291
-    mchKey: A2qWTQzN5EkvgeWgmnnTSY4vV3Y6Xxbj
-    subAppId: #服务商模式下的子商户公众账号ID
-    subMchId: #服务商模式下的子商户号
-    keyPath: classpath:/cert/apiclient_cert.p12
-    notifyUrl: http://nft.9space.vip/notify/order/weixin
-    refundNotifyUrl: http://nft.9space.vip/wx/refundNotify
-    returnUrl: http://nft.9space.vip/9th/orders
+    app-id: wx2375cba2eec2c479
+    mch-id: 1529090291
+    mch-key: A2qWTQzN5EkvgeWgmnnTSY4vV3Y6Xxbj
+    sub-app-id:
+    sub-mch-id:
+    key-path: classpath:/cert/apiclient_cert.p12
+    notify-url: https://nft.9space.vip/notify/order/weixin
+    refund-notify-url: https://nft.9space.vip/wx/refundNotify
+    return-url: https://nft.9space.vip/9th/orders
 storage:
   provider: aliyun
   local_path: /var/www/upload/
@@ -112,12 +112,12 @@ alipay:
   private-key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDGPN0GkL4ISuFSgeqPAjC6VXTdvnkrC6EyYhRBAwurYLYVcHmI+ffx4pcxXLXrbveXwdxNj2GpUCvy56a5ACu9wiaWwxaF6moV3NILKmJa6c7D/4N3Cy4KG7RcLRyeWpdbRFP7OeM+Y8iRFRp0EhAv7btAqimny32ETvIXMyCSvZbI0hrmtwUFMgPW8ofpIoQ5VhMixdKn2niAyQs5TBL1QuVEP1Qe7WRWBrvtwMx1VmI01zkjgFkfehVJwG+BtHYhRwI1pcDrpQv3sDAHl6Qa2th+BkOX1Qtwmzc/SvUELeqJJCsZ+DVr9kTBNke1A4aR2DrlfTezZpl/sN/fJmlTAgMBAAECggEBAIks+K1gX3+RgVX8vHj1RQ7Lr7D56xLUW1ln8SgDmYGfzKANUqxsfRyOdZ0c0G34PbBv36hz/VqSNbdCgWYnLh2DSfytRtqoGXzDbz12uNS8Ue3i0+/+dn9cKHRYayNRAMeRAqQnrI4xskpi1glXrofb8+WNWoHYGCUEFBXltTaUbSNa4saIuvRQvy1i8qZMiAGu+rd/A5TaI+6C7MnHWmYtZ6fFFUeMnJAPRbn4CqNntKmPwF2IrSHaQlefgaQMY6Il56Ws7D9LuNAqn9xuD1duOiK2VrJTLONkEY001iXczZi6JqGzX83ZyDy3kcbQ4BoWRZ6ehwlfPTmovyuKysECgYEA+5QwUXOlStA3wvYbT5lwvva/y51Di/fi5PCnSL3wBEcTXGPkbAvaH6CV6x11nuJWOSgwD1fBMyzAVASDYd0oRQq2+NUBx2v1PFRc3PM4Yp85oZV3eNDyRV9SzhsT1dR/OfuWyJefuCuxJDsBGJpJV0t7e5lq2qqYgZjvpymZhKMCgYEAybizrkcexSnhlnSaY7ENa7fZsIP5l/y3xbtg/65JsARF1VNOLURj9QgbVEoi5FnCMHiYEal25mTZGEWIawCD+XWdkCu4orvxBXU4boIca6R9lfbzJuY3We3Ts3TEXOp1Tkmn5bMM8ImLU9teetufvQa3+Mq7qI21gB0vEXawI5ECgYAZnagh0wWkjXjwCAEV5Mi/GP7Ea7nh+ZaHux09YeGbfeUxxhYPDlHiYIaDTxeX2vHulfH2zfelD0xyAZejElK0XPfudDnfJVXuE6T09mrqV84VbtOgYJ4ahC85PzaQ0jc2HzDmMdIYfZJm3v8okyUel1f2aNOhejdXEsxsF+dCwwKBgQCuV8Zj/+/mNBZW9RxiwSl6SgIJf2b/J1qluRdSpA3n5Sl+AGv2z78cjg8gwJp7heBCCFhWG4M6CTtgsOgAowdtWWv+qOsBKzJapz9Is4dguWAZdsAchKiePuDTnz3/mFwed6Z27lNmqVoT9esogB0FQINMsduTCDcwLQj7LPt7IQKBgCcPiM5BXeOnIQBlQNA4MrP7th4NIltOEIF6uarqUfnzCy52blRJaXf2VTZNgnY4KovdBIl4JukRyk2Iwcg/Kt+IIv/uBQOLNpQm1cSqMpDs+YZlmKjeTfZiqShuUDueypjQ6t4kK8cHRBQs7FEuKfg842MjJHenNt97TNHAoT5P
   app-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjzdBpC+CErhUoHqjwIwulV03b55KwuhMmIUQQMLq2C2FXB5iPn38eKXMVy16273l8HcTY9hqVAr8uemuQArvcImlsMWhepqFdzSCypiWunOw/+DdwsuChu0XC0cnlqXW0RT+znjPmPIkRUadBIQL+27QKopp8t9hE7yFzMgkr2WyNIa5rcFBTID1vKH6SKEOVYTIsXSp9p4gMkLOUwS9ULlRD9UHu1kVga77cDMdVZiNNc5I4BZH3oVScBvgbR2IUcCNaXA66UL97AwB5ekGtrYfgZDl9ULcJs3P0r1BC3qiSQrGfg1a/ZEwTZHtQOGkdg65X03s2aZf7Df3yZpUwIDAQAB
   ali-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2KS67bzs6FQ7+PYCm6Zp1gE06VVpuTpV9Mbqn7RqSKmzKZORbL0pG7UyN/Iu3dooNJLQIcxuUDZF6JNgOiX7nxRPyhLud45EXBBR+TUeJCfdSU/7kg2+XBgwD/zzLfj+cAR8SnlmYE5dA81hsM/l1MQrtLTryT/lAHR36eChb6QUnxAwwUZC8QiWDaFerlScJrJG0VJUEKQD6ANV2qP2fmU8IMxNZBT6WMvRvPIN34hCm9B8Kx2Tr8rOjZvwLwVwd1nR5a5mrbwG+kNY7olHW2ICYxJxIxXzypg4jTa5NyW7XR7tdgecRlAGJNxMeBqWwMRmN5l8G2ozV3iOIwhCMQIDAQAB
-  apiKey: CRv5YFAOIEGY5PgVf14Y9g==
-  appCertPath: classpath:cert/appCertPublicKey_2021002120645023.crt
-  aliPubCertPath: classpath:cert/alipayCertPublicKey_RSA2.crt
-  rootCertPath: classpath:cert/alipayRootCert.crt
-  notifyUrl: http://nft.9space.vip/notify/order/alipay
-  returnUrl: http://nft.9space.vip/9th/orders
+  ali-pub-cert-path: classpath:cert/alipayCertPublicKey_RSA2.crt
+  api-key: CRv5YFAOIEGY5PgVf14Y9g==
+  app-cert-path: classpath:cert/appCertPublicKey_2021002120645023.crt
+  root-cert-path: classpath:cert/alipayRootCert.crt
+  notify-url: https://nft.9space.vip/notify/order/alipay
+  return-url: https://nft.9space.vip/9th/orders
 ---
 
 spring:
@@ -130,12 +130,12 @@ spring:
   datasource:
     url: jdbc:mysql://mysql.izouma.com/nineth_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
 general:
-  host: http://nft.9space.vip
+  host: https://nft.9space.vip
 wx:
   pay:
-    notify-url: http://nft.9space.vip/notify/order/weixin
-    refund-notify-url: http://nft.9space.vip/wx/refundNotify
-    return-url: http://nft.9space.vip/9th/orders
+    notify-url: https://nft.9space.vip/notify/order/weixin
+    refund-notify-url: https://nft.9space.vip/wx/refundNotify
+    return-url: https://nft.9space.vip/9th/orders
 alipay:
-  notify-url: http://nft.9space.vip/notify/order/alipay
-  return-url: http://nft.9space.vip/9th/orders
+  notify-url: https://nft.9space.vip/notify/order/alipay
+  return-url: https://nft.9space.vip/9th/orders