From 9c25a15d45f675d742cc4090af6b84abc958db46 Mon Sep 17 00:00:00 2001 From: icanci Date: Sun, 15 Jan 2023 19:53:11 +0800 Subject: [PATCH 1/2] AppServiceImpl --- .../service/impl/AppMockCallServiceImpl.java | 4 +- .../amc/biz/service/impl/TeamServiceImpl.java | 83 +++++++++++++++++++ .../dal/mongodb/daointerface/TeamDAO.java | 4 + .../admin/dal/mongodb/mongo/MongoTeamDAO.java | 24 +++++- .../amc/common/enums/ModuleTypeEnum.java | 8 +- 5 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/TeamServiceImpl.java diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockCallServiceImpl.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockCallServiceImpl.java index aef8856..5664c80 100644 --- a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockCallServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockCallServiceImpl.java @@ -51,10 +51,10 @@ public class AppMockCallServiceImpl extends BaseService implement if (doInsert(appMock)) { AppMockCallDO appMockCallDO = appMockMapper.vo2do(appMock); appMockDAO.insert(appMockCallDO); - eventDispatcher.fire(new LogEvent(appMockCallDO.getUuid(), ModuleTypeEnum.AMC_APP_MOCK, JSONUtil.toJsonStr(appMockCallDO), LogOperatorTypeEnum.CREATE)); + eventDispatcher.fire(new LogEvent(appMockCallDO.getUuid(), ModuleTypeEnum.AMC_APP_MOCK_CALL, JSONUtil.toJsonStr(appMockCallDO), LogOperatorTypeEnum.CREATE)); } else { appMockDAO.update(appMockMapper.vo2do(appMock)); - eventDispatcher.fire(new LogEvent(appMock.getUuid(), ModuleTypeEnum.AMC_APP_MOCK, JSONUtil.toJsonStr(appMock), LogOperatorTypeEnum.UPDATE)); + eventDispatcher.fire(new LogEvent(appMock.getUuid(), ModuleTypeEnum.AMC_APP_MOCK_CALL, JSONUtil.toJsonStr(appMock), LogOperatorTypeEnum.UPDATE)); } } diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/TeamServiceImpl.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/TeamServiceImpl.java new file mode 100644 index 0000000..323dd28 --- /dev/null +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/TeamServiceImpl.java @@ -0,0 +1,83 @@ +package cn.icanci.loopstack.amc.biz.service.impl; + +import cn.hutool.json.JSONUtil; +import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.TeamDAO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.TeamDO; +import cn.icanci.loopstack.amc.biz.event.log.LogEvent; +import cn.icanci.loopstack.amc.biz.mapper.TeamMapper; +import cn.icanci.loopstack.amc.biz.service.BaseService; +import cn.icanci.loopstack.amc.biz.service.TeamService; +import cn.icanci.loopstack.amc.common.enums.LogOperatorTypeEnum; +import cn.icanci.loopstack.amc.common.enums.ModuleTypeEnum; +import cn.icanci.loopstack.amc.common.model.PageList; +import cn.icanci.loopstack.amc.common.model.TextValue; +import cn.icanci.loopstack.amc.common.model.config.TeamVO; + +import java.util.List; + +import javax.annotation.Resource; + +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import com.google.common.collect.Lists; + +/** + * @author icanci + * @since 1.0 Created in 2023/01/15 19:46 + */ +@Service +public class TeamServiceImpl extends BaseService implements TeamService { + @Resource + private TeamDAO teamDAO; + @Resource + private TeamMapper teamMapper; + + @Override + public PageList queryPage(TeamVO web2vo, int currentPage, int pageSize) { + PageList pageQuery = teamDAO.pageQuery(teamMapper.vo2do(web2vo), currentPage, pageSize); + return new PageList<>(teamMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); + } + + @Override + public void save(TeamVO team) { + if (doInsert(team)) { + TeamDO teamDO = teamMapper.vo2do(team); + teamDAO.insert(teamDO); + eventDispatcher.fire(new LogEvent(teamDO.getUuid(), ModuleTypeEnum.AMC_TEAM, JSONUtil.toJsonStr(teamDO), LogOperatorTypeEnum.CREATE)); + } else { + teamDAO.update(teamMapper.vo2do(team)); + eventDispatcher.fire(new LogEvent(team.getUuid(), ModuleTypeEnum.AMC_TEAM, JSONUtil.toJsonStr(team), LogOperatorTypeEnum.UPDATE)); + } + } + + @Override + public TeamVO queryByTeamId(String teamId) { + return teamMapper.do2vo(teamDAO.queryByTeamId(teamId)); + } + + @Override + public TeamVO queryByTeamName(String teamName) { + return teamMapper.do2vo(teamDAO.queryByTeamName(teamName)); + } + + @Override + public List loadSelector() { + List teamList = teamDAO.queryAll(); + if (CollectionUtils.isEmpty(teamList)) { + return Lists.newArrayList(); + } + List textValues = Lists.newArrayList(); + for (TeamDO teamDO : teamList) { + String label; + TeamVO teamVO = teamMapper.do2vo(teamDO); + if (isDeleted(teamVO)) { + label = String.format(DELETED_FORMAT, teamVO.getTeamName()); + } else { + label = String.format(NOT_DELETED_FORMAT, teamVO.getTeamName()); + } + textValues.add(new TextValue(label, teamVO.getUuid())); + } + return textValues; + } +} diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/TeamDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/TeamDAO.java index 1d289de..3823fa4 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/TeamDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/TeamDAO.java @@ -16,6 +16,10 @@ public interface TeamDAO extends BaseDAO { */ Class COLLECTION_CLASS = TeamDO.class; + TeamDO queryByTeamId(String teamId); + + TeamDO queryByTeamName(String teamName); + interface TeamColumn extends BaseColumn { String teamId = "teamId"; String teamName = "teamName"; diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoTeamDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoTeamDAO.java index 69f5039..cbeced2 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoTeamDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoTeamDAO.java @@ -1,9 +1,5 @@ package cn.icanci.loopstack.amc.admin.dal.mongodb.mongo; -import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.TeamDAO; -import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.TeamDO; -import cn.icanci.loopstack.amc.common.model.PageList; - import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -12,6 +8,10 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; +import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.TeamDAO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.TeamDO; +import cn.icanci.loopstack.amc.common.model.PageList; + /** * @author icanci * @since 1.0 Created in 2023/01/15 12:24 @@ -68,4 +68,20 @@ public class MongoTeamDAO extends AbstractBaseDAO implements TeamDAO { Query query = new Query(criteria); return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } + + @Override + public TeamDO queryByTeamId(String teamId) { + Criteria criteria = Criteria.where(TeamColumn.teamId).is(teamId); + criteria.and(TeamColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } + + @Override + public TeamDO queryByTeamName(String teamName) { + Criteria criteria = Criteria.where(TeamColumn.teamName).is(teamName); + criteria.and(TeamColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } } diff --git a/common/src/main/java/cn/icanci/loopstack/amc/common/enums/ModuleTypeEnum.java b/common/src/main/java/cn/icanci/loopstack/amc/common/enums/ModuleTypeEnum.java index 63dea20..395276f 100644 --- a/common/src/main/java/cn/icanci/loopstack/amc/common/enums/ModuleTypeEnum.java +++ b/common/src/main/java/cn/icanci/loopstack/amc/common/enums/ModuleTypeEnum.java @@ -18,9 +18,13 @@ public enum ModuleTypeEnum { */ AMC_APP("AMC_APP", "项目"), /** - * AMC_APP_MOCK + * AMC_APP_MOCK_CALL */ - AMC_APP_MOCK("AMC_APP_MOCK", "项目Mock"), + AMC_APP_MOCK_CALL("AMC_APP_MOCK_CALL", "项目MockCall"), + /** + * AMC_APP_MOCK_CALLBACK + */ + AMC_APP_MOCK_CALLBACK("AMC_APP_MOCK_CALLBACK", "项目MockCallBack"), ; -- Gitee From fa1a6d8ec9bb9f773d136b9ef47be4692c927a15 Mon Sep 17 00:00:00 2001 From: icanci Date: Sun, 15 Jan 2023 20:50:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amc/biz/service/BaseService.java | 4 +- .../amc/biz/service/LockService.java | 24 -- .../dal/mongodb/mongo/MongoGroupDAO.java | 10 +- .../utils/service/impl/EnvServiceImpl.java | 2 +- .../main/resources/vueboot/config/dev.env.js | 2 +- .../main/resources/vueboot/config/prod.env.js | 2 +- .../src/main/resources/vueboot/index.html | 2 +- .../main/resources/vueboot/src/api/appApi.js | 8 +- .../{appConfigApi.js => appMockCallApi.js} | 24 +- .../resources/vueboot/src/api/groupApi.js | 8 +- .../vueboot/src/api/loadSelectorApi.js | 24 +- .../main/resources/vueboot/src/api/logApi.js | 2 +- .../main/resources/vueboot/src/api/login.js | 6 +- .../vueboot/src/api/noticeConfigApi.js | 78 ----- .../resources/vueboot/src/api/registerApi.js | 36 --- .../main/resources/vueboot/src/api/teamApi.js | 8 +- .../src/components/Breadcrumb/index.vue | 2 +- .../resources/vueboot/src/router/index.js | 303 +++++++++--------- .../vueboot/src/views/config/appConfig.vue | 228 ------------- .../src/views/config/dialog/appConfigForm.vue | 149 --------- .../views/config/dialog/noticeConfigForm.vue | 177 ---------- .../vueboot/src/views/config/mockCall.vue | 15 + .../vueboot/src/views/config/mockCallback.vue | 15 + .../vueboot/src/views/config/noticeConfig.vue | 209 ------------ .../vueboot/src/views/dashboard/index.vue | 10 +- .../vueboot/src/views/doc/docDetail.vue | 44 ++- .../vueboot/src/views/login/index.vue | 41 ++- .../vueboot/src/views/register/register.vue | 132 -------- .../amc/common/model/config/BaseVO.java | 6 +- 29 files changed, 314 insertions(+), 1257 deletions(-) delete mode 100644 admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/LockService.java rename admin/admin-views/src/main/resources/vueboot/src/api/{appConfigApi.js => appMockCallApi.js} (43%) delete mode 100644 admin/admin-views/src/main/resources/vueboot/src/api/noticeConfigApi.js delete mode 100644 admin/admin-views/src/main/resources/vueboot/src/api/registerApi.js delete mode 100644 admin/admin-views/src/main/resources/vueboot/src/views/config/appConfig.vue delete mode 100644 admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/appConfigForm.vue delete mode 100644 admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/noticeConfigForm.vue create mode 100644 admin/admin-views/src/main/resources/vueboot/src/views/config/mockCall.vue create mode 100644 admin/admin-views/src/main/resources/vueboot/src/views/config/mockCallback.vue delete mode 100644 admin/admin-views/src/main/resources/vueboot/src/views/config/noticeConfig.vue delete mode 100644 admin/admin-views/src/main/resources/vueboot/src/views/register/register.vue diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/BaseService.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/BaseService.java index b4fed3a..2bebca0 100644 --- a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/BaseService.java +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/BaseService.java @@ -7,6 +7,8 @@ import cn.icanci.loopstack.lsi.event.EventDispatcher; import javax.annotation.Resource; +import org.apache.commons.lang3.StringUtils; + /** * @author icanci * @since 1.0 Created in 2023/01/07 18:39 @@ -36,7 +38,7 @@ public abstract class BaseService { * @return 返回是否是插入 */ protected boolean doInsert(T t) { - return t.getId() == null || t.getId() == 0; + return StringUtils.isBlank(t.getId()); } /** diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/LockService.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/LockService.java deleted file mode 100644 index 0d3d735..0000000 --- a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/LockService.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.icanci.loopstack.amc.biz.service; - -/** - * MySQL实现分布式锁 - * - * Tips: 分布式锁的实现是必要的，因为客户端不知道有多少；服务端也不知道有多少 - * 所以在进行心跳检测的时候，需要这样进行处理，否则会消耗无所谓的带宽 - * - * @author icanci - * @since 1.0 Created in 2023/01/12 08:35 - */ -public interface LockService { - - /** - * 加锁 - * - * @param key key - * @return - */ - Long acquire(String key); - - boolean release(String key, Long lockId); - -} diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java index c330d0b..5dd781a 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java @@ -67,11 +67,17 @@ public class MongoGroupDAO extends AbstractBaseDAO implements GroupDAO @Override public GroupDO queryByGroupId(String groupId) { - return null; + Criteria criteria = Criteria.where(GroupColumn.groupId).is(groupId); + criteria.and(GroupColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } @Override public GroupDO queryByGroupName(String groupName) { - return null; + Criteria criteria = Criteria.where(GroupColumn.groupName).is(groupName); + criteria.and(GroupColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } } diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/utils/service/impl/EnvServiceImpl.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/utils/service/impl/EnvServiceImpl.java index 2e8570a..bed57fe 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/utils/service/impl/EnvServiceImpl.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/utils/service/impl/EnvServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; */ @Service("envService") public class EnvServiceImpl implements EnvService, BeanPostProcessor { - @Value("${rec.env}") + @Value("${amc.env}") private String env; @Override diff --git a/admin/admin-views/src/main/resources/vueboot/config/dev.env.js b/admin/admin-views/src/main/resources/vueboot/config/dev.env.js index 33bae07..d35e435 100644 --- a/admin/admin-views/src/main/resources/vueboot/config/dev.env.js +++ b/admin/admin-views/src/main/resources/vueboot/config/dev.env.js @@ -4,5 +4,5 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://localhost:9998"', + BASE_API: '"http://localhost:9997"', }) diff --git a/admin/admin-views/src/main/resources/vueboot/config/prod.env.js b/admin/admin-views/src/main/resources/vueboot/config/prod.env.js index d81e9a1..30e89b5 100644 --- a/admin/admin-views/src/main/resources/vueboot/config/prod.env.js +++ b/admin/admin-views/src/main/resources/vueboot/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://localhost:9998"', + BASE_API: '"http://localhost:9997"', } diff --git a/admin/admin-views/src/main/resources/vueboot/index.html b/admin/admin-views/src/main/resources/vueboot/index.html index 1d6f55f..b27fb6b 100644 --- a/admin/admin-views/src/main/resources/vueboot/index.html +++ b/admin/admin-views/src/main/resources/vueboot/index.html @@ -3,7 +3,7 @@ - DDK-动态字典键 + AMC&MockCloud-自动化Mock组件
diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/appApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/appApi.js index f2aab33..26dcefc 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/api/appApi.js +++ b/admin/admin-views/src/main/resources/vueboot/src/api/appApi.js @@ -9,7 +9,7 @@ import request from '@/utils/request' */ export async function appQuery(app, paginator) { return await request({ - url: '/ddk/app/query', + url: '/amc/app/query', method: 'post', data: { 'app': app, @@ -26,7 +26,7 @@ export async function appQuery(app, paginator) { */ export async function saveApp(app) { return await request({ - url: '/ddk/app/save', + url: '/amc/app/save', method: 'post', data: app }) @@ -40,7 +40,7 @@ export async function saveApp(app) { */ export async function remoteValidateAppId(appId) { return await request({ - url: '/ddk/app/validateAppId/' + appId, + url: '/amc/app/validateAppId/' + appId, method: 'get' }) } @@ -53,7 +53,7 @@ export async function remoteValidateAppId(appId) { */ export async function remoteValidateAppName(appName) { return await request({ - url: '/ddk/app/validateAppName/' + appName, + url: '/amc/app/validateAppName/' + appName, method: 'get' }) } diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/appConfigApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/appMockCallApi.js similarity index 43% rename from admin/admin-views/src/main/resources/vueboot/src/api/appConfigApi.js rename to admin/admin-views/src/main/resources/vueboot/src/api/appMockCallApi.js index 722fd80..7a930d4 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/api/appConfigApi.js +++ b/admin/admin-views/src/main/resources/vueboot/src/api/appMockCallApi.js @@ -3,16 +3,16 @@ import request from '@/utils/request' /** * 分页查询 * - * @param app app + * @param appMockCall appMockCall * @param paginator paginator * @returns {*} */ -export async function appConfigQuery(appConfig, paginator) { +export async function appMockCallQuery(appMockCall, paginator) { return await request({ - url: '/ddk/appConfig/query', + url: '/amc/appMockCall/query', method: 'post', data: { - 'appConfig': appConfig, + 'appMockCall': appMockCall, 'paginator': paginator } }) @@ -21,26 +21,26 @@ export async function appConfigQuery(appConfig, paginator) { /** * 保存 * - * @param appConfig appConfig + * @param appMockCall appMockCall * @returns {*} */ -export async function saveAppConfig(appConfig) { +export async function saveAppMockCall(appMockCall) { return await request({ - url: '/ddk/appConfig/save', + url: '/amc/appMockCall/save', method: 'post', - data: appConfig + data: appMockCall }) } /** - * remoteValidateAppConfigName + * validateAppMockCallName * - * @param appConfigName appConfigName + * @param mockName mockName * @returns {*} */ -export async function remoteValidateAppConfigName(appConfigName) { +export async function validateAppMockCallName(mockName) { return await request({ - url: '/ddk/appConfig/validateAppConfigName/' + appConfigName, + url: '/amc/appMockCall/validateAppMockCallName/' + mockName, method: 'get' }) } diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/groupApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/groupApi.js index 9839553..435a0bd 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/api/groupApi.js +++ b/admin/admin-views/src/main/resources/vueboot/src/api/groupApi.js @@ -9,7 +9,7 @@ import request from '@/utils/request' */ export async function groupQuery(group, paginator) { return await request({ - url: '/ddk/group/query', + url: '/amc/group/query', method: 'post', data: { 'group': group, @@ -26,7 +26,7 @@ export async function groupQuery(group, paginator) { */ export async function saveGroup(group) { return await request({ - url: '/ddk/group/save', + url: '/amc/group/save', method: 'post', data: group }) @@ -40,7 +40,7 @@ export async function saveGroup(group) { */ export async function remoteValidateGroupId(groupId) { return await request({ - url: '/ddk/group/validateGroupId/' + groupId, + url: '/amc/group/validateGroupId/' + groupId, method: 'get' }) } @@ -53,7 +53,7 @@ export async function remoteValidateGroupId(groupId) { */ export async function remoteValidateGroupName(groupName) { return await request({ - url: '/ddk/group/validateGroupName/' + groupName, + url: '/amc/group/validateGroupName/' + groupName, method: 'get' }) } diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js index 11ce462..d6fae9a 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js +++ b/admin/admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js @@ -7,7 +7,7 @@ import request from '@/utils/request' */ export async function loadGroupSelector() { let ret = await request({ - url: '/ddk/group/loadSelector', + url: '/amc/group/loadSelector', method: 'get', }); if (ret.ok) { @@ -23,7 +23,7 @@ export async function loadGroupSelector() { */ export async function loadTeamSelector() { let ret = await request({ - url: '/ddk/team/loadSelector', + url: '/amc/team/loadSelector', method: 'get', }); if (ret.ok) { @@ -39,7 +39,7 @@ export async function loadTeamSelector() { */ export async function loadAppSelector() { let ret = await request({ - url: '/ddk/app/loadSelector', + url: '/amc/app/loadSelector', method: 'get', }); if (ret.ok) { @@ -55,7 +55,23 @@ export async function loadAppSelector() { */ export async function loadAppIdSelector() { let ret = await request({ - url: '/ddk/app/loadAppIdSelector', + url: '/amc/app/loadAppIdSelector', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadAppSelector + * + * @returns {*} + */ +export async function loadAppMockCallSelector() { + let ret = await request({ + url: '/amc/appMockCall/loadSelector', method: 'get', }); if (ret.ok) { diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/logApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/logApi.js index b2bcfdf..6fd9da8 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/api/logApi.js +++ b/admin/admin-views/src/main/resources/vueboot/src/api/logApi.js @@ -9,7 +9,7 @@ import request from '@/utils/request' */ export async function logPageQuery(logOperate, paginator) { return await request({ - url: '/ddk/log/query', + url: '/amc/log/query', method: 'post', data: { 'logOperate': logOperate, diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/login.js b/admin/admin-views/src/main/resources/vueboot/src/api/login.js index 8bb4194..8f4fca5 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/api/login.js +++ b/admin/admin-views/src/main/resources/vueboot/src/api/login.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function login(username, password) { return request({ - url: '/ddk/user/login', + url: '/amc/user/login', method: 'post', data: { username, @@ -13,14 +13,14 @@ export function login(username, password) { export function getInfo(token) { return request({ - url: '/ddk/user/info/' + token, + url: '/amc/user/info/' + token, method: 'get' }) } export function logout() { return request({ - url: '/ddk/user/logout', + url: '/amc/user/logout', method: 'post' }) } diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/noticeConfigApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/noticeConfigApi.js deleted file mode 100644 index 74e54a2..0000000 --- a/admin/admin-views/src/main/resources/vueboot/src/api/noticeConfigApi.js +++ /dev/null @@ -1,78 +0,0 @@ -import request from '@/utils/request' - -/** - * 分页查询 - * - * @param noticeConfig noticeConfig - * @param paginator paginator - * @returns {*} - */ -export async function noticeConfigQuery(noticeConfig, paginator) { - return await request({ - url: '/ddk/noticeConfig/query', - method: 'post', - data: { - 'noticeConfig': noticeConfig, - 'paginator': paginator - } - }) -} - -/** - * 保存 - * - * @param noticeConfig noticeConfig - * @returns {*} - */ -export async function saveNoticeConfig(noticeConfig) { - return await request({ - url: '/ddk/noticeConfig/save', - method: 'post', - data: noticeConfig - }) -} - -/** - * remoteValidateNoticeConfigName - * - * @param noticeConfigName noticeConfigName - * @returns {*} - */ -export async function remoteValidateNoticeConfigName(noticeConfigName) { - return await request({ - url: '/ddk/noticeConfig/validateNoticeConfigName/' + noticeConfigName, - method: 'get' - }) -} - -/** - * remoteValidateNoticeConfigResource - * - * @param noticeConfigSource noticeConfigSource - * @returns {*} - */ -export async function remoteValidateNoticeConfigResource(noticeConfigSource) { - return await request({ - url: '/ddk/noticeConfig/validateNoticeConfigSource/' + noticeConfigSource, - method: 'get' - }) -} - - -/** - * 发布 - * - * @param resource resource - * @param value value - * @returns {*} - */ -export async function publishResource(resource, value) { - return await request({ - url: '/ddk/webapi/publish', - method: 'post', - data: { - 'resource': resource, - 'value': value, - } - }) -} diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/registerApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/registerApi.js deleted file mode 100644 index 9605f98..0000000 --- a/admin/admin-views/src/main/resources/vueboot/src/api/registerApi.js +++ /dev/null @@ -1,36 +0,0 @@ -import request from '@/utils/request' - -/** - * 分页查询 - * - * @param appId appId - * @param paginator paginator - * @returns {*} - */ -export async function registerPageQuery(appId, paginator) { - return await request({ - url: '/ddk/register/query', - method: 'post', - data: { - 'appId': appId, - 'paginator': paginator - } - }) -} - -/** - * 发布 - * - * @param appId uuid - * @param paginator uuid - * @returns {*} - */ -export async function publishDict(uuid) { - return await request({ - url: '/ddk/register/publishDict', - method: 'post', - data: { - 'uuid': uuid, - } - }) -} diff --git a/admin/admin-views/src/main/resources/vueboot/src/api/teamApi.js b/admin/admin-views/src/main/resources/vueboot/src/api/teamApi.js index fa1a6c8..8c6b7e8 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/api/teamApi.js +++ b/admin/admin-views/src/main/resources/vueboot/src/api/teamApi.js @@ -9,7 +9,7 @@ import request from '@/utils/request' */ export async function teamQuery(team, paginator) { return await request({ - url: '/ddk/team/query', + url: '/amc/team/query', method: 'post', data: { 'team': team, @@ -26,7 +26,7 @@ export async function teamQuery(team, paginator) { */ export async function saveTeam(team) { return await request({ - url: '/ddk/team/save', + url: '/amc/team/save', method: 'post', data: team }) @@ -40,7 +40,7 @@ export async function saveTeam(team) { */ export async function remoteValidateTeamId(teamId) { return await request({ - url: '/ddk/team/validateTeamId/' + teamId, + url: '/amc/team/validateTeamId/' + teamId, method: 'get' }) } @@ -53,7 +53,7 @@ export async function remoteValidateTeamId(teamId) { */ export async function remoteValidateTeamName(teamName) { return await request({ - url: '/ddk/team/validateTeamName/' + teamName, + url: '/amc/team/validateTeamName/' + teamName, method: 'get' }) } diff --git a/admin/admin-views/src/main/resources/vueboot/src/components/Breadcrumb/index.vue b/admin/admin-views/src/main/resources/vueboot/src/components/Breadcrumb/index.vue index 8cba4a6..65332ff 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/components/Breadcrumb/index.vue +++ b/admin/admin-views/src/main/resources/vueboot/src/components/Breadcrumb/index.vue @@ -36,7 +36,7 @@ export default { const first = matched[0] if (first && first.name !== 'dashboard') { // 修改名字，页面横向导航 - matched = [{path: '/dashboard', meta: {title: 'DDK-动态字典键'}}].concat(matched) + matched = [{path: '/dashboard', meta: {title: 'AMC&MockCloud-自动化Mock组件'}}].concat(matched) } this.levelList = matched }, diff --git a/admin/admin-views/src/main/resources/vueboot/src/router/index.js b/admin/admin-views/src/main/resources/vueboot/src/router/index.js index c120509..3c1d002 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/router/index.js +++ b/admin/admin-views/src/main/resources/vueboot/src/router/index.js @@ -21,163 +21,164 @@ Vue.use(Router) } **/ export const constantRouterMap = [ - { - path: '/login', - component: () => import('@/views/login/index'), - hidden: true + { + path: '/login', + component: () => import('@/views/login/index'), + hidden: true + }, + { + path: '/404', + component: () => import('@/views/404'), + hidden: true + }, + { + path: '/', + component: Layout, + redirect: '/dashboard', + hidden: false, + children: [{ + path: 'dashboard', + name: 'dashboard', + meta: { + title: 'AMC&MockCloud', + icon: 'dashboard' + }, + component: () => import('@/views/dashboard/index') + }] + }, + { + path: '/config', + component: Layout, + meta: { + title: '配置', + icon: 'example' }, - { - path: '/404', - component: () => import('@/views/404'), - hidden: true - }, - { - path: '/', - component: Layout, - redirect: '/dashboard', - hidden: false, - children: [{ - path: 'dashboard', - name: 'dashboard', - meta: { - title: 'DDK-动态字典键', - icon: 'dashboard' - }, - component: () => import('@/views/dashboard/index') - }] - }, - { - path: '/config', - component: Layout, + children: [ + { + path: 'group', + name: '事业群', + component: () => import('@/views/config/group'), meta: { - title: '配置', - icon: 'example' - }, - children: [ - { - path: 'group', - name: '事业群', - component: () => import('@/views/config/group'), - meta: { - title: '事业群', - icon: 'edit' - } - }, - { - path: 'team', - name: '项目组', - component: () => import('@/views/config/team'), - meta: { - title: '项目组', - icon: 'link' - } - }, - { - path: 'app', - name: '项目', - component: () => import('@/views/config/app'), - meta: { - title: '项目', - icon: 'exit-fullscreen' - } - }, - { - path: 'baseData', - name: '项目配置', - component: () => import('@/views/config/appConfig'), - meta: { - title: '项目配置', - icon: 'form' - } - }, - { - path: 'noticeConfig', - name: '通知配置', - component: () => import('@/views/config/noticeConfig'), - meta: { - title: '通知配置', - icon: 'guide' - } - }, - ] - }, - // { - // path: '/recLogs', - // component: Layout, - // meta: { - // title: '执行日志', - // icon: 'tab' - // }, - // children: [ - // { - // path: 'log', - // name: 'log', - // component: () => import('@/views/recLogs/log'), - // meta: { - // title: '执行日志', - // icon: 'clipboard' - // } - // }, - // { - // path: 'logDetail', - // name: 'logDetail', - // component: () => import('@/views/recLogs/logDetail'), - // meta: { - // title: '执行日志详情', - // icon: 'clipboard' - // } - // }, - // ] - // }, - { - path: '/registerCenter', - component: Layout, + title: '事业群', + icon: 'edit' + } + }, + { + path: 'team', + name: '项目组', + component: () => import('@/views/config/team'), meta: { - title: '注册中心', - icon: 'education' - }, - children: [ - { - path: 'register', - name: 'register', - component: () => import('@/views/register/register'), - meta: { - title: '注册中心', - icon: 'bug' - } - }, - ] - }, - { - path: '/doc', - component: Layout, + title: '项目组', + icon: 'link' + } + }, + { + path: 'app', + name: '项目', + component: () => import('@/views/config/app'), + meta: { + title: '项目', + icon: 'exit-fullscreen' + } + }, + { + path: 'mockCall', + name: 'Mock调用配置', + component: () => import('@/views/config/mockCall'), meta: { - title: '开放文档', - icon: 'tab' - }, - children: [ - { - path: 'docDetail', - name: 'docDetail', - component: () => import('@/views/doc/docDetail'), - meta: { - title: '项目文档', - icon: 'clipboard' - } - }, - ] + title: 'Mock调用配置', + icon: 'form' + } + }, + { + path: 'mockCallback', + name: 'Mock回调配置', + component: () => import('@/views/config/mockCallback'), + meta: { + title: 'Mock回调配置', + icon: 'guide' + } + }, + + ] + }, + // { + // path: '/recLogs', + // component: Layout, + // meta: { + // title: '执行日志', + // icon: 'tab' + // }, + // children: [ + // { + // path: 'log', + // name: 'log', + // component: () => import('@/views/recLogs/log'), + // meta: { + // title: '执行日志', + // icon: 'clipboard' + // } + // }, + // { + // path: 'logDetail', + // name: 'logDetail', + // component: () => import('@/views/recLogs/logDetail'), + // meta: { + // title: '执行日志详情', + // icon: 'clipboard' + // } + // }, + // ] + // }, + // { + // path: '/registerCenter', + // component: Layout, + // meta: { + // title: '注册中心', + // icon: 'education' + // }, + // children: [ + // { + // path: 'register', + // name: 'register', + // component: () => import('@/views/register/register'), + // meta: { + // title: '注册中心', + // icon: 'bug' + // } + // }, + // ] + // }, + { + path: '/doc', + component: Layout, + meta: { + title: '开放文档', + icon: 'tab' }, - { - path: '*', - redirect: '/404', - hidden: true - } + children: [ + { + path: 'docDetail', + name: 'docDetail', + component: () => import('@/views/doc/docDetail'), + meta: { + title: '项目文档', + icon: 'clipboard' + } + }, + ] + }, + { + path: '*', + redirect: '/404', + hidden: true + } ] export default new Router({ - // mode: 'history', //后端支持可开 - scrollBehavior: () => ({ - y: 0 - }), - routes: constantRouterMap + // mode: 'history', //后端支持可开 + scrollBehavior: () => ({ + y: 0 + }), + routes: constantRouterMap }) diff --git a/admin/admin-views/src/main/resources/vueboot/src/views/config/appConfig.vue b/admin/admin-views/src/main/resources/vueboot/src/views/config/appConfig.vue deleted file mode 100644 index eeacb7d..0000000 --- a/admin/admin-views/src/main/resources/vueboot/src/views/config/appConfig.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - diff --git a/admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/appConfigForm.vue b/admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/appConfigForm.vue deleted file mode 100644 index e13e643..0000000 --- a/admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/appConfigForm.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - diff --git a/admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/noticeConfigForm.vue b/admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/noticeConfigForm.vue deleted file mode 100644 index cbe9263..0000000 --- a/admin/admin-views/src/main/resources/vueboot/src/views/config/dialog/noticeConfigForm.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - diff --git a/admin/admin-views/src/main/resources/vueboot/src/views/config/mockCall.vue b/admin/admin-views/src/main/resources/vueboot/src/views/config/mockCall.vue new file mode 100644 index 0000000..0a09901 --- /dev/null +++ b/admin/admin-views/src/main/resources/vueboot/src/views/config/mockCall.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/admin/admin-views/src/main/resources/vueboot/src/views/config/mockCallback.vue b/admin/admin-views/src/main/resources/vueboot/src/views/config/mockCallback.vue new file mode 100644 index 0000000..f404329 --- /dev/null +++ b/admin/admin-views/src/main/resources/vueboot/src/views/config/mockCallback.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/admin/admin-views/src/main/resources/vueboot/src/views/config/noticeConfig.vue b/admin/admin-views/src/main/resources/vueboot/src/views/config/noticeConfig.vue deleted file mode 100644 index d2b8ead..0000000 --- a/admin/admin-views/src/main/resources/vueboot/src/views/config/noticeConfig.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - - - diff --git a/admin/admin-views/src/main/resources/vueboot/src/views/dashboard/index.vue b/admin/admin-views/src/main/resources/vueboot/src/views/dashboard/index.vue index 2d30d3b..658578a 100644 --- a/admin/admin-views/src/main/resources/vueboot/src/views/dashboard/index.vue +++ b/admin/admin-views/src/main/resources/vueboot/src/views/dashboard/index.vue @@ -1,10 +1,12 @@