Merge branch 'master' of http://182.92.169.222:3000/chaodf0105/zmd_cxq

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -90,7 +90,7 @@ public interface CommonConstant {
     /** 登录用户Shiro权限缓存KEY前缀 */
     public static String PREFIX_USER_SHIRO_CACHE  = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:";
     /** 登录用户Token令牌缓存KEY前缀 */
-    String PREFIX_USER_TOKEN  = "prefix_user_token:";
+    String PREFIX_USER_TOKEN  = "prefix_user_cxq_token:";
 //    /** Token缓存时间：3600秒即一小时 */
 //    int  TOKEN_EXPIRE_TIME  = 3600;
 

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 18086
+  port: 18088
   tomcat:
     max-swallow-size: -1
   error:
@@ -215,9 +215,9 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/upFiles
+    upload: /opt/cxq/upFiles
     #webapp文件路径
-    webapp: /opt/webapp
+    webapp: /opt/cxq/webapp
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置

jeecgboot-vue3/.env

@@ -2,7 +2,7 @@
 VITE_PORT = 3500
 
 #  网站标题
-VITE_GLOB_APP_TITLE = JeecgBoot 企业级低代码平台
+VITE_GLOB_APP_TITLE =创新券
 
 # 简称，此变量只能是字符/下划线
 VITE_GLOB_APP_SHORT_NAME = JeecgBoot_Pro

jeecgboot-vue3/.env.development

@@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = /
 
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
-VITE_PROXY = [["/jeecgboot","http://localhost:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://localhost:18088/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:18086/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://localhost:18088/jeecg-boot
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/jeecgboot

jeecgboot-vue3/.env.production

@@ -2,7 +2,7 @@
 VITE_USE_MOCK = false
 
 # 发布路径
-VITE_PUBLIC_PATH = /
+VITE_PUBLIC_PATH = '/cxq'
 
 # 是否启用gzip或brotli压缩
 # 选项值: gzip | brotli | none
@@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 #后台接口父地址(必填)
-VITE_GLOB_API_URL=/jeecgboot
+VITE_GLOB_API_URL=/cxqadmin
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://182.92.169.222:18088/jeecg-boot
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=

jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts

@@ -67,9 +67,9 @@ export default {
     signUpFormTitle: '注册',
     forgetFormTitle: '重置密码',
 
-    signInTitle: 'Jeecg Boot',
+    signInTitle: '创新卷',
-    signInDesc: '是中国最具影响力的 企业级低代码平台！在线开发，可视化拖拽设计，零代码实现80%的基础功能~',
+    signInDesc: '科技局创新卷',
-    policy: '我同意敲敲云隐私政策5',
+    policy: '我同意科技局隐私政策',
     scanSign: `扫码后，即可完成登录`,
     scanSuccess: `扫码成功，登录中`,
 

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JeecgPdfView.vue

@@ -15,7 +15,7 @@
           <a-col :span="24">
             <template v-if="file.filePdfPath">
               <div @click="pdfPreview(file.title)">
-                <img style="width: 80px; height: 80px" src="../../../assets/images/pdf4.jpg" />
+                <img style="width: 80px; height: 80px" src="/@/assets/images/pdf4.jpg" />
               </div>
             </template>
             <template v-else> (暂无材料，点击"选择文件"或"扫描上传"上传文件) </template>

jeecgboot-vue3/src/views/sys/login/TokenLoginPage.vue

@@ -5,7 +5,7 @@
             <div class="app-loading-dots">
                 <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
             </div>
-            <div class="app-loading-title">JeecgBoot 企业级低代码平台</div>
+            <div class="app-loading-title">创新券</div>
         </div>
     </div>
 </template>