接入信息

src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java

@@ -714,7 +714,11 @@ public class JavaFxApplication extends Application {
         mTree.setOnMouseClicked(new EventHandler<MouseEvent>() {
             @Override
             public void handle(MouseEvent event) {
-                Object value = ((TreeItem) mTree.getSelectionModel().getSelectedItem()).getValue();
+                TreeItem model = (TreeItem) mTree.getSelectionModel().getSelectedItem();
+                if (model == null) {
+                    return;
+                }
+                Object value = model.getValue();
                 if (value instanceof Project) {
                     loadProject();
                 } else if (value instanceof Module) {
@@ -796,7 +800,7 @@ public class JavaFxApplication extends Application {
 
                                             projectTreeItem.getChildren().remove(moduleTreeItem);
                                             project.getModules().remove(module);
-                                            if (currentModule.hashCode() == module.hashCode()){
+                                            if (currentModule.hashCode() == module.hashCode()) {
                                                 loadProject();
                                             }
                                             System.out.println("删除模块" + mo.getModuleName());
@@ -850,7 +854,7 @@ public class JavaFxApplication extends Application {
 
                                             getTreeItem().getParent().getChildren().remove(indexOf);
                                             module.getTables().remove(indexOf);
-                                            if (currentTable.hashCode() == table.hashCode()){
+                                            if (currentTable.hashCode() == table.hashCode()) {
                                                 loadModule();
                                             }
                                             System.out.println("删除对象" + table.getTableName());

src/main/resources/fxml/OptionApi.fxml

@@ -59,21 +59,21 @@
             <top>
                 <ToolBar prefHeight="30.0" prefWidth="200.0" BorderPane.alignment="CENTER">
                     <items>
-                        <CheckBox mnemonicParsing="false" fx:id="All" text="All" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="All" text="All" selected="true">
                         </CheckBox>
-                        <CheckBox mnemonicParsing="false" fx:id="create" text="create" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="create" text="create" selected="true">
                         </CheckBox>
-                        <CheckBox mnemonicParsing="false" fx:id="delete" text="delete" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="delete" text="delete" selected="true">
                         </CheckBox>
-                        <CheckBox mnemonicParsing="false" fx:id="update" text="update" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="update" text="update" selected="true">
                         </CheckBox>
-                        <CheckBox mnemonicParsing="false" fx:id="find" text="find" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="find" text="find" selected="true">
                         </CheckBox>
-                        <CheckBox mnemonicParsing="false" fx:id="search" text="search" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="search" text="search" selected="true">
                         </CheckBox>
-                        <CheckBox mnemonicParsing="false" fx:id="get" text="get" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="get" text="get" selected="true">
                         </CheckBox>
-                        <CheckBox mnemonicParsing="false" fx:id="getAll" text="getAll" selected="false">
+                        <CheckBox mnemonicParsing="false" fx:id="getAll" text="getAll" selected="true">
                         </CheckBox>
                     </items>
                 </ToolBar>

src/main/resources/modules/SpringBoot/java/action/GlobalController.java

@@ -33,6 +33,11 @@ import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.StringUtil;
 import ${domain}.module.wsys.mgr.LogerrManager;
 <#if project.frameValue() = 1>
+import ${domain}.module.wsys.ent.Visitor;
+import ${domain}.module.wsys.mgr.VisitorManager;
+import ${domain}.module.wsys.req.VisitorFindRequest;
+import ${domain}.module.wsys.req.TokensBuildRequest;
+import ${domain}.module.wsys.rsp.VisitorFindResponse;
 import ${domain}.module.wsys.mgr.TokensManager;
 import ${domain}.module.wsys.req.TokensBuildRequest;
 import ${domain}.module.wsys.rsp.TokensBuildResponse;
@@ -74,6 +79,8 @@ public class GlobalController {
     private String loginPage;
     @Autowired
     private FreeMarkerViewResolver viewResolver;
+    @Autowired
+    private VisitorManager visitorManager;
 
     @RequestMapping("/")
     public String home() {
@@ -272,28 +279,42 @@ public class GlobalController {
             return MapperUtil.toJson(response);
         }
 
-        String data = null;
+        String data;
-        String appSecret = "01234567890123456789012345678901";
+        Visitor visitor;
+
+        // 检索应用码对应的接入对象，未找到或发生错误时，返回空白
+        VisitorFindRequest visitorFindRequest = new VisitorFindRequest();
+        visitorFindRequest.setAppKey(appKey);
+        VisitorFindResponse visitorFindResponse = visitorManager.find(visitorFindRequest, LocalData.getSysToken());
+        if (visitorFindResponse.hasError()) {
+            return MapperUtil.toJson(visitorFindResponse);
+        } else if (visitorFindResponse.getResult().size() == 0) {
+            response.addError(ErrorType.BUSINESS_ERROR, "接入信息不存在!");
+            return MapperUtil.toJson(response);
+        } else {
+            visitor = visitorFindResponse.getResult().get(0);
+        }
+
         // 解码
         try {
-            data = AESUtil.decrypt2String(encryptData, appSecret);
+            data = AESUtil.decrypt2String(encryptData, visitor.getAppSecret());
         } catch (Exception e) {
             response.addError(ErrorType.BUSINESS_ERROR, "解码失败,请确认编码是否正确!");
             return MapperUtil.toJson(response);
         }
 
         // 验证签名
-        String sign_ = MD5Util.encode(appSecret + data + timestamp);
+        String sign_ = MD5Util.encode(visitor.getAppSecret() + data + timestamp);
         if (!sign_.equals(sign)) {
             response.addError(ErrorType.BUSINESS_ERROR, "签名验证失败!");
-            return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+            return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
         }
 
         // 时效性验证
         long currentTime = System.currentTimeMillis();
         if (currentTime - timestamp > 2 * 60 * 1000) {
             response.addError(ErrorType.BUSINESS_ERROR, "请求过期, 或本地时间错误!");
-            return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+            return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
         }
 <#-- 当项目框架只为接口时，无资源维护管理页，则认为是一对一应用接口，不做权限验证 -->
 <#if project.frameValue() = 1>
@@ -307,13 +328,13 @@ public class GlobalController {
             LocalData.setToken(tokensBuildResponse.getToken());
             if (!LocalData.getToken().hasRes(httpServletRequest.getServletPath())) {
                 response.addError(ErrorType.BUSINESS_ERROR, "[" + httpServletRequest.getServletPath() + "]未授权的资源!");
-                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
             }
         } else {
             String excluded = LocalData.getEnvironment().getProperty("web.url.auth.excluded", "") + ",/api/wsys/User/login";
             if (!excluded.contains(excluded)) {
                 response.addError(ErrorType.BUSINESS_ERROR, "请通过登录接口获取Token!");
-                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
             }
         }
 </#if>
@@ -334,7 +355,7 @@ public class GlobalController {
 
             if (methodC == null) {
                 response.addError(ErrorType.BUSINESS_ERROR, "未找到对应的方法!");
-                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+                return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
             }
 
             Parameter[] parameters = methodC.getParameters();
@@ -374,7 +395,7 @@ public class GlobalController {
             e.getTargetException().printStackTrace();
             response.addError(ErrorType.BUSINESS_ERROR, "方法执行错误[" + e.getTargetException().getMessage() + "]");
         }
-        return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
+        return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
     }
 
     private static ConcurrentHashMap<String, SseEmitter> sseMap = new ConcurrentHashMap();

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/SequenceAjax.java

@@ -0,0 +1,23 @@
+package ${domain}.action.ajax.wsys;
+
+import ${domain}.frame.auth.LocalData;
+import ${domain}.module.wsys.mgr.SequenceManager;
+import ${domain}.module.wsys.req.SequenceNextRequest;
+import ${domain}.module.wsys.req.SequenceRamHexRequest;
+import ${domain}.module.wsys.rsp.SequenceNextResponse;
+import ${domain}.module.wsys.rsp.SequenceRamHexResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class SequenceAjax {
+
+    @Autowired
+    private SequenceManager sequenceManager;
+
+    public SequenceNextResponse next(SequenceNextRequest request) {
+        return sequenceManager.next(request, LocalData.getToken());
+    }
+
+    public SequenceRamHexResponse ramHex(SequenceRamHexRequest request) {
+        return sequenceManager.ramHex(request, LocalData.getToken());
+    }
+}

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java

@@ -75,7 +75,6 @@ public class UserAjax {
         UserLoginResponse response = userManager.login(request, LocalData.getToken());
         if (!response.hasError()) {
             Cookie cookie = CookieUtil.newCookie("token", response.getToken());
-            cookie.setPath("/");
             httpServletResponse.addCookie(cookie);
         }
         return response;

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/SequenceManager.java

@@ -3,8 +3,10 @@ package ${domain}.module.wsys.mgr;
 import ${domain}.frame.auth.Token;
 import ${domain}.module.wsys.req.SequenceFindRequest;
 import ${domain}.module.wsys.req.SequenceNextRequest;
+import ${domain}.module.wsys.req.SequenceRamHexRequest;
 import ${domain}.module.wsys.rsp.SequenceFindResponse;
 import ${domain}.module.wsys.rsp.SequenceNextResponse;
+import ${domain}.module.wsys.rsp.SequenceRamHexResponse;
 
 /**
  * 序列
@@ -32,4 +34,13 @@ public interface SequenceManager {
      * @return
      */
     SequenceNextResponse next(SequenceNextRequest request, Token token);
+
+    /**
+     * 获得HEX序列
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    SequenceRamHexResponse ramHex(SequenceRamHexRequest request, Token token);
 }

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/SequenceManagerImpl.java

@@ -1,22 +1,25 @@
 package ${domain}.module.wsys.mgr;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.github.pagehelper.util.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import ${domain}.frame.auth.Token;
 import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.utils.IDgenerator;
+import ${domain}.frame.utils.RandomUtil;
 import ${domain}.frame.utils.ValidationUtil;
 import ${domain}.module.wsys.ent.Sequence;
 import ${domain}.module.wsys.mpr.SequenceMapper;
 import ${domain}.module.wsys.req.SequenceFindRequest;
 import ${domain}.module.wsys.req.SequenceNextRequest;
+import ${domain}.module.wsys.req.SequenceRamHexRequest;
 import ${domain}.module.wsys.rsp.SequenceFindResponse;
 import ${domain}.module.wsys.rsp.SequenceNextResponse;
+import ${domain}.module.wsys.rsp.SequenceRamHexResponse;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -150,4 +153,35 @@ public class SequenceManagerImpl implements SequenceManager {
                 value));
         return response;
     }
+
+    /**
+     * 获得HEX序列
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    @Override
+    public SequenceRamHexResponse ramHex(SequenceRamHexRequest request, Token token) {
+        SequenceRamHexResponse response = new SequenceRamHexResponse();
+
+        ValidationUtil.validate(request, response);
+        if (response.hasError()) {
+            return response;
+        }
+
+        String sequence = RandomUtil.getString("0123456789abcdef", request.getSize());
+        response.setSequence(sequence);
+        if (request.isUpperCase()) {
+            response.setSequence(response.getSequence().toUpperCase());
+        }
+        if (StringUtil.isNotEmpty(request.getPrefix())) {
+            response.setSequence(request.getPrefix() + response.getSequence());
+        }
+        if (StringUtil.isNotEmpty(request.getSuffix())) {
+            response.setSequence(response.getSequence() + request.getSuffix());
+        }
+
+        return response;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/wsys/req/SequenceRamHexRequest.java

@@ -0,0 +1,65 @@
+package ${domain}.module.wsys.req;
+
+import ${domain}.frame.base.BaseRequest;
+
+/**
+ * SequenceNextRequest - 序列获取
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-25
+ */
+public class SequenceRamHexRequest extends BaseRequest {
+
+    /**
+     * 序列号前缀
+     */
+    private String prefix;
+
+    /**
+     * 序列号后缀
+     */
+    private String suffix;
+
+    /**
+     * 序列长
+     */
+    private int size = 6;
+
+    /**
+     * 是否转大写
+     */
+    private boolean upperCase;
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
+
+    public void setSuffix(String suffix) {
+        this.suffix = suffix;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public boolean isUpperCase() {
+        return upperCase;
+    }
+
+    public void setUpperCase(boolean upperCase) {
+        this.upperCase = upperCase;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsys/req/VisitorCreateRequest.java

@@ -39,7 +39,7 @@ public class VisitorCreateRequest extends BaseRequest {
      * 安全码.
      */
     @NotBlank(message = "[appSecret]安全码不能为空")
-    @Length(min = 0, max = 16, message = "[appSecret]安全码长度不合法(0-16)")
+    @Length(min = 32, max = 32, message = "[appSecret]安全码长度不合法(32)")
     private String appSecret;
 
     /**

src/main/resources/modules/SpringBoot/java/module/wsys/req/VisitorUpdateRequest.java

@@ -45,7 +45,7 @@ public class VisitorUpdateRequest extends BaseUpdateRequest {
      * 安全码.
      */
     @NotBlank(message = "[appSecret]安全码不能为空")
-    @Length(min = 0, max = 16, message = "[appSecret]安全码长度不合法(0-16)")
+    @Length(min = 32, max = 32, message = "[appSecret]安全码长度不合法(32)")
     private String appSecret;
 
     /**

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/SequenceRamHexResponse.java

@@ -0,0 +1,26 @@
+package ${domain}.module.wsys.rsp;
+
+import ${domain}.frame.base.BaseResponse;
+
+/**
+ * SequenceNextResponse - 序列
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-25
+ */
+public class SequenceRamHexResponse extends BaseResponse {
+
+    /**
+     * 序列
+     */
+    private String sequence;
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+}

src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml

@@ -208,7 +208,7 @@
 <field defaultValue="NULL" fieldComment="应用名称" fieldLength="50" fieldName="APP_NAME" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="应用简介" fieldLength="255" fieldName="APP_NOTE" fieldType="String_var255" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="应用码" fieldLength="50" fieldName="APP_KEY" fieldType="String_var50" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="true"/>
-<field defaultValue="NULL" fieldComment="安全码" fieldLength="16" fieldName="APP_SECRET" fieldType="String_var" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
+<field defaultValue="NULL" fieldComment="安全码" fieldLength="32" fieldName="APP_SECRET" fieldType="String_var" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="是否有效" fieldLength="0" fieldName="VALID" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false"/>
 <field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql

@@ -263,7 +263,7 @@ CREATE TABLE `SYS_VISITOR` (
     `APP_NAME` VARCHAR(50) NOT NULL COMMENT '应用名称',
     `APP_NOTE` VARCHAR(250) COMMENT '应用简介',
     `APP_KEY` VARCHAR(50) NOT NULL COMMENT '应用码',
-    `APP_SECRET` VARCHAR(16) NOT NULL COMMENT '安全码',
+    `APP_SECRET` VARCHAR(32) NOT NULL COMMENT '安全码',
     `VALID` TINYINT(1) NOT NULL COMMENT '是否有效',
     `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
     `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_VISITOR.sql

@@ -9,7 +9,7 @@ CREATE TABLE `SYS_VISITOR` (
         `APP_NAME` VARCHAR(50) NOT NULL COMMENT '应用名称',
         `APP_NOTE` VARCHAR(250) COMMENT '应用简介',
         `APP_KEY` VARCHAR(50) NOT NULL COMMENT '应用码',
-        `APP_SECRET` VARCHAR(16) NOT NULL COMMENT '安全码',
+        `APP_SECRET` VARCHAR(32) NOT NULL COMMENT '安全码',
         `VALID` TINYINT(1) NOT NULL COMMENT '是否有效',
         `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
         `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql

@@ -407,7 +407,7 @@ CREATE TABLE "SYS_VISITOR" (
 "APP_NAME" VARCHAR2(50) NULL,
 "APP_NOTE" VARCHAR2(250) NULL,
 "APP_KEY" VARCHAR2(50) NULL,
-"APP_SECRET" VARCHAR2(16) NULL,
+"APP_SECRET" VARCHAR2(32) NULL,
 "VALID" CHAR(1) NULL,
 "ROW_VERSION" NUMBER(19) NOT NULL,
 "IS_DELETED" CHAR(1) NOT NULL,

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_VISITOR.sql

@@ -9,7 +9,7 @@ CREATE TABLE "SYS_VISITOR" (
     "APP_NAME" VARCHAR2(50) NULL,
     "APP_NOTE" VARCHAR2(250) NULL,
     "APP_KEY" VARCHAR2(50) NULL,
-    "APP_SECRET" VARCHAR2(16) NULL,
+    "APP_SECRET" VARCHAR2(32) NULL,
     "VALID" CHAR(1) NULL,
     "ROW_VERSION" NUMBER(19) NOT NULL,
     "IS_DELETED" CHAR(1) NOT NULL,

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_VISITOR.sql

@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS SYS_VISITOR (
     "APP_NAME" VARCHAR(50) NOT NULL,
     "APP_NOTE" VARCHAR(250),
     "APP_KEY" VARCHAR(50) NOT NULL,
-    "APP_SECRET" VARCHAR(16) NOT NULL,
+    "APP_SECRET" VARCHAR(32) NOT NULL,
     "VALID" BOOLEAN NOT NULL,
     "ROW_VERSION" BIGINT NOT NULL,
     "IS_DELETED" BOOLEAN NOT NULL,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl

@@ -17,10 +17,12 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="开始日期" prop="startDate">
-                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime"
+                                value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
             <el-form-item label="结束日期" prop="endDate">
-                <el-date-picker v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                <el-date-picker v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime"
+                                value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
@@ -154,10 +156,22 @@
 
         <el-page-header slot="title" @back="form.formShow = false" :content="form.formTitle"></el-page-header>
 
-		<el-form class="form" :model="form" :inline="true" :rules="formRules" ref="form" label-position="right" label-width="90px">
+        <el-form class="form" :model="form" :inline="true" :rules="formRules" ref="form" label-position="right"
+                 label-width="90px">
             <el-form-item label="应用名称" prop="appName">
                 <el-input v-model="form.appName" clearable size="mini" placeholder="请输入应用名称" maxlength="50"></el-input>
             </el-form-item>
+            <el-form-item label="应用码" prop="appKey">
+                <el-row>
+                    <el-col :span="23">
+                        <el-input v-model="form.appKey" clearable size="mini" placeholder="请输入应用码"
+                                  maxlength="50"></el-input>
+                    </el-col>
+                    <el-col :span="1">
+                        <el-link icon="el-icon-refresh" :underline="false" style="padding: 10px;" @click="refreshAppKey"></el-link>
+                    </el-col>
+                </el-row>
+            </el-form-item>
             <el-form-item label="应用简介" prop="appNote">
                 <el-input v-model="form.appNote"
                           clearable
@@ -167,11 +181,21 @@
                           maxlength="255"
                           show-word-limit></el-input>
             </el-form-item>
-            <el-form-item label="应用码" prop="appKey">
-                <el-input v-model="form.appKey" clearable size="mini" placeholder="请输入应用码" maxlength="50"></el-input>
-            </el-form-item>
             <el-form-item label="安全码" prop="appSecret">
-                <el-input v-model="form.appSecret" clearable size="mini" placeholder="请输入安全码" maxlength="16"></el-input>
+                <el-row>
+                    <el-col :span="23">
+                        <el-input v-model="form.appSecret"
+                                  clearable
+                                  size="mini"
+                                  placeholder="请输入安全码"
+                                  type="textarea"
+                                  minlength="32"
+                                  maxlength="32"></el-input>
+                    </el-col>
+                    <el-col :span="1">
+                        <el-link icon="el-icon-refresh" :underline="false" style="padding: 10px;" @click="refreshAppSecret"></el-link>
+                    </el-col>
+                </el-row>
             </el-form-item>
             <el-form-item label="是否有效" prop="valid">
                 <el-radio-group v-model="form.valid" clearable size="mini">
@@ -203,8 +227,8 @@
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,
-                sortKey:'CREATE_TIME',
+                sortKey: 'CREATE_TIME',
-                sortType:'DESC'
+                sortType: 'DESC'
             },
             form: {//待提交表单
                 formTitle: null,
@@ -231,7 +255,7 @@
                 ],
                 appSecret: [
                     {required: true, message: '安全码不能为空', trigger: 'blur'},
-                    {min: 1, max: 16, message: '安全码长度在 1 到 16 个字符', trigger: 'blur'}
+                    {min: 32, max: 32, message: '安全码长度为32个字符', trigger: 'blur'}
                 ],
                 valid: [
                     {required: true, message: '是否有效不能为空', trigger: 'blur'},
@@ -247,7 +271,7 @@
                 this.form.appNote = "";
                 this.form.appKey = "";
                 this.form.appSecret = "";
-                this.form.valid = "";
+                this.form.valid = true;
             },
             onEdit: function (item) {
                 this.form.formTitle = "应用接入编辑";
@@ -277,6 +301,24 @@
                 }.bind(this)).catch(function (action) {
 
                 });
+            },
+            refreshAppKey: function () {
+                new Ajax("wsys", "sequence", "ramHex").post({size:16,prefix:"APP"}, function (response) {
+                    if (response.errors.length > 0) {
+                        nav.e(response.errors[0].message);
+                    } else {
+                        this.form.appKey = response.sequence;
+                    }
+                }.bind(this))
+            },
+            refreshAppSecret: function () {
+                new Ajax("wsys", "sequence", "ramHex").post({size:32}, function (response) {
+                    if (response.errors.length > 0) {
+                        nav.e(response.errors[0].message);
+                    } else {
+                        this.form.appSecret = response.sequence;
+                    }
+                }.bind(this))
             }
         },
         mounted: function () {