diff --git a/jeecg-boot-master/ant-design-vue-jeecg/public/index.html b/jeecg-boot-master/ant-design-vue-jeecg/public/index.html index 589625c..2cae4c5 100644 --- a/jeecg-boot-master/ant-design-vue-jeecg/public/index.html +++ b/jeecg-boot-master/ant-design-vue-jeecg/public/index.html @@ -249,7 +249,7 @@ <div id="loader"></div> <div class="loader-section section-left"></div> <div class="loader-section section-right"></div> - <div class="load_title">正在加载 JeecgBoot 低代码平台,请耐心等待 + <div class="load_title">正在加载 华恒仓储管理系统,请耐心等待 </div> </div> diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue index 7f9f59e..3e905ea 100644 --- a/jeecg-boot-master/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue +++ b/jeecg-boot-master/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue @@ -177,7 +177,7 @@ // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题 changeTitle(title) { - let projectTitle = "Jeecg-Boot 企业级低代码平台" + let projectTitle = "华恒仓储管理系统" // 首页特殊处理 if (this.$route.path === indexKey) { document.title = projectTitle diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue index 4463912..2836f1e 100644 --- a/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue +++ b/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue @@ -17,8 +17,8 @@ :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/> - <span v-if="device === 'desktop'">欢迎进入 Jeecg-Boot 企业级低代码平台</span> - <span v-else>Jeecg-Boot</span> + <span v-if="device === 'desktop'">欢迎进入 华恒仓储管理系统</span> + <span v-else>华恒仓储管理系统</span> <user-menu :theme="theme"/> </div> diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/Logo.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/Logo.vue index 7808fba..34e31e4 100644 --- a/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/Logo.vue +++ b/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/Logo.vue @@ -3,8 +3,8 @@ <router-link :to="routerLinkTo"> <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 --> - <img v-if="navTheme === 'dark'" src="~@/assets/logo-white.png" alt="logo"> - <img v-else src="~@/assets/logo.svg" alt="logo"> + <img v-if="navTheme === 'dark'" src="~@/assets/huaheng.png" alt="logo"> + <img v-else src="~@/assets/huaheng.png" alt="logo"> <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 --> <h1 v-if="showTitle">{{ title }}</h1> @@ -21,7 +21,7 @@ props: { title: { type: String, - default: 'Jeecg-Boot Pro', + default: 'WMS', required: false }, showTitle: { diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/UserMenu.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/UserMenu.vue index 6efba61..4b6e7c3 100644 --- a/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/UserMenu.vue +++ b/jeecg-boot-master/ant-design-vue-jeecg/src/components/tools/UserMenu.vue @@ -26,11 +26,11 @@ <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件,在手机端呈现出弹出框 --> <!-- 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-icon type="question-circle-o"></a-icon> - </a> - </span> +<!-- <span class="action">--> +<!-- <a class="logout_title" target="_blank" href="http://doc.jeecg.com">--> +<!-- <a-icon type="question-circle-o"></a-icon>--> +<!-- </a>--> +<!-- </span>--> <header-notice class="action"/> <a-dropdown> <span class="action action-full ant-dropdown-link user-dropdown-menu"> diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/oauth2/OAuth2Login.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/oauth2/OAuth2Login.vue index b95fff0..90579ff 100644 --- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/oauth2/OAuth2Login.vue +++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/oauth2/OAuth2Login.vue @@ -4,7 +4,7 @@ <div id="loader"></div> <div class="loader-section section-left"></div> <div class="loader-section section-right"></div> - <div class="load_title">正在登录 JeecgBoot 低代码平台,请耐心等待</div> + <div class="load_title">正在登录 华恒仓储管理系统,请耐心等待</div> </div> </div> </template> diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml index 773d9a4..72496ed 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -131,9 +131,9 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: hhsoftware + password: HHsoft123. driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: