bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc

This commit is contained in:
BianLzhaoMin 2024-07-23 17:11:58 +08:00
parent 3c8fd1e72b 09e2076e26
commit fccf9d1356
11 changed files with 63 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-auth/src/main/resources/bootstrap.yml
View File

@ -14,12 +14,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

10
sgzb-gateway/src/main/resources/bootstrap.yml
View File

@ -27,12 +27,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

10
sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
View File

@ -21,12 +21,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

10
sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
View File

@ -36,12 +36,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

10
sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml
View File

@ -14,12 +14,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

10
sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml
View File

@ -14,12 +14,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java
View File

@ -8,7 +8,6 @@ import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.material.domain.*;
import com.bonus.sgzb.material.service.IPurchaseAccessoryService;
import com.bonus.sgzb.material.vo.MaInputVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -116,7 +115,7 @@ public class PurchaseAccessoryController extends BaseController
public void export(HttpServletResponse response, PurchasePartInfo bean)
{
List<PurchasePartInfo> list = purchaseAccessoryService.exportList(bean);
ExcelUtil<PurchasePartInfo> util = new ExcelUtil<PurchasePartInfo>(PurchasePartInfo.class);
ExcelUtil<PurchasePartInfo> util = new ExcelUtil<>(PurchasePartInfo.class);
util.exportExcel(response, list, "新购配件验收数据");
}
@ -183,7 +182,7 @@ public class PurchaseAccessoryController extends BaseController
public void inputExport(HttpServletResponse response, PurchasePartDetails bean)
{
List<PurchasePartDetails> list = purchaseAccessoryService.inputExport(bean);
ExcelUtil<PurchasePartDetails> util = new ExcelUtil<PurchasePartDetails>(PurchasePartDetails.class);
ExcelUtil<PurchasePartDetails> util = new ExcelUtil<>(PurchasePartDetails.class);
util.exportExcel(response, list, "新购配件入库数据");
}
}

10
sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
View File

@ -21,12 +21,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

10
sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml
View File

@ -14,12 +14,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置

24
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
View File

@ -1,23 +1,18 @@
package com.bonus.sgzb.system.controller;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.Arrays;
import cn.hutool.core.util.IdUtil;
import com.bonus.sgzb.common.core.constant.Constants;
import com.bonus.sgzb.common.core.domain.R;
import com.bonus.sgzb.common.core.utils.DateTimeHelper;
import com.bonus.sgzb.system.api.domain.SysFile;
import com.bonus.sgzb.system.config.RsaUtil;
import com.bonus.sgzb.system.domain.FileInfo;
import com.bonus.sgzb.system.service.SysFileService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.utils.file.FileTypeUtils;
import com.bonus.sgzb.common.core.utils.file.MimeTypeUtils;
import com.bonus.sgzb.common.core.web.controller.BaseController;
@ -26,15 +21,12 @@ import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.security.service.TokenService;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.system.api.RemoteFileService;
import com.bonus.sgzb.system.api.domain.SysUser;
import com.bonus.sgzb.system.api.model.LoginUser;
import com.bonus.sgzb.system.service.ISysUserService;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
* 个人信息 业务处理
@ -44,14 +36,12 @@ import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("/user/profile")
public class SysProfileController extends BaseController {
@Autowired
@Resource
private ISysUserService userService;
@Autowired
@Resource
private TokenService tokenService;
@Autowired
private RemoteFileService remoteFileService;
@Resource
private SysFileService sysFileService;

10
sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
View File

@ -25,12 +25,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nw
server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置