UPDATE - 更新相关代码优化

config_filters/filters-dev.properties

@@ -0,0 +1,25 @@
+#db
+db.ywtcenter.url=jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/ywt_center?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
+db.ywtcenter.username=ywt_qa
+db.ywtcenter.password=Ywtqa123456x*#
+db.glasses.url=jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/glasses?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
+db.glasses.username=ywt_qa
+db.glasses.password=Ywtqa123456x*#
+
+#nacos
+nacos.address=192.168.3.206:8848
+nacos.namespace=41e1cd78-70df-4760-8fa9-1b74baa75320
+
+
+logging.level.root=INFO
+
+#redis
+redis.host=192.168.3.202
+redis.port=6379
+
+#???
+ywt.wxsite.domain=m-qa.ywtinfo.com
+ywt.glasses.domain=glasses-qa.ywtinfo.com
+test.doctor.ids=10178,112,10179,10470,7,10533
+test.admin.ids=1,7,10
+

config_filters/filters-preproduct.properties

@@ -0,0 +1,6 @@
+#数据库配置
+db.ywtcenter.url=jdbc:mysql://192.168.3.202:3306/YwtCenter?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+db.ywtcenter.username=root
+db.ywtcenter.password=123456x
+
+logging.level.root=DEBUG

config_filters/filters-product.properties

@@ -0,0 +1 @@
+logging.level.root=ERROR

config_filters/filters-test.properties

@@ -0,0 +1,11 @@
+db.ywtcenter.url=jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/ywt_center?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
+db.ywtcenter.username=ywt_qa
+db.ywtcenter.password=Ywtqa123456x*#
+db.ywtlog.url=jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/ywt_log?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
+
+
+logging.level.root=INFO
+
+#redis \u914D\u7F6E
+redis.address=172.18.82.224:6339
+

pom.xml

@@ -78,6 +78,11 @@
         </dependencies>
     </dependencyManagement>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>

ywt-platform-glasses-common/pom.xml

@@ -30,32 +30,6 @@
 
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.zaxxer</groupId>
@@ -74,36 +48,11 @@
         </dependency>
 
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ywt</groupId>
-            <artifactId>ywt-biz-common</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
 
-        <!--		<dependency>-->
-        <!--			<groupId>com.google.guava</groupId>-->
-        <!--			<artifactId>guava</artifactId>-->
-        <!--		</dependency>-->
         <dependency>
             <groupId>net.sf.barcode4j</groupId>
             <artifactId>barcode4j-light</artifactId>
@@ -124,19 +73,12 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.belerweb</groupId>
-            <artifactId>pinyin4j</artifactId>
-        </dependency>
+
         <!-- BeanUtils的依赖 -->
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
 
     </dependencies>
 

ywt-platform-glasses-common/src/main/java/com/ywt/glasses/config/jpa/GlassesConfig.java

@@ -17,6 +17,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Map;
 
