diff --git a/nginx-admin.db3 b/nginx-admin.db3 index 0493de4..c15888f 100644 Binary files a/nginx-admin.db3 and b/nginx-admin.db3 differ diff --git a/src/main/java/xyz/wbsite/module/admin/ent/Locations.java b/src/main/java/xyz/wbsite/module/admin/ent/Locations.java index a08add1..15c20fa 100644 --- a/src/main/java/xyz/wbsite/module/admin/ent/Locations.java +++ b/src/main/java/xyz/wbsite/module/admin/ent/Locations.java @@ -17,11 +17,11 @@ import xyz.wbsite.frame.base.BaseEntity; public class Locations extends BaseEntity { /** - * SERVICE_ID - 服务主键 + * SERVICES_ID - 服务主键 */ @ExcelProperty("服务主键") @ExcelNote("") - private Long serviceId; + private Long servicesId; /** * LOCAL_TITLE - 配置标题 */ @@ -61,12 +61,12 @@ public class Locations extends BaseEntity { @ExcelNote("") private String filterConf; - public Long getServiceId() { - return this.serviceId; + public Long getServicesId() { + return this.servicesId; } - public void setServiceId(Long serviceId) { - this.serviceId = serviceId; + public void setServicesId(Long servicesId) { + this.servicesId = servicesId; } public String getLocalTitle() { diff --git a/src/main/java/xyz/wbsite/module/admin/mgr/ServicesManagerImpl.java b/src/main/java/xyz/wbsite/module/admin/mgr/ServicesManagerImpl.java index 5f7a085..8545099 100644 --- a/src/main/java/xyz/wbsite/module/admin/mgr/ServicesManagerImpl.java +++ b/src/main/java/xyz/wbsite/module/admin/mgr/ServicesManagerImpl.java @@ -52,41 +52,16 @@ public class ServicesManagerImpl implements ServicesManager { return response; } - {// 主机标题唯一检查 - ServicesFindRequest servicesFindRequest = new ServicesFindRequest(); - servicesFindRequest.setTitle(request.getTitle()); - ServicesFindResponse servicesFindResponse = this.find(servicesFindRequest, token); - if (servicesFindResponse.hasError()) { - response.addErrors(servicesFindResponse.getErrors()); - return response; - } else if (servicesFindResponse.getTotalCount() > 0) { - response.addError(ErrorType.UNIQUENESS_ERROR, "[title]主机标题已存在，请检查!"); - return response; - } - } - {// 主机域名唯一检查 ServicesFindRequest servicesFindRequest = new ServicesFindRequest(); servicesFindRequest.setDomain(request.getDomain()); - ServicesFindResponse servicesFindResponse = this.find(servicesFindRequest, token); - if (servicesFindResponse.hasError()) { - response.addErrors(servicesFindResponse.getErrors()); - return response; - } else if (servicesFindResponse.getTotalCount() > 0) { - response.addError(ErrorType.UNIQUENESS_ERROR, "[domain]主机域名已存在，请检查!"); - return response; - } - } - - {// 服务端口唯一检查 - ServicesFindRequest servicesFindRequest = new ServicesFindRequest(); servicesFindRequest.setPort(request.getPort()); ServicesFindResponse servicesFindResponse = this.find(servicesFindRequest, token); if (servicesFindResponse.hasError()) { response.addErrors(servicesFindResponse.getErrors()); return response; } else if (servicesFindResponse.getTotalCount() > 0) { - response.addError(ErrorType.UNIQUENESS_ERROR, "[port]服务端口已存在，请检查!"); + response.addError(ErrorType.UNIQUENESS_ERROR, "虚拟主机已存在，请检查!"); return response; } } diff --git a/src/main/java/xyz/wbsite/module/admin/mpr/LocationsMapper.xml b/src/main/java/xyz/wbsite/module/admin/mpr/LocationsMapper.xml index 9fd48a2..3200af3 100644 --- a/src/main/java/xyz/wbsite/module/admin/mpr/LocationsMapper.xml +++ b/src/main/java/xyz/wbsite/module/admin/mpr/LocationsMapper.xml @@ -7,12 +7,12 @@ "NA_LOCATIONS" - "ID","SERVICE_ID","LOCAL_TITLE","LOCAL_NOTE","LOCAL_PATH","LOCAL_VALID","FILTER","FILTER_CONF","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" + "ID","SERVICES_ID","LOCAL_TITLE","LOCAL_NOTE","LOCAL_PATH","LOCAL_VALID","FILTER","FILTER_CONF","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + @@ -36,7 +36,7 @@ VALUES ( #{request.id}, - #{request.serviceId,jdbcType=BIGINT}, + #{request.servicesId,jdbcType=BIGINT}, #{request.localTitle,jdbcType=VARCHAR}, #{request.localNote,jdbcType=VARCHAR}, #{request.localPath,jdbcType=VARCHAR}, @@ -61,7 +61,7 @@ VALUES #{item.id}, - #{item.serviceId,jdbcType=BIGINT}, + #{item.servicesId,jdbcType=BIGINT}, #{item.localTitle,jdbcType=VARCHAR}, #{item.localNote,jdbcType=VARCHAR}, #{item.localPath,jdbcType=VARCHAR}, @@ -100,7 +100,7 @@ UPDATE SET - SERVICE_ID = #{request.serviceId,jdbcType=BIGINT}, + SERVICES_ID = #{request.servicesId,jdbcType=BIGINT}, LOCAL_TITLE = #{request.localTitle,jdbcType=VARCHAR}, LOCAL_NOTE = #{request.localNote,jdbcType=VARCHAR}, LOCAL_PATH = #{request.localPath,jdbcType=VARCHAR}, @@ -121,8 +121,8 @@ FROM WHERE "IS_DELETED" = 0 - - AND "SERVICE_ID" = #{request.serviceId} + + AND "SERVICES_ID" = #{request.servicesId} AND "LOCAL_TITLE" = #{request.localTitle} @@ -144,8 +144,8 @@ FROM WHERE "IS_DELETED" = 0 - - AND "SERVICE_ID" = #{request.serviceId} + + AND "SERVICES_ID" = #{request.servicesId} AND "LOCAL_TITLE" = #{request.localTitle} diff --git a/src/main/java/xyz/wbsite/module/admin/req/LocationsCreateRequest.java b/src/main/java/xyz/wbsite/module/admin/req/LocationsCreateRequest.java index 76621b2..f1fb030 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/LocationsCreateRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/LocationsCreateRequest.java @@ -17,8 +17,8 @@ public class LocationsCreateRequest extends BaseRequest { /** * 服务主键. */ - @NotNull(message = "[serviceId]服务主键不能为NULL") - private Long serviceId; + @NotNull(message = "[servicesId]服务主键不能为NULL") + private Long servicesId; /** * 配置标题. @@ -58,12 +58,12 @@ public class LocationsCreateRequest extends BaseRequest { @Length(min = 0, max = 500, message = "[filterConf]过滤配置长度不合法(0-500)") private String filterConf; - public Long getServiceId() { - return this.serviceId; + public Long getServicesId() { + return this.servicesId; } - public void setServiceId(Long serviceId) { - this.serviceId = serviceId; + public void setServicesId(Long servicesId) { + this.servicesId = servicesId; } public String getLocalTitle() { diff --git a/src/main/java/xyz/wbsite/module/admin/req/LocationsFindRequest.java b/src/main/java/xyz/wbsite/module/admin/req/LocationsFindRequest.java index a57f247..30f22f9 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/LocationsFindRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/LocationsFindRequest.java @@ -15,7 +15,7 @@ public class LocationsFindRequest extends BaseFindRequest { /** * 服务主键. */ - private Long serviceId; + private Long servicesId; /** * 配置标题. @@ -62,12 +62,12 @@ public class LocationsFindRequest extends BaseFindRequest { */ private Date endDate; - public Long getServiceId() { - return this.serviceId; + public Long getServicesId() { + return this.servicesId; } - public void setServiceId(Long serviceId) { - this.serviceId = serviceId; + public void setServicesId(Long servicesId) { + this.servicesId = servicesId; } public String getLocalTitle() { diff --git a/src/main/java/xyz/wbsite/module/admin/req/LocationsUpdateRequest.java b/src/main/java/xyz/wbsite/module/admin/req/LocationsUpdateRequest.java index 912f65c..604e880 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/LocationsUpdateRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/LocationsUpdateRequest.java @@ -24,8 +24,8 @@ public class LocationsUpdateRequest extends BaseUpdateRequest { /** * 服务主键. */ - @NotNull(message = "[serviceId]服务主键不能为NULL") - private Long serviceId; + @NotNull(message = "[servicesId]服务主键不能为NULL") + private Long servicesId; /** * 配置标题. @@ -73,12 +73,12 @@ public class LocationsUpdateRequest extends BaseUpdateRequest { this.id = id; } - public Long getServiceId() { - return this.serviceId; + public Long getServicesId() { + return this.servicesId; } - public void setServiceId(Long serviceId) { - this.serviceId = serviceId; + public void setServicesId(Long servicesId) { + this.servicesId = servicesId; } public String getLocalTitle() { diff --git a/src/main/java/xyz/wbsite/module/admin/req/ServicesCreateRequest.java b/src/main/java/xyz/wbsite/module/admin/req/ServicesCreateRequest.java index 3b2afd0..7c30178 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/ServicesCreateRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/ServicesCreateRequest.java @@ -50,6 +50,7 @@ public class ServicesCreateRequest extends BaseRequest { /** * 是否启用. */ + @NotNull(message = "[valid]是否启用不能为NULL") private Boolean valid; /** diff --git a/src/main/resources/nginx-admin.db3 b/src/main/resources/nginx-admin.db3 index 6fb4147..179f4e3 100644 Binary files a/src/main/resources/nginx-admin.db3 and b/src/main/resources/nginx-admin.db3 differ diff --git a/src/main/resources/pt/admina_table/SQLite_ALL_TABLE.sql b/src/main/resources/pt/admin_table/SQLite_ALL_TABLE.sql similarity index 97% rename from src/main/resources/pt/admina_table/SQLite_ALL_TABLE.sql rename to src/main/resources/pt/admin_table/SQLite_ALL_TABLE.sql index 1883232..b057c8f 100644 --- a/src/main/resources/pt/admina_table/SQLite_ALL_TABLE.sql +++ b/src/main/resources/pt/admin_table/SQLite_ALL_TABLE.sql @@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS NA_SERVICES ( "DOMAIN" VARCHAR(50) NOT NULL, "TYPE" VARCHAR(20) NOT NULL, "PORT" MEDIUMINT NOT NULL, - "VALID" BOOLEAN, + "VALID" BOOLEAN NOT NULL, "FILTER" BOOLEAN NOT NULL, "FILTER_CONF" VARCHAR(500), "ROW_VERSION" BIGINT NOT NULL, @@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS NA_SERVICES ( -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_LOCATIONS ( "ID" BIGINT PRIMARY KEY NOT NULL, - "SERVICE_ID" BIGINT NOT NULL, + "SERVICES_ID" BIGINT NOT NULL, "LOCAL_TITLE" VARCHAR(50) NOT NULL, "LOCAL_NOTE" VARCHAR(250), "LOCAL_PATH" VARCHAR(50) NOT NULL, diff --git a/src/main/resources/pt/admina_table/SQLite_CONFIG.sql b/src/main/resources/pt/admin_table/SQLite_CONFIG.sql similarity index 100% rename from src/main/resources/pt/admina_table/SQLite_CONFIG.sql rename to src/main/resources/pt/admin_table/SQLite_CONFIG.sql diff --git a/src/main/resources/pt/admina_table/SQLite_CONFIG_DATA.sql b/src/main/resources/pt/admin_table/SQLite_CONFIG_DATA.sql similarity index 100% rename from src/main/resources/pt/admina_table/SQLite_CONFIG_DATA.sql rename to src/main/resources/pt/admin_table/SQLite_CONFIG_DATA.sql diff --git a/src/main/resources/pt/admina_table/SQLite_LOCATIONS.sql b/src/main/resources/pt/admin_table/SQLite_LOCATIONS.sql similarity index 95% rename from src/main/resources/pt/admina_table/SQLite_LOCATIONS.sql rename to src/main/resources/pt/admin_table/SQLite_LOCATIONS.sql index 77e10d0..258797a 100644 --- a/src/main/resources/pt/admina_table/SQLite_LOCATIONS.sql +++ b/src/main/resources/pt/admin_table/SQLite_LOCATIONS.sql @@ -6,7 +6,7 @@ -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_LOCATIONS ( "ID" BIGINT PRIMARY KEY NOT NULL, - "SERVICE_ID" BIGINT NOT NULL, + "SERVICES_ID" BIGINT NOT NULL, "LOCAL_TITLE" VARCHAR(50) NOT NULL, "LOCAL_NOTE" VARCHAR(250), "LOCAL_PATH" VARCHAR(50) NOT NULL, diff --git a/src/main/resources/pt/admina_table/SQLite_SERVICES.sql b/src/main/resources/pt/admin_table/SQLite_SERVICES.sql similarity index 95% rename from src/main/resources/pt/admina_table/SQLite_SERVICES.sql rename to src/main/resources/pt/admin_table/SQLite_SERVICES.sql index 72af3c6..b9511eb 100644 --- a/src/main/resources/pt/admina_table/SQLite_SERVICES.sql +++ b/src/main/resources/pt/admin_table/SQLite_SERVICES.sql @@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS NA_SERVICES ( "DOMAIN" VARCHAR(50) NOT NULL, "TYPE" VARCHAR(20) NOT NULL, "PORT" MEDIUMINT NOT NULL, - "VALID" BOOLEAN, + "VALID" BOOLEAN NOT NULL, "FILTER" BOOLEAN NOT NULL, "FILTER_CONF" VARCHAR(500), "ROW_VERSION" BIGINT NOT NULL, diff --git a/src/main/resources/pt/nginx-admin.xml b/src/main/resources/pt/nginx-admin.xml index 13501e7..2efcbed 100644 --- a/src/main/resources/pt/nginx-admin.xml +++ b/src/main/resources/pt/nginx-admin.xml @@ -26,7 +26,7 @@ - + diff --git a/src/main/resources/static/img/http.png b/src/main/resources/static/img/http.png new file mode 100644 index 0000000..ab5a157 Binary files /dev/null and b/src/main/resources/static/img/http.png differ diff --git a/src/main/resources/static/img/reload.png b/src/main/resources/static/img/reload.png new file mode 100644 index 0000000..410ab46 Binary files /dev/null and b/src/main/resources/static/img/reload.png differ diff --git a/src/main/resources/static/img/reload_.png b/src/main/resources/static/img/reload_.png new file mode 100644 index 0000000..322fbf0 Binary files /dev/null and b/src/main/resources/static/img/reload_.png differ diff --git a/src/main/resources/static/img/start.png b/src/main/resources/static/img/start.png new file mode 100644 index 0000000..7dede70 Binary files /dev/null and b/src/main/resources/static/img/start.png differ diff --git a/src/main/resources/static/img/start_.png b/src/main/resources/static/img/start_.png new file mode 100644 index 0000000..89353bf Binary files /dev/null and b/src/main/resources/static/img/start_.png differ diff --git a/src/main/resources/static/img/stop.png b/src/main/resources/static/img/stop.png new file mode 100644 index 0000000..fb237de Binary files /dev/null and b/src/main/resources/static/img/stop.png differ diff --git a/src/main/resources/static/img/stop_.png b/src/main/resources/static/img/stop_.png new file mode 100644 index 0000000..6ee40c9 Binary files /dev/null and b/src/main/resources/static/img/stop_.png differ diff --git a/src/main/resources/templates/control/nav.ftl b/src/main/resources/templates/control/nav.ftl index ab435e7..34cde4b 100644 --- a/src/main/resources/templates/control/nav.ftl +++ b/src/main/resources/templates/control/nav.ftl @@ -1121,30 +1121,25 @@ toHome: function () { location.href = this.context + "/" }, - // 打开一个新Tab - tabOpen: function (tab) { + // 打开新标签 nav.openTab({title:"",name:"",url:""}) + openTab: function (tab) { if (window.index) { - window.index.addTab(tab) + window.index.openTab(tab) } else if (window.parent.index) { - window.parent.index.addTab(tab) + window.parent.index.openTab(tab) } }, - // 关闭Tab - tabClose: function (tabName) { + // 关闭标签，tabName为空时，关闭当前 + closeTab: function (tabName) { + if (!tabName) { + tabName = window.index.activeTabName + } if (window.index) { window.index.removeTab(tabName) } else if (window.parent.index) { window.parent.index.removeTab(tabName) } }, - // 关闭当前Tab - tabCloseCur: function () { - if (window.index) { - window.index.removeTab(window.index.activeTabName) - } else if (window.parent.index) { - window.parent.index.removeTab(window.parent.index.activeTabName) - } - }, // 全屏 screenFull: function () { if (window.isFull)return; diff --git a/src/main/resources/templates/layout/home.ftl b/src/main/resources/templates/layout/home.ftl index e69de29..ac31e87 100644 --- a/src/main/resources/templates/layout/home.ftl +++ b/src/main/resources/templates/layout/home.ftl @@ -0,0 +1,15 @@ + + + + ${title?default("管理系统")} + + + + + + + +<#include controlHolder("nav")/> +<#include screenHolder()/> + + diff --git a/src/main/resources/templates/screen/admin/locations.ftl b/src/main/resources/templates/screen/admin/locations.ftl index 7b4f8d7..a17e7d8 100644 --- a/src/main/resources/templates/screen/admin/locations.ftl +++ b/src/main/resources/templates/screen/admin/locations.ftl @@ -1,9 +1,6 @@
- - - @@ -100,12 +97,6 @@ prop="id" label="主键"> - - - - - + + + - - - @@ -266,7 +254,7 @@ module: 'admin', target: 'locations', vm: {//条件及分页参数 - serviceId: null, + servicesId: $w.getSearchParam("servicesId"), localTitle: null, localTitleLike: null, localNoteLike: null, @@ -286,7 +274,7 @@ formTitle: "", formShow: false, id: null, - serviceId: null, + servicesId: null, localTitle: null, localNote: null, localPath: null, @@ -296,9 +284,6 @@ rowVersion: null }, formRules: { - serviceId: [ - {required: true, message: '服务主键不能为空', trigger: 'blur'}, - ], localTitle: [ {required: true, message: '配置标题不能为空', trigger: 'blur'}, {min: 1, max: 50, message: '配置标题长度在 1 到 50 个字符', trigger: 'blur'} @@ -326,19 +311,19 @@ this.form.formTitle = "路径配置新增"; this.form.formShow = true; this.form.id = ""; - this.form.serviceId = ""; + this.form.servicesId = $w.getSearchParam("servicesId"); this.form.localTitle = ""; this.form.localNote = ""; - this.form.localPath = ""; - this.form.localValid = ""; - this.form.filter = ""; + this.form.localPath = "/"; + this.form.localValid = true; + this.form.filter = false; this.form.filterConf = ""; }, onEdit: function (item) { this.form.formTitle = "路径配置编辑"; this.form.formShow = true; this.form.id = item.id; - this.form.serviceId = item.serviceId; + this.form.servicesId = item.servicesId; this.form.localTitle = item.localTitle; this.form.localNote = item.localNote; this.form.localPath = item.localPath; diff --git a/src/main/resources/templates/screen/admin/services.ftl b/src/main/resources/templates/screen/admin/services.ftl index d155262..6210c80 100644 --- a/src/main/resources/templates/screen/admin/services.ftl +++ b/src/main/resources/templates/screen/admin/services.ftl @@ -170,14 +170,14 @@ @@ -314,6 +314,7 @@ {required: true, message: '服务端口不能为空', trigger: 'blur'}, ], valid: [ + {required: true, message: '是否启用不能为空', trigger: 'blur'}, ], filter: [ {required: true, message: '启用过滤不能为空', trigger: 'blur'}, @@ -332,8 +333,8 @@ this.form.domain = "localhost"; this.form.type = ""; this.form.port = 80; - this.form.valid = ""; - this.form.filter = ""; + this.form.valid = true; + this.form.filter = false; this.form.filterConf = ""; }, onEdit: function (item) { diff --git a/src/main/resources/templates/screen/helpDev.ftl b/src/main/resources/templates/screen/helpDev.ftl index f2e31fd..dffcdab 100644 --- a/src/main/resources/templates/screen/helpDev.ftl +++ b/src/main/resources/templates/screen/helpDev.ftl @@ -1024,7 +1024,7 @@ 
    name: 'home',
    url: '/home.htm'
}
- 
index.addTab(tab)
+ 
index.openTab(tab)
diff --git a/src/main/resources/templates/screen/home.ftl b/src/main/resources/templates/screen/home.ftl index e69de29..c5d55e3 100644 --- a/src/main/resources/templates/screen/home.ftl +++ b/src/main/resources/templates/screen/home.ftl @@ -0,0 +1,232 @@ +
+ + + + Nginx 控制中心 + + + + + + + + + + + + + + + + + + + +
+
+ + + {{item.title}} +
+ +
+ + inactive-color="#ff4949"> + +
+ +
+ +
+
+ +
+ + diff --git a/src/main/resources/templates/screen/index.ftl b/src/main/resources/templates/screen/index.ftl index 8c0957a..93b3da9 100644 --- a/src/main/resources/templates/screen/index.ftl +++ b/src/main/resources/templates/screen/index.ftl @@ -16,23 +16,32 @@ :unique-opened="prop.open" :collapse="prop.coll" :collapse-transition="prop.tran"> - <#if token.hasRes("ADMIN")> + <#if token.hasRes("ADMIN")> <#if token.hasRes("ADMIN_SERVICES")> - 虚拟主机 + + 虚拟主机 + <#if token.hasRes("ADMIN_LOCATIONS")> - 路径配置 + + 路径配置 + <#if token.hasRes("ADMIN_CONFIG")> - 配置预设 + + 配置预设 + - +
@@ -60,8 +69,14 @@ 关于 - 开发指导 - 使用指导 + + 开发指导 + + + 使用指导 + @@ -94,13 +109,16 @@ :visible.sync="form.formShow"> - + - + - + @@ -145,18 +163,18 @@ z-index: 99; } - #loadingBar div[role=progressbar] .el-progress-bar__outer{ + #loadingBar div[role=progressbar] .el-progress-bar__outer { background-color: transparent; } - #devMarker{ + #devMarker { position: absolute; bottom: 50px; right: 50px; } - #devMarker:after{ - pointer-events:none; + #devMarker:after { + pointer-events: none; content: attr(marker-value); font-size: 100px; color: rgba(188, 188, 188, 0.5); @@ -257,18 +275,18 @@ line-height: 20px; } - #content,#content .el-tabs__content { + #content, #content .el-tabs__content { padding: 0; height: calc(100% - 40px); } - #content > div,#content .el-tab-pane { + #content > div, #content .el-tab-pane { padding: 0; border: 0; height: 100%; } - #content div[role=tab]{ + #content div[role=tab] { padding: 0 10px; } @@ -282,19 +300,19 @@ prop: { menu: '', tabName: '', - open: <#if prop.open>true<#else>false, - coll: <#if prop.coll>true<#else>false, - tran: <#if prop.tran>true<#else>false, - full: <#if prop.full>true<#else>false + open: <#if prop.open>true<#else>false, + coll: <#if prop.coll>true<#else>false, + tran: <#if prop.tran>true<#else>false, + full: <#if prop.full>true<#else>false }, - barStatus:null, + barStatus: null, barPercent: 0, barInterval: null, - form:{ - formShow:false, - password:'', - newPassword:'', - newPassword_:'' + form: { + formShow: false, + password: '', + newPassword: '', + newPassword_: '' }, formRules: { password: [ @@ -306,22 +324,24 @@ ], newPassword_: [ {required: true, message: '密码确认不能为空', trigger: 'blur'}, - { validator: function (rule, value, callback) { - if (value === '') { - callback(new Error('请再次输入密码')); - } else if (value !== index.form.newPassword) { - callback(new Error('两次输入密码不一致!')); - } else { - callback(); - } - }, trigger: 'blur' } + { + validator: function (rule, value, callback) { + if (value === '') { + callback(new Error('请再次输入密码')); + } else if (value !== index.form.newPassword) { + callback(new Error('两次输入密码不一致!')); + } else { + callback(); + } + }, trigger: 'blur' + } ] }, - resultUnRead:[] + resultUnRead: [] }, methods: { onHome: function () { - this.addTab({ + this.openTab({ title: '首页', name: 'home', url: this.context + '/home.htm' @@ -357,11 +377,15 @@ handleSelect: function (index) { this.prop.menu = index; }, - addTab: function (tab) { + openTab: function (tab) { //查找是否存在该tab var tempTabs = this.tabs.filter(function (tab_) { return tab_.name === tab.name; - }) + }); + //检查url + if (!tab.url.startsWith(this.context)) { + this.tab.url = this.context + this.tab.url; + }; //不存在则添加 if (tempTabs.length <= 0) { this.tabs.push(tab) @@ -387,7 +411,7 @@ return tab.name !== tabName }) }, - onChangePwd:function () { + onChangePwd: function () { this.$refs['form'].validate(function (valid) { if (valid) { new Ajax("wadmin", "user", "changePwd").post(this.form, function (response) { @@ -400,9 +424,9 @@ } }.bind(this)) }, - onLogout: function() { - nav.boxYesNo("退出提示", "是否退出当前登录账户?" ,function (result) { - if (result){ + onLogout: function () { + nav.boxYesNo("退出提示", "是否退出当前登录账户?", function (result) { + if (result) { new Ajax("wframe", "auth", "logout").post({}, function (response) { if (response.errors.length > 0) { nav.e(response.errors[0].message); @@ -415,7 +439,7 @@ }.bind(this)) }, onLogoutForChangePwd: function () { - nav.boxYes("退出提示", "密码修改成功立即重新登录?" ,function (result) { + nav.boxYes("退出提示", "密码修改成功立即重新登录?", function (result) { new Ajax("wadmin", "user").method("logout").post({}, function (response) { if (response.errors.length > 0) { nav.e(response.errors[0].message); @@ -426,7 +450,7 @@ }.bind(this)); }.bind(this)) }, - switchFullScreen:function(){ + switchFullScreen: function () { this.prop.full = !this.prop.full; if (this.prop.full) { nav.screenFull() @@ -455,14 +479,14 @@ var tabs = $.getSessionStorage("tabs"); if (tabs) { this.tabs = JSON.parse(tabs); - }else { + } else { this.onHome(); // 开发模式，默认打开指导页 - if (this.active === 'dev') { - this.addTab({ + if (this.active === 'dev') { + this.openTab({ title: '开发指导', name: 'helpDev', - url: this.context + '/helpDev.htm' + url: '/helpDev.htm' }) } } @@ -479,7 +503,7 @@ }.bind(this)); }, watch: { - "prop.tabName":function () { + "prop.tabName": function () { this.onSaveState(); } } diff --git a/src/test/java/xyz/wbsite/admin/LocationsTest.java b/src/test/java/xyz/wbsite/admin/LocationsTest.java index 1648bb1..24d82c0 100644 --- a/src/test/java/xyz/wbsite/admin/LocationsTest.java +++ b/src/test/java/xyz/wbsite/admin/LocationsTest.java @@ -40,7 +40,7 @@ public class LocationsTest { @Test public void testCreate() { LocationsCreateRequest request = new LocationsCreateRequest(); - request.setServiceId(1L); + request.setServicesId(1L); request.setLocalTitle("配置标题"); request.setLocalNote("配置备注"); request.setLocalPath("配置路径"); @@ -58,7 +58,7 @@ public class LocationsTest { //创建数据 LocationsCreateRequest createRequest = new LocationsCreateRequest(); - createRequest.setServiceId(1L); + createRequest.setServicesId(1L); createRequest.setLocalTitle("配置标题"); createRequest.setLocalNote("配置备注"); createRequest.setLocalPath("配置路径"); @@ -82,7 +82,7 @@ public class LocationsTest { public void testUpdate() { //创建数据 LocationsCreateRequest createRequest = new LocationsCreateRequest(); - createRequest.setServiceId(1L); + createRequest.setServicesId(1L); createRequest.setLocalTitle("配置标题"); createRequest.setLocalNote("配置备注"); createRequest.setLocalPath("配置路径"); @@ -97,7 +97,7 @@ public class LocationsTest { //更新数据 LocationsUpdateRequest request = new LocationsUpdateRequest(); request.setId(createResponse.getId()); - request.setServiceId(1L); + request.setServicesId(1L); request.setLocalTitle("配置标题"); request.setLocalNote("配置备注"); request.setLocalPath("配置路径"); @@ -113,7 +113,7 @@ public class LocationsTest { @Test public void testFind() { LocationsFindRequest request = new LocationsFindRequest(); - request.setServiceId(1L); + request.setServicesId(1L); request.setLocalTitle("配置标题"); request.setLocalPath("配置路径"); request.setLocalValid(true);