diff --git a/dsBase/target/classes/Sql/menu.sql b/dsBase/target/classes/Sql/menu.sql
index 49a8db05..360b8830 100644
--- a/dsBase/target/classes/Sql/menu.sql
+++ b/dsBase/target/classes/Sql/menu.sql
@@ -34,7 +34,9 @@ select identity_id from t_base_menu_privilage where menu_id=?
 
   -- 获取指定的节点信息
   #sql("selectSingle")
-    select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,t1.create_time,t1.update_ts,t1.level_id,t1.for_school,t1.for_bureau,
+    select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,
+           t1.create_time,t1.update_ts,t1.level_id,t1.for_school,t1.for_bureau,
+           t1.icon,t1.isFull,
        (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf
     from t_base_menu as t1 where t1.menu_id=?
   #end
diff --git a/dsBase/target/classes/application_ali.yaml b/dsBase/target/classes/application_ali.yaml
new file mode 100644
index 00000000..0af87d49
--- /dev/null
+++ b/dsBase/target/classes/application_ali.yaml
@@ -0,0 +1,31 @@
+# 上传文件的临时路径
+uploadTempPath: /tmp
+# JWT
+SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
+# 生成Token的密码
+CookieMd5SingPwd: DsideaL4r5t6y7u
+
+mysql:
+  # 数据库信息
+  driverClassName: com.mysql.cj.jdbc.Driver
+  user: ylt
+  password: Ycharge666
+  jdbcUrl : jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8
+
+
+redis:
+  ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com
+  port: 6379
+  password: Ycharge666
+
+# ==============================================================
+jwt:
+  # 生成Token的密码
+  CookieMd5SingPwd: DsideaL4r5t6y7u
+
+excel:
+  #  导出excel 的模板配置路径
+  excelExportTemplatePathSuffix: /ExcelExportTemplate/
+  #  导入excel 的模板配置路径
+  ExcelImportTemplatePathSuffix: /ExcelImportTemplate/
+
diff --git a/dsBase/target/classes/application_pro.yaml b/dsBase/target/classes/application_pro.yaml
index 0af87d49..7673bd7f 100644
--- a/dsBase/target/classes/application_pro.yaml
+++ b/dsBase/target/classes/application_pro.yaml
@@ -1,5 +1,5 @@
 # 上传文件的临时路径
-uploadTempPath: /tmp
+uploadTempPath: c:/Windows/Temp
 # JWT
 SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
 # 生成Token的密码
@@ -8,20 +8,17 @@ CookieMd5SingPwd: DsideaL4r5t6y7u
 mysql:
   # 数据库信息
   driverClassName: com.mysql.cj.jdbc.Driver
-  user: ylt
-  password: Ycharge666
-  jdbcUrl : jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8
+  user: root
+  password: DsideaL147258369
+  jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 
 
 redis:
-  ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com
-  port: 6379
-  password: Ycharge666
+  ip: 10.10.14.210
+  port: 18890
+  password:
 
 # ==============================================================
-jwt:
-  # 生成Token的密码
-  CookieMd5SingPwd: DsideaL4r5t6y7u
 
 excel:
   #  导出excel 的模板配置路径
diff --git a/dsBaseWeb/ds-base/html/pages/menu/add.html b/dsBaseWeb/ds-base/html/pages/menu/add.html
index d22a5f7e..d23f8c12 100644
--- a/dsBaseWeb/ds-base/html/pages/menu/add.html
+++ b/dsBaseWeb/ds-base/html/pages/menu/add.html
@@ -239,7 +239,7 @@
                 if (this.checked) {
                     isfullFlag = 1;
                 } else {
-
+                    isfullFlag = 0;
                 }
             });
         });
diff --git a/dsBaseWeb/ds-base/html/pages/menu/edit.html b/dsBaseWeb/ds-base/html/pages/menu/edit.html
index 9848c6c6..a6e49474 100644
--- a/dsBaseWeb/ds-base/html/pages/menu/edit.html
+++ b/dsBaseWeb/ds-base/html/pages/menu/edit.html
@@ -6,7 +6,8 @@
     <title>编辑菜单</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../static/css/font.css">
     <link rel="stylesheet" href="../../static/css/weadmin.css">
     <link rel="stylesheet" href="../../lib/layui/css/layui.css">
@@ -17,207 +18,269 @@
     <![endif]-->
     <style>
         .layui-form-label {
-            width: 90px!important;
+            width: 90px !important;
         }
+
         input[type='text'] {
-            width: 320px!important;
+            width: 320px !important;
         }
     </style>
 </head>
 
 <body>
