diff --git a/.gitignore b/.gitignore index 84adb3f..d339b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +.idea/ diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/acs/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 62ad5a0..988abb6 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -10,7 +10,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_acs_97}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:zzzw_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} # password: ${DB_PWD:Root.123456} diff --git a/acs/acs2/nladmin-ui/README.md b/acs/acs2/nladmin-ui/README.md index 352b6d7..e225319 100644 --- a/acs/acs2/nladmin-ui/README.md +++ b/acs/acs2/nladmin-ui/README.md @@ -1,2 +1,2 @@ -# 武汉新锐MES前端 +# 株洲中钨ACS前端 diff --git a/acs/acs2/nladmin-ui/src/assets/images/logo.png b/acs/acs2/nladmin-ui/src/assets/images/logo.png index fbfa3c9..3e041eb 100644 Binary files a/acs/acs2/nladmin-ui/src/assets/images/logo.png and b/acs/acs2/nladmin-ui/src/assets/images/logo.png differ diff --git a/acs/acs2/nladmin-ui/src/assets/images/logo1.png b/acs/acs2/nladmin-ui/src/assets/images/logo1.png index f757710..3e041eb 100644 Binary files a/acs/acs2/nladmin-ui/src/assets/images/logo1.png and b/acs/acs2/nladmin-ui/src/assets/images/logo1.png differ diff --git a/acs/acs2/nladmin-ui/src/assets/images/logo2.png b/acs/acs2/nladmin-ui/src/assets/images/logo2.png index a1ca19b..3e041eb 100644 Binary files a/acs/acs2/nladmin-ui/src/assets/images/logo2.png and b/acs/acs2/nladmin-ui/src/assets/images/logo2.png differ