Pine hace 6 años
padre
commit
88042e2074

+ 3 - 0
pine-admin/src/main/java/com/pine/admin/modules/business/entity/CarOrder.java

@@ -274,4 +274,7 @@ public class CarOrder implements Serializable {
     @ApiModelProperty(value = "订单是否发送给金融公司  0 否 1是  默认 0", name = "isSend")
     private String isSend;
 
+    @ApiModelProperty(value = "是否退款 0 否 1 是 默认 0",name = "")
+    private String isRefund = "1";
+
 }

+ 7 - 2
pine-admin/src/main/java/com/pine/admin/modules/system/controller/SysUserLoginController.java

@@ -6,6 +6,7 @@ import com.google.code.kaptcha.Producer;
 import com.pine.admin.modules.system.entity.SysPermission;
 import com.pine.admin.modules.system.entity.SysUserRole;
 import com.pine.admin.modules.system.service.SysUserRoleService;
+import com.pine.admin.modules.youpaiyun.util.MD5Utils;
 import com.pine.admin.shiro.ShiroUtils;
 import com.pine.common.dto.Result;
 import com.pine.common.utils.CookieUtil;
@@ -19,6 +20,7 @@ import org.apache.shiro.authc.*;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.security.provider.MD5;
 
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
@@ -140,7 +142,10 @@ public class SysUserLoginController {
     }
 
     public static void main(String[] args) {
-        String encode = MD5Util.getMD5("123456");
-        System.out.println(encode);
+        byte[] bytes = MD5Util.md5("123456");
+        bytes.toString();
+        System.out.println("123456");
+        System.out.println(        MD5Util.md5Hex("123456")
+        );
     }
 }

+ 1 - 1
pine-common/src/main/java/com/pine/common/utils/RSAUtils.java

@@ -21,7 +21,7 @@ public class RSAUtils {
     private final static int MAX_DECRYPT_BLOCK = 128;           //RSA最大解密密文大小
     private final static String KEY_ALGORITHM = "RSA";          //加密算法RSA
     private final static int MAX_ENCRYPT_BLOCK = 117;           //RSA最大加密明文大小
-    public final static String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHEoOi4U/rmwFu6gqn7Sc1IwLX38ncSaonSwkhKyxa44nvvqjyqzHryFb7t5kbANBWrhjhaZ4AmpiODH0hSj9cCJJY2qWrQfeZLt3fWIfED/yZhocImuxb7QZqFjwu2/N7PdGMAPA0pAX4rtQM8iw773iGk6uSBRIDC3IXs3lC9QIDAQAB";
+    public final static String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHhQ6Px0l+cMR1tRsky0HDlvJD94AbE9Z0UhIZFgtdJ20GRQoV2DO3jQbGMBrM6giEcUCbYcDsnTVUovBrDQit1QtZZ3eKtoqrW7bMT2eX5qQOrZtO2kRkrnWwsxkKHKhn41atEMvSqrVqLgOUDgBhmxREWN93KUYE2adAg62/jQIDAQAB";
 
     /**
      * 加密