@@ -24,58 +25,50 @@ import java.util.Map;
 @Configuration
 @EnableTransactionManagement
 @EnableJpaRepositories(
-        entityManagerFactoryRef = "entityManagerFactory",
-        transactionManagerRef = "transactionManager",
-        basePackages = {"com.ywt.mg.domain.entity.glasses"}
+        entityManagerFactoryRef = "entityManagerFactoryGlasses",
+        transactionManagerRef = "transactionManagerGlasses",
+        basePackages = {"com.ywt.glasses.domain.entity.glasses"}
 )
 public class GlassesConfig {
     @Autowired
-    @Qualifier("glassesDataSource")
-    private DataSource glassesDataSource;
+    @Qualifier("ywtCenterDataSource")
+    private DataSource ywtCenterDataSource;
 
-//    @Primary
-//    @Bean(name = "entityManager")
-//    public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
-//        return entityManagerFactory(builder).getObject().createEntityManager();
-//    }
+    @Autowired
+    private JpaProperties jpaProperties;
 
-    @Primary
-    @Bean(name = "entityManager")
-    public EntityManager entityManager(EntityManagerFactoryBuilder builder,@Qualifier("glassesJpaProperties") JpaProperties jpaProperties) {
-        return entityManagerFactory(builder,jpaProperties).getObject().createEntityManager();
-    }
+    @Autowired
+    private HibernateProperties hibernateProperties;
 
-    @Primary
-    @Bean(name = "entityManagerFactory")
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory (EntityManagerFactoryBuilder builder,  @Qualifier("glassesJpaProperties") JpaProperties jpaProperties) {
-        return builder
-                .dataSource(glassesDataSource)
-                .properties(jpaProperties.getProperties())
-                .properties(new HibernateProperties()
-                        .determineHibernateProperties(
-                                jpaProperties.getProperties(), new HibernateSettings()))
-                .packages("com.ywt.mg.domain.entity.glasses") //设置实体类所在位置
-                .persistenceUnit("askcenterPersistenceUnit")
-                .build();
+    /*
+     * 通过LocalContainerEntityManagerFactoryBean来获取EntityManagerFactory实例
+     */
+    @Bean(name = "entityManagerFactoryBeanGlasses")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean(
+            EntityManagerFactoryBuilder builder) {
+        Map<String, Object> properties = hibernateProperties.determineHibernateProperties(
+                jpaProperties.getProperties(), new HibernateSettings());
+        return builder.dataSource(ywtCenterDataSource).properties(properties)
+                .packages("com.ywt.glasses.domain.entity.glasses").build();
     }
 
-//    @Autowired
-//    private JpaProperties jpaProperties;
-//
-//    private Map<String, String> getVendorProperties(DataSource dataSource) {
-//        return jpaProperties.getHibernateProperties(dataSource);
-//    }
-
-
-    @Bean(name = "glassesJpaProperties")
-    @ConfigurationProperties(prefix = "spring.jpa.glasses")
-    public JpaProperties jpaProperties() {
-        return new JpaProperties();
+    /*
+     * EntityManagerFactory类似于Hibernate的SessionFactory,mybatis的SqlSessionFactory
+     * 总之,在执行操作之前,我们总要获取一个EntityManager,这就类似于Hibernate的Session,
+     * mybatis的sqlSession.
+     */
+    @Bean(name = "entityManagerFactoryGlasses")
+    @Primary
+    public EntityManagerFactory entityManagerFactory(EntityManagerFactoryBuilder builder) {
+        return this.entityManagerFactoryBean(builder).getObject();
     }
 
+    /*
+     * 配置事务管理器
+     */
+    @Bean(name = "transactionManagerGlasses")
     @Primary
-    @Bean(name = "transactionManager")
     public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
-        return new JpaTransactionManager(entityManagerFactory(builder, jpaProperties()).getObject());
+        return new JpaTransactionManager(this.entityManagerFactory(builder));
     }
 }

ywt-platform-glasses-common/src/main/java/com/ywt/glasses/config/jpa/YwtCenterConfig.java

@@ -1,70 +1,76 @@
-package com.ywt.glasses.config.jpa;
+package com.ywt.order.common.config.db;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Map;
 
 /**
- * ywt_center数据库配置
- * @author dyh
+ * Created by huangguoping.
  */
 @Configuration
 @EnableTransactionManagement
 @EnableJpaRepositories(
-        entityManagerFactoryRef = "entityManagerFactoryBase",
-        transactionManagerRef = "transactionManagerBase",
-        basePackages = {"com.ywt.mg.domain.entity.center"}
+        entityManagerFactoryRef = "entityManagerFactoryCenter",
+        transactionManagerRef = "transactionManagerCenter",
+        basePackages = {"com.ywt.glasses.domain.entity.center"}
 )
-
+@Slf4j
 public class YwtCenterConfig {
     @Autowired
     @Qualifier("ywtCenterDataSource")
     private DataSource ywtCenterDataSource;
 
-    @Bean(name = "entityManagerBase")
-    public EntityManager entityManager(EntityManagerFactoryBuilder builder,@Qualifier("ywtCenterJpaProperties") JpaProperties jpaProperties) {
-        return entityManagerFactory(builder,jpaProperties).getObject().createEntityManager();
-    }
-
-    @Bean(name = "entityManagerFactoryBase")
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory (EntityManagerFactoryBuilder builder,  @Qualifier("ywtCenterJpaProperties") JpaProperties jpaProperties) {
-        return builder
-                .dataSource(ywtCenterDataSource)
-                .properties(jpaProperties.getProperties())
-                .properties(new HibernateProperties()
-                        .determineHibernateProperties(
-                                jpaProperties.getProperties(), new HibernateSettings()))
-                .packages("com.ywt.mg.domain.entity.center") //设置实体类所在位置
-                .persistenceUnit("askcenterPersistenceUnit")
-                .build();
-    }
-
     @Autowired
     private JpaProperties jpaProperties;
 
-    @Bean(name = "ywtCenterJpaProperties")
-    @ConfigurationProperties(prefix = "spring.jpa.ywtcenter")
-    public JpaProperties jpaProperties() {
-        return new JpaProperties();
+    @Autowired
+    private HibernateProperties hibernateProperties;
+
+    /*
+     * 通过LocalContainerEntityManagerFactoryBean来获取EntityManagerFactory实例
+     */
+    @Bean(name = "entityManagerFactoryBeanCenter")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean(
+            EntityManagerFactoryBuilder builder) {
+        Map<String, Object> properties = hibernateProperties.determineHibernateProperties(
+                jpaProperties.getProperties(), new HibernateSettings());
+        return builder.dataSource(ywtCenterDataSource).properties(properties)
+                .packages("com.ywt.glasses.domain.entity.center").build();
+    }
+
+    /*
+     * EntityManagerFactory类似于Hibernate的SessionFactory,mybatis的SqlSessionFactory
+     * 总之,在执行操作之前,我们总要获取一个EntityManager,这就类似于Hibernate的Session,
+     * mybatis的sqlSession.
+     */
+    @Bean(name = "entityManagerFactoryCenter")
+    public EntityManagerFactory entityManagerFactory(EntityManagerFactoryBuilder builder) {
+        log.info("创建ywt—center 的EntityManagerFactory");
+        return this.entityManagerFactoryBean(builder).getObject();
     }
 
-    @Bean(name = "transactionManagerBase")
+    /*
+     * 配置事务管理器
+     */
+    @Bean(name = "transactionManagerCenter")
     public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
-        return new JpaTransactionManager(entityManagerFactory(builder, jpaProperties()).getObject());
+        log.info("创建Center的TransactionManager");
+        return new JpaTransactionManager(this.entityManagerFactory(builder));
     }
 }

ywt-platform-glasses-common/src/main/java/com/ywt/glasses/config/jpa/DomainConfigurer.java → ywt-platform-glasses-common/src/main/java/com/ywt/glasses/config/param/DomainConfigurer.java

@@ -1,4 +1,4 @@
-package com.ywt.glasses.config.jpa;
+package com.ywt.glasses.config.param;
 
 import com.ywt.biz.common.util.Checker;
 import org.springframework.beans.factory.annotation.Value;
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class DomainConfigurer {
 
-    @Value("${ywt.glasses.domain}")
+    @Value("${glasses.domain}")
     private String ywtGlasses;
 
 

ywt-platform-glasses-common/src/main/java/com/ywt/glasses/config/param/ParameterConfigurer.java

@@ -13,13 +13,13 @@ import org.springframework.stereotype.Component;
 @Component
 public class ParameterConfigurer {
 
-    @Value("${test.doctor.ids}")
+    @Value("${glasses.test.doctor.ids}")
     private String testDoctorIds;
 
-    @Value("${test.admin.ids}")
+    @Value("${glasses.test.admin.ids}")
     private String testAdminIds;
 
-    @Value("${ywt.wxsite.domain}")
+    @Value("${glasses.wxsite.domain}")
     private String ywtMsiteDomainStr;
 
     public String getTestDoctorIds() {

ywt-platform-glasses-common/src/main/java/com/ywt/glasses/core/CookiesHelper.java

@@ -1,24 +0,0 @@
-package com.ywt.glasses.core;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by dyh2020
- */
-public class CookiesHelper {
-    public static Map<String,Cookie> getCookiesDict(HttpServletRequest httpServletRequest){
-        Cookie[] cookies = httpServletRequest.getCookies();
-        if (cookies != null && cookies.length > 0){
-            Map<String, Cookie> map = new HashMap<>();
-            for (Cookie cookie : cookies){
-                if (cookie.getName() == null || cookie.getName().equals("")) continue;
-                map.put(cookie.getName(), cookie);
-            }
-            return map;
-        }
-        return null;
-    }
-}

ywt-platform-glasses-common/src/main/java/com/ywt/glasses/core/CorsFilter.java

@@ -1,28 +0,0 @@
-package com.ywt.glasses.core;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-//@Component
-public class CorsFilter implements Filter{
-
-    private static Logger logger = LoggerFactory.getLogger(Filter.class);
-
-
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
-        HttpServletResponse response = (HttpServletResponse) res;
-        response.setHeader("Access-Control-Allow-Origin", "*");
-        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
-        response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
-        System.out.println("*********************************过滤器被使用**************************");
-        chain.doFilter(req, res);
-    }
-    public void init(FilterConfig filterConfig) {}
-    public void destroy() {}
-
-}

ywt-platform-glasses-sdk/pom.xml

@@ -46,120 +46,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>${protobuf.version}</version>
-<!--            <version>3.19.6</version>-->
         </dependency>
 
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>${protobuf.version}</version>
-<!--                            <version>3.19.6</version>-->
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl-over-slf4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jul-to-slf4j</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
-        </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.boot</groupId>-->
-        <!--            <artifactId>spring-boot-starter-redis</artifactId>-->
-        <!--        </dependency>-->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>com.google.guava</groupId>-->
-        <!--            <artifactId>guava</artifactId>-->
-        <!--            <version>${guava.version}</version>-->
-        <!--        </dependency>-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-            <!--            <version>1.7.0</version>-->
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-protobuf</artifactId>
-            <!--            <version>1.7.0</version>-->
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-stub</artifactId>
-            <!--            <version>1.7.0</version>-->
-        </dependency>
-
-
-        <!--  引入swagger包 -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <!--            <version>2.2.2</version>-->
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <!--            <version>2.2.2</version>-->
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
         </dependency>
     </dependencies>
 

ywt-platform-glasses-sdk/src/main/java/com/ywt/glasses/service/AreaService.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  * @program glasses_service
  * @description 地区服务
  **/
-@DubboService
+
 @Service
 public class AreaService {
     private static final Logger logger = LoggerFactory.getLogger(AreaService.class);

ywt-platform-glasses-sdk/src/main/java/com/ywt/glasses/service/GlassesIdGenerator.java

@@ -2,7 +2,6 @@ package com.ywt.glasses.service;
 
 import com.ywt.glasses.domain.entity.glasses.GlassesSequenceRepository;
 
-import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ywt-platform-glasses-sdk/src/main/java/com/ywt/glasses/service/ShopService.java

@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@DubboService
 @Service
 public class ShopService extends ServiceBase {
 

ywt-platform-glasses-sdk/src/main/java/com/ywt/glasses/service/UserService.java

@@ -17,9 +17,6 @@ public class UserService {
     private SqlHelper sqlHelper;
 
     @Autowired
-    private UserRepository userRepository;
-
-    @Autowired
     private MGAdminsRepository mgAdminsRepository;
 
     @Autowired
@@ -31,6 +28,9 @@ public class UserService {
     @Autowired
     private MgRightCacheService mgRightCacheService;
 
+    @Autowired
+    private UserRepository userRepository;
+
 
     public MGAdmins getCurrentAdmin() {
         return mgAdminsRepository.findById(getAdminId()).orElse(null);

ywt-platform-glasses-sdk/src/main/resources/application.yml

@@ -1,31 +0,0 @@
-spring:
-  application:
-    name: demo-rpc
-  datasource:
-    glasses:
-      url:${db.glasses.url}
-      username:${db.ywtcenter.username}
-      password:${db.ywtcenter.password}
-      driver-class-name:com.mysql.jdbc.Driver
-    ywtcenter:
-      url:${db.ywtcenter.url}
-      username:${db.ywtcenter.username}
-      password:${db.ywtcenter.password}
-      driver-class-name:com.mysql.jdbc.Driver
-
-
-dubbo:
-  application:
-    logger: slf4j
-    qos-enable: false
-    register-mode: instance    # all interface  dubbo3.0支持 注册服务模式
-  registry:
-    address: nacos://${nacos.address:127.0.0.1}:8848
-  protocol:  #协议
-    name: tri  #远triple协议
-    port: 20880  #端口
-  consumer:
-    #远程服务调用重试次数，不包括第一次调用，不需要重试请设为0
-    retries: 2
-    check: false
-

ywt-platform-glasses-web/pom.xml

@@ -17,20 +17,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-nacos</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ywt</groupId>
-            <artifactId>ywt-platform-glasses-common</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.ywt</groupId>
@@ -47,30 +33,23 @@
             <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
 
-        <!-- 自动装配dubbo-->
+        <!-- 注册中心 -->
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-nacos</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-        </dependency>
+
 
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -87,4 +66,56 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <active.profile>dev</active.profile>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <active.profile>test</active.profile>
+            </properties>
+        </profile>
+        <profile>
+            <id>product</id>
+            <properties>
+                <active.profile>product</active.profile>
+            </properties>
+        </profile>
+
+    </profiles>
+    <build>
+        <filters>
+            <filter>../config_filters/filters-${active.profile}.properties</filter>
+        </filters>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>utf-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

ywt-platform-glasses-sdk/src/main/java/com/ywt/glasses/DemoRpcServiceApplication.java → ywt-platform-glasses-web/src/main/java/com/ywt/GlassesFrontServiceApplication.java

@@ -6,10 +6,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 @EnableDubbo
-public class DemoRpcServiceApplication {
+public class GlassesFrontServiceApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(DemoRpcServiceApplication.class, args);
+        SpringApplication.run(GlassesFrontServiceApplication.class, args);
     }
 
 }

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/api/OrderController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/api/OrderController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.api;
+package com.ywt.glasses.controllers.api;
 
 import com.ywt.glasses.api.order.*;
 import com.ywt.glasses.core.BaseResponse;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/AuthController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/AuthController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg;
+package com.ywt.glasses.controllers.mg;
 
 import com.ywt.glasses.core.BaseResponse;
 import com.ywt.glasses.core.DataResponse;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/DictTypeController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/DictTypeController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg;
+package com.ywt.glasses.controllers.mg;
 
 
 import com.ywt.biz.common.util.Checker;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/EnumController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/EnumController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg;
+package com.ywt.glasses.controllers.mg;
 
 import com.ywt.biz.common.enums.PaymentChannelEnum;
 import com.ywt.glasses.core.BaseResponse;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/FileController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/FileController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg;
+package com.ywt.glasses.controllers.mg;
 
 import com.google.protobuf.ByteString;
 import com.ywt.biz.common.util.StringHelper;
@@ -14,7 +14,6 @@ import com.ywt.glasses.utils.DateUtil;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/GoodsOrderController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/GoodsOrderController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg;
+package com.ywt.glasses.controllers.mg;
 
 import com.ywt.biz.common.enums.PaymentChannelEnum;
 import com.ywt.biz.common.enums.PaymentStatusEnum;
@@ -8,7 +8,7 @@ import com.ywt.biz.common.util.DateUtil;
 import com.ywt.biz.common.util.FormatUtil;
 import com.ywt.glasses.api.mg.order.AmoutListRequest;
 import com.ywt.glasses.api.mg.order.QueryOrdersListRequest;
-import com.ywt.glasses.config.jpa.DomainConfigurer;
+import com.ywt.glasses.config.param.DomainConfigurer;
 import com.ywt.glasses.config.param.ParameterConfigurer;
 import com.ywt.glasses.constants.ConstantDef;
 import com.ywt.glasses.domain.entity.glasses.GoodsOrders;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/MgOrderController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/MgOrderController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg;
+package com.ywt.glasses.controllers.mg;
 
 import com.ywt.glasses.api.mg.order.*;
 import com.ywt.glasses.api.order.GetOrderDetailRemarkRequest;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/ShopController.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/ShopController.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg;
+package com.ywt.glasses.controllers.mg;
 
 import com.ywt.glasses.core.BaseResponse;
 import com.ywt.glasses.core.MGRight;

ywt-platform-glasses-web/src/main/java/com/ywt/controllers/mg/interceptors/AuthInterceptor.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/interceptors/AuthInterceptor.java

@@ -1,4 +1,4 @@
-package com.ywt.controllers.mg.interceptors;
+package com.ywt.glasses.controllers.mg.interceptors;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

ywt-platform-glasses-web/src/main/resources/application.yml

@@ -1,16 +1,66 @@
 server:
-  port: 8888
+  port: 8007
 spring:
+  main:
+    allow-circular-references: true  #service 中有循环依赖需要设置为true
+  # redis 配置
+  redis:
+    enable: true # 开启redis
+    host: @redis.host@
+    port: @redis.port@
+  http:
+    multipart:
+      maxFileSize: 10Mb
+      maxRequestSize: 10Mb
   application:
-    name: consumer
-
-
+    name: glasses-front-service   #眼镜店前置服务
+  # datasource 配置
+  datasource:
+    glasses:
+      jdbcUrl: @db.glasses.url@
+      driver-class-name: com.mysql.jdbc.Driver
+      username:  @db.glasses.username@
+      password:  @db.glasses.password@
+      initialSize: 10
+      maxActive: 2000
+      minIdle: 1
+      maximumPoolSize: 200
+      autoCommit: true
+      poolName: HikariPool_center
+      maxLifetime: 1800000
+      connectionTestQuery: SELECT 1
+    ywtcenter:
+      jdbcUrl: @db.ywtcenter.url@
+      driver-class-name: com.mysql.jdbc.Driver
+      username: @db.ywtcenter.username@
+      password: @db.ywtcenter.password@
+      initialSize: 10
+      maxActive: 2000
+      minIdle: 1
+      maximumPoolSize: 200
+      autoCommit: true
+      poolName: HikariPool_center
+      maxLifetime: 1800000
+      connectionTestQuery: SELECT 1
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.address@
+        namespace: @nacos.namespace@
+        username:
+        password:
+        metadata: # 保证微服务5s内能快速响应上线线
+          preserved.heart.beat.interval: 1000 # 该实例在客户端上报心跳的间隔时间，单位为毫秒，默认为5s
+          preserved.heart.beat.timeout: 5000 # 该实例在不发送心跳后，从健康到不健康的时间，单位为毫秒，默认为15s
+          preserved.ip.delete.timeout: 5000 # 该实例在不发送心跳后，被nacos下掉该实例的时间，单位为毫秒
 dubbo: #统一配置
   application:
     logger: slf4j
     qos-enable: false
   registry:
-    address: nacos://192.168.5.19:8848
+    address: nacos://@nacos.address@
+    parameters:
+      namespace: @nacos.namespace@
   protocol:  #协议  消费者端可不配置
     name: tri  #远triple协议
     port: 20881  #端口
@@ -18,3 +68,15 @@ dubbo: #统一配置
     #远程服务调用重试次数，不包括第一次调用，不需要重试请设为0
     retries: 2
     check: false
+
+#自定义参数
+glasses:
+    domain: @ywt.glasses.domain@
+    test:
+      doctor:
+        ids: @test.doctor.ids@
+      admin:
+        ids: @test.admin.ids@
+    wxsite:
+      domain: @ywt.wxsite.domain@
+

ywt-platform-glasses-web/src/main/resources/logback-spring.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>./logs/glasses_service.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>100MB</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.hibernate" level="ERROR" />
+    <!-- 日志输出级别 -->
+    <root level="@logging.level.root@">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="console" />
+    </root>
+</configuration>