-<div class="weadmin-body">
-    <form class="layui-form" lay-filter="editForm">
-        <div class="layui-form-item">
-            <label for="name" class="layui-form-label">
-                <span class="we-red">*</span>菜单名称：
-            </label>
-            <div class="layui-input-inline ">
-                <input type="text" id="name" name="name"  lay-verify="required|contentLength" max="64"  autocomplete="off" class="layui-input">
+    <div class="weadmin-body">
+        <form class="layui-form" lay-filter="editForm">
+            <div class="layui-form-item">
+                <label for="name" class="layui-form-label">
+                    <span class="we-red">*</span>菜单名称：
+                </label>
+                <div class="layui-input-inline ">
+                    <input type="text" id="name" name="name" lay-verify="required|contentLength" max="64"
+                        autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label for="url" class="layui-form-label">
+                    <span class="we-red">*</span>url地址：
+                </label>
+                <div class="layui-input-inline ">
+                    <input type="text" id="url" name="url" lay-verify="required|contentLength" max="128"
+                        autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label for="name" class="layui-form-label">
+                    <span class="we-red">*</span>图标：
+                </label>
+                <div class="layui-input-inline" style="display: flex;width: 300px;align-items: center;">
+                    <input type="text" id="icon" name="icon" lay-verify="required" disabled autocomplete="off"
+                        class="layui-input">
+                    <div style="width: 50px;text-align: right;color: #1e9fff;cursor: pointer;" id="selectIcon">选择</div>
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label for="url" class="layui-form-label">
-                <span class="we-red">*</span>url地址：
-            </label>
-            <div class="layui-input-inline ">
-                <input type="text" id="url" name="url"  lay-verify="required|contentLength" max="128"   autocomplete="off" class="layui-input">
+            <div class="layui-form-item">
+                <label for="name" class="layui-form-label">
+                    <span class="we-red">*</span>是否全屏：
+                </label>
+                <div class="layui-input-inline" style="display: flex;width: 300px;align-items: center;">
+                    <input type="checkbox" name="isfull" id="isfull" lay-skin="switch" lay-filter="switchTest"
+                        lay-text="是|否">
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label for="sort_id" class="layui-form-label">
-                <span class="we-red">*</span>排序号：
-            </label>
-            <div class="layui-input-inline ">
-                <input type="text" id="sort_id" name="sort_id" lay-verify="required|number" autocomplete="off" class="layui-input">
+            <div class="layui-form-item">
+                <label for="sort_id" class="layui-form-label">
+                    <span class="we-red">*</span>排序号：
+                </label>
+                <div class="layui-input-inline ">
+                    <input type="text" id="sort_id" name="sort_id" lay-verify="required|number" autocomplete="off"
+                        class="layui-input">
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label for="memo" class="layui-form-label">
-                <span class="we-red">*</span>描述信息：
-            </label>
-            <div class="layui-input-inline ">
-                <input type="text" id="memo" name="memo"   lay-verify="required|contentLength" max="64"  autocomplete="off" class="layui-input">
+            <div class="layui-form-item">
+                <label for="memo" class="layui-form-label">
+                    <span class="we-red">*</span>描述信息：
+                </label>
+                <div class="layui-input-inline ">
+                    <input type="text" id="memo" name="memo" lay-verify="required|contentLength" max="64"
+                        autocomplete="off" class="layui-input">
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label for="memo" class="layui-form-label">
-                <span class="we-red">*</span>可用身份：
-            </label>
-            <div class="layui-input-item" style="width: 70%;float: left;padding-top:8px;margin-left: -10px">
-                <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk" title="超级管理员" value="1"></span>
-                <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"  title="市级管理员" value="2"></span>
-                <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"  title="县区管理员" value="3"></span>
-                <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"  title="单位管理员" lay-filter="chk"  value="4"></span>
-                <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"  title="普通教师"   value="5"></span>
+            <div class="layui-form-item">
+                <label for="memo" class="layui-form-label">
+                    <span class="we-red">*</span>可用身份：
+                </label>
+                <div class="layui-input-item" style="width: 70%;float: left;padding-top:8px;margin-left: -10px">
+                    <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"
+                            title="超级管理员" value="1"></span>
+                    <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"
+                            title="市级管理员" value="2"></span>
+                    <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"
+                            title="县区管理员" value="3"></span>
+                    <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"
+                            title="单位管理员" lay-filter="chk" value="4"></span>
+                    <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" name="chk"
+                            title="普通教师" value="5"></span>
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item" id="school" style="display: none">
-            <label for="" class="layui-form-label">
-                <span class="we-red">*</span>学校管理员：
-            </label>
-            <div class="layui-input-item" style="width: 70%;float: left;padding-top:8px;margin-left: -10px">
-                <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" lay-filter="school" name="school" title="学校管理员" ></span>
-                <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox" lay-filter="bureau" name="bureau" title="非学校管理员"></span>
+            <div class="layui-form-item" id="school" style="display: none">
+                <label for="" class="layui-form-label">
+                    <span class="we-red">*</span>学校管理员：
+                </label>
+                <div class="layui-input-item" style="width: 70%;float: left;padding-top:8px;margin-left: -10px">
+                    <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox"
+                            lay-filter="school" name="school" title="学校管理员"></span>
+                    <span style="display: inline-block;margin:0 10px 8px 10px"><input type="checkbox"
+                            lay-filter="bureau" name="bureau" title="非学校管理员"></span>
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label for="" class="layui-form-label">
-            </label>
-            <button class="layui-btn" lay-filter="save" lay-submit="">确定</button>
-        </div>
-    </form>
-</div>
-<script src="../../lib/layui/layui.js" charset="utf-8"></script>
+            <div class="layui-form-item">
+                <label for="" class="layui-form-label">
+                </label>
+                <button class="layui-btn" lay-filter="save" lay-submit="">确定</button>
+            </div>
+        </form>
+    </div>
+    <script src="../../lib/layui/layui.js" charset="utf-8"></script>
 
