Merge remote-tracking branch 'origin/master'

config/application-spbt.yml

@@ -48,6 +48,8 @@ cy:
     decryptKey: cyKey
     # sm4
     decryptSm4Param: true
+    # 解密范围：0:解密注解；1：全局解密
+    decryptSm4Scope: 0
     decryptSm4Secret: 'FFFAAA333777EEEB'
     # 文件存储
     fileStorage:

pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.91isoft</groupId>
             <artifactId>91isoft_spbt</artifactId>
-            <version>3.3.0_core_alpha2</version>
+            <version>3.3.0_core_alpha5</version>
             <!--            <version>3.0.0_nlt.25</version>-->
             <!-- 排除oracle12的驱动，此处代码不能提交，测试使用的是12，生产为11 -->
         </dependency>

src/main/java/org/rcisoft/app/appMemInfo/controller/AppMemInfoController.java

@@ -10,9 +10,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.servlet.http.HttpServletResponse;
 import org.rcisoft.business.memInfo.entity.MemInfo;
 import org.rcisoft.business.memInfo.service.MemInfoService;
-import org.rcisoft.common.component.CyGlobal;
 import org.rcisoft.core.anno.CyEncryptSm4Anno;
 import org.rcisoft.core.anno.CyOpeLogAnno;
+import org.rcisoft.core.component.CyGlobal;
 import org.rcisoft.core.constant.CyMessCons;
 import org.rcisoft.core.controller.CyPaginationController;
 import org.rcisoft.core.exception.CyServiceException;

src/main/resources/mapper/business/cmsbanner/mapper/CmsBannerMapper.xml

@@ -15,7 +15,7 @@
         <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
         <result column="flag" jdbcType="VARCHAR" property="flag"/>
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
-        <result column="url" jdbcType="VARCHAR" property="url"/>
+        <result column="path" jdbcType="VARCHAR" property="path"/>
     </resultMap>
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
@@ -42,7 +42,7 @@
     </select>
 
     <select id="queryCmsBannersPaged" resultMap="BaseResultMap">
-        select smb.*,oi.url from cms_banner smb
+        select smb.*,oi.path from cms_banner smb
         left join oss_info oi on smb.picture_id = oi.business_id
         where 1=1
         and smb.del_flag = '0'