第一版bug

src/main/java/com/edgec/browserbackend/account/controller/AccountController.java

@@ -203,10 +203,10 @@ public class AccountController {
     }
 
     @RequestMapping(path = "/resetpassword", method = RequestMethod.POST)
-    public ResultDto forgetPassword(@Valid @RequestBody UserDto user) {
+    public ResultDto forgetPassword(Principal principal, @RequestBody UserDto user) {
         ResultDto resultDto = new ResultDto();
         try {
-            accountService.resetPassword(user);
+            accountService.resetPassword(principal.getName(), user);
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {
             resultDto.setStatus(-1);

src/main/java/com/edgec/browserbackend/account/domain/UserDto.java

@@ -12,9 +12,9 @@ public class UserDto {
 
     private String phone;
 
-    private String otp;
+    private String authCode;
 
-    private String passwd;
+    private String password;
 
     public String getPhone() {
         return phone;
@@ -24,20 +24,20 @@ public class UserDto {
         this.phone = phone;
     }
 
-    public String getOtp() {
-        return otp;
+    public String getAuthCode() {
+        return authCode;
     }
 
-    public void setOtp(String otp) {
-        this.otp = otp;
+    public void setAuthCode(String authCode) {
+        this.authCode = authCode;
     }
 
-    public String getPasswd() {
-        return passwd;
+    public String getPassword() {
+        return password;
     }
 
-    public void setPasswd(String passwd) {
-        this.passwd = passwd;
+    public void setPassword(String password) {
+        this.password = password;
     }
 
     public String getEmail() {

src/main/java/com/edgec/browserbackend/account/service/AccountService.java

@@ -42,7 +42,7 @@ public interface AccountService {
      */
     Account saveChanges(String name, Account update);
 
-    void resetPassword(UserDto user);
+    void resetPassword(String username, UserDto user);
 
     Account createSub(String name, AccountDto user);
 

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -750,16 +750,13 @@ public class AccountServiceImpl implements AccountService {
     }
 
     @Override
-    public void resetPassword(UserDto user) {
+    public void resetPassword(String username, UserDto user) {
         if (user == null)
             throw new ClientRequestException(AccountErrorCode.NAMEOREMAILNOTEXIST, "Can't find user with name or mail: " + user);
 
-        Account account = repository.findByEmail(user.getEmail());
+        Account account = repository.findByName(user.getUsername());
         if (account == null) {
-            Account accountname = repository.findByName(user.getUsername());
-            if (accountname == null)
-                throw new ClientRequestException(AccountErrorCode.NAMEOREMAILNOTEXIST, "Can't find user with name or mail: " + user);
-            account = accountname;
+            throw new ClientRequestException(AccountErrorCode.NAMEOREMAILNOTEXIST, "Can't find user with name: " + user);
         }
 
         User newuser = new User();
@@ -795,7 +792,7 @@ public class AccountServiceImpl implements AccountService {
         if (otp == null) {
             throw new ClientRequestException(AccountErrorCode.OTPWRONG, AccountErrorCode.OTPWRONG.getReason());
         }
-        if (!otp.getOtp().equals(user.getOtp())) {
+        if (!otp.getOtp().equals(user.getAuthCode())) {
             throw new ClientRequestException(AccountErrorCode.OTPWRONG, AccountErrorCode.OTPWRONG.getReason());
         }
 
@@ -806,7 +803,7 @@ public class AccountServiceImpl implements AccountService {
 
         User client = new User();
         client.setUsername(account.getName());
-        client.setPassword(user.getPasswd());
+        client.setPassword(user.getPassword());
 
         userAuthService.resetUserPassword(new com.edgec.browserbackend.auth.domain.User(client));
 

src/main/java/com/edgec/browserbackend/auth/config/WebSecurityConfig.java

@@ -33,7 +33,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         web.ignoring()
                 .antMatchers( "/user/authCode", "/user/signUp",
-                "/user/reset*");
+                "/user/forgot**");
     }
 
     @Override

src/main/java/com/edgec/browserbackend/browser/domain/Shop.java

@@ -35,7 +35,7 @@ public class Shop {
 
     private String shopUA;
 
-    private CharSequence shopCookie;
+    private String shopCookie;
 
     private long createTime;
 
@@ -184,11 +184,11 @@ public class Shop {
         this.shopPassword = shopPassword;
     }
 
-    public CharSequence getShopCookie() {
+    public String getShopCookie() {
         return shopCookie;
     }
 
-    public void setShopCookie(CharSequence shopCookie) {
+    public void setShopCookie(String shopCookie) {
         this.shopCookie = shopCookie;
     }
 

src/main/java/com/edgec/browserbackend/browser/dto/ShopResultDto.java

@@ -30,7 +30,7 @@ public class ShopResultDto {
 
     private String shopUA;
 
-    private CharSequence shopCookie;
+    private String shopCookie;
 
     private IpResource bindIp;
 
@@ -151,11 +151,11 @@ public class ShopResultDto {
         this.shopUA = shopUA;
     }
 
-    public CharSequence getShopCookie() {
+    public String getShopCookie() {
         return shopCookie;
     }
 
-    public void setShopCookie(CharSequence shopCookie) {
+    public void setShopCookie(String shopCookie) {
         this.shopCookie = shopCookie;
     }
 

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -169,7 +169,8 @@ public class IpResourceServiceImpl implements IpResourceService {
         String price = vendorPrices.stream()
                 .filter(x ->  Vendor.valueOf(ipResourceRequestDto.getVendor()).getValue().equals(x.substring(0, x.indexOf("-"))))
                 .map(x -> x.substring(x.lastIndexOf("-") + 1)).collect(Collectors.joining());
-        IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, Double.valueOf(price) * ipResourceRequestDto.getAmount());
+        double newprice = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price);
+        IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, newprice * ipResourceRequestDto.getAmount());
         if (!ipChargeResultDto.isSuccess()) {
             throw new ClientRequestException(AccountErrorCode.NOTENOUGHBALANCE);
         }
@@ -244,7 +245,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                 ipBuyResultDto = restTemplate.postForObject(URL + "/intelligroup/ipresources?accountId=browser", httpEntity, IpBuyResultDto.class);
                 if (StringUtils.isNotBlank(ipBuyResultDto.getErrorCode())) {
                     IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 1);
-                    accountService.chargeByMoney(username, -Double.valueOf(price)*ipChargeRequestDto.getAmount(), ipChargeRequestDto);
+                    accountService.chargeByMoney(username, -newprice*ipChargeRequestDto.getAmount(), ipChargeRequestDto);
                     logger.error("fail to buy ip");
                     logger.error(ipBuyResultDto.getErrorCode());
                 }
@@ -264,7 +265,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     });
                     if (ipBuyResultDto.getIplist().size() < ipResourceDtos.size()) {
                         IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 1);
-                        accountService.chargeByMoney(username, -Double.valueOf(price)*(ipResourceDtos.size() - ipBuyResultDto.getIplist().size()), ipChargeRequestDto);
+                        accountService.chargeByMoney(username, -newprice*(ipResourceDtos.size() - ipBuyResultDto.getIplist().size()), ipChargeRequestDto);
                     }
                 }
                 ipTransaction.setStatus(1);
@@ -275,7 +276,7 @@ public class IpResourceServiceImpl implements IpResourceService {
         }, ThreadPoolUtils.taskExecutorPool);
 
         IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 1);
-        accountService.chargeByMoney(username, Double.valueOf(price) * ipChargeRequestDto.getAmount(), ipChargeRequestDto);
+        accountService.chargeByMoney(username, newprice * ipChargeRequestDto.getAmount(), ipChargeRequestDto);
         return ipTransactionDto;
     }
 
@@ -294,7 +295,8 @@ public class IpResourceServiceImpl implements IpResourceService {
                 .filter(vendorprice -> Vendor.valueOf(ipResourceRequestDto.getVendor()).getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                 .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining())).mapToDouble(Double::valueOf).sum();
 
-        IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, Double.valueOf(totalprice));
+        double newprice = ipResourceRequestDto.getUnit().equals("week") ? (int) (totalprice/3) : (int) totalprice;
+        IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, newprice);
         if (!ipChargeResultDto.isSuccess()) {
             throw new ClientRequestException(AccountErrorCode.NOTENOUGHBALANCE);
         }
@@ -324,8 +326,9 @@ public class IpResourceServiceImpl implements IpResourceService {
                     .filter(vendorprice -> Vendor.valueOf(ipResourceRequestDto.getVendor()).getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                     .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining());
 
+            double newprice1 = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price);
             IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2);
-            accountService.chargeByMoney(username, Double.valueOf(price), ipChargeRequestDto);
+            accountService.chargeByMoney(username, newprice1, ipChargeRequestDto);
 
             ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());
             ipResourceRepository.save(ipResource);

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -80,6 +80,7 @@ public class ShopServiceImpl implements ShopService {
             shopResultDto.setOwner(username);
             Shop shop = new Shop();
             shop.of(shopResultDto);
+            shop.setCreateTime(Instant.now().toEpochMilli());
             id = shopRepository.save(shop).getShopId();
             UserShop userShop = new UserShop();
             userShop.setUsername(username);