去除字样

jero-boot/db/Dockerfile

@@ -8,6 +8,6 @@ RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 COPY ./tables_nacos.sql /docker-entrypoint-initdb.d
 
-COPY jeroboot-mysql-5.7-20220224.sql /docker-entrypoint-initdb.d
+COPY jeroboot-mysql-5.7-20220331.sql /docker-entrypoint-initdb.d
 
 COPY ./tables_xxl_job.sql /docker-entrypoint-initdb.d

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java

@@ -29,7 +29,7 @@ import com.jero.common.util.oConvertUtils;
 public class JwtUtil {
 
 	// Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
-	public static final long EXPIRE_TIME = 30 * 60 * 1000;
+	public static final long EXPIRE_TIME = 60 * 60 * 1000;
 
 	/**
 	 * 校验token是否正确

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.modules.system.service.impl;
 
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.RSA;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
@@ -71,7 +72,12 @@ public class LoginServiceImpl implements ILoginService {
         String username = sysLoginModel.getUsername();
         String password = sysLoginModel.getPassword();
         String rsaPublicKey = sysLoginModel.getRsaPublicKey();
-        String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
+        String rsaPrivateKey = redisUtil.get(rsaPublicKey) != null ? String.valueOf(redisUtil.get(rsaPublicKey)) : null;
+
+        if(StrUtil.isEmpty(rsaPrivateKey)){
+            return result.error500("页面过期，请刷新页面");
+        }
+
         //update-begin--Author:scott  Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
         //前端密码加密，后端进行密码解密
         //password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密

jero-web/src/components/JVxeCells/JVxePopupCell.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script>
-  import JVxeCellMixins, { dispatchEvent, vModel } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins'
+  import JVxeCellMixins, { dispatchEvent, vModel } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
 
   export default {
     name: 'JVxePopupCell',

jero-web/src/components/jero/README.md

@@ -88,7 +88,7 @@ fieldList结构示例：
 ----
 1.import之后再components之内声明
 ```vue
-import JSuperQuery from '@/components/jeecg/JSuperQuery.vue';
+import JSuperQuery from '@/components/jero/JSuperQuery.vue';
   export default {
     name: "JeroDemoList",
     components: {

jero-web/src/components/tools/UserMenu.vue

@@ -27,7 +27,7 @@
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
     <span class="action">
-      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
+      <a class="logout_title" target="_blank" href="#">
         <a-icon type="question-circle-o"></a-icon>
       </a>
     </span>

jero-web/src/store/modules/user.js

@@ -124,7 +124,7 @@ const user = {
           sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
           sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
           if (menuData && menuData.length > 0) {
-            //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
+            //update--begin--autor:qinfeng-----date:20200109------for： 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
             menuData.forEach((item, index) => {
               if (item["children"]) {
                 let hasChildrenMenu = item["children"].filter((i) => {
@@ -136,7 +136,7 @@ const user = {
               }
             })
             //console.log(" menu show json ", menuData)
-            //update--end--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
+            //update--end--autor:qinfeng-----date:20200109------for： 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
             commit('SET_PERMISSIONLIST', menuData)
           } else {
             reject('getPermissionList: permissions must be a non-null array !')

jero-web/src/views/demo/ImagPreview.vue

@@ -72,20 +72,20 @@
           key:0,
           fileDetails:[
             {
-              imgUrl:"https://static.jeecg.com/upload/test/3a4490d5d1cd495b826e528537a47cc1.jpg"
+              imgUrl:"https://static.jero.com/upload/test/3a4490d5d1cd495b826e528537a47cc1.jpg"
             },
             {
-              imgUrl:"https://static.jeecg.com/temp/国炬软件logo_1606575029126.png"
+              imgUrl:"https://static.jero.com/temp/国炬软件logo_1606575029126.png"
             }
           ]
         },{
           key:1,
           fileDetails:[
             {
-              imgUrl:"https://static.jeecg.com/upload/test/u27356337152749454924fm27gp0_1588149731821.jpg"
+              imgUrl:"https://static.jero.com/upload/test/u27356337152749454924fm27gp0_1588149731821.jpg"
             },
             {
-              imgUrl:"https://static.jeecg.com/upload/test/1_1588149743473.jpg"
+              imgUrl:"https://static.jero.com/upload/test/1_1588149743473.jpg"
             }
           ]
         }

jero-web/src/views/demo/SelectDemo.vue

@@ -464,7 +464,7 @@
   import JSelectMultiple from '@/components/jero/JSelectMultiple'
   import JTreeDict from "../../components/jero/JTreeDict.vue";
   import JCron from "@/components/jero/JCron.vue";
-  import JEasyCron from "@/components/jeecg/JEasyCron";
+  import JEasyCron from "@/components/jero/JEasyCron";
   import JTreeSelect from '@/components/jero/JTreeSelect'
   import JSuperQuery from '@/components/jero/JSuperQuery'
   import JUpload from '@/components/jero/JUpload'
@@ -516,8 +516,8 @@
           orgCodes: 'A02A01,A02A02',
           departId: '57197590443c44f083d42ae24ef26a2c,a7d7e77e06c84325a40932163adcdaa6',
           userIds: 'admin',
-          multiUser: 'admin,jeecg',
-          jCheckbox: 'spring,jeecgboot',
+          multiUser: 'admin,jero',
+          jCheckbox: 'spring,jeroboot',
           jCodeEditor: `function sayHi(word) {\n  alert(word)\n}\nsayHi('hello, world!')`,
           jDate: '2019-5-10 15:33:06',
           jEditor: '<h2 style="text-align: center;">富文本编辑器</h2> <p>这里是富文本编辑器。</p>',
@@ -530,8 +530,8 @@
           cronExpression: '* * * * * ? *',
         },
         jCheckboxOptions: [
-          {label: 'Jeecg', value: 'jeecg'},
-          {label: 'Jeecg-Boot', value: 'jeecgboot'},
+          {label: 'jero', value: 'jero'},
+          {label: 'jero-Boot', value: 'jeroboot'},
           {label: 'Spring', value: 'spring', disabled: true},
           {label: 'MyBaits', value: 'mybatis'}
         ],

jero-web/src/views/system/modules/QuartzJobModal.vue

@@ -35,7 +35,7 @@
 
 <script>
   import { httpAction } from '@/api/manage'
-  import cronValidator from "@/components/jeecg/JEasyCron/validator";
+  import cronValidator from "@/components/jero/JEasyCron/validator";
 
   export default {
     name: "QuartzJobModal",