修改-bug

src/main/java/cn/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -564,8 +564,7 @@ public class ChinaMobileRestApiController extends BaseController {
 
             // 填充编号
             this.setBoardSerial(exhibitionBoard);
-            // 记录用户最后一次进入的学习内容,这里记录是从学习内容进入展板参看资料是需要部分显示，但该接口只接收了展板id，没有学习内容id
-            // 另外，防止中移那边从项目进入展板参考资料和从内容进入参考资料使用同一个接口，需要在app进入项目时删除记录的该缓存
+            // 记录用户最后一次进入的学习内容,这里记录是从学习内容进入展板参看资料是需要部分显示，
             String userId = getUserId();
             stringRedisTemplate.opsForValue().set(LAST_CONTENT + userId, learningContentId);
         }

src/main/java/cn/chnmuseum/party/web/controller/LoginController.java

@@ -334,11 +334,11 @@ public class LoginController extends BaseController {
             HttpServletRequest request) {
         String regUrl;
         if ("H5".equalsIgnoreCase(clientType)) {
-            regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/h5/login";
-//            regUrl = request.getScheme() + "://" + request.getServerName() + "/h5/login";
+//            regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/h5/login";
+            regUrl = request.getScheme() + "://" + request.getServerName() + "/h5/login";
         } else {
-            regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/plat/#/login";
-//            regUrl = request.getScheme() + "://" + request.getServerName() + "/wdzcfwpt/";
+//            regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/plat/#/login";
+            regUrl = request.getScheme() + "://" + request.getServerName() + "/wdzcfwpt/";
         }
         QrConfig config = new QrConfig(width, height);
         config.setCharset(StandardCharsets.UTF_8);

src/main/java/cn/chnmuseum/party/web/controller/TOrganController.java

@@ -12,6 +12,7 @@ import cn.chnmuseum.party.model.TUser;
 import cn.chnmuseum.party.service.TAreaService;
 import cn.chnmuseum.party.service.TOrganService;
 import cn.chnmuseum.party.web.controller.base.BaseController;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -143,6 +144,13 @@ public class TOrganController extends BaseController {
                     return resultMap;
                 }
             }
+            // 机构存在机顶盒用户，不让修改地理位置
+            TOrgan oldOrgan = tOrganService.getById(tOrgan.getId());
+            List<TUser> list = userService.list(new UpdateWrapper<TUser>().eq("org_id", tOrgan.getId()).eq("is_deleted", "0"));
+            if (!oldOrgan.getAreaId().equals(tOrgan.getAreaId()) && CollectionUtil.isNotEmpty(list)) {
+                return getFailResult("机构存在机顶盒账号，不能修改地理位置！");
+            }
+
             tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
             boolean flag;
             flag = tOrganService.updateById(tOrgan);

src/main/resources/application.properties

@@ -43,7 +43,7 @@ IMAGE_BASE_URL=http://111.203.232.175:8085/
 #IMAGE_BASE_URL=http://101.96.131.110:9999/
 
 
-# fdfs.tracker-list[0]=39.101.194.223:22122
+# fdfs.tracker-list[0]=172.19.173.122:22122
 #dfsFileAccessBasePath=http://39.101.194.223:9999
 #prefixPat=/home/guobo/fastdfs/fastdfs_storage_data
 #IMAGE_BASE_URL=http://39.101.194.223:9999/