Skip to content

G
gs1-office-web-sit
Commit 675d3ffd by 吴迪
Options

【修改】伤心修改配置

parent 58122f4f
Showing with 205 additions and 19 deletions
src/main/java/io/office/modules/manage/controller/BranchController.java
......@@ -6,6 +6,7 @@ import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.office.common.annotation.SysLog;
import io.office.modules.app.annotation.Login;
import io.office.modules.manage.entity.CodeagentEntity;
import io.office.modules.manage.entity.DocEntity;
import io.office.modules.manage.service.CodeagentService;
......@@ -83,8 +84,8 @@ public class BranchController {
@Transactional
@RequestMapping("/update")
@RequiresPermissions("manage:branch:update")
public R update(@RequestBody BranchEntity branch){
branchService.updateById(branch);
public R update(@RequestBody CodeagentEntity codeagentEntity){
codeagentService.updateById(codeagentEntity);
return R.ok();
}
......@@ -102,7 +103,7 @@ public class BranchController {
branchCode=branchCode.trim();
}
}
branchService.removeByIds(Arrays.asList(branchCodes));
//branchService.removeByIds(Arrays.asList(branchCodes));
codeagentService.removeByIds(Arrays.asList(branchCodes));
return R.ok();
}
......
src/main/java/io/office/modules/manage/entity/BranchEntity.java
......@@ -15,7 +15,7 @@ import lombok.Data;
* @date 2021-12-05 14:35:52
*/
@Data
@TableName("center_outer.dbo.branch")
@TableName("center_sync.dbo.branch")
public class BranchEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
src/main/java/io/office/modules/manage/entity/EanUpcEntity.java
......@@ -15,7 +15,7 @@ import lombok.Data;
* @date 2021-12-06 16:04:53
*/
@Data
@TableName("center_outer.dbo.EAN_UPC")
@TableName("center_sync.dbo.EAN_UPC")
public class EanUpcEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
src/main/resources/application-prod.yml
spring:
redis:
open: true # 是否开启redis缓存 true开启 false关闭
database: 0
#host: 81.68.189.225
host: 127.0.0.1
port: 6379
#password: J0UjwnsIVDr7pSeU # 密码（默认为空）
password:
timeout: 6000ms # 连接超时时长（毫秒）
jedis:
pool:
max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
max-idle: 10 # 连接池中的最大空闲连接
min-idle: 5 # 连接池中的最小空闲连接
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
username: renren
password: 123456
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db
username: test
password: test123
initial-size: 10
max-active: 100
min-idle: 10
......@@ -33,7 +48,18 @@ spring:
config:
multi-statement-allow: true
dynamic:
datasource:
slave1:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=center_sync
username: test
password: test123
slave2:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db
username: test
password: test123
##多数据源的配置
#dynamic:
# datasource:
......@@ -47,11 +73,36 @@ spring:
# url: jdbc:postgresql://localhost:5432/renren_security
# username: renren
# password: 123456
server:
port: 9091
# password: 123456
#自定义文件上传路径
request:
upload:
file:
prefix: uploadFileResource
file:
save:
path: M:/uploadFileResource/
request:
prefix: http://192.168.0.81:9091/office/uploadFileResource/
ueditorSavePath: M:/uploadFileResource/
prefix_host: http://192.168.0.81:9091/office/
#uploadFileQY: C:\upload_img\firm_archives_file\ #/第二步，电子表格上传路径(企业认证)
uploadFileQY: M:/uploadFileResource/upload_img/firm_archives_file/ #/第二步，电子表格上传路径(企业认证)
#uploadFileQYOne: C:\upload_img\firmBusinessLicenseFile\ #第一步，营业执照上传路径(企业认证)
uploadFileQYOne: M:/uploadFileResource/upload_img/firmBusinessLicenseFile/ #第一步，营业执照上传路径(企业认证)
#是否开启查询限制 1 打开 0关闭
searchLimitSwitch: 0
#是否开启每次查询次数限制 1 打开 0关闭
searchDayLimitSwitch: 0
#查询次数限制上限
searchDayCountLimitSwitch: 100
#域名
gs1:
domain:
list:
- http://www.gs1cn.orgc
- http://www.ancc.org.cn
\ No newline at end of file
domain: http://192.168.0.81:80
\ No newline at end of file
src/main/resources/application-prod2.yml 0 → 100644
spring:
redis:
open: true # 是否开启redis缓存 true开启 false关闭
database: 0
#host: 81.68.189.225
host: 127.0.0.1
port: 6379
#password: J0UjwnsIVDr7pSeU # 密码（默认为空）
password:
timeout: 6000ms # 连接超时时长（毫秒）
jedis:
pool:
max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
max-idle: 10 # 连接池中的最大空闲连接
min-idle: 5 # 连接池中的最小空闲连接
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db
username: test
password: test123
initial-size: 10
max-active: 100
min-idle: 10
max-wait: 60000
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
#Oracle需要打开注释
#validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false
stat-view-servlet:
enabled: true
url-pattern: /druid/*
#login-username: admin
#login-password: admin
filter:
stat:
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: false
wall:
config:
multi-statement-allow: true
dynamic:
datasource:
slave1:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=center_sync
username: test
password: test123
slave2:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db
username: test
password: test123
##多数据源的配置
#dynamic:
# datasource:
# slave1:
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_security
# username: sa
# password: 123456
# slave2:
# driver-class-name: org.postgresql.Driver
# url: jdbc:postgresql://localhost:5432/renren_security
# username: renren
# password: 123456
server:
port: 9091
# password: 123456
#自定义文件上传路径
request:
upload:
file:
prefix: uploadFileResource
file:
save:
path: M:/uploadFileResource/
request:
prefix: http://192.168.0.82:9091/office/uploadFileResource/
ueditorSavePath: M:/uploadFileResource/
prefix_host: http://192.168.0.82:9091/office/
#uploadFileQY: C:\upload_img\firm_archives_file\ #/第二步，电子表格上传路径(企业认证)
uploadFileQY: M:/uploadFileResource/upload_img/firm_archives_file/ #/第二步，电子表格上传路径(企业认证)
#uploadFileQYOne: C:\upload_img\firmBusinessLicenseFile\ #第一步，营业执照上传路径(企业认证)
uploadFileQYOne: M:/uploadFileResource/upload_img/firmBusinessLicenseFile/ #第一步，营业执照上传路径(企业认证)
#是否开启查询限制 1 打开 0关闭
searchLimitSwitch: 0
#是否开启每次查询次数限制 1 打开 0关闭
searchDayLimitSwitch: 0
#查询次数限制上限
searchDayCountLimitSwitch: 100
#域名
gs1:
domain: http://192.168.0.81:80
\ No newline at end of file
src/main/resources/application.yml
......@@ -14,7 +14,7 @@ spring:
name: GS1OfficeWebSit
# 环境 dev|test|prod
profiles:
active: test
active: prod
# jackson时间格式化
jackson:
time-zone: GMT+8
......
src/main/resources/logback-spring.xml
......@@ -234,9 +234,34 @@
</root>
<logger name="io.office.modules.manage.dao" level="debug"/> <!-- 测试环境, 指定某包日志为info级 -->
</springProfile>
<!--
<springProfile name="pro">
<root level="info">
&lt;!&ndash; 生产环境最好不配置console写文件 &ndash;&gt;
<appender-ref ref="DEBUG_FILE" />
<appender-ref ref="INFO_FILE" />
<appender-ref ref="WARN_FILE" />
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
<logger name="io.office" level="warn"/> &lt;!&ndash; 生产环境, 指定某包日志为warn级 &ndash;&gt;
<logger name="io.office" level="info"/> &lt;!&ndash; 特定某个类打印info日志, 比如application启动成功后的提示语 &ndash;&gt;
</springProfile>-->
<springProfile name="prod2">
<root level="info">
<!-- 生产环境最好不配置console写文件 -->
<appender-ref ref="DEBUG_FILE" />
<appender-ref ref="INFO_FILE" />
<appender-ref ref="WARN_FILE" />
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
<logger name="io.office.modules.manage.dao" level="debug"/>
</springProfile>
<springProfile name="prod">
<root level="info">
<!-- 生产环境最好不配置console写文件 -->
<appender-ref ref="DEBUG_FILE" />
<appender-ref ref="INFO_FILE" />
......@@ -244,8 +269,7 @@
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
<logger name="io.office" level="warn"/> <!-- 生产环境, 指定某包日志为warn级 -->
<logger name="io.office" level="info"/> <!-- 特定某个类打印info日志, 比如application启动成功后的提示语 -->
<logger name="io.office.modules.manage.dao" level="debug"/>
</springProfile>
</configuration>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment