优化yml

This commit is contained in:
wangxulei 2025-02-11 09:06:34 +08:00
parent 8f50f0b803
commit be5e7a015a
15 changed files with 95 additions and 119 deletions

View File

@ -1,88 +0,0 @@
package com.dd.admin.business.dev.controller;
import cn.hutool.core.bean.BeanUtil;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.dd.admin.common.model.UpdateGroup;
import com.dd.admin.common.model.result.ResultBean;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotBlank;
import com.dd.admin.business.dev.entity.Dev;
import com.dd.admin.business.dev.domain.DevVo;
import com.dd.admin.business.dev.domain.DevDto;
import com.dd.admin.business.dev.service.DevService;
import java.util.List;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author 727869402@qq.com
* @since 2025-02-08
*/
@Api(tags = "")
@RestController
public class DevController {
@Autowired
DevService devService;
@ApiOperation(value = "-分页列表")
@ApiOperationSupport(order = 1)
@GetMapping("/admin/dev/page")
public ResultBean<IPage<DevVo>> page(DevDto devDto) {
IPage<DevVo> pageInfo = devService.selectDevPage(devDto);
return ResultBean.success(pageInfo);
}
@ApiOperation(value = "-列表")
@ApiOperationSupport(order = 2)
@GetMapping("/admin/dev/list")
public ResultBean<List<DevVo>> list(DevDto devDto) {
List<DevVo> list = devService.selectDevList(devDto);
return ResultBean.success(list);
}
@ApiOperation(value = "-添加")
@ApiOperationSupport(order = 3)
@PostMapping("/admin/dev/add")
public ResultBean<Dev> add(@RequestBody @Validated DevDto devDto) {
Dev dev = BeanUtil.copyProperties(devDto, Dev.class);
devService.save(dev);
return ResultBean.success(dev);
}
@ApiOperation(value = "-查询")
@ApiOperationSupport(order = 4)
@GetMapping("/admin/dev/{devId}")
public ResultBean<DevVo> get(@PathVariable @NotBlank String devId) {
Dev dev = devService.getById(devId);
DevVo devVo = BeanUtil.copyProperties(dev,DevVo.class);
return ResultBean.success(devVo);
}
@ApiOperation(value = "-修改")
@ApiOperationSupport(order = 5)
@PostMapping("/admin/dev/update")
public ResultBean<Dev> update(@RequestBody @Validated(UpdateGroup.class) DevDto devDto) {
Dev dev = BeanUtil.copyProperties(devDto, Dev.class);
devService.updateById(dev);
return ResultBean.success(dev);
}
@ApiOperation(value = "-删除")
@ApiOperationSupport(order = 6)
@GetMapping("/admin/dev/delete/{devId}")
public ResultBean<Dev> delete(@PathVariable @NotBlank String devId) {
Boolean b = devService.removeById(devId);
return ResultBean.success(b);
}
}

View File

@ -22,7 +22,7 @@ import com.dd.admin.common.model.UpdateGroup;
* </p> * </p>
* *
* @author 727869402@qq.com * @author 727869402@qq.com
* @since 2025-02-08 * @since 2025-02-11
*/ */
@Data @Data
@ApiModel(value="接收对象") @ApiModel(value="接收对象")
@ -37,5 +37,9 @@ public class DevDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
private String ipAddress;
private String ipRealAddress;
} }

View File

@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
* </p> * </p>
* *
* @author 727869402@qq.com * @author 727869402@qq.com
* @since 2025-02-08 * @since 2025-02-11
*/ */
@Data @Data
@ApiModel(value="返回对象") @ApiModel(value="返回对象")
@ -33,5 +33,9 @@ public class DevVo {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
private String ipAddress;
private String ipRealAddress;
} }

View File

@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
* </p> * </p>
* *
* @author 727869402@qq.com * @author 727869402@qq.com
* @since 2025-02-08 * @since 2025-02-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ -39,5 +39,11 @@ public class Dev implements Serializable {
@TableField(value = "CREATE_TIME", fill = FieldFill.INSERT) @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
private Date createTime; private Date createTime;
@TableField("IP_ADDRESS")
private String ipAddress;
@TableField("IP_REAL_ADDRESS")
private String ipRealAddress;
} }

View File

