Merge branch 'dev' of 139.224.139.2:AGSH/yd-backend into dev

yd-api/pom.xml

@@ -129,6 +129,21 @@
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>2.10.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
     </dependencies>
 
     <build>

yd-api/src/main/java/com/yd/dal/mapper/customer/AclFileUploadMapper.java

@@ -19,7 +19,7 @@ public interface AclFileUploadMapper {
 
     int updateByPrimaryKey(AclFileUpload record);
 
-    CustomerFileUpload findByTargetTypeAndTargetUseForAndTargetId(@Param("targetType") Integer targetType, @Param("targetUseFor")Integer targetUseFor,@Param("practitionerId") Long practitionerId);
+    CustomerFileUpload findByTargetTypeAndTargetUseForAndTargetId(@Param("targetType")Integer targetType, @Param("targetUseFor")Integer targetUseFor, @Param("practitionerId")Long practitionerId);
 
     List<AclFileUpload> findByAclFileUpload(AclFileUpload fileUpload);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/rmi/ali/oss/service/impl/OssServiceImpl.java

@@ -2,7 +2,7 @@ package com.yd.rmi.ali.oss.service.impl;
 
 import com.aliyun.oss.model.*;
 import com.yd.api.result.CommonResult;
-import com.yd.cache.SystemConfigService;
+import com.yd.rmi.cache.SystemConfigService;
 import com.yd.rmi.ali.oss.service.OssService;
 import com.yd.rmi.ali.oss.vo.OssOperateTypeEnum;
 import com.yd.rmi.ali.oss.vo.OssRequestVO;

yd-api/src/main/java/com/yd/rmi/ali/ossinterf/service/impl/AliOssInterfServiceImpl.java

@@ -3,7 +3,7 @@ package com.yd.rmi.ali.ossinterf.service.impl;
 import com.aliyun.oss.HttpMethod;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.*;
-import com.yd.cache.SystemConfigService;
+import com.yd.rmi.cache.SystemConfigService;
 import com.yd.rmi.ali.ossinterf.service.AliOssInterfService;
 import com.yd.util.CommonUtil;
 import org.springframework.beans.factory.annotation.Autowired;

yd-api/src/main/java/com/yd/cache/SystemCacheManager.java → yd-api/src/main/java/com/yd/rmi/cache/SystemCacheManager.java

-package com.yd.cache;
+package com.yd.rmi.cache;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 

yd-api/src/main/java/com/yd/cache/SystemConfigService.java → yd-api/src/main/java/com/yd/rmi/cache/SystemConfigService.java

-package com.yd.cache;
+package com.yd.rmi.cache;
 
 import com.yd.dal.entity.meta.MdCode;
 import com.yd.dal.service.meta.MdCodeDALService;
@@ -10,7 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 @Service("systemConfigService")
 @org.springframework.core.annotation.Order(1)

yd-api/src/main/java/com/yd/cache/SystemConstants.java → yd-api/src/main/java/com/yd/rmi/cache/SystemConstants.java

-package com.yd.cache;
+package com.yd.rmi.cache;
 
 import com.yd.util.CommonUtil;
 

yd-api/src/main/java/com/yd/rmi/tencent/wechat/service/impl/WechatServiceImpl.java

 package com.yd.rmi.tencent.wechat.service.impl;
 
 import com.yd.api.result.CommonResult;
-import com.yd.cache.SystemConfigService;
+import com.yd.rmi.cache.SystemConfigService;
 import com.yd.dal.entity.tencent.TenInterfRecord;
 import com.yd.dal.entity.transaction.TranLog;
 import com.yd.dal.service.tencent.TenInterfRecordDALService;

yd-api/src/main/java/com/yd/rmi/tencent/wechatinterf/service/impl/WechatInterfServiceImpl.java

 package com.yd.rmi.tencent.wechatinterf.service.impl;
 
-import com.yd.cache.SystemConfigService;
+import com.yd.rmi.cache.SystemConfigService;
 import com.yd.dal.service.transaction.TranLogDALService;
 import com.yd.rmi.tencent.wechatinterf.pojo.accesstoken.AccessTokenRequest;
 import com.yd.rmi.tencent.wechatinterf.pojo.accesstoken.AccessTokenResponse;