From 2edf3f1fd9505cbdd435524d316e7558b25f6760 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 14:25:02 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/api/business/CompanyController.java | 8 ++
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 6 ++
admin/src/components/business/OperaManagersWindow.vue | 2
server/src/main/resources/application-dev.yml | 7 ++
server/src/main/java/com/doumee/dao/business/model/Company.java | 6 ++
admin/src/views/index.vue | 12 ++--
/dev/null | 8 --
server/src/main/java/com/doumee/dao/business/model/CompanyMember.java | 6 +
server/src/main/resources/application-test.yml | 6 +
.idea/modules.xml | 2
server/src/main/java/com/doumee/dao/business/vo/CompanyTree.java | 38 ++++++++++++
server/src/main/java/com/doumee/service/business/CompanyService.java | 1
admin/src/views/business/workorderDbh.vue | 11 ++-
admin/src/views/business/workorderDcaChild.vue | 11 ++-
server/src/main/resources/application.yml | 6 -
server/src/main/java/com/doumee/dao/business/CompanyMemberMapper.java | 3
server/src/main/resources/application-pro.yml | 6 ++
admin/src/api/business/company.js | 5 +
server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 22 +++++++
admin/lianhelihua_admin/index.html | 2
20 files changed, 132 insertions(+), 36 deletions(-)
diff --git a/.idea/modules.xml b/.idea/modules.xml
index deaa4c3..5aa4937 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file://$PROJECT_DIR$/dmttwebsite.iml" filepath="$PROJECT_DIR$/dmttwebsite.iml" />
<module fileurl="file://$PROJECT_DIR$/server/lianghelihua.iml" filepath="$PROJECT_DIR$/server/lianghelihua.iml" />
- <module fileurl="file://$PROJECT_DIR$/lianhelihua_sh.iml" filepath="$PROJECT_DIR$/lianhelihua_sh.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/admin/lianhelihua_admin/index.html b/admin/lianhelihua_admin/index.html
index 4054258..eb176e7 100644
--- a/admin/lianhelihua_admin/index.html
+++ b/admin/lianhelihua_admin/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>鑱斿悎鍒╁崕浜嬩欢涓婃姤绯荤粺</title><link href="/lianhelihua_admin/static/css/app.39e777cc.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.94e81d49.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.52ca84c8.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.39e777cc.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.52ca84c8.js"></script><script src="/lianhelihua_admin/static/js/app.94e81d49.js"></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>鑱斿悎鍒╁崕浜嬩欢涓婃姤绯荤粺</title><link href="/lianhelihua_admin/static/css/app.39e777cc.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.ecb1f3a1.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.fe7fcf11.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.39e777cc.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.fe7fcf11.js"></script><script src="/lianhelihua_admin/static/js/app.ecb1f3a1.js"></script></body></html>
\ No newline at end of file
diff --git a/admin/src/api/business/company.js b/admin/src/api/business/company.js
index f19de73..6da94a0 100644
--- a/admin/src/api/business/company.js
+++ b/admin/src/api/business/company.js
@@ -12,6 +12,11 @@
trim: true
})
}
+export function treeWithMember (data) {
+ return request.post('/business/company/treeWithMember', encryptData(data), {
+ trim: true
+ })
+}
// 瀵煎嚭Excel
export function exportExcel (data) {
diff --git a/admin/src/components/business/OperaManagersWindow.vue b/admin/src/components/business/OperaManagersWindow.vue
index 2180c04..4649fc9 100644
--- a/admin/src/components/business/OperaManagersWindow.vue
+++ b/admin/src/components/business/OperaManagersWindow.vue
@@ -29,7 +29,7 @@
show-checkbox
node-key="id"
default-expand-all
- @check-change="changeTree"
+ @check-change="changeTree"
:expand-on-click-node="false"
:check-on-click-node="true"
:props="{children: 'childList',label: 'name'}">
diff --git a/admin/src/views/business/workorderDbh.vue b/admin/src/views/business/workorderDbh.vue
index c0d231c..2d2e4aa 100644
--- a/admin/src/views/business/workorderDbh.vue
+++ b/admin/src/views/business/workorderDbh.vue
@@ -26,10 +26,13 @@
<el-form-item label="鐘舵�佹弿杩�" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @change="search" >
<el-option label="寰呭垎閰峎TS" value="0"></el-option>
- <el-option label="寰呭垎閰嶅伐绋嬪笀" value="1"></el-option>
- <el-option label="SHE鍏抽棴" value="2"></el-option>
- <el-option label="WTS鍏抽棴" value="3"></el-option>
- <el-option label="宸ョ▼甯堝叧闂�" value="4"></el-option>
+<!--
+ <el-option label="寰呭垎閰嶄换鍔�" value="1"></el-option>
+-->
+ <el-option label="寰呭伐绋嬪笀澶勭悊" value="2"></el-option>
+ <el-option label="SHE鍏抽棴" value="3"></el-option>
+ <el-option label="WTS鍏抽棴" value="4"></el-option>
+ <el-option label="宸ョ▼甯堝叧闂�" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎻愪氦鏃堕棿" prop="queryStartTime">
diff --git a/admin/src/views/business/workorderDcaChild.vue b/admin/src/views/business/workorderDcaChild.vue
index 2d0cbbe..f79c433 100644
--- a/admin/src/views/business/workorderDcaChild.vue
+++ b/admin/src/views/business/workorderDcaChild.vue
@@ -32,10 +32,13 @@
<el-form-item label="鐘舵�佹弿杩�" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @change="search" >
<el-option label="寰呭垎閰峎TS" value="0"></el-option>
- <el-option label="寰呭垎閰嶅伐绋嬪笀" value="1"></el-option>
- <el-option label="SHE鍏抽棴" value="2"></el-option>
- <el-option label="WTS鍏抽棴" value="3"></el-option>
- <el-option label="宸ョ▼甯堝叧闂�" value="4"></el-option>
+<!--
+ <el-option label="寰呭垎閰嶄换鍔�" value="1"></el-option>
+-->
+ <el-option label="寰呭伐绋嬪笀澶勭悊" value="2"></el-option>
+ <el-option label="SHE鍏抽棴" value="3"></el-option>
+ <el-option label="WTS鍏抽棴" value="4"></el-option>
+ <el-option label="宸ョ▼甯堝叧闂�" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎻愪氦鏃堕棿" prop="queryStartTime">
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index b090fe8..8aaec37 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -34,8 +34,8 @@
-->
</div>
<div class="content">
- <div>鏈В鍐筹細{{ headerData.dbhYesNum || 0}}</div>
- <div>宸茶В鍐筹細{{ headerData.dbhNoNum || 0}}</div>
+ <div>鏈В鍐筹細{{ headerData.dbhNoNum || 0}}</div>
+ <div>宸茶В鍐筹細{{ headerData.dbhYesNum || 0}}</div>
<div>鎬诲伐鍗曢噺锛歿{ headerData.dbhNum || 0}}</div>
</div>
</div>
@@ -48,8 +48,8 @@
<!-- <img src="@/assets/icons/home_icon3.png" alt="" />-->
</div>
<div class="content">
- <div>绗﹀悎椤癸細{{ headerData.dcaYesNum || 0}}</div>
- <div>涓嶇鍚堥」锛歿{ headerData.dcaNoNum || 0}}</div>
+ <div>绗﹀悎椤癸細{{ headerData.dcaNoNum || 0}}</div>
+ <div>涓嶇鍚堥」锛歿{ headerData.dcaYesNum || 0}}</div>
<div>鎬讳笂鎶ユ鏁帮細{{ headerData.dcaNum || 0}}</div>
</div>
</div>
@@ -62,8 +62,8 @@
<!-- <img src="@/assets/images/bg_a.png" alt="" />-->
</div>
<div class="content">
- <div>鏈В鍐筹細{{ headerData.dcaChildYesNum || 0}}</div>
- <div>宸茶В鍐筹細{{ headerData.dcaChildNoNum || 0}}</div>
+ <div>鏈В鍐筹細{{ headerData.dcaChildNoNum || 0}}</div>
+ <div>宸茶В鍐筹細{{ headerData.dcaChildYesNum || 0}}</div>
<div>鎬诲伐鍗曢噺锛歿{ headerData.dcaChildNum || 0}}</div>
</div>
</div>
diff --git a/lianhelihua_sh.iml b/lianhelihua_sh.iml
deleted file mode 100644
index 9a5cfce..0000000
--- a/lianhelihua_sh.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="GENERAL_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/server/src/main/java/com/doumee/api/business/CompanyController.java b/server/src/main/java/com/doumee/api/business/CompanyController.java
index c1a27d5..3b757b4 100644
--- a/server/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/src/main/java/com/doumee/api/business/CompanyController.java
@@ -58,6 +58,14 @@
public ApiResponse<List<Company>> tree (@RequestBody Company company){
return ApiResponse.success(companyService.companyTree());
}
+ @ApiOperation("缁勭粐鏍戞煡璇�")
+ @PostMapping("/treeWithMember")
+ @EncryptionResp
+ @EncryptionReq
+ @RequiresPermissions("business:company:query")
+ public ApiResponse<List<Company>> treeWithMember (@RequestBody Company company){
+ return ApiResponse.success(companyService.companyTreeWithMember ());
+ }
@ApiOperation("鏍规嵁ID鍒犻櫎")
diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
index 06ad2fc..b738729 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -4,6 +4,7 @@
import com.doumee.config.annotation.EncryptionReq;
import com.doumee.config.annotation.EncryptionResp;
import com.doumee.config.annotation.LoginRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -56,6 +57,7 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤")
@PostMapping("/create")
+ @PreventRepeat
@EncryptionReq
@EncryptionResp
public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
@@ -111,6 +113,7 @@
@LoginRequired
@ApiOperation("宸ュ崟鍏抽棴")
@PostMapping("/closeWorkOrder")
+ @PreventRepeat
@EncryptionReq
@EncryptionResp
public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
@@ -132,6 +135,7 @@
@LoginRequired
@ApiOperation("宸ュ崟鎸囨淳")
@PostMapping("/passOn")
+ @PreventRepeat
@EncryptionReq
@EncryptionResp
public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
@@ -152,6 +156,7 @@
@LoginRequired
@ApiOperation("宸ュ崟鍌績")
@GetMapping("/urge")
+ @PreventRepeat
@EncryptionReq
@EncryptionResp
public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
@@ -169,6 +174,7 @@
@LoginRequired
@ApiOperation("宸ュ崟鎶勯��")
+ @PreventRepeat
@PostMapping("/sendCopy")
@EncryptionReq
@EncryptionResp
diff --git a/server/src/main/java/com/doumee/dao/business/CompanyMemberMapper.java b/server/src/main/java/com/doumee/dao/business/CompanyMemberMapper.java
index 4a669e7..2593b44 100644
--- a/server/src/main/java/com/doumee/dao/business/CompanyMemberMapper.java
+++ b/server/src/main/java/com/doumee/dao/business/CompanyMemberMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.CompanyMember;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @since 2025/04/03 16:30
*/
-public interface CompanyMemberMapper extends BaseMapper<CompanyMember> {
+public interface CompanyMemberMapper extends MPJBaseMapper<CompanyMember> {
}
diff --git a/server/src/main/java/com/doumee/dao/business/model/Company.java b/server/src/main/java/com/doumee/dao/business/model/Company.java
index 1fe3ce5..179ace6 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Company.java
@@ -96,5 +96,11 @@
@ApiModelProperty(value = "鏄惁鍖呭惈瀛愯彍鍗�")
@TableField(exist = false)
private Boolean hasChildren;
+ @ApiModelProperty(value = "瀵硅薄绫诲瀷 0閮ㄩ棬 1鍛樺伐")
+ @TableField(exist = false)
+ private int objType;
+ @ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎ember", example = "1")
+ @TableField(exist = false)
+ private Integer memberId;
}
diff --git a/server/src/main/java/com/doumee/dao/business/model/CompanyMember.java b/server/src/main/java/com/doumee/dao/business/model/CompanyMember.java
index 8df1158..3b58529 100644
--- a/server/src/main/java/com/doumee/dao/business/model/CompanyMember.java
+++ b/server/src/main/java/com/doumee/dao/business/model/CompanyMember.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -53,8 +54,11 @@
@ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎ember", example = "1")
private Integer memberId;
-
@ApiModelProperty(value = "鏄惁涓洪儴闂ㄨ礋璐ｄ汉0-鍚︼紱1-鏄�", example = "1")
private Integer isLeader;
+ @ApiModelProperty(value = "浜哄憳濮撳悕", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+
}
diff --git a/server/src/main/java/com/doumee/dao/business/vo/CompanyTree.java b/server/src/main/java/com/doumee/dao/business/vo/CompanyTree.java
index ab82e42..c7e59e1 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/CompanyTree.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/CompanyTree.java
@@ -1,9 +1,14 @@
package com.doumee.dao.business.vo;
+import com.doumee.core.constants.Constants;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.CompanyMember;
+import com.doumee.dao.business.model.Member;
import org.apache.commons.lang3.StringUtils;
+import org.yaml.snakeyaml.scanner.Constant;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Objects;
@@ -17,6 +22,7 @@
// 淇濆瓨鍙備笌鏋勫缓鏍戝舰鐨勬墍鏈夋暟鎹紙閫氬父鏁版嵁搴撴煡璇㈢粨鏋滐級
public List<Company> nodeList = new ArrayList<>();
+ public List<CompanyMember> memberList = new ArrayList<>();
public Integer origin = 0; //0鑷缓 1浼佸井
@@ -28,6 +34,11 @@
public CompanyTree(List<Company> nodeList, Integer origin){
this.nodeList = nodeList;
this.origin = origin;
+ }
+ public CompanyTree(List<Company> nodeList, Integer origin, List<CompanyMember> memberList ){
+ this.nodeList = nodeList;
+ this.origin = origin;
+ this.memberList=memberList;
}
@@ -105,12 +116,21 @@
if (!Objects.isNull(treeNode.getParentId())&&treeNode.getParentId().equals(pNode.getId())) {
// 鍐嶉�掑綊杩涜鍒ゆ柇褰撳墠鑺傜偣鐨勬儏鍐碉紝璋冪敤鑷韩鏂规硶
childTree.add(buildChildTree(treeNode));
+
}
}
}
// for寰幆缁撴潫锛屽嵆鑺傜偣涓嬫病鏈変换浣曡妭鐐癸紝鏍戝舰鏋勫缓缁撴潫锛岃缃爲缁撴灉
pNode.setChildList(childTree);
- if(childTree == null || childTree.size() ==0){
+ List<Company> memberList = getMemberNode(pNode.getId());
+ if(memberList!=null && memberList.size()>0){
+ if(pNode.getChildList() == null){
+ pNode.setChildList(memberList);
+ }else{
+ pNode.getChildList().addAll(memberList);
+ }
+ }
+ if( pNode.getChildList() == null || pNode.getChildList().size() ==0){
pNode.setHasChildren(Boolean.FALSE);
}else{
pNode.setHasChildren(Boolean.TRUE);
@@ -118,5 +138,21 @@
return pNode;
}
+ private List<Company> getMemberNode(Integer id) {
+ List<Company> companyList = new ArrayList<>();
+ if(memberList!=null && memberList.size()>0){
+ for(CompanyMember member :memberList){
+ if(member.getCompanyId()!=null && Constants.equalsInteger(member.getCompanyId(),id)){
+ Company com = new Company();
+ com.setObjType(Constants.ONE);
+ com.setName(member.getMemberName());
+ com.setMemberId(member.getMemberId());
+ companyList.add(com);
+ }
+ }
+ }
+ return companyList;
+ }
+
}
diff --git a/server/src/main/java/com/doumee/service/business/CompanyService.java b/server/src/main/java/com/doumee/service/business/CompanyService.java
index 03b98e9..85b841d 100644
--- a/server/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/src/main/java/com/doumee/service/business/CompanyService.java
@@ -98,4 +98,5 @@
int syncAll(Company company);
List<Company> companyTree();
+ List<Company> companyTreeWithMember();
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 4fa54b3..9f24d45 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -15,7 +15,9 @@
import com.doumee.core.utils.qiyeweixin.QywxUtil;
import com.doumee.core.utils.qiyeweixin.model.response.QywxDepartInfoResponse;
import com.doumee.dao.business.CompanyMapper;
+import com.doumee.dao.business.CompanyMemberMapper;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.CompanyMember;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.CompanyTree;
import com.doumee.dao.system.model.SystemUser;
@@ -47,6 +49,8 @@
private RedisTemplate<Object, Serializable> redisTemplate;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private CompanyMemberMapper companyMemberMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -151,6 +155,9 @@
@Override
public List<Company> companyTree( ) {
+ return companyTreeBiz(0);
+ }
+ public List<Company> companyTreeBiz(int type ) {
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Company.class);
queryWrapper.selectAs(SystemUser::getUsername,Company::getEditorName);
@@ -161,10 +168,23 @@
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
queryWrapper.orderByAsc( "t.code");
List<Company> companyList = companyMapper.selectJoinList(Company.class,queryWrapper);
- CompanyTree treeBuild = new CompanyTree(companyList, 0);
+ List<CompanyMember> memberList = null;
+ if(type == 1){
+ memberList = companyMemberMapper.selectJoinList(CompanyMember.class,new MPJLambdaWrapper<CompanyMember>()
+ .selectAll(CompanyMember.class)
+ .selectAs(Member::getName,CompanyMember::getMemberName)
+ .leftJoin(Member.class,Member::getId,CompanyMember::getMemberId)
+ .eq(Member::getIsdeleted,Constants.ZERO )
+ .eq(CompanyMember::getIsdeleted,Constants.ZERO ));
+ }
+ CompanyTree treeBuild = new CompanyTree(companyList, 0,memberList);
companyList = treeBuild.buildTree();
return companyList;
}
+ @Override
+ public List<Company> companyTreeWithMember() {
+ return companyTreeBiz(1);
+ }
@Override
public int syncAll(Company company) {
diff --git a/server/src/main/resources/application-dev.yml b/server/src/main/resources/application-dev.yml
index 74e10f9..6d7ebf6 100644
--- a/server/src/main/resources/application-dev.yml
+++ b/server/src/main/resources/application-dev.yml
@@ -1,4 +1,9 @@
-# WEB鏈嶅姟鍣ㄩ厤缃�
+project:
+ # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ env: development
+ # 妯″紡锛宼esting娴嬭瘯妯″紡
+ mode: testing
+
server:
port: 10010
spring:
diff --git a/server/src/main/resources/application-pro.yml b/server/src/main/resources/application-pro.yml
index e3e3a9c..c8b123b 100644
--- a/server/src/main/resources/application-pro.yml
+++ b/server/src/main/resources/application-pro.yml
@@ -1,3 +1,9 @@
+project:
+ # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ env: production
+ # 妯″紡锛宼esting娴嬭瘯妯″紡
+ mode: production
+
# WEB鏈嶅姟鍣ㄩ厤缃�
server:
port: 10010
diff --git a/server/src/main/resources/application-test.yml b/server/src/main/resources/application-test.yml
index 1b4c49a..a8452a4 100644
--- a/server/src/main/resources/application-test.yml
+++ b/server/src/main/resources/application-test.yml
@@ -1,4 +1,8 @@
-# WEB鏈嶅姟鍣ㄩ厤缃�
+project:
+ # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ env: production
+ # 妯″紡锛宼esting娴嬭瘯妯″紡
+ mode: production
server:
port: 10040
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index d2aa372..3699dae 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -2,14 +2,10 @@
project:
name: 鑱斿悎鍒╁崕浜嬩欢涓婃姤绯荤粺
version: 1.0.0
- # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
- env: development
- # 妯″紡锛宼esting娴嬭瘯妯″紡
- mode: testing
spring:
profiles:
- active: dev
+ active: test
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3