Merge branch 'v21.1_jianzhuang_20240807' into release

performance-web/src/main/java/com/clx/performance/config/LoadAppConfig.java

@@ -4,7 +4,7 @@ import com.clx.performance.dao.AppDao;
 import com.clx.performance.enums.AppEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.App;
-import com.clx.performance.utils.SpringContextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -16,10 +16,12 @@ public class LoadAppConfig {
 
     private App purchaseManageApp;
 
+    @Autowired
+    private AppDao appDao;
+
 
     public App getPurchaseManageApp() {
         if (purchaseManageApp == null) {
-            AppDao appDao = SpringContextUtils.getBeanByClass(AppDao.class);
             purchaseManageApp = appDao.getOneByField(App::getUniqueIdentifier, AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode()).orElseThrow(
                     PerformanceResultEnum.DATA_NOT_FIND);;
         }

performance-web/src/main/java/com/clx/performance/dao/impl/AppDaoImpl.java

+package com.clx.performance.dao.impl;
+
+
+import com.clx.performance.dao.AppDao;
+import com.clx.performance.mapper.AppMapper;
+import com.clx.performance.model.App;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class AppDaoImpl extends BaseDaoImpl<AppMapper, App, Integer> implements AppDao {
+
+}