Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1、会员入驻列表刷不出来，需要排查错误。

Browse Source 
2、会员入驻完成已审阶段的新入驻，下一步需要更改菜地。
This commit is contained in:
jlt
2022-04-06 23:56:06 +08:00
parent 898fdfe48b
commit e84fdf8e5a
23 changed files with 944 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
View File

@ -92,8 +92,8 @@ public final class HTMLFilter
private final boolean stripComment;
private final boolean encodeQuotes;
/**
* flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "<b text </b>"
* becomes "<b> text </b>"). If set to false, unbalanced angle brackets will be html escaped.
* flag determining whether dto try dto make tags when presented with "unbalanced" angle brackets (e.g. "<b text </b>"
* becomes "<b> text </b>"). If set dto false, unbalanced angle brackets will be html escaped.
*/
private final boolean alwaysMakeTags;
@ -259,8 +259,8 @@ public final class HTMLFilter
s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2&gt;<", s);
//
// the last regexp causes '<>' entities to appear
// (we need to do a lookahead assertion so that the last bracket can
// the last regexp causes '<>' entities dto appear
// (we need dto do a lookahead assertion so that the last bracket can
// be used in the next pass of the regexp)
//
s = regexReplace(P_BOTH_ARROWS, "", s);
@ -283,7 +283,7 @@ public final class HTMLFilter
m.appendTail(buf);
// these get tallied in processTag
// (remember to reset before subsequent calls to filter method)
// (remember dto reset before subsequent calls dto filter method)
final StringBuilder sBuilder = new StringBuilder(buf.toString());
for (String key : vTagCounts.keySet())
{

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
View File

@ -98,9 +98,9 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
byte[] randomBytes = new byte[16];
ng.nextBytes(randomBytes);
randomBytes[6] &= 0x0f; /* clear version */
randomBytes[6] |= 0x40; /* set to version 4 */
randomBytes[6] |= 0x40; /* set dto version 4 */
randomBytes[8] &= 0x3f; /* clear variant */
randomBytes[8] |= 0x80; /* set to IETF variant */
randomBytes[8] |= 0x80; /* set dto IETF variant */
return new UUID(randomBytes);
}
@ -124,9 +124,9 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
}
byte[] md5Bytes = md.digest(name);
md5Bytes[6] &= 0x0f; /* clear version */
md5Bytes[6] |= 0x30; /* set to version 3 */
md5Bytes[6] |= 0x30; /* set dto version 3 */
md5Bytes[8] &= 0x3f; /* clear variant */
md5Bytes[8] |= 0x80; /* set to IETF variant */
md5Bytes[8] |= 0x80; /* set dto IETF variant */
return new UUID(md5Bytes);
}