Browse Source

采美百科icon图标提交

yuwenjun1997 2 years ago
parent
commit
86abda5bfa

+ 6 - 6
src/main/resources/config/dev/application-dev.yml

@@ -4,14 +4,14 @@ spring:
   #数据源连接--start
   datasource:
     #本地连接数据库
-#    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-#    username: developer
-#    password: 05bZ/OxTB:X+yd%1
+    #url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    #username: developer
+    #password: 05bZ/OxTB:X+yd%1
     #测试连接数据库
     url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
     password: J5p3tgOVazNl4ydf
-    #type: com.zaxxer.hikari.HikariDataSource
+    type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
       maximum-pool-size: 15
@@ -56,8 +56,8 @@ caimei:
   #spiServer: http://192.168.2.68:8008
   coreServer: https://core-b.caimei365.com
   #coreServer: http://192.168.2.67:18002
-#  coreServer: http://192.168.2.17:18002
-  #coreServer: http://192.168.2.200:18002
+  #coreServer: http://192.168.2.17:18002
+  #coreServer: http://192.168.2.103:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http://localhost:8009
   destPath: classpath:/

BIN
src/main/resources/static/img/activity/attestation/section_bg_device_01.temp.png


BIN
src/main/resources/static/img/activity/attestation/section_bg_device_02.temp.png


BIN
src/main/resources/static/img/encyclopedia/assets/pc-icon-delete-hover.png


BIN
src/main/resources/static/img/encyclopedia/assets/pc-icon-delete.png


BIN
src/main/resources/static/img/encyclopedia/assets/pc-icon-edit-hover.png


BIN
src/main/resources/static/img/encyclopedia/assets/pc-icon-edit.png


BIN
src/main/resources/static/img/encyclopedia/assets/pc-icon-img-hover.png


BIN
src/main/resources/static/img/encyclopedia/assets/pc-icon-img.png