Pre Merge pull request !269 from runphp/N/A

Merge pull request !397 from 威士忌的纯度/N/A

docker/nginx/conf/nginx.conf

@@ -29,7 +29,7 @@ http {
         }
 
         # 避免actuator暴露
-        if ($request_uri ~ "/actuator") {
+        if ($uri ~ "/actuator") {
             return 403;
         }
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java

@@ -355,13 +355,13 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
         }
         // time_high_and_version
         builder.append(digits(mostSigBits, 4));
-        if (false == isSimple)
+        if (!isSimple)
         {
             builder.append('-');
         }
         // variant_and_sequence
         builder.append(digits(leastSigBits >> 48, 4));
-        if (false == isSimple)
+        if (!isSimple)
         {
             builder.append('-');
         }
@@ -419,13 +419,9 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
     @Override
     public int compareTo(UUID val)
     {
-        // The ordering is intentionally set up so that the UUIDs
-        // can simply be numerically compared as two numbers
         return (this.mostSigBits < val.mostSigBits ? -1 : //
                 (this.mostSigBits > val.mostSigBits ? 1 : //
-                        (this.leastSigBits < val.leastSigBits ? -1 : //
-                                (this.leastSigBits > val.leastSigBits ? 1 : //
-                                        0))));
+                        (Long.compare(this.leastSigBits, val.leastSigBits))));
     }
 
     // -------------------------------------------------------------------------------------------------------------------