From ea68e8f8c00c0178037a9f1cc6dc1663bde913b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 03 七月 2021 17:49:35 +0800
Subject: [PATCH] 推送服务完善
---
service-push/src/main/resources/static/pushplatform-appinfo-add.html | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 57 insertions(+), 54 deletions(-)
diff --git a/service-push/src/main/resources/static/source-get-add.html b/service-push/src/main/resources/static/pushplatform-appinfo-add.html
similarity index 66%
rename from service-push/src/main/resources/static/source-get-add.html
rename to service-push/src/main/resources/static/pushplatform-appinfo-add.html
index b7749e7..718f5e1 100644
--- a/service-push/src/main/resources/static/source-get-add.html
+++ b/service-push/src/main/resources/static/pushplatform-appinfo-add.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
- <title>娆㈣繋椤甸潰-X-admin2.2</title>
+ <title>鏂板鎺ㄩ�佸钩鍙板弬鏁�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
@@ -31,77 +31,52 @@
<div class="layui-input-inline">
<select id="L_appCode" name="appCode" lay-verify="required" lay-search="">
<option value="">鐩存帴閫夋嫨鎴栨悳绱㈠簲鐢�</option>
- <option v-for="item in appList" :value="item.appCode">{{item.appName}}</option>
+ <option v-for="item in appList" :value="item.appCode">{{item.name}}</option>
</select>
</div>
</div>
+
<div class="layui-form-item">
- <label for="L_name" class="layui-form-label">
- <span class="x-red">*</span>鏉ユ簮鍚嶇О</label>
+ <label for="L_appCode" class="layui-form-label">
+ <span class="x-red">*</span>鎺ㄩ�佸钩鍙�</label>
<div class="layui-input-inline">
- <input type="text" id="L_name" name="sourceName" required="" lay-verify="username"
+ <select id="L_appCode" name="platform" lay-verify="required" lay-search="">
+ <option v-for="item in platformList" :value="item.platform">{{item.name}}</option>
+ </select>
+ </div>
+ </div>
+
+
+ <div class="layui-form-item">
+ <label for="L_code" class="layui-form-label">
+ <span class="x-red">*</span>appId</label>
+ <div class="layui-input-inline">
+ <input type="text" id="L_code" name="pushAppInfo.appId" lay-verify="code"
autocomplete="off" class="layui-input"></div>
</div>
<div class="layui-form-item">
<label for="L_code" class="layui-form-label">
- <span class="x-red">*</span>鏉ユ簮鏍囪瘑</label>
+ <span class="x-red">*</span>appKey</label>
<div class="layui-input-inline">
- <input type="text" id="L_code" name="sourceCode" required="" lay-verify="code"
- autocomplete="off" class="layui-input"></div>
- <div class="layui-form-mid layui-word-aux">
- <span class="x-red">*</span>鍚屼竴搴旂敤涓嶈兘閲嶅
- </div>
- </div>
-
-
- <div class="layui-form-item">
- <label class="layui-form-label">
- 鍥炬爣</label>
- <div class="layui-input-inline">
- <input type="text" name="icon"
+ <input type="text" id="L_code" name="pushAppInfo.appKey" lay-verify="code"
autocomplete="off" class="layui-input"></div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">
- <span class="x-red">*</span>閲戝竵鏁伴噺</label>
+ <label for="L_code" class="layui-form-label">
+ <span class="x-red">*</span>appSecret</label>
<div class="layui-input-inline">
- <input type="text" name="goldCorn" required="" lay-verify="number"
+ <input type="text" id="L_code" name="pushAppInfo.appSecret"
autocomplete="off" class="layui-input"></div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">
- <span class="x-red">*</span>姣忔棩鑾峰彇鏈�澶ф鏁�</label>
+ <label for="L_code" class="layui-form-label">
+ <span class="x-red">*</span>鍖呭悕</label>
<div class="layui-input-inline">
- <input type="text" name="maxDayCount" required="" lay-verify="number"
+ <input type="text" id="L_code" name="pushAppInfo.packageName" required="" lay-verify="packageName"
autocomplete="off" class="layui-input"></div>
- </div>
-
-
- <div class="layui-form-item">
- <label class="layui-form-label">
- <span class="x-red">*</span>姣忔闂撮殧鏃堕棿锛堢锛�</label>
- <div class="layui-input-inline">
- <input type="text" name="minTimeSpan" required="" lay-verify="number"
- autocomplete="off" class="layui-input"></div>
- </div>
-
- <div class="layui-form-item">
- <label for="L_desc" class="layui-form-label">
- 鏉ユ簮绠�浠�</label>
- <div class="layui-input-inline">
- <textarea id="L_desc" name="sourceDesc" required="" lay-verify="desc"
- autocomplete="off" class="layui-textarea"></textarea></div>
- </div>
-
- <div class="layui-form-item">
- <label for="L_remarks" class="layui-form-label">
- 鏉ユ簮澶囨敞</label>
- <div class="layui-input-inline">
- <textarea type="text" id="L_remarks" name="remarks" required="" lay-verify="remarks"
- autocomplete="off" class="layui-textarea"></textarea></div>
</div>
<div class="layui-form-item">
@@ -116,7 +91,14 @@
var app = new Vue({
el: '.layui-form',
data: {
- appList: []
+ appList: [],
+ platformList: [
+ {name: "灏忕背", platform: "xm"},
+ {name: "鍗庝负", platform: "hw"},
+ {name: "OPPO", platform: "oppo"},
+ {name: "VIVO", platform: "vivo"},
+ {name: "榄呮棌", platform: "mz"}
+ ]
},
created: function () {
this.getAppList();
@@ -125,12 +107,13 @@
appList: function () {
app.render();
}
+
},
methods: {
getAppList: function () {
ksapp.post("/admin/api/app/list", {page: 1, limit: 100}, function (e) {
if (e.code == 0) {
- app.appList = e.data.data;
+ app.appList = e.data.list;
} else
layer.msg(e.msg);
}, function (e) {
@@ -150,7 +133,14 @@
return '鍚嶇О鑷冲皯寰�3涓瓧绗�';
}
},
- code: [/^([A-Za-z0-9]|\-|_)+$/, '鏍囪瘑鍙兘鍖呭惈 鏁板瓧銆佽嫳鏂囧瓧绗︺�乢 銆�-'],
+ code: function (value) {
+ if (value) {
+ if (!(/^([A-Za-z0-9]|\-|_)+$/).test(value)) {
+ return '鏍囪瘑鍙兘鍖呭惈 鏁板瓧銆佽嫳鏂囧瓧绗︺�乢 銆�-';
+ }
+ }
+ },
+ packageName: [/^([A-Za-z0-9]|\-|_|\.)+$/, '鍖呭悕鍙兘鍖呭惈 鏁板瓧銆佽嫳鏂囧瓧绗︺�乢 銆�-銆�.'],
desc: function (value) {
if (value != null && value.length > 128) {
return '绠�浠嬫渶澶т负128涓瓧绗�';
@@ -169,8 +159,21 @@
form.on('submit(add)',
function (data) {
console.log(data.field);
+ //杞崲json瀵硅薄
+ for (key in data.field) {
+ if (key.indexOf(".") > -1) {
+ var value = data.field[key];
+ delete data.field[key];
+ var onkeys = key.split(".");
+ //鍒涘缓瀵硅薄
+ if (data.field[onkeys[0]] == undefined) {
+ data.field[onkeys[0]] = {};
+ }
+ data.field[onkeys[0]][onkeys[1]] = value;
+ }
+ }
//鍙戝紓姝ワ紝鎶婃暟鎹彁浜ょ粰php
- ksapp.post('/admin/api/source/get/add', data.field, function (res) {
+ ksapp.postJSON('/admin/api/pushplatform-app/add', data.field, function (res) {
if (res.code == 0) {
layer.alert("澧炲姞鎴愬姛", {
icon: 6
--
Gitblit v1.8.0