-<script>
-    layui.extend({
-        admin: '{/}../../static/js/admin'
-    });
-    layui.use(['form','jquery','admin', 'layer'], function() {
-        var form = layui.form,
-            $ = layui.jquery,
-            admin = layui.admin,
-            layer = layui.layer;
-        var for_school="";//学校管理员
-        var for_bureau="";//非学校管理员
-        var id;
-        $(function () {
-            id=GetQueryString("id");
-            selectSingle();
-        })
+    <script>
+        layui.extend({
+            admin: '{/}../../static/js/admin'
+        });
+        layui.use(['form', 'jquery', 'admin', 'layer'], function () {
+            var form = layui.form,
+                $ = layui.jquery,
+                admin = layui.admin,
+                layer = layui.layer;
+            var for_school = "";//学校管理员
+            var for_bureau = "";//非学校管理员
+            var id;
+            var isfullFlag = 0;
+            $(function () {
+                id = GetQueryString("id");
+                selectSingle();
+            })
 
-        // 根据id获取信息
-        function selectSingle(){
-            $.ajax({
-                url:'/dsBase/menu/selectSingle?menu_id='+id,
-                type:"GET",
-                dataType:'json',
-                success:function(data){
-                    var lis1=data.menu_info[0];
-                    form.val('editForm', {
-                        name:lis1.menu_name,
-                        memo:lis1.memo,
-                        sort_id:lis1.sort_id,
-                        url:lis1.url
-                    });
-                    for_bureau=lis1.for_bureau;
-                    for_school=lis1.for_school;
-                    for (var i=0;i<data.identity_info.length;i++){
-                        $("input[type='checkbox'][value="+data.identity_info[i].identity_id+"]").attr("checked",true);
-                        if(data.identity_info[i].identity_id==4){
-                            $("#school").show();
-                            if(lis1.for_school==1){
-                                $("input[type='checkbox'][name='school']").attr("checked",true);
-                            }
-                            if(lis1.for_bureau==1){
-                                $("input[type='checkbox'][name='bureau']").attr("checked",true);
+            // 根据id获取信息
+            function selectSingle() {
+                $.ajax({
+                    url: '/dsBase/menu/selectSingle?menu_id=' + id,
+                    type: "GET",
+                    dataType: 'json',
+                    success: function (data) {
+                        var lis1 = data.menu_info[0];
+                        form.val('editForm', {
+                            name: lis1.menu_name,
+                            memo: lis1.memo,
+                            sort_id: lis1.sort_id,
+                            url: lis1.url,
+                            icon: lis1.icon,
+                            isfull: lis1.isFull == 1 ? true : false
+                        });
+                        isfullFlag = lis1.isFull;
+                        for_bureau = lis1.for_bureau;
+                        for_school = lis1.for_school;
+                        for (var i = 0; i < data.identity_info.length; i++) {
+                            $("input[type='checkbox'][value=" + data.identity_info[i].identity_id + "]").attr("checked", true);
+                            if (data.identity_info[i].identity_id == 4) {
+                                $("#school").show();
+                                if (lis1.for_school == 1) {
+                                    $("input[type='checkbox'][name='school']").attr("checked", true);
+                                }
+                                if (lis1.for_bureau == 1) {
+                                    $("input[type='checkbox'][name='bureau']").attr("checked", true);
+                                }
                             }
                         }
+
+                        form.render();
                     }
+                })
+            }
 
-                    form.render();
+
+            // 选中学校管理员 for_school=1
+            form.on('checkbox(school)', function (data) {
+                if (data.elem.checked) {
+                    for_school = 1;
+                } else {
+                    for_school = 0;
+                }
+            });
+            // 选中非学校管理员 for_bureau=1
+            form.on('checkbox(bureau)', function (data) {
+                if (data.elem.checked) {
+                    for_bureau = 1;
+                } else {
+                    for_bureau = 0;
+                }
+            });
+            // 点击单位管理员 显示是否学校
+            form.on('checkbox(chk)', function (data) {
+                if (data.elem.checked) {
+                    $("#school").show();
+                } else {
+                    $("#school").hide();
+                }
+            });
+            verifyLength();
+            //监听提交
+            form.on('submit(save)', function (data) {
+                var arr = new Array();
+                $("input:checkbox[name='chk']:checked").each(function (i) {
+                    arr[i] = $(this).val();
+                })
+                data.field.chk = arr.join(",");
+                var f = data.field;
+                if (f.chk == "") {
+                    layer.msg("请选择可用身份", { icon: 5 })
+                    return false;
+                }
+                if ($("#school").is(":visible")) {
+                    if (for_school == 0 && for_bureau == 0) {
+                        layer.msg("请选择是否为学校管理员", { icon: 5 })
+                        return false;
+                    }
                 }
-            })
-        }
 
+                $.ajax({
+                    url: '/dsBase/menu/UpdateMenu',
+                    type: "POST",
+                    dataType: 'json',
+                    data: {
+                        menu_id: id,
+                        sort_id: f.sort_id,
+                        menu_name: f.name,
+                        url: f.url,
+                        memo: f.memo,
+                        identity_ids: f.chk,
+                        for_school: for_school,
+                        for_bureau: for_bureau,
+                        icon: $("#icon").val(),
+                        isFull: isfullFlag
+                    },
+                    success: function (data) {
+                        if (data.success) {
+                            layer.msg("修改成功", { icon: 1, time: 1000, shade: [0.5, '#000', true] }, function () {
+                                var index = parent.layer.getFrameIndex(window.name);
+                                parent.layer.close(index);
+                                window.parent.treeReload(id);
+                            });
+                        } else {
+                            layer.alert(data.message, { icon: 0 })
+                        }
+                    }
+                })
 
-        // 选中学校管理员 for_school=1
-        form.on('checkbox(school)', function(data){
-            if(data.elem.checked){
-                for_school=1;
-            }else{
-                for_school=0;
-            }
-        });
-        // 选中非学校管理员 for_bureau=1
-        form.on('checkbox(bureau)', function(data){
-            if(data.elem.checked){
-                for_bureau=1;
-            }else{
-                for_bureau=0;
-            }
-        });
-        // 点击单位管理员 显示是否学校
-        form.on('checkbox(chk)', function(data){
-            if(data.elem.checked){
-                $("#school").show();
-            }else{
-                $("#school").hide();
-            }
-        });
-        verifyLength();
-        //监听提交
-        form.on('submit(save)', function(data) {
-            var arr=new Array();
-            $("input:checkbox[name='chk']:checked").each(function (i) {
-                arr[i]=$(this).val();
-            })
-            data.field.chk=arr.join(",");
-            var f=data.field;
-            if(f.chk==""){
-                layer.msg("请选择可用身份",{icon:5})
                 return false;
+            });
+
+            window.setIconName = function (iconName) {
+                $("#icon").val(iconName);
             }
-            if($("#school").is(":visible")){
-                if(for_school==0&&for_bureau==0){
-                    layer.msg("请选择是否为学校管理员",{icon:5})
-                    return false;
-                }
-            }
-            console.log(f);
-            $.ajax({
-                url:'/dsBase/menu/UpdateMenu',
-                type:"POST",
-                dataType:'json',
-                data:{
-                    menu_id:id,
-                    sort_id:f.sort_id,
-                    menu_name:f.name,
-                    url:f.url,
-                    memo:f.memo,
-                    identity_ids:f.chk,
-                    for_school:for_school,
-                    for_bureau:for_bureau
-                },
-                success:function(data){
-                    if(data.success){
-                        layer.msg("修改成功", {icon: 1,time:1000,shade : [0.5 , '#000' , true]}, function() {
-                            var index = parent.layer.getFrameIndex(window.name);
-                            parent.layer.close(index);
-                            window.parent.treeReload(id);
-                        });
-                    }else{
-                        layer.alert(data.message,{icon:0})
-                    }
+
+            $("#selectIcon").click(function () {
+                layer.open({
+                    type: 2,
+                    area: ['500px', '450px'],
+                    fix: false, //不固定
+                    maxmin: true,
+                    shadeClose: false,
+                    shade: 0.4,
+                    title: '选择图标',
+                    content: './icons.html'
+                });
+            });
+
+            form.on('switch(switchTest)', function (data) {
+                if (this.checked) {
+                    isfullFlag = 1;
+                } else {
+                    isfullFlag = 0;
                 }
-            })
+            });
 
-            return false;
         });
-
-    });
-</script>
+    </script>
 </body>
 
 </html>
\ No newline at end of file