wqp 2 月之前
父节点
当前提交
51052dcb84
共有 24 个文件被更改,包括 64 次插入64 次删除
  1. 3 3
      miniapp-admin/.project
  2. 2 2
      miniapp-admin/src/main/resources/application-druid.yml
  3. 7 7
      miniapp-admin/src/main/resources/application.yml
  4. 2 2
      miniapp-admin/target/classes/META-INF/maven/com.miniapp/miniapp-admin/pom.properties
  5. 2 2
      miniapp-admin/target/classes/application-druid.yml
  6. 7 7
      miniapp-admin/target/classes/application.yml
  7. 3 3
      miniapp-basics/.project
  8. 7 7
      miniapp-basics/src/main/java/com/miniapp/basics/service/impl/MiniAppUserServiceImpl.java
  9. 2 2
      miniapp-basics/target/classes/META-INF/maven/com.miniapp/miniapp-basics/pom.properties
  10. 二进制
      miniapp-basics/target/classes/com/miniapp/basics/service/impl/MiniAppUserServiceImpl.class
  11. 3 3
      miniapp-common/.project
  12. 1 1
      miniapp-common/src/main/java/com/miniapp/common/utils/oss/OSSUtils.java
  13. 2 2
      miniapp-common/target/classes/META-INF/maven/com.miniapp/miniapp-common/pom.properties
  14. 二进制
      miniapp-common/target/classes/com/miniapp/common/utils/oss/OSSUtils.class
  15. 3 3
      miniapp-framework/.project
  16. 3 3
      miniapp-framework/src/main/java/com/miniapp/framework/security/miniapp/UserDetailsMiniAppByOpenIdServiceImpl.java
  17. 2 2
      miniapp-framework/target/classes/META-INF/maven/com.miniapp/miniapp-framework/pom.properties
  18. 二进制
      miniapp-framework/target/classes/com/miniapp/framework/security/miniapp/UserDetailsMiniAppByOpenIdServiceImpl.class
  19. 3 3
      miniapp-generator/.project
  20. 2 2
      miniapp-generator/target/classes/META-INF/maven/com.miniapp/miniapp-generator/pom.properties
  21. 3 3
      miniapp-quartz/.project
  22. 2 2
      miniapp-quartz/target/classes/META-INF/maven/com.miniapp/miniapp-quartz/pom.properties
  23. 3 3
      miniapp-system/.project
  24. 2 2
      miniapp-system/target/classes/META-INF/maven/com.miniapp/miniapp-system/pom.properties

+ 3 - 3
miniapp-admin/.project

@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

+ 2 - 2
miniapp-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://127.0.0.1:3306/miniapp-demo-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/miniapp-xzhx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 12345
+                password: onesoft
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 7 - 7
miniapp-admin/src/main/resources/application.yml

@@ -74,7 +74,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: 123456
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -115,7 +115,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: true
+  enabled: false
   # 请求前缀
   pathMapping: /dev-api
 
@@ -138,8 +138,8 @@ wx:
       timeout: 5000
       database: 0
 #阿里oss配置
-oss:
-  endpoint:
-  bucket:
-  accessKeyId:
-  accessKeySecret:
+#oss:
+#  endpoint:
+#  bucket:
+#  accessKeyId:
+#  accessKeySecret:

+ 2 - 2
miniapp-admin/target/classes/META-INF/maven/com.miniapp/miniapp-admin/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Mon Sep 01 14:22:47 CST 2025
+#Tue Sep 02 14:13:32 CST 2025
 version=3.8.8
 groupId=com.miniapp
 m2e.projectName=miniapp-admin
-m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-xzhx-admin\\miniapp-admin
+m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-assign-platform\\miniapp-admin
 artifactId=miniapp-admin

+ 2 - 2
miniapp-admin/target/classes/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://127.0.0.1:3306/miniapp-demo-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/miniapp-xzhx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 12345
+                password: onesoft
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 7 - 7
miniapp-admin/target/classes/application.yml

@@ -74,7 +74,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: 123456
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -115,7 +115,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: true
+  enabled: false
   # 请求前缀
   pathMapping: /dev-api
 
@@ -138,8 +138,8 @@ wx:
       timeout: 5000
       database: 0
 #阿里oss配置
-oss:
-  endpoint:
-  bucket:
-  accessKeyId:
-  accessKeySecret:
+#oss:
+#  endpoint:
+#  bucket:
+#  accessKeyId:
+#  accessKeySecret:

+ 3 - 3
miniapp-basics/.project

@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

+ 7 - 7
miniapp-basics/src/main/java/com/miniapp/basics/service/impl/MiniAppUserServiceImpl.java

@@ -37,8 +37,8 @@ public class MiniAppUserServiceImpl implements IMiniAppUserService
     @Autowired
     private MiniAppUserMapper miniAppUserMapper;
 
