优化：

2025-04-14 14:24:49 +08:00
parent d2a92d7cde
commit 832531dc56
4 changed files with 13 additions and 136 deletions
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpPagesController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsMpPagesController.java
@@ -1,120 +0,0 @@
-package com.gxwebsoft.cms.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.cms.service.CmsMpPagesService;
-import com.gxwebsoft.cms.entity.CmsMpPages;
-import com.gxwebsoft.cms.param.CmsMpPagesParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 小程序页面控制器
- *
- * @author 科技小王子
- * @since 2024-09-10 20:47:57
- */
-@Api(tags = "小程序页面管理")
-@RestController
-@RequestMapping("/api/cms/cms-mp-pages")
-public class CmsMpPagesController extends BaseController {
-    @Resource
-    private CmsMpPagesService cmsMpPagesService;
-
-    @ApiOperation("分页查询小程序页面")
-    @GetMapping("/page")
-    public ApiResult<PageResult<CmsMpPages>> page(CmsMpPagesParam param) {
-        // 使用关联查询
-        return success(cmsMpPagesService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部小程序页面")
-    @GetMapping()
-    public ApiResult<List<CmsMpPages>> list(CmsMpPagesParam param) {
-        PageParam<CmsMpPages, CmsMpPagesParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(cmsMpPagesService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(cmsMpPagesService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('cms:cmsMpPages:list')")
-    @OperationLog
-    @ApiOperation("根据id查询小程序页面")
-    @GetMapping("/{id}")
-    public ApiResult<CmsMpPages> get(@PathVariable("id") Integer id) {
-        return success(cmsMpPagesService.getById(id));
-        // 使用关联查询
-        //return success(cmsMpPagesService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加小程序页面")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody CmsMpPages cmsMpPages) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          cmsMpPages.setUserId(loginUser.getUserId());
-        }
-        if (cmsMpPagesService.save(cmsMpPages)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("修改小程序页面")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody CmsMpPages cmsMpPages) {
-        if (cmsMpPagesService.updateById(cmsMpPages)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除小程序页面")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (cmsMpPagesService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("批量添加小程序页面")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<CmsMpPages> list) {
-        if (cmsMpPagesService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("批量修改小程序页面")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<CmsMpPages> batchParam) {
-        if (batchParam.update(cmsMpPagesService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("批量删除小程序页面")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (cmsMpPagesService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpPagesServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpPagesServiceImpl.java
@@ -23,7 +23,7 @@ public class CmsMpPagesServiceImpl extends ServiceImpl<CmsMpPagesMapper, CmsMpPa
    @Override
    public PageResult<CmsMpPages> pageRel(CmsMpPagesParam param) {
        PageParam<CmsMpPages, CmsMpPagesParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("create_time asc");
        List<CmsMpPages> list = baseMapper.selectPageRel(page, param);
        return new PageResult<>(list, page.getTotal());
    }
@@ -33,7 +33,7 @@ public class CmsMpPagesServiceImpl extends ServiceImpl<CmsMpPagesMapper, CmsMpPa
        List<CmsMpPages> list = baseMapper.selectListRel(param);
        // 排序
        PageParam<CmsMpPages, CmsMpPagesParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("create_time asc");
        return page.sortRecords(list);
    }

--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -157,12 +157,7 @@ public class User implements UserDetails {
    @TableField(exist = false)
    private String groupName;

-    @ApiModelProperty("客户ID")
-    @TableField(exist = false)
-    private Integer customerId;
-
    @ApiModelProperty("企业ID")
-    @TableField(exist = false)
    private Integer companyId;

    @ApiModelProperty("注册来源客户端")
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
@@ -112,27 +112,24 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
      superAdmin.setTemplateId(company.getTemplateId());
      superAdmin.setIsAdmin(true);
      superAdmin.setRealName(company.getBusinessEntity());
+      superAdmin.setPassword(userService.encodePassword("$2a$10$iMsEmh.rPlzwy/SVe6KW3.62vlwqMJpibhCF9jYN.fMqxdqymzMzu"));
+      if (company.getPassword() != null) {
        superAdmin.setPassword(userService.encodePassword(company.getPassword()));
+      }
      superAdmin.setTenantId(company.getTid());
      if(company.getTemplateId() != null){
        superAdmin.setTemplateId(company.getTemplateId());
      }
-      boolean result = userService.save(superAdmin);
-      Integer superAdminUserId = superAdmin.getUserId();
-
      // 企业资源配置
      company.setTenantId(company.getTid());
      company.setShortName(company.getShortName());
      company.setPhone(company.getPhone());
      company.setMembers(20);
      company.setServerUrl("https://server.gxwebsoft.com");
-      company.setModulesUrl("https://modules.gxwebsoft.com");
+      company.setModulesUrl("https://cms-api.websoft.top");
      company.setSocketUrl("wss://server.gxwebsoft.com");
      company.setAdminUrl(DomainUtil.getAdminUrl(company.getTid().toString()));
      company.setWebsiteUrl(DomainUtil.getSiteUrl(company.getTid().toString()));
-//      company.setH5Code("https://".concat("websoft.top"));
-//      company.setAndroidUrl("http://".concat(company.getTid().toString()).concat(".android.wsdns.cn"));
-//      company.setIosUrl("http://".concat(company.getTid().toString()).concat(".ios.wsdns.cn"));
      company.setVersion(10);
      company.setIndustryParent("");
      company.setIndustryChild("");
@@ -148,7 +145,12 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
      company.setEmail(company.getEmail());
      company.setUserId(superAdmin.getUserId());
      company.setExpirationTime(DateUtil.nextMonth());
-      companyService.save(company);
+
+      final boolean save = companyService.save(company);
+      superAdmin.setCompanyId(company.getCompanyId());
+
+      boolean result = userService.save(superAdmin);
+      Integer superAdminUserId = superAdmin.getUserId();

      // 创建角色
      if (result) {