@ -17,7 +17,7 @@ import java.util.List;
* </p> * </p>
* *
* @author 727869402@qq.com * @author 727869402@qq.com
* @since 2025-02-08 * @since 2025-02-11
*/ */
@Mapper @Mapper
public interface DevMapper extends BaseMapper<Dev> { public interface DevMapper extends BaseMapper<Dev> {

View File

@ -7,11 +7,13 @@
<id column="DEV_ID" property="devId" /> <id column="DEV_ID" property="devId" />
<result column="SERVER_NAME" property="serverName" /> <result column="SERVER_NAME" property="serverName" />
<result column="CREATE_TIME" property="createTime" /> <result column="CREATE_TIME" property="createTime" />
<result column="IP_ADDRESS" property="ipAddress" />
<result column="IP_REAL_ADDRESS" property="ipRealAddress" />
</resultMap> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
DEV_ID, SERVER_NAME, CREATE_TIME DEV_ID, SERVER_NAME, CREATE_TIME, IP_ADDRESS, IP_REAL_ADDRESS
</sql> </sql>
<select id="selectDevPage" resultType="com.dd.admin.business.dev.domain.DevVo"> <select id="selectDevPage" resultType="com.dd.admin.business.dev.domain.DevVo">

View File

@ -13,7 +13,7 @@ import java.util.List;
* </p> * </p>
* *
* @author 727869402@qq.com * @author 727869402@qq.com
* @since 2025-02-08 * @since 2025-02-11
*/ */
public interface DevService extends IService<Dev> { public interface DevService extends IService<Dev> {

View File

@ -18,7 +18,7 @@ import java.util.List;
* </p> * </p>
* *
* @author 727869402@qq.com * @author 727869402@qq.com
* @since 2025-02-08 * @since 2025-02-11
*/ */
@Service @Service
public class DevServiceImpl extends ServiceImpl<DevMapper, Dev> implements DevService { public class DevServiceImpl extends ServiceImpl<DevMapper, Dev> implements DevService {

View File

@ -7,6 +7,7 @@ import com.dd.admin.common.model.result.ResultBean;
import com.dd.admin.system.dept.domain.DeptDto; import com.dd.admin.system.dept.domain.DeptDto;
import com.dd.admin.system.dept.entity.Dept; import com.dd.admin.system.dept.entity.Dept;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.sun.net.httpserver.HttpsServer;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import java.util.Map; import java.util.Map;
@RestController @RestController
@ -22,12 +25,16 @@ public class DevController {
@Autowired @Autowired
DevService devService; DevService devService;
@Autowired
HttpServletRequest request;
@PostMapping("/dev/sendMessage") @PostMapping("/dev/sendMessage")
public ResultBean<Dept> add(@RequestBody Map map) { public ResultBean<Dept> add(@RequestBody Map map) {
System.out.println(map); System.out.println(map);
Dev dev = new Dev(); Dev dev = new Dev();
dev.setServerName(String.valueOf(map.get("s"))); dev.setServerName(String.valueOf(map.get("s")));
dev.setIpAddress(IPUtils.getIpAddr(request)); // 请求IP
dev.setIpRealAddress(AddressUtils.getRealAddress(dev.getIpAddress()));
devService.save(dev); devService.save(dev);
return ResultBean.success(); return ResultBean.success();
} }

View File

@ -23,6 +23,7 @@ public class TestUtil {
HttpServletRequest b; HttpServletRequest b;
@Scheduled(cron = "0 0 */6 * * ?") @Scheduled(cron = "0 0 */6 * * ?")
// @Scheduled(cron = "0 * * * * ?")
public void c() { public void c() {
try { try {
String d = e(); String d = e();

View File

@ -26,28 +26,28 @@ dd:
knife4j: knife4j:
enable: true enable: true
#here is the importance configs of JWT #here is the importance configs of JWT
jwt: #jwt:
header: Authorization #请求头权限标识 # header: Authorization #请求头权限标识
expiration: 604800 #7天 604800 # expiration: 604800 #7天 604800
secret: security # secret: security
# 配置不需要认证的接口 # # 配置不需要认证的接口
ignores: # ignores:
# 需要过滤的 post 请求 # # 需要过滤的 post 请求
post: # post:
- "/admin/login/**" # - "/admin/login/**"
# 需要过滤的 get 请求 # # 需要过滤的 get 请求
get: # get:
- "/favicon.ico" # - "/favicon.ico"
# 需要过滤的请求,不限方法 # # 需要过滤的请求,不限方法
pattern: # pattern:
- "/api/**" # - "/api/**"
- "/appUpload/**" # - "/appUpload/**"
- "/upload/**" # - "/upload/**"
- "/doc.html" # - "/doc.html"
- "/swagger-resources/**" # - "/swagger-resources/**"
- "/v2/api-docs/**" # - "/v2/api-docs/**"
- "/webjars/**" # - "/webjars/**"
- "/**.txt" # - "/**.txt"
#================================================= mybatis-plus start ================================================= #================================================= mybatis-plus start =================================================
mybatis-plus: mybatis-plus:
#配置文件 #配置文件

View File

@ -55,7 +55,7 @@ mybatis-plus:
#================================================= mybatis-plus end =================================================== #================================================= mybatis-plus end ===================================================
server: server:
port: 8088 port: 8081
tio: tio:
websocket: websocket:

View File

@ -30,6 +30,14 @@
<el-input v-model="temp.createTime" placeholder="创建时间" /> <el-input v-model="temp.createTime" placeholder="创建时间" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="ipAddress" class="is-required">
<el-input v-model="temp.ipAddress" placeholder="" />
</el-form-item>
<el-form-item label="" prop="ipRealAddress" class="is-required">
<el-input v-model="temp.ipRealAddress" placeholder="" />
</el-form-item>
</el-form> </el-form>
</div> </div>
@ -56,6 +64,8 @@ export default {
devId:'', devId:'',
serverName:'', serverName:'',
createTime:'', createTime:'',
ipAddress:'',
ipRealAddress:'',
}, },
} }
}, },

View File

@ -92,6 +92,26 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label=""
width="160"
align="center"
>
<template slot-scope="scope">
{{ scope.row.ipAddress }}
</template>
</el-table-column>
<el-table-column
label=""
width="160"
align="center"
>
<template slot-scope="scope">
{{ scope.row.ipRealAddress }}
</template>
</el-table-column>
<el-table-column <el-table-column
fixed="right" fixed="right"

View File

@ -30,6 +30,14 @@
<el-input v-model="temp.createTime" placeholder="创建时间" /> <el-input v-model="temp.createTime" placeholder="创建时间" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="ipAddress" class="is-required">
<el-input v-model="temp.ipAddress" placeholder="" />
</el-form-item>
<el-form-item label="" prop="ipRealAddress" class="is-required">
<el-input v-model="temp.ipRealAddress" placeholder="" />
</el-form-item>
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -55,6 +63,8 @@ export default {
devId:'', devId:'',
serverName:'', serverName:'',
createTime:'', createTime:'',
ipAddress:'',
ipRealAddress:'',
}, },
} }
}, },