-    @Autowired
-    private OSSUtils ossUtils;
+    //@Autowired
+    //private OSSUtils ossUtils;
 
     /**
      * 查询小程序用户
@@ -129,10 +129,10 @@ public class MiniAppUserServiceImpl implements IMiniAppUserService
             String format = DateUtil.format(new Date(), "/yyyyMMddHHmmssSSS.");
             String fileExtendName = FileUtils.getFileExtendName(file.getBytes());
             String filePath = MiniAppConstants.FilePrefix.USER_AVATAR + miniAppUser.getOpenId() + format + fileExtendName;
-            ossUtils.upload(filePath, file.getBytes());
-            String imgUrl = ossUtils.getUrl(filePath, false);
-            result.put("imgUrl", imgUrl);
-            result.put("filePath", filePath);
+            //ossUtils.upload(filePath, file.getBytes());
+            //String imgUrl = ossUtils.getUrl(filePath, false);
+            //result.put("imgUrl", imgUrl);
+            //result.put("filePath", filePath);
             miniAppUser.setAvatar(filePath);
             updateMiniAppUser(miniAppUser);
             return result;
@@ -152,7 +152,7 @@ public class MiniAppUserServiceImpl implements IMiniAppUserService
             {
             if(!ObjectUtils.isEmpty(user.getAvatar()))
             {
-                user.setAvatar(ossUtils.getUrl(user.getAvatar(), false));
+                //user.setAvatar(ossUtils.getUrl(user.getAvatar(), false));
             }
             }).collect(Collectors.toList());
         return result;

+ 2 - 2
miniapp-basics/target/classes/META-INF/maven/com.miniapp/miniapp-basics/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Mon Sep 01 14:22:38 CST 2025
+#Tue Sep 02 14:13:22 CST 2025
 version=3.8.8
 groupId=com.miniapp
 m2e.projectName=miniapp-basics
-m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-xzhx-admin\\miniapp-basics
+m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-assign-platform\\miniapp-basics
 artifactId=miniapp-basics

二进制
miniapp-basics/target/classes/com/miniapp/basics/service/impl/MiniAppUserServiceImpl.class


+ 3 - 3
miniapp-common/.project

@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

+ 1 - 1
miniapp-common/src/main/java/com/miniapp/common/utils/oss/OSSUtils.java

@@ -12,7 +12,7 @@ import java.io.ByteArrayInputStream;
 import java.net.URL;
 import java.util.Date;
 
-@Component
+//@Component
 public class OSSUtils
 {
 

+ 2 - 2
miniapp-common/target/classes/META-INF/maven/com.miniapp/miniapp-common/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Mon Sep 01 14:22:30 CST 2025
+#Tue Sep 02 14:13:20 CST 2025
 version=3.8.8
 groupId=com.miniapp
 m2e.projectName=miniapp-common
-m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-xzhx-admin\\miniapp-common
+m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-assign-platform\\miniapp-common
 artifactId=miniapp-common

二进制
miniapp-common/target/classes/com/miniapp/common/utils/oss/OSSUtils.class


+ 3 - 3
miniapp-framework/.project

@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

+ 3 - 3
miniapp-framework/src/main/java/com/miniapp/framework/security/miniapp/UserDetailsMiniAppByOpenIdServiceImpl.java

@@ -20,8 +20,8 @@ public class UserDetailsMiniAppByOpenIdServiceImpl implements UserDetailsService
     @Autowired
     private IMiniAppUserService miniAppUserService;
 
-    @Autowired
-    private OSSUtils ossUtils;
+    //@Autowired
+    //private OSSUtils ossUtils;
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
@@ -41,7 +41,7 @@ public class UserDetailsMiniAppByOpenIdServiceImpl implements UserDetailsService
     public UserDetails createWxLoginUser(MiniAppUser miniAppUser)
     {
         String avatar = miniAppUser.getAvatar();
-        miniAppUser.setAvatar(ObjectUtils.isEmpty(avatar) ? avatar : ossUtils.getUrl(avatar,false));
+        //miniAppUser.setAvatar(ObjectUtils.isEmpty(avatar) ? avatar : ossUtils.getUrl(avatar,false));
         return new LoginUser(miniAppUser);
     }
 }

+ 2 - 2
miniapp-framework/target/classes/META-INF/maven/com.miniapp/miniapp-framework/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Mon Sep 01 14:22:45 CST 2025
+#Tue Sep 02 14:13:29 CST 2025
 version=3.8.8
 groupId=com.miniapp
 m2e.projectName=miniapp-framework
-m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-xzhx-admin\\miniapp-framework
+m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-assign-platform\\miniapp-framework
 artifactId=miniapp-framework

二进制
miniapp-framework/target/classes/com/miniapp/framework/security/miniapp/UserDetailsMiniAppByOpenIdServiceImpl.class


+ 3 - 3
miniapp-generator/.project

@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

+ 2 - 2
miniapp-generator/target/classes/META-INF/maven/com.miniapp/miniapp-generator/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Mon Sep 01 14:22:39 CST 2025
+#Tue Sep 02 14:13:24 CST 2025
 version=3.8.8
 groupId=com.miniapp
 m2e.projectName=miniapp-generator
-m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-xzhx-admin\\miniapp-generator
+m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-assign-platform\\miniapp-generator
 artifactId=miniapp-generator

+ 3 - 3
miniapp-quartz/.project

@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

+ 2 - 2
miniapp-quartz/target/classes/META-INF/maven/com.miniapp/miniapp-quartz/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Mon Sep 01 14:22:41 CST 2025
+#Tue Sep 02 14:13:25 CST 2025
 version=3.8.8
 groupId=com.miniapp
 m2e.projectName=miniapp-quartz
-m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-xzhx-admin\\miniapp-quartz
+m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-assign-platform\\miniapp-quartz
 artifactId=miniapp-quartz

+ 3 - 3
miniapp-system/.project

@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

+ 2 - 2
miniapp-system/target/classes/META-INF/maven/com.miniapp/miniapp-system/pom.properties

@@ -1,7 +1,7 @@
 #Generated by Maven Integration for Eclipse
-#Mon Sep 01 14:22:43 CST 2025
+#Tue Sep 02 14:13:27 CST 2025
 version=3.8.8
 groupId=com.miniapp
 m2e.projectName=miniapp-system
-m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-xzhx-admin\\miniapp-system
+m2e.projectLocation=D\:\\Java\\workspace-tm\\miniapp-assign-platform\\miniapp-system
 artifactId=miniapp-system