fix-[xmg二期]:修改从库密码（弱口令问题）， <>替换为显式类型实参 （jdk打包报错）

src/main/java/com/ruoyi/project/VRdemo/domain/imData/ArchivesUnboundImData.java

@@ -23,7 +23,7 @@ public class ArchivesUnboundImData implements BaseImData<ArchivesUnboundImData,
     private String link;
 
     @ExcelIgnore
-    DataConverter<ArchivesUnboundImData, ArchivesUnbound> converter = new DataConverter<>() {
+    DataConverter<ArchivesUnboundImData, ArchivesUnbound> converter = new DataConverter<ArchivesUnboundImData, ArchivesUnbound>() {
         @Override
         protected ArchivesUnbound convert(ArchivesUnboundImData archivesUnboundImData) {
             ArchivesUnbound archivesUnbound = new ArchivesUnbound();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/ConsultationImData.java

@@ -29,7 +29,7 @@ public class ConsultationImData implements BaseImData<ConsultationImData, Consul
     private String introduce;
 
     @ExcelIgnore
-    DataConverter<ConsultationImData, Consultation> converter = new DataConverter<>() {
+    DataConverter<ConsultationImData, Consultation> converter = new DataConverter<ConsultationImData, Consultation>() {
         @Override
         protected Consultation convert(ConsultationImData consultationImData) {
             Consultation consultation = new Consultation();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/EconomyImData.java

@@ -26,7 +26,7 @@ public class EconomyImData implements BaseImData<EconomyImData, Economy> {
     private String introduce;
 
     @ExcelIgnore
-    DataConverter<EconomyImData, Economy> converter = new DataConverter<>() {
+    DataConverter<EconomyImData, Economy> converter = new DataConverter<EconomyImData, Economy>() {
         @Override
         protected Economy convert(EconomyImData economyImData) {
             Economy economy = new Economy();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/InstitutionImData.java

@@ -29,7 +29,7 @@ public class InstitutionImData implements BaseImData<InstitutionImData, Institut
     private String introduce;
 
     @ExcelIgnore
-    DataConverter<InstitutionImData, Institution> converter = new DataConverter<>() {
+    DataConverter<InstitutionImData, Institution> converter = new DataConverter<InstitutionImData, Institution>() {
         @Override
         protected Institution convert(InstitutionImData institutionImData) {
             Institution institution = new Institution();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/LiteratureImData.java

@@ -20,7 +20,7 @@ public class LiteratureImData implements BaseImData<LiteratureImData, Literature
     private String publicationTime;
 
     @ExcelIgnore
-    DataConverter<LiteratureImData, Literature> converter = new DataConverter<>(){
+    DataConverter<LiteratureImData, Literature> converter = new DataConverter<LiteratureImData, Literature>(){
         @Override
         protected Literature convert(LiteratureImData literatureImData) {
             Literature literature = new Literature();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/PressImData.java

@@ -39,7 +39,7 @@ public class PressImData implements BaseImData<PressImData, Press> {
     private String area;
 
     @ExcelIgnore
-    DataConverter<PressImData, Press> converter = new DataConverter<>() {
+    DataConverter<PressImData, Press> converter = new DataConverter<PressImData, Press>() {
         @Override
         protected Press convert(PressImData pressImData) {
             Press press = new Press();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/PublicationImData.java

@@ -26,7 +26,7 @@ public class PublicationImData implements BaseImData<PublicationImData, Publicat
     private String introduce;
 
     @ExcelIgnore
-    DataConverter<PublicationImData, Publication> converter = new DataConverter<>() {
+    DataConverter<PublicationImData, Publication> converter = new DataConverter<PublicationImData, Publication>() {
         @Override
         protected Publication convert(PublicationImData publicationImData) {
             Publication publication = new Publication();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/ResearchImData.java

@@ -29,7 +29,7 @@ public class ResearchImData implements BaseImData<ResearchImData, Research> {
     private String category;
 
     @ExcelIgnore
-    DataConverter<ResearchImData, Research> converter = new DataConverter<>() {
+    DataConverter<ResearchImData, Research> converter = new DataConverter<ResearchImData, Research>() {
         @Override
         protected Research convert(ResearchImData researchImData) {
             Research research = new Research();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/SpecialCollectionImData.java

@@ -20,7 +20,7 @@ public class SpecialCollectionImData implements BaseImData<SpecialCollectionImDa
     private String link;
 
     @ExcelIgnore
-    DataConverter<SpecialCollectionImData, SpecialCollection> converter = new DataConverter<>() {
+    DataConverter<SpecialCollectionImData, SpecialCollection> converter = new DataConverter<SpecialCollectionImData, SpecialCollection>() {
         @Override
         public SpecialCollection convert(SpecialCollectionImData collectionImData) {
             SpecialCollection specialCollection = new SpecialCollection();

src/main/java/com/ruoyi/project/VRdemo/domain/imData/ThesisImData.java

@@ -67,7 +67,7 @@ public class ThesisImData implements BaseImData<ThesisImData, Thesis> {
     }
 
     @ExcelIgnore
-    DataConverter<ThesisImData, Thesis> converter = new DataConverter<>() {
+    DataConverter<ThesisImData, Thesis> converter = new DataConverter<ThesisImData, Thesis>() {
         @Override
         protected Thesis convert(ThesisImData thesisImData) {
             Date finalDate = null;

src/main/java/com/ruoyi/project/VRdemo/service/impl/ArchivesUnboundServiceImpl.java

@@ -101,7 +101,7 @@ public class ArchivesUnboundServiceImpl implements IArchivesUnboundService {
      */
     @Override
     public String importData(List<ArchivesUnbound> dataList, boolean updateSupport) {
-        BulkImportService<ArchivesUnbound> importService = new BulkImportService<>() {
+        BulkImportService<ArchivesUnbound> importService = new BulkImportService<ArchivesUnbound>() {
             @Override
             protected Long checkExistingItem(ArchivesUnbound item) {
                 ArchivesUnbound archivesUnbound = archivesUnboundMapper.selectArchivesUnboundByTitle(item.getTitle());

src/main/java/com/ruoyi/project/VRdemo/service/impl/ConsultationServiceImplImpl.java

@@ -94,7 +94,7 @@ public class ConsultationServiceImplImpl implements IConsultationService {
 
     @Override
     public String importData(List<Consultation> dataList, boolean updateSupport) {
-        BulkImportService<Consultation> importService = new BulkImportService<>() {
+        BulkImportService<Consultation> importService = new BulkImportService<Consultation>() {
             @Override
             protected Long checkExistingItem(Consultation item) {
                 Consultation consultation = consultationMapper.selectConsultationByTitle(item.getChineseName(), item.getEnglishName());

src/main/java/com/ruoyi/project/VRdemo/service/impl/EconomyServiceImpl.java

@@ -102,7 +102,7 @@ public class EconomyServiceImpl implements IEconomyService {
      */
     @Override
     public String importData(List<Economy> dataList, boolean updateSupport) {
-        BulkImportService<Economy> importService = new BulkImportService<>() {
+        BulkImportService<Economy> importService = new BulkImportService<Economy>() {
             @Override
             protected Long checkExistingItem(Economy item) {
                 Economy economy = economyMapper.selectEconomyByTitle(item.getTitle());

src/main/java/com/ruoyi/project/VRdemo/service/impl/InstitutionServiceImpl.java

@@ -99,7 +99,7 @@ public class InstitutionServiceImpl implements IInstitutionService {
      */
     @Override
     public String importData(List<Institution> dataList, boolean updateSupport) {
-        BulkImportService<Institution> importService = new BulkImportService<>() {
+        BulkImportService<Institution> importService = new BulkImportService<Institution>() {
             @Override
             protected Long checkExistingItem(Institution item) {
                 Institution institution = institutionMapper.selectInstitutionByTitle(item.getChineseName(), item.getEnglishName());

src/main/java/com/ruoyi/project/VRdemo/service/impl/LiteratureServiceImpl.java

@@ -98,7 +98,7 @@ public class LiteratureServiceImpl implements ILiteratureService {
      */
     @Override
     public String importData(List<Literature> dataList, boolean updateSupport) {
-        BulkImportService<Literature> importService = new BulkImportService<>() {
+        BulkImportService<Literature> importService = new BulkImportService<Literature>() {
             @Override
             protected Long checkExistingItem(Literature item) {
                 Literature literature = literatureMapper.selectLiteratureByTitle(item.getTitle());

src/main/java/com/ruoyi/project/VRdemo/service/impl/PressServiceImpl.java

@@ -99,7 +99,7 @@ public class PressServiceImpl implements IPressService {
      */
     @Override
     public String importData(List<Press> dataList, boolean updateSupport) {
-        BulkImportService<Press> importService = new BulkImportService<>() {
+        BulkImportService<Press> importService = new BulkImportService<Press>() {
             @Override
             protected Long checkExistingItem(Press item) {
                 Press press = pressMapper.selectPressByTitle(item.getTitle());

src/main/java/com/ruoyi/project/VRdemo/service/impl/PublicationServiceImpl.java

@@ -102,7 +102,7 @@ public class PublicationServiceImpl implements IPublicationService {
      */
     @Override
     public String importData(List<Publication> dataList, boolean updateSupport) {
-        BulkImportService<Publication> importService = new BulkImportService<>() {
+        BulkImportService<Publication> importService = new BulkImportService<Publication>() {
             @Override
             protected Long checkExistingItem(Publication item) {
                 Publication publication = publicationMapper.selectPublicationByTitle(item.getTitle());

src/main/java/com/ruoyi/project/VRdemo/service/impl/ResearchServiceImpl.java

@@ -97,7 +97,7 @@ public class ResearchServiceImpl implements IResearchService {
      */
     @Override
     public String importData(List<Research> dataList, boolean updateSupport) {
-        BulkImportService<Research> importService = new BulkImportService<>() {
+        BulkImportService<Research> importService = new BulkImportService<Research>() {
             @Override
             protected Long checkExistingItem(Research item) {
                 Research research = researchMapper.selectResearchByTitle(item.getTitle());

src/main/java/com/ruoyi/project/VRdemo/service/impl/SpecialCollectionServiceImpl.java

@@ -102,7 +102,7 @@ public class SpecialCollectionServiceImpl implements ISpecialCollectionService {
      */
     @Override
     public String importData(List<SpecialCollection> dataList, boolean updateSupport) {
-        BulkImportService<SpecialCollection> importService = new BulkImportService<>() {
+        BulkImportService<SpecialCollection> importService = new BulkImportService<SpecialCollection>() {
             @Override
             protected Long checkExistingItem(SpecialCollection item) {
                 SpecialCollection specialCollection = specialCollectionMapper.selectCollectionByTitle(item.getTitle());

src/main/java/com/ruoyi/project/VRdemo/service/impl/ThesisServiceImpl.java

@@ -98,7 +98,7 @@ public class ThesisServiceImpl implements IThesisService {
      */
     @Override
     public String importData(List<Thesis> dataList, boolean updateSupport) {
-        BulkImportService<Thesis> importService = new BulkImportService<>() {
+        BulkImportService<Thesis> importService = new BulkImportService<Thesis>() {
             @Override
             protected Long checkExistingItem(Thesis item) {
                 Thesis thesis = thesisMapper.selectThesisByTitle(item.getTitle());

src/main/resources/application-product.yml

@@ -6,7 +6,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 3760
+  port: 8080
 
 spring:
   # redis 配置
@@ -21,9 +21,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://124.71.57.20:3306/vr-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: vrone
-        password: vrone123@
+        url: jdbc:mysql://localhost:3306/vr-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: root
 
 # 七牛云配置
 qiniu:

src/main/resources/application.yml

@@ -20,8 +20,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid  #测试
-    #active: product  #正式
+#    active: druid  #测试
+    active: product  #正式
     #  active: local
     #  active: seeseele
   # 文件上传
@@ -100,7 +100,7 @@ spring:
         url-pattern: /druid/*
         # 控制台管理用户名和密码
         login-username: ruoyi
-        login-password: 123456
+        login-password: 5xvse[49X_E-ILAy
       filter:
         stat:
           enabled: true