bihs před 3 týdny
rodič
revize
890bab785d

+ 5 - 5
src/main/java/com/ruoyi/system/service/impl/SysAppVersionServiceImpl.java

@@ -35,7 +35,7 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService {
     @Override
     public SysAppVersion selectSysAppVersionById(String id) {
         /*图片前缀*/
-        String url = configService.selectConfigByKey("fileUrl");
+        String url = configService.selectConfigByKey("appUrl");
         SysAppVersion sysAppVersion = sysAppVersionMapper.selectSysAppVersionById(id);
         sysAppVersion.setPath(url + sysAppVersion.getPath());
         sysAppVersion.setPicUrl(url + sysAppVersion.getPicUrl());
@@ -51,7 +51,7 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService {
     @Override
     public List<SysAppVersion> selectSysAppVersionList(SysAppVersion sysAppVersion) {
         /*图片前缀*/
-        String url = configService.selectConfigByKey("fileUrl");
+        String url = configService.selectConfigByKey("appUrl");
         /*如果附件不为空,则拼接协议前缀,用来回显*/
         List<SysAppVersion> ls = sysAppVersionMapper.selectSysAppVersionList(sysAppVersion);
         for (SysAppVersion l : ls) {
@@ -78,10 +78,10 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService {
 
     private void removeUrlPrefix(SysAppVersion sysAppVersion) {
         if (!"".equals(sysAppVersion.getPath()) && null != sysAppVersion.getPath()) {
-            sysAppVersion.setPath(sysAppVersion.getPath().substring(sysAppVersion.getPath().indexOf("/group")));
+            sysAppVersion.setPath(sysAppVersion.getPath().substring(sysAppVersion.getPath().indexOf("group")));
         }
         if (!"".equals(sysAppVersion.getPicUrl()) && null != sysAppVersion.getPicUrl()) {
-            sysAppVersion.setPicUrl(sysAppVersion.getPicUrl().substring(sysAppVersion.getPicUrl().indexOf("/group")));
+            sysAppVersion.setPicUrl(sysAppVersion.getPicUrl().substring(sysAppVersion.getPicUrl().indexOf("group")));
         }
     }
 
@@ -124,7 +124,7 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService {
     @Override
     public AppVersionBO getVersionInfo(String packageName) {
         /*图片前缀*/
-        String url = configService.selectConfigByKey("fileUrl");
+        String url = configService.selectConfigByKey("appUrl");
         AppVersionBO appVersionBO = sysAppVersionMapper.selectMaxVersion(packageName);
         appVersionBO.setPath(url + appVersionBO.getPath());
         appVersionBO.setPicUrl(url + appVersionBO.getPicUrl());

+ 2 - 1
src/main/resources/mapper/system/SysUserMapper.xml

@@ -568,7 +568,8 @@
             <if test="dahuaPassword != null and dahuaPassword != ''">dahua_password= #{dahuaPassword},</if>
             <if test="haikangAccount != null and haikangAccount != ''">haikang_account= #{haikangAccount},</if>
             <if test="haikangPassword != null and haikangPassword != ''">haikang_password= #{haikangPassword},</if>
-            update_time = sysdate()
+            update_time = sysdate(),
+            update_pwd_time = null
         </set>
         where user_id = #{userId}
     </update>