| pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/lxzn/common/Result.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/lxzn/config/Swagger2Config.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/lxzn/modules/assembly2/controller/AssemblyCollectionJobController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-prod.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-test.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -76,13 +76,6 @@ <scope>runtime</scope> </dependency> <!-- knife4j --> <dependency> <groupId>com.github.xiaoymin</groupId> <artifactId>knife4j-spring-boot-starter</artifactId> <version>${knife4j-spring-boot-starter.version}</version> </dependency> <!-- Lombok --> <dependency> <groupId>org.projectlombok</groupId> src/main/java/com/lxzn/common/Result.java
@@ -1,8 +1,6 @@ package com.lxzn.common; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -14,7 +12,6 @@ * @date 2019å¹´1æ19æ¥ */ @Data @ApiModel(value = "æ¥å£è¿å对象", description = "æ¥å£è¿å对象") public class Result<T> implements Serializable { private static final long serialVersionUID = 1L; @@ -22,31 +19,26 @@ /** * æåæ å¿ */ @ApiModelProperty(value = "æåæ å¿") private boolean success = true; /** * è¿åå¤çæ¶æ¯ */ @ApiModelProperty(value = "è¿åå¤çæ¶æ¯") private String message = ""; /** * è¿å代ç */ @ApiModelProperty(value = "è¿å代ç ") private Integer code = 0; /** * è¿åæ°æ®å¯¹è±¡ data */ @ApiModelProperty(value = "è¿åæ°æ®å¯¹è±¡") private T result; /** * æ¶é´æ³ */ @ApiModelProperty(value = "æ¶é´æ³") private long timestamp = System.currentTimeMillis(); public Result() { src/main/java/com/lxzn/config/Swagger2Config.java
ÎļþÒÑɾ³ý src/main/java/com/lxzn/modules/assembly2/controller/AssemblyCollectionJobController.java
@@ -3,8 +3,6 @@ import com.lxzn.common.Result; import com.lxzn.modules.assembly2.entity.TcOpstate; import com.lxzn.modules.assembly2.service.ITcOpstateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,14 +10,12 @@ import java.util.List; @Api(tags = "2å·è£ é 线éé") @RestController @RequestMapping("/assembly2/job") public class AssemblyCollectionJobController { @Autowired private ITcOpstateService tcOpstateService; @ApiOperation(value = "2å·è£ é 线éé-设å¤ç¶æ", notes = "2å·è£ é 线éé-设å¤ç¶æ") @GetMapping("/opstate") public Result<?> testOpStateList(){ List<TcOpstate> list = tcOpstateService.list(); src/main/resources/application-dev.yml
@@ -62,14 +62,4 @@ # è¿ä¸ªé ç½®ä¼å°æ§è¡çsqlæå°åºæ¥ï¼å¨å¼åææµè¯çæ¶åå¯ä»¥ç¨ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # è¿åç±»å为Map,æ¾ç¤ºnull对åºçå段 call-setters-on-nulls: true #swagger knife4j: #å¼å¯å¢å¼ºé ç½® enable: true #å¼å¯ç产ç¯å¢å±è½ production: false basic: enable: false username: jeecg password: jeecg1314 call-setters-on-nulls: true src/main/resources/application-prod.yml
@@ -1,100 +1,6 @@ server: port: 6099 tomcat: max-swallow-size: -1 error: include-exception: true include-stacktrace: ALWAYS include-message: ALWAYS servlet: context-path: compression: enabled: true min-response-size: 1024 mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: endpoints: web: exposure: include: metrics,httptrace port: 19988 spring: servlet: multipart: max-file-size: 10MB max-request-size: 10MB mail: host: smtp.163.com username: jeecgos@163.com password: ?? properties: mail: smtp: auth: true starttls: enable: true required: true ## quartzå®æ¶ä»»å¡,éç¨æ°æ®åºæ¹å¼ quartz: job-store-type: jdbc initialize-schema: embedded #å®æ¶ä»»å¡å¯å¨å¼å ³ï¼true-å¼ false-å ³ auto-startup: true #延è¿1ç§å¯å¨å®æ¶ä»»å¡ startup-delay: 1s #å¯å¨æ¶æ´æ°å·±åå¨çJob overwrite-existing-jobs: true properties: org: quartz: scheduler: instanceName: MyScheduler instanceId: AUTO jobStore: selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ? # class: org.springframework.scheduling.quartz.LocalDataSourceJobStore # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate # tablePrefix: QRTZ_ # isClustered: true # misfireThreshold: 12000 # clusterCheckinInterval: 15000 threadPool: class: org.quartz.simpl.SimpleThreadPool threadCount: 10 threadPriority: 5 threadsInheritContextClassLoaderOfInitializingThread: true #json æ¶é´æ³ç»ä¸è½¬æ¢ jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 jpa: open-in-view: false database-platform: org.hibernate.dialect.SQLServerDialect aop: proxy-target-class: true #é ç½®freemarker freemarker: # 设置模æ¿åç¼å suffix: .ftl # 设置æ档类å content-type: text/html # 设置页é¢ç¼ç æ ¼å¼ charset: UTF-8 # 设置页é¢ç¼å cache: false prefer-file-system-access: false # 设置ftlæä»¶è·¯å¾ template-loader-path: - classpath:/templates # 设置éææ件路å¾ï¼js,cssç mvc: static-path-pattern: /** #Spring Boot 2.6+åæ å°å¹é çé»è®¤çç¥å·²ä»AntPathMatcheræ´æ¹ä¸ºPathPatternParser,éè¦æå¨æå®ä¸ºant-path-matcher pathmatch: matching-strategy: ant_path_matcher resource: static-locations: classpath:/static/,classpath:/public/ autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: @@ -112,7 +18,7 @@ # åå§å大å°ï¼æå°ï¼æ大 initial-size: 5 min-idle: 5 maxActive: 1000 maxActive: 20 # é ç½®è·åè¿æ¥çå¾ è¶ æ¶çæ¶é´ maxWait: 60000 # é ç½®é´éå¤ä¹ æè¿è¡ä¸æ¬¡æ£æµï¼æ£æµéè¦å ³éç空é²è¿æ¥ï¼åä½æ¯æ¯«ç§ @@ -132,19 +38,18 @@ connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: url: jdbc:sqlserver://10.210.199.2:1433;databasename=LXZN_MDC_XHJ url: jdbc:sqlserver://127.0.0.1:1433;databasename=LXZN_TEST_XHJ_20250728;nullCatalogMeansCurrent=true username: sa password: Lxzn1688 password: sa123 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver #redis é ç½® redis: database: 0 host: 127.0.0.1 port: 6379 password: '1qaz@WSX' assembly2: url: jdbc:sqlserver://127.0.0.1:1433;databasename=XHJ-HUB3Line;nullCatalogMeansCurrent=true username: sa password: sa123 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml mapper-locations: classpath*:com/lxzn/modules/**/xml/*Mapper.xml global-config: # å ³éMP3.0èªå¸¦çbanner banner: false @@ -155,156 +60,6 @@ table-underline: true configuration: # è¿ä¸ªé ç½®ä¼å°æ§è¡çsqlæå°åºæ¥ï¼å¨å¼åææµè¯çæ¶åå¯ä»¥ç¨ #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # è¿åç±»å为Map,æ¾ç¤ºnull对åºçå段 call-setters-on-nulls: true #jeecgä¸ç¨é ç½® minidao: base-package: org.jeecg.modules.jmreport.* jeecg: # æ¯å¦å¯ç¨å®å ¨æ¨¡å¼ safeMode: false # ç¾åå¯é¥ä¸²(åå端è¦ä¸è´ï¼æ£å¼åå¸è¯·èªè¡ä¿®æ¹) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # ç¾åæ¦æªæ¥å£ signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys #localãminioãalioss uploadType: local # å端访é®å°å domainUrl: pc: http://localhost:3100 app: http://localhost:8051 path: #æ件ä¸ä¼ æ ¹ç®å½ 设置 upload: C://opt//upFiles #webappæä»¶è·¯å¾ webapp: C://opt//upFiles shiro: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo #é¿éäºossåå¨å大鱼çä¿¡ç§é¥é ç½® oss: accessKey: ?? secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev staticDomain: https://static.jeecg.com # ElasticSearch 设置 elasticsearch: cluster-name: jeecg-ES cluster-nodes: 127.0.0.1:9200 check-enabled: false # å¨çº¿é¢è§æ件æå¡å¨å°åé ç½® file-view-domain: http://fileview.jeecg.com # minioæ件ä¸ä¼ minio: minio_url: http://minio.jeecg.com minio_name: ?? minio_pass: ?? bucketName: otatest #大å±æ¥è¡¨åæ°è®¾ç½® jmreport: mode: prod #æ°æ®åå ¸æ¯å¦è¿è¡saasæ°æ®é离ï¼èªå·±çèªå·±çåå ¸ saas: false #æ¯å¦éè¦æ ¡éªtoken is_verify_token: true #å¿ é¡»æ ¡éªæ¹æ³ verify_methods: remove,delete,save,add,update #åå¸å¼éé ç½® redisson: address: 127.0.0.1:6379 password: type: STANDALONE enabled: true #casåç¹ç»å½ cas: prefixUrl: http://cas.example.org:8443/cas #Mybatisè¾åºsqlæ¥å¿ logging: level: org.jeecg.modules.system.mapper: info #swagger knife4j: #å¼å¯å¢å¼ºé ç½® enable: true #å¼å¯ç产ç¯å¢å±è½ production: false basic: enable: true username: jeecg password: jeecg1314 #第ä¸æ¹ç»å½ justauth: enabled: true type: GITHUB: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback WECHAT_ENTERPRISE: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback agent-id: ?? DINGTALK: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback WECHAT_OPEN: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback cache: type: default prefix: 'demo::' timeout: 1h #第ä¸æ¹APPå¯¹æ¥ third-app: enabled: false type: #ä¼ä¸å¾®ä¿¡ WECHAT_ENTERPRISE: enabled: false #CORP_ID client-id: ?? #SECRET client-secret: ?? #èªå»ºåºç¨id agent-id: ?? #èªå»ºåºç¨ç§é¥ï¼æ°çä¼å¾®éè¦é ç½®ï¼ # agent-app-secret: ?? #éé DINGTALK: enabled: false # appKey client-id: ?? # appSecret client-secret: ?? agent-id: ?? webservice: url: http://10.101.0.182:8002/MesWebService/WebService.asmx?wsdl namespace: http://tempuri.org/ # SAP RFCæ¹å¼æ¥å£éæ sap: rfc: destination: SAP_RFC_DEST # èªå®ä¹çç®æ å°å RFC ç®æ å称 ashost: 10.101.0.188 # SAP 主æºå°å sysnr: '00' # ç³»ç»ç¼å· client: 800 # 客æ·ç«¯ç¼å· user: SLSAP_JK # ç¨æ·å passwd: 112233 # å¯ç lang: ZH # è¯è¨ poolSize: 5 # 线ç¨æ± æ°é expirationTime: 10000 # è¿ææ¶é´ peekLimit: 10 # å³°å¼ feishu: url: https://open.feishu.cn/ appId: cli_a74aab6353b7d00e appSecret: mx5wm7X9S8WSzZCOYlxcggXTFL8iujIT sync: departmentId: od-47692f32e6b66cc3985d317fee780a8b xhj: factoryCode: 2301 orderType: Z001 productionManager: 012 orderStatus: REL call-setters-on-nulls: true src/main/resources/application-test.yml
@@ -1,100 +1,6 @@ server: port: 8091 tomcat: max-swallow-size: -1 error: include-exception: true include-stacktrace: ALWAYS include-message: ALWAYS servlet: context-path: compression: enabled: true min-response-size: 1024 mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: endpoints: web: exposure: include: metrics,httptrace port: 19988 spring: servlet: multipart: max-file-size: 10MB max-request-size: 10MB mail: host: smtp.163.com username: jeecgos@163.com password: ?? properties: mail: smtp: auth: true starttls: enable: true required: true ## quartzå®æ¶ä»»å¡,éç¨æ°æ®åºæ¹å¼ quartz: job-store-type: jdbc initialize-schema: embedded #å®æ¶ä»»å¡å¯å¨å¼å ³ï¼true-å¼ false-å ³ auto-startup: true #延è¿1ç§å¯å¨å®æ¶ä»»å¡ startup-delay: 1s #å¯å¨æ¶æ´æ°å·±åå¨çJob overwrite-existing-jobs: true properties: org: quartz: scheduler: instanceName: MyScheduler instanceId: AUTO jobStore: selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ? # class: org.springframework.scheduling.quartz.LocalDataSourceJobStore # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate # tablePrefix: QRTZ_ # isClustered: true # misfireThreshold: 12000 # clusterCheckinInterval: 15000 threadPool: class: org.quartz.simpl.SimpleThreadPool threadCount: 10 threadPriority: 5 threadsInheritContextClassLoaderOfInitializingThread: true #json æ¶é´æ³ç»ä¸è½¬æ¢ jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 jpa: open-in-view: false database-platform: org.hibernate.dialect.SQLServerDialect aop: proxy-target-class: true #é ç½®freemarker freemarker: # 设置模æ¿åç¼å suffix: .ftl # 设置æ档类å content-type: text/html # 设置页é¢ç¼ç æ ¼å¼ charset: UTF-8 # 设置页é¢ç¼å cache: false prefer-file-system-access: false # 设置ftlæä»¶è·¯å¾ template-loader-path: - classpath:/templates # 设置éææ件路å¾ï¼js,cssç mvc: static-path-pattern: /** #Spring Boot 2.6+åæ å°å¹é çé»è®¤çç¥å·²ä»AntPathMatcheræ´æ¹ä¸ºPathPatternParser,éè¦æå¨æå®ä¸ºant-path-matcher pathmatch: matching-strategy: ant_path_matcher resource: static-locations: classpath:/static/,classpath:/public/ autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: @@ -132,33 +38,18 @@ connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: url: jdbc:sqlserver://192.168.0.118:1433;databasename=LXZN_TEST_430 # url: jdbc:sqlserver://30036q420j.yicp.fun:11047;databasename=LXZN_TEST_430 # url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_430 url: jdbc:sqlserver://127.0.0.1:1433;databasename=LXZN_TEST_XHJ_20250728;nullCatalogMeansCurrent=true username: sa # password: LXZN@1688 password: 123 # password: 123456 password: sa123 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai #username: root #password: root #driver-class-name: com.mysql.cj.jdbc.Driver # å¤æ°æ®æºé ç½® #multi-datasource1: # url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test # username: sa # password: 123 # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver #redis é ç½® redis: database: 0 host: 127.0.0.1 port: 6381 password: assembly2: url: jdbc:sqlserver://127.0.0.1:1433;databasename=XHJ-HUB3Line;nullCatalogMeansCurrent=true username: sa password: sa123 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml mapper-locations: classpath*:com/lxzn/modules/**/xml/*Mapper.xml global-config: # å ³éMP3.0èªå¸¦çbanner banner: false @@ -171,126 +62,4 @@ # è¿ä¸ªé ç½®ä¼å°æ§è¡çsqlæå°åºæ¥ï¼å¨å¼åææµè¯çæ¶åå¯ä»¥ç¨ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # è¿åç±»å为Map,æ¾ç¤ºnull对åºçå段 call-setters-on-nulls: true #jeecgä¸ç¨é ç½® minidao: base-package: org.jeecg.modules.jmreport.* jeecg: # æ¯å¦å¯ç¨å®å ¨æ¨¡å¼ safeMode: false # ç¾åå¯é¥ä¸²(åå端è¦ä¸è´ï¼æ£å¼åå¸è¯·èªè¡ä¿®æ¹) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # ç¾åæ¦æªæ¥å£ signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys # local\minio\alioss uploadType: local # å端访é®å°å domainUrl: pc: http://localhost:3100 app: http://localhost:8051 path: #æ件ä¸ä¼ æ ¹ç®å½ 设置 upload: D://opt//upFiles #webappæä»¶è·¯å¾ webapp: D://opt//webapp shiro: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #é¿éäºossåå¨å大鱼çä¿¡ç§é¥é ç½® oss: accessKey: ?? secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES cluster-nodes: 127.0.0.1:9200 check-enabled: false # å¨çº¿é¢è§æ件æå¡å¨å°åé ç½® file-view-domain: 127.0.0.1:8012 # minioæ件ä¸ä¼ minio: minio_url: http://minio.jeecg.com minio_name: ?? minio_pass: ?? bucketName: otatest #大å±æ¥è¡¨åæ°è®¾ç½® jmreport: mode: dev #æ°æ®åå ¸æ¯å¦è¿è¡saasæ°æ®é离ï¼èªå·±çèªå·±çåå ¸ saas: false #æ¯å¦éè¦æ ¡éªtoken is_verify_token: true #å¿ é¡»æ ¡éªæ¹æ³ verify_methods: remove,delete,save,add,update #åå¸å¼éé ç½® redisson: address: 127.0.0.1:6379 password: type: STANDALONE enabled: true #Mybatisè¾åºsqlæ¥å¿ logging: level: org.jeecg.modules.system.mapper: info #casåç¹ç»å½ cas: prefixUrl: http://cas.example.org:8443/cas #swagger knife4j: #å¼å¯å¢å¼ºé ç½® enable: true #å¼å¯ç产ç¯å¢å±è½ production: false basic: enable: false username: jeecg password: jeecg1314 #第ä¸æ¹ç»å½ justauth: enabled: true type: GITHUB: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback WECHAT_ENTERPRISE: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback agent-id: ?? DINGTALK: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback WECHAT_OPEN: client-id: ?? client-secret: ?? redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback cache: type: default prefix: 'demo::' timeout: 1h #第ä¸æ¹APPå¯¹æ¥ third-app: enabled: false type: #ä¼ä¸å¾®ä¿¡ WECHAT_ENTERPRISE: enabled: false #CORP_ID client-id: ?? #SECRET client-secret: ?? #èªå»ºåºç¨id agent-id: ?? #èªå»ºåºç¨ç§é¥ï¼æ°çä¼å¾®éè¦é ç½®ï¼ # agent-app-secret: ?? #éé DINGTALK: enabled: false # appKey client-id: ?? # appSecret client-secret: ?? agent-id: ?? call-setters-on-nulls: true
