From f4c843733cc6e1c92b91626050b5ab3179d1d10a Mon Sep 17 00:00:00 2001 From: liupopo Date: Tue, 5 Sep 2023 09:34:13 +0800 Subject: [PATCH 1/2] 1 --- warehousing-system/project_web_ui/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warehousing-system/project_web_ui/src/main.js b/warehousing-system/project_web_ui/src/main.js index c5a769f5..ec937bbc 100644 --- a/warehousing-system/project_web_ui/src/main.js +++ b/warehousing-system/project_web_ui/src/main.js @@ -25,7 +25,7 @@ import axios from 'axios' /* 设定axios的请求根目录 */ // axios.defaults.baseURL = 'http://192.168.1.193:9050/' -axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/' +axios.defaults.baseURL = '/warehouseapi/' // import '@/permission' //权限控制 Vue.prototype.$http = axios Vue.prototype.$userInfo = null // 用户信息 From 1bf99ef6ed1893ca0b7f6ac076df2c855f4dbbdc Mon Sep 17 00:00:00 2001 From: liupopo Date: Tue, 5 Sep 2023 15:15:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=86=E5=B1=B1=E6=B5=B7=E5=85=89?= =?UTF-8?q?=E4=BC=8F=E9=A1=B9=E7=9B=AE=E7=A7=BB=E5=88=B0=E5=A4=96=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-supervise-guanfu/pom.xml | 19 ---- .../yxt-supervise-guanfu-api/pom.xml | 44 --------- .../supervise/guanfu/api/package-info.java | 4 - .../yxt-supervise-guanfu-biz/pom.xml | 91 ------------------- .../guanfu/YxtSuperviseCyfApplication.java | 18 ---- .../supervise/guanfu/biz/package-info.java | 4 - .../src/main/resources/application-devv.yml | 31 ------- .../src/main/resources/application-pro.yml | 28 ------ .../src/main/resources/application-test.yml | 30 ------ .../src/main/resources/application.yml | 47 ---------- .../src/main/resources/logback-spring.xml | 50 ---------- 项目说明.txt | 12 +++ 12 files changed, 12 insertions(+), 366 deletions(-) delete mode 100644 yxt-supervise-guanfu/pom.xml delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-api/pom.xml delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-api/src/main/java/com/yxt/supervise/guanfu/api/package-info.java delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/pom.xml delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/YxtSuperviseCyfApplication.java delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/biz/package-info.java delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-devv.yml delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-pro.yml delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-test.yml delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application.yml delete mode 100644 yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/logback-spring.xml create mode 100644 项目说明.txt diff --git a/yxt-supervise-guanfu/pom.xml b/yxt-supervise-guanfu/pom.xml deleted file mode 100644 index 91749e4a..00000000 --- a/yxt-supervise-guanfu/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - 4.0.0 - yxt-supervise-guanfu - - yxt-supervise-guanfu-api - yxt-supervise-guanfu-biz - - com.yxt.supervise.guanfu - 0.0.1 - - pom - 监管项目，光伏 - - \ No newline at end of file diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-api/pom.xml b/yxt-supervise-guanfu/yxt-supervise-guanfu-api/pom.xml deleted file mode 100644 index ea522b49..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-api/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - com.yxt - yxt-parent - 0.0.1 - - - 4.0.0 - - yxt-supervise-guanfu-api - com.yxt.supervise.guanfu - 0.0.1-SNAPSHOT - - - - com.yxt - yxt-common-core - 0.0.1 - - - org.projectlombok - lombok - 1.18.24 - true - - - - - - - nexus-releases - http://172.18.0.3:8081/repository/yxt-mvn-releases/ - - - nexus-snapshots - http://172.18.0.3:8081/repository/yxt-mvn-snapshot/ - - - - - \ No newline at end of file diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-api/src/main/java/com/yxt/supervise/guanfu/api/package-info.java b/yxt-supervise-guanfu/yxt-supervise-guanfu-api/src/main/java/com/yxt/supervise/guanfu/api/package-info.java deleted file mode 100644 index 3a05de6b..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-api/src/main/java/com/yxt/supervise/guanfu/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 宇信通监管项目-光伏项目-接口声明 - */ -package com.yxt.supervise.guanfu.api; \ No newline at end of file diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/pom.xml b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/pom.xml deleted file mode 100644 index 9f3e63aa..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - com.yxt - yxt-parent - 0.0.1 - - - 4.0.0 - - yxt-supervise-guanfu-biz - com.yxt.supervise.cyf - 0.0.1 - - - - com.yxt.supervise.guanfu - yxt-supervise-guanfu-api - 0.0.1-SNAPSHOT - - - com.yxt - yxt-common-base - 0.0.1 - - - - mysql - mysql-connector-java - runtime - - - - com.baomidou - mybatis-plus-boot-starter - - - com.baomidou - mybatis-plus-annotation - - - junit - junit - compile - - - javax.servlet - javax.servlet-api - 4.0.1 - compile - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.6 - - - - repackage - - - - - - - - src/main/java - - **/*Mapper.xml - - - - src/main/resources - - **/*.* - - false - - - - - \ No newline at end of file diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/YxtSuperviseCyfApplication.java b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/YxtSuperviseCyfApplication.java deleted file mode 100644 index e4590c0c..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/YxtSuperviseCyfApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.supervise.cyf; - - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author dimengzhe - */ -@SpringBootApplication(scanBasePackages = { - "com.yxt.common.base.config", - "com.yxt.supervise.cyf" -}) -public class YxtSuperviseCyfApplication { - public static void main(String[] args) { - SpringApplication.run(CrmApplication.class, args); - } -} diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/biz/package-info.java b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/biz/package-info.java deleted file mode 100644 index c3adc2f8..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/java/com/yxt/supervise/guanfu/biz/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 宇信通监管项目-光伏项目-业务逻辑 - */ -package com.yxt.supervise.guanfu.biz; \ No newline at end of file diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-devv.yml b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-devv.yml deleted file mode 100644 index 6bb843a4..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-devv.yml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - datasource: - hikari: - max-lifetime: 500000 - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/yxt_supervise_guanfu?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true - username: root - password: root - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 - redis: - database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 - jedis: - pool: - max-active: -1 #连接池最大连接数（使用负值表示没有限制） - max-idle: 8 #连接池中的最大空闲连接 - max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - password: - port: 6379 - timeout: 0 # 连接超时时间（毫秒） - -image: - upload: - path: D:\supervise\upload\ - url: - prefix: http://127.0.0.1:8112/upload/ - diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-pro.yml b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-pro.yml deleted file mode 100644 index be94367e..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-pro.yml +++ /dev/null @@ -1,28 +0,0 @@ -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 - username: root - password: root - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 - redis: - database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 - jedis: - pool: - max-active: -1 #连接池最大连接数（使用负值表示没有限制） - max-idle: 8 #连接池中的最大空闲连接 - max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 - port: 6379 - timeout: 0 # 连接超时时间（毫秒） -image: - upload: - path: D:\supervise\upload\ - url: - prefix: http://127.0.0.1/api/upload/ - diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-test.yml b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-test.yml deleted file mode 100644 index e4ee8ce0..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application-test.yml +++ /dev/null @@ -1,30 +0,0 @@ -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/yxt_supervise_guanfu?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true - username: root - password: 1LAiGz$t1*Iw - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 - redis: - database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 - jedis: - pool: - max-active: -1 #连接池最大连接数（使用负值表示没有限制） - max-idle: 8 #连接池中的最大空闲连接 - max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 - port: 6379 - timeout: 0 # 连接超时时间（毫秒） - - -image: - upload: - path: D:/webapps/supervise/static/upload/ - url: - prefix: http://122.14.222.186:7003/upload/ - diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application.yml b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application.yml deleted file mode 100644 index 2907a3db..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/application.yml +++ /dev/null @@ -1,47 +0,0 @@ -spring: - application: - name: supervise-crm - profiles: - active: devv -# active: test - messages: - # 国际化资源文件路径 - basename: i18n/messages - servlet: - #上传文件 - multipart: - max-file-size: 50MB - max-request-size: 100MB - devtools: - restart: - # 热部署开关 - enabled: true - - - -server: - port: 7101 - max-http-header-size: 102400 - undertow: - max-http-post-size: -1 - -#mybatis -mybatis-plus: - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapper-locations: classpath*:**Mapper.xml - global-config: - refresh: true - db-config: - #定义生成ID的类型 - id-type: Auto - db-type: mysql - configuration: - map-underscore-to-camel-case: false - cache-enabled: true - call-setters-on-nulls: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - - - - - diff --git a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/logback-spring.xml b/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/logback-spring.xml deleted file mode 100644 index e58d77b7..00000000 --- a/yxt-supervise-guanfu/yxt-supervise-guanfu-biz/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - - - - - - - - - ${log.base}.log - - ${log.base}.%d{yyyyMMdd}.%i.log.zip - - - - 1MB - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - -%msg%n - - - - - - - - - - \ No newline at end of file diff --git a/项目说明.txt b/项目说明.txt new file mode 100644 index 00000000..312c2f3e --- /dev/null +++ b/项目说明.txt @@ -0,0 +1,12 @@ + +醇油坊 +supervise/yxt-supervise-cyf yxt-supervise-cyf-biz-0.0.1.jar 端口号：7101 + +中鸿记 +supervise/yxt-supervise-dbcenter yxt-supervise-dbcenter-biz-0.0.1.jar 端口号：7109 + +山海光伏 +guangfu/yxt-supervise-gf yxt-supervise-gf-biz-0.0.1.jar 端口号：7102 + +国大36524 +jianguan/yxt-supervise-gd36524 yxt-supervise-gf-biz-0.0.1.jar 端口号：7103 \ No newline at end of file