diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 56378f35..b34ed5d4 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 18082 + port: 18083 tomcat: max-swallow-size: -1 error: @@ -133,7 +133,7 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://182.92.169.222:3306/comp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://182.92.169.222:3306/hnjd_comp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: ycwl2022. driver-class-name: com.mysql.cj.jdbc.Driver @@ -145,7 +145,7 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 2 + database: 3 host: 182.92.169.222 port: 6379 password: 'redis@ycwl2022.' diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 110226a7..ae0daeab 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 18082 + port: 18083 tomcat: max-swallow-size: -1 error: @@ -133,7 +133,7 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://182.92.169.222:3306/comp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://182.92.169.222:3306/hnjd_comp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: ycwl2022. driver-class-name: com.mysql.cj.jdbc.Driver @@ -145,7 +145,7 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 2 + database: 3 host: 182.92.169.222 port: 6379 password: 'redis@ycwl2022.' diff --git a/jeecgboot-vue3-master/.env b/jeecgboot-vue3-master/.env index cd7aac7b..fd91e2f3 100644 --- a/jeecgboot-vue3-master/.env +++ b/jeecgboot-vue3-master/.env @@ -1,8 +1,8 @@ # port -VITE_PORT = 3100 +VITE_PORT = 3200 # 网站标题 -VITE_GLOB_APP_TITLE = 国际教育学院比赛综合管理系统 +VITE_GLOB_APP_TITLE = 大数据双创应用竞赛管理系统 # 简称，用于配置文件名字 不要出现空格、数字开头等特殊字符 VITE_GLOB_APP_SHORT_NAME = JeecgBootAdmin diff --git a/jeecgboot-vue3-master/.env.development b/jeecgboot-vue3-master/.env.development index ebba404f..1b91645a 100644 --- a/jeecgboot-vue3-master/.env.development +++ b/jeecgboot-vue3-master/.env.development @@ -5,7 +5,7 @@ VITE_USE_MOCK = true VITE_PUBLIC_PATH = / # 跨域代理，您可以配置多个 ,请注意，没有换行符 -VITE_PROXY = [["/jeecgboot","http://localhost:18082/jeecg-boot"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/jeecgboot","http://localhost:18083/jeecg-boot"],["/upload","http://localhost:3300/upload"]] # 控制台不输出 VITE_DROP_CONSOLE = false @@ -14,7 +14,7 @@ VITE_DROP_CONSOLE = false VITE_GLOB_API_URL=/jeecgboot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:18082/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:18083/jeecg-boot # 接口前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/jeecgboot-vue3-master/.env.production b/jeecgboot-vue3-master/.env.production index 54b2c68b..b937151b 100644 --- a/jeecgboot-vue3-master/.env.production +++ b/jeecgboot-vue3-master/.env.production @@ -16,10 +16,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=http://10.100.200.177:18082/jeecg-boot +VITE_GLOB_API_URL=http://10.100.200.177:18083/jeecg-boot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://10.100.200.177:18082/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://10.100.200.177:18083/jeecg-boot # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/jeecgboot-vue3-master/public/logo.png b/jeecgboot-vue3-master/public/logo.png index 97a3871e..3a4935d9 100644 Binary files a/jeecgboot-vue3-master/public/logo.png and b/jeecgboot-vue3-master/public/logo.png differ diff --git a/jeecgboot-vue3-master/public/resource/img/comp/appLogo.png b/jeecgboot-vue3-master/public/resource/img/comp/appLogo.png index b962bd37..3a4935d9 100644 Binary files a/jeecgboot-vue3-master/public/resource/img/comp/appLogo.png and b/jeecgboot-vue3-master/public/resource/img/comp/appLogo.png differ diff --git a/jeecgboot-vue3-master/public/resource/img/comp/comp_ad.png b/jeecgboot-vue3-master/public/resource/img/comp/comp_ad.png index 35ff69e7..1179c2d4 100644 Binary files a/jeecgboot-vue3-master/public/resource/img/comp/comp_ad.png and b/jeecgboot-vue3-master/public/resource/img/comp/comp_ad.png differ diff --git a/jeecgboot-vue3-master/public/resource/img/comp/comp_bg.png b/jeecgboot-vue3-master/public/resource/img/comp/comp_bg.png index 22fb857f..5ff942a0 100644 Binary files a/jeecgboot-vue3-master/public/resource/img/comp/comp_bg.png and b/jeecgboot-vue3-master/public/resource/img/comp/comp_bg.png differ diff --git a/jeecgboot-vue3-master/public/resource/img/comp/comp_logo.png b/jeecgboot-vue3-master/public/resource/img/comp/comp_logo.png index 35ff69e7..5058f4a5 100644 Binary files a/jeecgboot-vue3-master/public/resource/img/comp/comp_logo.png and b/jeecgboot-vue3-master/public/resource/img/comp/comp_logo.png differ diff --git a/jeecgboot-vue3-master/src/assets/images/comp/appLogo.png b/jeecgboot-vue3-master/src/assets/images/comp/appLogo.png index b962bd37..3a4935d9 100644 Binary files a/jeecgboot-vue3-master/src/assets/images/comp/appLogo.png and b/jeecgboot-vue3-master/src/assets/images/comp/appLogo.png differ diff --git a/jeecgboot-vue3-master/src/assets/loginmini/icon/黄淮学院北门.png b/jeecgboot-vue3-master/src/assets/loginmini/icon/黄淮学院北门.png deleted file mode 100644 index 2f8a425a..00000000 Binary files a/jeecgboot-vue3-master/src/assets/loginmini/icon/黄淮学院北门.png and /dev/null differ diff --git a/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts b/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts index 7a92ad10..b90bd27e 100644 --- a/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts +++ b/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts @@ -68,7 +68,7 @@ export default { forgetFormTitle: '重置密码', signInTitle: '', - signInDesc: '国际教育学院比赛综合管理系统', + signInDesc: '大数据双创应用竞赛管理系统', policy: '我同意敲敲云隐私政策', scanSign: `扫码后，即可完成登录`, scanSuccess: `扫码成功，登录中`, diff --git a/jeecgboot-vue3-master/src/views/sys/login/TokenLoginPage.vue b/jeecgboot-vue3-master/src/views/sys/login/TokenLoginPage.vue index 5f7d1879..99ad3bfe 100644 --- a/jeecgboot-vue3-master/src/views/sys/login/TokenLoginPage.vue +++ b/jeecgboot-vue3-master/src/views/sys/login/TokenLoginPage.vue @@ -1,11 +1,11 @@ @@ -19,7 +19,7 @@ import { useMessage } from '/@/hooks/web/useMessage'; import { useUserStore } from '/@/store/modules/user'; import { useI18n } from '/@/hooks/web/useI18n'; - + export default { name: "TokenLogin", setup(){ @@ -31,7 +31,7 @@ if(!routeQuery){ createMessage.warning('参数无效') } - + const token = routeQuery['loginToken']; if(!token){ createMessage.warning('token无效') @@ -53,7 +53,7 @@ duration: 4, }); } - + function requestSuccess(res){ let info = routeQuery.info; if(info){ @@ -206,4 +206,4 @@ } } - \ No newline at end of file +