模型、服务、审核发布

ruoyi-api-patform/src/main/resources/mapper/interfaces/PtServiceMapper.xml

@@ -210,7 +210,6 @@ PUBLISH_TIME
         #{tm, jdbcType=DATE},
         #{proxyAddress,jdbcType=VARCHAR},
         #{proxyPath,jdbcType=VARCHAR},
-        #{gatewayId,jdbcType=VARCHAR},
         #{serviceSource,jdbcType=VARCHAR},
         #{serviceDept,jdbcType=VARCHAR},
         #{manageName,jdbcType=VARCHAR},
@@ -227,8 +226,9 @@ PUBLISH_TIME
         #{auditRemark,jdbcType=VARCHAR},
         #{publish,jdbcType=VARCHAR},
         #{publishBy,jdbcType=VARCHAR},
-        #{publishTime,jdbcType=DATE}
-        #{gatewayId,jdbcType=DATE}
+        #{publishTime,jdbcType=DATE},
+        #{gatewayId,jdbcType=VARCHAR},
+        #{state,jdbcType=VARCHAR}
     </sql>
     <sql id="page_where">
         <trim prefix="where" prefixOverrides="and | or ">

ruoyi-common/src/main/java/com/ruoyi/common/utils/SM4Util.java

@@ -78,7 +78,7 @@ public class SM4Util {
      * @return Base64编码的加密结果
      */
     public String encrypt(String data) {
-        if (StringUtils.isNull(data)) return null;
+        if (StringUtils.isEmpty(data)) return null;
         try {
             Cipher cipher = Cipher.getInstance(ALGORITHM_NAME_ECB_PADDING, BouncyCastleProvider.PROVIDER_NAME);
             SecretKeySpec secretKeySpec = new SecretKeySpec(key, ALGORITHM_NAME);
@@ -97,7 +97,7 @@ public class SM4Util {
      * @return 解密后的原始字符串
      */
     public String decrypt(String encryptedData) {
-        if (StringUtils.isNull(encryptedData)) return null;
+        if (StringUtils.isEmpty(encryptedData)) return null;
         try {
             Cipher cipher = Cipher.getInstance(ALGORITHM_NAME_ECB_PADDING, BouncyCastleProvider.PROVIDER_NAME);
             SecretKeySpec secretKeySpec = new SecretKeySpec(key, ALGORITHM_NAME);